diff --git a/debian/changelog b/debian/changelog index 1c2efc5c0e..c387598a30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,61 @@ +gtk+2.0 (2.18.4-1) unstable; urgency=low + + * New upstream bugfix release: + + debian/patches/070_mandatory-relibtoolize.patch: + - Updated for the new version. + + debian/patches/091_dont-omit-gtk-icon-size-dialog.patch, + debian/patches/092_gtk-image-size-allocation.patch: + - Dropped, merged upstream. + + -- Sebastian Dröge Tue, 01 Dec 2009 07:46:18 +0100 + +gtk+2.0 (2.18.3-1) unstable; urgency=low + + * New upstream bugfix release: + + debian/patches/070_mandatory-relibtoolize.patch: + - Updated for the new version. + * debian/patches/091_dont-omit-gtk-icon-size-dialog.patch: + + Patch from upstream GIT to not omit GTk_ICON_SIZE_DIALOG + when searching for an appropiate icon size. + * debian/patches/092_gtk-image-size-allocation.patch: + + Patch from upstream GIT to fix size allocation of GtkImage. + + -- Sebastian Dröge Sun, 18 Oct 2009 13:23:44 +0200 + +gtk+2.0 (2.18.2-1) unstable; urgency=low + + * New upstream bugfix release: + + debian/patches/070_mandatory-relibtoolize.patch: + - Updated for the new version. + + 090_directfb-backend-compilation-fix.patch: + - Dropped, merged upstream. + + -- Sebastian Dröge Tue, 06 Oct 2009 07:41:45 +0200 + +gtk+2.0 (2.18.1-1) unstable; urgency=low + + * New upstream bugfix release: + + debian/patches/070_mandatory-relibtoolize.patch: + - Updated for the new version. + + 090_directfb-backend-compilation-fix.patch: + - Fix compilation of the DirectFB backend, see + https://bugzilla.gnome.org/show_bug.cgi?id=596959 + + -- Sebastian Dröge Thu, 01 Oct 2009 07:20:43 +0200 + +gtk+2.0 (2.18.0-1) unstable; urgency=low + + * New upstream stable release: + + debian/rules, + debian/*.symbols: + - Updated for the new version. + + debian/patches/005_gdk_directfb_window_new.patch: + - Dropped, merged upstream. + + debian/patches/070_mandatory-relibtoolize.patch: + - Updated for the new version. + + -- Sebastian Dröge Wed, 23 Sep 2009 06:36:41 +0200 + gtk+2.0 (2.17.11-1) experimental; urgency=low * New upstream development release: diff --git a/debian/libgtk-directfb-2.0-0.symbols b/debian/libgtk-directfb-2.0-0.symbols index 208337ed09..74a1ee1e92 100644 --- a/debian/libgtk-directfb-2.0-0.symbols +++ b/debian/libgtk-directfb-2.0-0.symbols @@ -20,7 +20,7 @@ libgdk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gdk_cairo_create@Base 2.8.0 gdk_cairo_rectangle@Base 2.8.0 gdk_cairo_region@Base 2.8.0 - gdk_cairo_reset_clip@Base 2.17.11 + gdk_cairo_reset_clip@Base 2.18.0 gdk_cairo_set_source_color@Base 2.8.0 gdk_cairo_set_source_pixbuf@Base 2.8.0 gdk_cairo_set_source_pixmap@Base 2.10.0 @@ -106,13 +106,13 @@ libgdk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gdk_directfb_visual_by_format@Base 2.8.0 gdk_directfb_window_find_focus@Base 2.8.0 gdk_directfb_window_find_toplevel@Base 2.8.0 - gdk_directfb_window_get_pointer_helper@Base 2.17.11 + gdk_directfb_window_get_pointer_helper@Base 2.18.0 gdk_directfb_window_id_table_insert@Base 2.8.0 gdk_directfb_window_id_table_lookup@Base 2.8.0 gdk_directfb_window_id_table_remove@Base 2.8.0 - gdk_directfb_window_input_shape_combine_region@Base 2.17.11 + gdk_directfb_window_input_shape_combine_region@Base 2.18.0 gdk_directfb_window_lookup@Base 2.10.0 - gdk_directfb_window_new@Base 2.17.11 + gdk_directfb_window_new@Base 2.18.0 gdk_directfb_window_send_crossing_events@Base 2.8.0 gdk_directfb_window_set_opacity@Base 2.8.0 gdk_display_add_client_message_filter@Base 2.8.0 @@ -364,10 +364,10 @@ libgdk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gdk_notify_startup_complete@Base 2.8.0 gdk_notify_startup_complete_with_id@Base 2.12.0 gdk_notify_type_get_type@Base 2.8.0 - gdk_offscreen_window_get_embedder@Base 2.17.11 - gdk_offscreen_window_get_pixmap@Base 2.17.11 - gdk_offscreen_window_get_type@Base 2.17.11 - gdk_offscreen_window_set_embedder@Base 2.17.11 + gdk_offscreen_window_get_embedder@Base 2.18.0 + gdk_offscreen_window_get_pixmap@Base 2.18.0 + gdk_offscreen_window_get_type@Base 2.18.0 + gdk_offscreen_window_set_embedder@Base 2.18.0 gdk_overlap_type_get_type@Base 2.8.0 gdk_owner_change_get_type@Base 2.8.0 gdk_pango_attr_emboss_color_new@Base 2.12.0 @@ -432,7 +432,7 @@ libgdk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gdk_region_offset@Base 2.8.0 gdk_region_point_in@Base 2.8.0 gdk_region_polygon@Base 2.8.0 - gdk_region_rect_equal@Base 2.17.11 + gdk_region_rect_equal@Base 2.18.0 gdk_region_rect_in@Base 2.8.0 gdk_region_rectangle@Base 2.8.0 gdk_region_shrink@Base 2.8.0 @@ -502,7 +502,7 @@ libgdk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gdk_selection_owner_get_for_display@Base 2.8.0 gdk_selection_owner_set@Base 2.8.0 gdk_selection_owner_set_for_display@Base 2.8.0 - gdk_selection_property_get@Base 2.17.11 + gdk_selection_property_get@Base 2.18.0 gdk_selection_send_notify@Base 2.8.0 gdk_selection_send_notify_for_display@Base 2.8.0 gdk_set_double_click_time@Base 2.8.0 @@ -588,16 +588,17 @@ libgdk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gdk_window_edge_get_type@Base 2.8.0 gdk_window_enable_synchronized_configure@Base 2.8.0 gdk_window_end_paint@Base 2.8.0 - gdk_window_ensure_native@Base 2.17.11 + gdk_window_ensure_native@Base 2.18.0 + gdk_window_flush@Base 2.18.0 gdk_window_focus@Base 2.8.0 gdk_window_foreign_new@Base 2.8.0 gdk_window_foreign_new_for_display@Base 2.8.0 gdk_window_freeze_toplevel_updates_libgtk_only@Base 2.12.0 gdk_window_freeze_updates@Base 2.8.0 gdk_window_fullscreen@Base 2.8.0 - gdk_window_geometry_changed@Base 2.17.11 + gdk_window_geometry_changed@Base 2.18.0 gdk_window_get_children@Base 2.8.0 - gdk_window_get_cursor@Base 2.17.11 + gdk_window_get_cursor@Base 2.18.0 gdk_window_get_decorations@Base 2.8.0 gdk_window_get_deskrelative_origin@Base 2.8.0 gdk_window_get_events@Base 2.8.0 @@ -609,7 +610,7 @@ libgdk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gdk_window_get_parent@Base 2.8.0 gdk_window_get_pointer@Base 2.8.0 gdk_window_get_position@Base 2.8.0 - gdk_window_get_root_coords@Base 2.17.11 + gdk_window_get_root_coords@Base 2.18.0 gdk_window_get_root_origin@Base 2.8.0 gdk_window_get_state@Base 2.8.0 gdk_window_get_toplevel@Base 2.8.0 @@ -628,7 +629,7 @@ libgdk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gdk_window_invalidate_maybe_recurse@Base 2.8.0 gdk_window_invalidate_rect@Base 2.8.0 gdk_window_invalidate_region@Base 2.8.0 - gdk_window_is_destroyed@Base 2.17.11 + gdk_window_is_destroyed@Base 2.18.0 gdk_window_is_viewable@Base 2.8.0 gdk_window_is_visible@Base 2.8.0 gdk_window_lookup@Base 2.8.0 @@ -652,7 +653,7 @@ libgdk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gdk_window_remove_redirection@Base 2.14.0 gdk_window_reparent@Base 2.8.0 gdk_window_resize@Base 2.8.0 - gdk_window_restack@Base 2.17.11 + gdk_window_restack@Base 2.18.0 gdk_window_scroll@Base 2.8.0 gdk_window_set_accept_focus@Base 2.8.0 gdk_window_set_back_pixmap@Base 2.8.0 @@ -1058,24 +1059,24 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_cell_renderer_combo_get_type@Base 2.8.0 gtk_cell_renderer_combo_new@Base 2.8.0 gtk_cell_renderer_editing_canceled@Base 2.8.0 - gtk_cell_renderer_get_alignment@Base 2.17.11 + gtk_cell_renderer_get_alignment@Base 2.18.0 gtk_cell_renderer_get_fixed_size@Base 2.8.0 - gtk_cell_renderer_get_padding@Base 2.17.11 - gtk_cell_renderer_get_sensitive@Base 2.17.11 + gtk_cell_renderer_get_padding@Base 2.18.0 + gtk_cell_renderer_get_sensitive@Base 2.18.0 gtk_cell_renderer_get_size@Base 2.8.0 gtk_cell_renderer_get_type@Base 2.8.0 - gtk_cell_renderer_get_visible@Base 2.17.11 + gtk_cell_renderer_get_visible@Base 2.18.0 gtk_cell_renderer_mode_get_type@Base 2.8.0 gtk_cell_renderer_pixbuf_get_type@Base 2.8.0 gtk_cell_renderer_pixbuf_new@Base 2.8.0 gtk_cell_renderer_progress_get_type@Base 2.8.0 gtk_cell_renderer_progress_new@Base 2.8.0 gtk_cell_renderer_render@Base 2.8.0 - gtk_cell_renderer_set_alignment@Base 2.17.11 + gtk_cell_renderer_set_alignment@Base 2.18.0 gtk_cell_renderer_set_fixed_size@Base 2.8.0 - gtk_cell_renderer_set_padding@Base 2.17.11 - gtk_cell_renderer_set_sensitive@Base 2.17.11 - gtk_cell_renderer_set_visible@Base 2.17.11 + gtk_cell_renderer_set_padding@Base 2.18.0 + gtk_cell_renderer_set_sensitive@Base 2.18.0 + gtk_cell_renderer_set_visible@Base 2.18.0 gtk_cell_renderer_spin_get_type@Base 2.10.0 gtk_cell_renderer_spin_new@Base 2.10.0 gtk_cell_renderer_start_editing@Base 2.8.0 @@ -1084,12 +1085,12 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_cell_renderer_text_get_type@Base 2.8.0 gtk_cell_renderer_text_new@Base 2.8.0 gtk_cell_renderer_text_set_fixed_height_from_font@Base 2.8.0 - gtk_cell_renderer_toggle_get_activatable@Base 2.17.11 + gtk_cell_renderer_toggle_get_activatable@Base 2.18.0 gtk_cell_renderer_toggle_get_active@Base 2.8.0 gtk_cell_renderer_toggle_get_radio@Base 2.8.0 gtk_cell_renderer_toggle_get_type@Base 2.8.0 gtk_cell_renderer_toggle_new@Base 2.8.0 - gtk_cell_renderer_toggle_set_activatable@Base 2.17.11 + gtk_cell_renderer_toggle_set_activatable@Base 2.18.0 gtk_cell_renderer_toggle_set_active@Base 2.8.0 gtk_cell_renderer_toggle_set_radio@Base 2.8.0 gtk_cell_type_get_type@Base 2.8.0 @@ -1428,7 +1429,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_curve_set_range@Base 2.8.0 gtk_curve_set_vector@Base 2.8.0 gtk_curve_type_get_type@Base 2.8.0 - gtk_custom_paper_unix_dialog_get_type@Base 2.17.11 + gtk_custom_paper_unix_dialog_get_type@Base 2.18.0 gtk_debug_flag_get_type@Base 2.8.0 gtk_debug_flags@Base 2.8.0 gtk_decorated_window_calculate_frame_size@Base 2.8.0 @@ -1534,18 +1535,18 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_editable_set_editable@Base 2.8.0 gtk_editable_set_position@Base 2.8.0 gtk_entry_append_text@Base 2.8.0 - gtk_entry_buffer_delete_text@Base 2.17.11 - gtk_entry_buffer_emit_deleted_text@Base 2.17.11 - gtk_entry_buffer_emit_inserted_text@Base 2.17.11 - gtk_entry_buffer_get_bytes@Base 2.17.11 - gtk_entry_buffer_get_length@Base 2.17.11 - gtk_entry_buffer_get_max_length@Base 2.17.11 - gtk_entry_buffer_get_text@Base 2.17.11 - gtk_entry_buffer_get_type@Base 2.17.11 - gtk_entry_buffer_insert_text@Base 2.17.11 - gtk_entry_buffer_new@Base 2.17.11 - gtk_entry_buffer_set_max_length@Base 2.17.11 - gtk_entry_buffer_set_text@Base 2.17.11 + gtk_entry_buffer_delete_text@Base 2.18.0 + gtk_entry_buffer_emit_deleted_text@Base 2.18.0 + gtk_entry_buffer_emit_inserted_text@Base 2.18.0 + gtk_entry_buffer_get_bytes@Base 2.18.0 + gtk_entry_buffer_get_length@Base 2.18.0 + gtk_entry_buffer_get_max_length@Base 2.18.0 + gtk_entry_buffer_get_text@Base 2.18.0 + gtk_entry_buffer_get_type@Base 2.18.0 + gtk_entry_buffer_insert_text@Base 2.18.0 + gtk_entry_buffer_new@Base 2.18.0 + gtk_entry_buffer_set_max_length@Base 2.18.0 + gtk_entry_buffer_set_text@Base 2.18.0 gtk_entry_completion_complete@Base 2.8.0 gtk_entry_completion_delete_action@Base 2.8.0 gtk_entry_completion_get_completion_prefix@Base 2.12.0 @@ -1574,7 +1575,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_entry_completion_set_text_column@Base 2.8.0 gtk_entry_get_activates_default@Base 2.8.0 gtk_entry_get_alignment@Base 2.8.0 - gtk_entry_get_buffer@Base 2.17.11 + gtk_entry_get_buffer@Base 2.18.0 gtk_entry_get_completion@Base 2.8.0 gtk_entry_get_current_icon_drag_source@Base 2.16.0 gtk_entry_get_cursor_hadjustment@Base 2.12.0 @@ -1605,14 +1606,14 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_entry_icon_position_get_type@Base 2.16.0 gtk_entry_layout_index_to_text_index@Base 2.8.0 gtk_entry_new@Base 2.8.0 - gtk_entry_new_with_buffer@Base 2.17.11 + gtk_entry_new_with_buffer@Base 2.18.0 gtk_entry_new_with_max_length@Base 2.8.0 gtk_entry_prepend_text@Base 2.8.0 gtk_entry_progress_pulse@Base 2.16.0 gtk_entry_select_region@Base 2.8.0 gtk_entry_set_activates_default@Base 2.8.0 gtk_entry_set_alignment@Base 2.8.0 - gtk_entry_set_buffer@Base 2.17.11 + gtk_entry_set_buffer@Base 2.18.0 gtk_entry_set_completion@Base 2.8.0 gtk_entry_set_cursor_hadjustment@Base 2.12.0 gtk_entry_set_editable@Base 2.8.0 @@ -1685,7 +1686,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_file_chooser_error_get_type@Base 2.8.0 gtk_file_chooser_error_quark@Base 2.8.0 gtk_file_chooser_get_action@Base 2.8.0 - gtk_file_chooser_get_create_folders@Base 2.17.11 + gtk_file_chooser_get_create_folders@Base 2.18.0 gtk_file_chooser_get_current_folder@Base 2.8.0 gtk_file_chooser_get_current_folder_file@Base 2.14.0 gtk_file_chooser_get_current_folder_uri@Base 2.8.0 @@ -1719,7 +1720,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_file_chooser_select_filename@Base 2.8.0 gtk_file_chooser_select_uri@Base 2.8.0 gtk_file_chooser_set_action@Base 2.8.0 - gtk_file_chooser_set_create_folders@Base 2.17.11 + gtk_file_chooser_set_create_folders@Base 2.18.0 gtk_file_chooser_set_current_folder@Base 2.8.0 gtk_file_chooser_set_current_folder_file@Base 2.14.0 gtk_file_chooser_set_current_folder_uri@Base 2.8.0 @@ -1961,7 +1962,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_icon_view_get_dest_item_at_pos@Base 2.8.0 gtk_icon_view_get_drag_dest_item@Base 2.8.0 gtk_icon_view_get_item_at_pos@Base 2.8.0 - gtk_icon_view_get_item_padding@Base 2.17.11 + gtk_icon_view_get_item_padding@Base 2.18.0 gtk_icon_view_get_item_width@Base 2.8.0 gtk_icon_view_get_margin@Base 2.8.0 gtk_icon_view_get_markup_column@Base 2.8.0 @@ -1991,7 +1992,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_icon_view_set_columns@Base 2.8.0 gtk_icon_view_set_cursor@Base 2.8.0 gtk_icon_view_set_drag_dest_item@Base 2.8.0 - gtk_icon_view_set_item_padding@Base 2.17.11 + gtk_icon_view_set_item_padding@Base 2.18.0 gtk_icon_view_set_item_width@Base 2.8.0 gtk_icon_view_set_margin@Base 2.8.0 gtk_icon_view_set_markup_column@Base 2.8.0 @@ -2085,19 +2086,19 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_image_set_from_stock@Base 2.8.0 gtk_image_set_pixel_size@Base 2.8.0 gtk_image_type_get_type@Base 2.8.0 - gtk_info_bar_add_action_widget@Base 2.17.11 - gtk_info_bar_add_button@Base 2.17.11 - gtk_info_bar_add_buttons@Base 2.17.11 - gtk_info_bar_get_action_area@Base 2.17.11 - gtk_info_bar_get_content_area@Base 2.17.11 - gtk_info_bar_get_message_type@Base 2.17.11 - gtk_info_bar_get_type@Base 2.17.11 - gtk_info_bar_new@Base 2.17.11 - gtk_info_bar_new_with_buttons@Base 2.17.11 - gtk_info_bar_response@Base 2.17.11 - gtk_info_bar_set_default_response@Base 2.17.11 - gtk_info_bar_set_message_type@Base 2.17.11 - gtk_info_bar_set_response_sensitive@Base 2.17.11 + gtk_info_bar_add_action_widget@Base 2.18.0 + gtk_info_bar_add_button@Base 2.18.0 + gtk_info_bar_add_buttons@Base 2.18.0 + gtk_info_bar_get_action_area@Base 2.18.0 + gtk_info_bar_get_content_area@Base 2.18.0 + gtk_info_bar_get_message_type@Base 2.18.0 + gtk_info_bar_get_type@Base 2.18.0 + gtk_info_bar_new@Base 2.18.0 + gtk_info_bar_new_with_buttons@Base 2.18.0 + gtk_info_bar_response@Base 2.18.0 + gtk_info_bar_set_default_response@Base 2.18.0 + gtk_info_bar_set_message_type@Base 2.18.0 + gtk_info_bar_set_response_sensitive@Base 2.18.0 gtk_init@Base 2.8.0 gtk_init_add@Base 2.8.0 gtk_init_check@Base 2.8.0 @@ -2146,7 +2147,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_label_get@Base 2.8.0 gtk_label_get_angle@Base 2.8.0 gtk_label_get_attributes@Base 2.8.0 - gtk_label_get_current_uri@Base 2.17.11 + gtk_label_get_current_uri@Base 2.18.0 gtk_label_get_ellipsize@Base 2.8.0 gtk_label_get_justify@Base 2.8.0 gtk_label_get_label@Base 2.8.0 @@ -2161,7 +2162,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_label_get_selection_bounds@Base 2.8.0 gtk_label_get_single_line_mode@Base 2.8.0 gtk_label_get_text@Base 2.8.0 - gtk_label_get_track_visited_links@Base 2.17.11 + gtk_label_get_track_visited_links@Base 2.18.0 gtk_label_get_type@Base 2.8.0 gtk_label_get_use_markup@Base 2.8.0 gtk_label_get_use_underline@Base 2.8.0 @@ -2186,7 +2187,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_label_set_single_line_mode@Base 2.8.0 gtk_label_set_text@Base 2.8.0 gtk_label_set_text_with_mnemonic@Base 2.8.0 - gtk_label_set_track_visited_links@Base 2.17.11 + gtk_label_set_track_visited_links@Base 2.18.0 gtk_label_set_use_markup@Base 2.8.0 gtk_label_set_use_underline@Base 2.8.0 gtk_label_set_width_chars@Base 2.8.0 @@ -2314,7 +2315,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_menu_get_attach_widget@Base 2.8.0 gtk_menu_get_for_attach_widget@Base 2.8.0 gtk_menu_get_monitor@Base 2.14.0 - gtk_menu_get_reserve_toggle_size@Base 2.17.11 + gtk_menu_get_reserve_toggle_size@Base 2.18.0 gtk_menu_get_tearoff_state@Base 2.8.0 gtk_menu_get_title@Base 2.8.0 gtk_menu_get_type@Base 2.8.0 @@ -2347,7 +2348,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_menu_set_accel_path@Base 2.8.0 gtk_menu_set_active@Base 2.8.0 gtk_menu_set_monitor@Base 2.8.0 - gtk_menu_set_reserve_toggle_size@Base 2.17.11 + gtk_menu_set_reserve_toggle_size@Base 2.18.0 gtk_menu_set_screen@Base 2.8.0 gtk_menu_set_tearoff_state@Base 2.8.0 gtk_menu_set_title@Base 2.8.0 @@ -2622,7 +2623,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_print_backend_printer_list_is_done@Base 2.10.0 gtk_print_backend_remove_printer@Base 2.10.0 gtk_print_backend_set_list_done@Base 2.10.0 - gtk_print_backend_set_password@Base 2.17.11 + gtk_print_backend_set_password@Base 2.18.0 gtk_print_capabilities_get_type@Base 2.10.0 gtk_print_context_create_pango_context@Base 2.10.0 gtk_print_context_create_pango_layout@Base 2.10.0 @@ -2654,14 +2655,14 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_print_operation_cancel@Base 2.10.0 gtk_print_operation_draw_page_finish@Base 2.16.0 gtk_print_operation_get_default_page_setup@Base 2.10.0 - gtk_print_operation_get_embed_page_setup@Base 2.17.11 + gtk_print_operation_get_embed_page_setup@Base 2.18.0 gtk_print_operation_get_error@Base 2.10.0 - gtk_print_operation_get_has_selection@Base 2.17.11 - gtk_print_operation_get_n_pages_to_print@Base 2.17.11 + gtk_print_operation_get_has_selection@Base 2.18.0 + gtk_print_operation_get_n_pages_to_print@Base 2.18.0 gtk_print_operation_get_print_settings@Base 2.10.0 gtk_print_operation_get_status@Base 2.10.0 gtk_print_operation_get_status_string@Base 2.10.0 - gtk_print_operation_get_support_selection@Base 2.17.11 + gtk_print_operation_get_support_selection@Base 2.18.0 gtk_print_operation_get_type@Base 2.10.0 gtk_print_operation_is_finished@Base 2.10.0 gtk_print_operation_new@Base 2.10.0 @@ -2676,14 +2677,14 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_print_operation_set_custom_tab_label@Base 2.10.0 gtk_print_operation_set_default_page_setup@Base 2.10.0 gtk_print_operation_set_defer_drawing@Base 2.16.0 - gtk_print_operation_set_embed_page_setup@Base 2.17.11 + gtk_print_operation_set_embed_page_setup@Base 2.18.0 gtk_print_operation_set_export_filename@Base 2.10.0 - gtk_print_operation_set_has_selection@Base 2.17.11 + gtk_print_operation_set_has_selection@Base 2.18.0 gtk_print_operation_set_job_name@Base 2.10.0 gtk_print_operation_set_n_pages@Base 2.10.0 gtk_print_operation_set_print_settings@Base 2.10.0 gtk_print_operation_set_show_progress@Base 2.10.0 - gtk_print_operation_set_support_selection@Base 2.17.11 + gtk_print_operation_set_support_selection@Base 2.18.0 gtk_print_operation_set_track_print_status@Base 2.10.0 gtk_print_operation_set_unit@Base 2.10.0 gtk_print_operation_set_use_full_page@Base 2.10.0 @@ -2769,23 +2770,23 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_print_status_get_type@Base 2.10.0 gtk_print_unix_dialog_add_custom_tab@Base 2.10.0 gtk_print_unix_dialog_get_current_page@Base 2.10.0 - gtk_print_unix_dialog_get_embed_page_setup@Base 2.17.11 - gtk_print_unix_dialog_get_has_selection@Base 2.17.11 - gtk_print_unix_dialog_get_manual_capabilities@Base 2.17.11 + gtk_print_unix_dialog_get_embed_page_setup@Base 2.18.0 + gtk_print_unix_dialog_get_has_selection@Base 2.18.0 + gtk_print_unix_dialog_get_manual_capabilities@Base 2.18.0 gtk_print_unix_dialog_get_page_setup@Base 2.10.0 - gtk_print_unix_dialog_get_page_setup_set@Base 2.17.11 + gtk_print_unix_dialog_get_page_setup_set@Base 2.18.0 gtk_print_unix_dialog_get_selected_printer@Base 2.10.0 gtk_print_unix_dialog_get_settings@Base 2.10.0 - gtk_print_unix_dialog_get_support_selection@Base 2.17.11 + gtk_print_unix_dialog_get_support_selection@Base 2.18.0 gtk_print_unix_dialog_get_type@Base 2.10.0 gtk_print_unix_dialog_new@Base 2.10.0 gtk_print_unix_dialog_set_current_page@Base 2.10.0 - gtk_print_unix_dialog_set_embed_page_setup@Base 2.17.11 - gtk_print_unix_dialog_set_has_selection@Base 2.17.11 + gtk_print_unix_dialog_set_embed_page_setup@Base 2.18.0 + gtk_print_unix_dialog_set_has_selection@Base 2.18.0 gtk_print_unix_dialog_set_manual_capabilities@Base 2.10.0 gtk_print_unix_dialog_set_page_setup@Base 2.10.0 gtk_print_unix_dialog_set_settings@Base 2.10.0 - gtk_print_unix_dialog_set_support_selection@Base 2.17.11 + gtk_print_unix_dialog_set_support_selection@Base 2.18.0 gtk_printer_accepts_pdf@Base 2.10.0 gtk_printer_accepts_ps@Base 2.10.0 gtk_printer_compare@Base 2.10.0 @@ -2811,12 +2812,12 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_printer_option_allocate_choices@Base 2.10.0 gtk_printer_option_choices_from_array@Base 2.10.0 gtk_printer_option_clear_has_conflict@Base 2.10.0 - gtk_printer_option_get_activates_default@Base 2.17.11 + gtk_printer_option_get_activates_default@Base 2.18.0 gtk_printer_option_get_type@Base 2.10.0 gtk_printer_option_has_choice@Base 2.10.0 gtk_printer_option_new@Base 2.10.0 gtk_printer_option_set@Base 2.10.0 - gtk_printer_option_set_activates_default@Base 2.17.11 + gtk_printer_option_set_activates_default@Base 2.18.0 gtk_printer_option_set_add@Base 2.10.0 gtk_printer_option_set_boolean@Base 2.10.0 gtk_printer_option_set_clear_conflicts@Base 2.10.0 @@ -2921,7 +2922,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_radio_tool_button_set_group@Base 2.8.0 gtk_range_get_adjustment@Base 2.8.0 gtk_range_get_fill_level@Base 2.12.0 - gtk_range_get_flippable@Base 2.17.11 + gtk_range_get_flippable@Base 2.18.0 gtk_range_get_inverted@Base 2.8.0 gtk_range_get_lower_stepper_sensitivity@Base 2.10.0 gtk_range_get_restrict_to_fill_level@Base 2.12.0 @@ -2932,7 +2933,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_range_get_value@Base 2.8.0 gtk_range_set_adjustment@Base 2.8.0 gtk_range_set_fill_level@Base 2.12.0 - gtk_range_set_flippable@Base 2.17.11 + gtk_range_set_flippable@Base 2.18.0 gtk_range_set_increments@Base 2.8.0 gtk_range_set_inverted@Base 2.8.0 gtk_range_set_lower_stepper_sensitivity@Base 2.10.0 @@ -3262,7 +3263,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_status_icon_get_size@Base 2.10.0 gtk_status_icon_get_stock@Base 2.10.0 gtk_status_icon_get_storage_type@Base 2.10.0 - gtk_status_icon_get_title@Base 2.17.11 + gtk_status_icon_get_title@Base 2.18.0 gtk_status_icon_get_tooltip_markup@Base 2.16.0 gtk_status_icon_get_tooltip_text@Base 2.16.0 gtk_status_icon_get_type@Base 2.10.0 @@ -3284,7 +3285,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_status_icon_set_from_stock@Base 2.10.0 gtk_status_icon_set_has_tooltip@Base 2.16.0 gtk_status_icon_set_screen@Base 2.12.0 - gtk_status_icon_set_title@Base 2.17.11 + gtk_status_icon_set_title@Base 2.18.0 gtk_status_icon_set_tooltip@Base 2.10.0 gtk_status_icon_set_tooltip_markup@Base 2.16.0 gtk_status_icon_set_tooltip_text@Base 2.16.0 @@ -4252,11 +4253,11 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_widget_freeze_child_notify@Base 2.8.0 gtk_widget_get_accessible@Base 2.8.0 gtk_widget_get_action@Base 2.10.0 - gtk_widget_get_allocation@Base 2.17.11 + gtk_widget_get_allocation@Base 2.18.0 gtk_widget_get_ancestor@Base 2.8.0 - gtk_widget_get_app_paintable@Base 2.17.11 - gtk_widget_get_can_default@Base 2.17.11 - gtk_widget_get_can_focus@Base 2.17.11 + gtk_widget_get_app_paintable@Base 2.18.0 + gtk_widget_get_can_default@Base 2.18.0 + gtk_widget_get_can_focus@Base 2.18.0 gtk_widget_get_child_requisition@Base 2.8.0 gtk_widget_get_child_visible@Base 2.8.0 gtk_widget_get_clipboard@Base 2.8.0 @@ -4268,11 +4269,11 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_widget_get_default_visual@Base 2.8.0 gtk_widget_get_direction@Base 2.8.0 gtk_widget_get_display@Base 2.8.0 - gtk_widget_get_double_buffered@Base 2.17.11 + gtk_widget_get_double_buffered@Base 2.18.0 gtk_widget_get_events@Base 2.8.0 gtk_widget_get_extension_events@Base 2.8.0 gtk_widget_get_has_tooltip@Base 2.12.0 - gtk_widget_get_has_window@Base 2.17.11 + gtk_widget_get_has_window@Base 2.18.0 gtk_widget_get_modifier_style@Base 2.8.0 gtk_widget_get_name@Base 2.8.0 gtk_widget_get_no_show_all@Base 2.8.0 @@ -4280,28 +4281,28 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_widget_get_parent@Base 2.8.0 gtk_widget_get_parent_window@Base 2.8.0 gtk_widget_get_pointer@Base 2.8.0 - gtk_widget_get_receives_default@Base 2.17.11 + gtk_widget_get_receives_default@Base 2.18.0 gtk_widget_get_root_window@Base 2.8.0 gtk_widget_get_screen@Base 2.8.0 - gtk_widget_get_sensitive@Base 2.17.11 + gtk_widget_get_sensitive@Base 2.18.0 gtk_widget_get_settings@Base 2.8.0 gtk_widget_get_size_request@Base 2.8.0 gtk_widget_get_snapshot@Base 2.14.0 - gtk_widget_get_state@Base 2.17.11 + gtk_widget_get_state@Base 2.18.0 gtk_widget_get_style@Base 2.8.0 gtk_widget_get_tooltip_markup@Base 2.12.0 gtk_widget_get_tooltip_text@Base 2.12.0 gtk_widget_get_tooltip_window@Base 2.12.0 gtk_widget_get_toplevel@Base 2.8.0 gtk_widget_get_type@Base 2.8.0 - gtk_widget_get_visible@Base 2.17.11 + gtk_widget_get_visible@Base 2.18.0 gtk_widget_get_visual@Base 2.8.0 gtk_widget_get_window@Base 2.14.0 gtk_widget_grab_default@Base 2.8.0 gtk_widget_grab_focus@Base 2.8.0 - gtk_widget_has_default@Base 2.17.11 - gtk_widget_has_focus@Base 2.17.11 - gtk_widget_has_grab@Base 2.17.11 + gtk_widget_has_default@Base 2.18.0 + gtk_widget_has_focus@Base 2.18.0 + gtk_widget_has_grab@Base 2.18.0 gtk_widget_has_screen@Base 2.8.0 gtk_widget_help_type_get_type@Base 2.8.0 gtk_widget_hide@Base 2.8.0 @@ -4311,10 +4312,10 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_widget_intersect@Base 2.8.0 gtk_widget_is_ancestor@Base 2.8.0 gtk_widget_is_composited@Base 2.10.0 - gtk_widget_is_drawable@Base 2.17.11 + gtk_widget_is_drawable@Base 2.18.0 gtk_widget_is_focus@Base 2.8.0 - gtk_widget_is_sensitive@Base 2.17.11 - gtk_widget_is_toplevel@Base 2.17.11 + gtk_widget_is_sensitive@Base 2.18.0 + gtk_widget_is_toplevel@Base 2.18.0 gtk_widget_keynav_failed@Base 2.12.0 gtk_widget_list_accel_closures@Base 2.8.0 gtk_widget_list_mnemonic_labels@Base 2.8.0 @@ -4351,10 +4352,10 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_widget_send_expose@Base 2.8.0 gtk_widget_set@Base 2.8.0 gtk_widget_set_accel_path@Base 2.8.0 - gtk_widget_set_allocation@Base 2.17.11 + gtk_widget_set_allocation@Base 2.18.0 gtk_widget_set_app_paintable@Base 2.8.0 - gtk_widget_set_can_default@Base 2.17.11 - gtk_widget_set_can_focus@Base 2.17.11 + gtk_widget_set_can_default@Base 2.18.0 + gtk_widget_set_can_focus@Base 2.18.0 gtk_widget_set_child_visible@Base 2.8.0 gtk_widget_set_colormap@Base 2.8.0 gtk_widget_set_composite_name@Base 2.8.0 @@ -4365,12 +4366,12 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_widget_set_events@Base 2.8.0 gtk_widget_set_extension_events@Base 2.8.0 gtk_widget_set_has_tooltip@Base 2.12.0 - gtk_widget_set_has_window@Base 2.17.11 + gtk_widget_set_has_window@Base 2.18.0 gtk_widget_set_name@Base 2.8.0 gtk_widget_set_no_show_all@Base 2.8.0 gtk_widget_set_parent@Base 2.8.0 gtk_widget_set_parent_window@Base 2.8.0 - gtk_widget_set_receives_default@Base 2.17.11 + gtk_widget_set_receives_default@Base 2.18.0 gtk_widget_set_redraw_on_allocate@Base 2.8.0 gtk_widget_set_scroll_adjustments@Base 2.8.0 gtk_widget_set_sensitive@Base 2.8.0 @@ -4382,8 +4383,8 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_widget_set_tooltip_window@Base 2.12.0 gtk_widget_set_uposition@Base 2.8.0 gtk_widget_set_usize@Base 2.8.0 - gtk_widget_set_visible@Base 2.17.11 - gtk_widget_set_window@Base 2.17.11 + gtk_widget_set_visible@Base 2.18.0 + gtk_widget_set_window@Base 2.18.0 gtk_widget_shape_combine_mask@Base 2.8.0 gtk_widget_show@Base 2.8.0 gtk_widget_show_all@Base 2.8.0 diff --git a/debian/libgtk2.0-0.symbols b/debian/libgtk2.0-0.symbols index b73f44a576..9e98cf1d96 100644 --- a/debian/libgtk2.0-0.symbols +++ b/debian/libgtk2.0-0.symbols @@ -20,7 +20,7 @@ libgdk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gdk_cairo_create@Base 2.8.0 gdk_cairo_rectangle@Base 2.8.0 gdk_cairo_region@Base 2.8.0 - gdk_cairo_reset_clip@Base 2.17.11 + gdk_cairo_reset_clip@Base 2.18.0 gdk_cairo_set_source_color@Base 2.8.0 gdk_cairo_set_source_pixbuf@Base 2.8.0 gdk_cairo_set_source_pixmap@Base 2.10.0 @@ -322,10 +322,10 @@ libgdk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gdk_notify_startup_complete@Base 2.8.0 gdk_notify_startup_complete_with_id@Base 2.12.0 gdk_notify_type_get_type@Base 2.8.0 - gdk_offscreen_window_get_embedder@Base 2.17.11 - gdk_offscreen_window_get_pixmap@Base 2.17.11 - gdk_offscreen_window_get_type@Base 2.17.11 - gdk_offscreen_window_set_embedder@Base 2.17.11 + gdk_offscreen_window_get_embedder@Base 2.18.0 + gdk_offscreen_window_get_pixmap@Base 2.18.0 + gdk_offscreen_window_get_type@Base 2.18.0 + gdk_offscreen_window_set_embedder@Base 2.18.0 gdk_overlap_type_get_type@Base 2.8.0 gdk_owner_change_get_type@Base 2.8.0 gdk_pango_attr_emboss_color_new@Base 2.12.0 @@ -390,7 +390,7 @@ libgdk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gdk_region_offset@Base 2.8.0 gdk_region_point_in@Base 2.8.0 gdk_region_polygon@Base 2.8.0 - gdk_region_rect_equal@Base 2.17.11 + gdk_region_rect_equal@Base 2.18.0 gdk_region_rect_in@Base 2.8.0 gdk_region_rectangle@Base 2.8.0 gdk_region_shrink@Base 2.8.0 @@ -460,7 +460,7 @@ libgdk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gdk_selection_owner_get_for_display@Base 2.8.0 gdk_selection_owner_set@Base 2.8.0 gdk_selection_owner_set_for_display@Base 2.8.0 - gdk_selection_property_get@Base 2.17.11 + gdk_selection_property_get@Base 2.18.0 gdk_selection_send_notify@Base 2.8.0 gdk_selection_send_notify_for_display@Base 2.8.0 gdk_set_double_click_time@Base 2.8.0 @@ -546,16 +546,17 @@ libgdk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gdk_window_edge_get_type@Base 2.8.0 gdk_window_enable_synchronized_configure@Base 2.8.0 gdk_window_end_paint@Base 2.8.0 - gdk_window_ensure_native@Base 2.17.11 + gdk_window_ensure_native@Base 2.18.0 + gdk_window_flush@Base 2.18.0 gdk_window_focus@Base 2.8.0 gdk_window_foreign_new@Base 2.8.0 gdk_window_foreign_new_for_display@Base 2.8.0 gdk_window_freeze_toplevel_updates_libgtk_only@Base 2.12.0 gdk_window_freeze_updates@Base 2.8.0 gdk_window_fullscreen@Base 2.8.0 - gdk_window_geometry_changed@Base 2.17.11 + gdk_window_geometry_changed@Base 2.18.0 gdk_window_get_children@Base 2.8.0 - gdk_window_get_cursor@Base 2.17.11 + gdk_window_get_cursor@Base 2.18.0 gdk_window_get_decorations@Base 2.8.0 gdk_window_get_deskrelative_origin@Base 2.8.0 gdk_window_get_events@Base 2.8.0 @@ -567,7 +568,7 @@ libgdk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gdk_window_get_parent@Base 2.8.0 gdk_window_get_pointer@Base 2.8.0 gdk_window_get_position@Base 2.8.0 - gdk_window_get_root_coords@Base 2.17.11 + gdk_window_get_root_coords@Base 2.18.0 gdk_window_get_root_origin@Base 2.8.0 gdk_window_get_state@Base 2.8.0 gdk_window_get_toplevel@Base 2.8.0 @@ -586,7 +587,7 @@ libgdk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gdk_window_invalidate_maybe_recurse@Base 2.8.0 gdk_window_invalidate_rect@Base 2.8.0 gdk_window_invalidate_region@Base 2.8.0 - gdk_window_is_destroyed@Base 2.17.11 + gdk_window_is_destroyed@Base 2.18.0 gdk_window_is_viewable@Base 2.8.0 gdk_window_is_visible@Base 2.8.0 gdk_window_lookup@Base 2.8.0 @@ -610,7 +611,7 @@ libgdk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gdk_window_remove_redirection@Base 2.14.0 gdk_window_reparent@Base 2.8.0 gdk_window_resize@Base 2.8.0 - gdk_window_restack@Base 2.17.11 + gdk_window_restack@Base 2.18.0 gdk_window_scroll@Base 2.8.0 gdk_window_set_accept_focus@Base 2.8.0 gdk_window_set_back_pixmap@Base 2.8.0 @@ -695,7 +696,7 @@ libgdk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gdk_x11_image_get_xdisplay@Base 2.8.0 gdk_x11_image_get_ximage@Base 2.8.0 gdk_x11_lookup_xdisplay@Base 2.8.0 - gdk_x11_pixmap_get_drawable_impl@Base 2.17.11 + gdk_x11_pixmap_get_drawable_impl@Base 2.18.0 gdk_x11_register_standard_event_type@Base 2.8.0 gdk_x11_screen_get_monitor_output@Base 2.14.0 gdk_x11_screen_get_screen_number@Base 2.8.0 @@ -705,7 +706,7 @@ libgdk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gdk_x11_screen_supports_net_wm_hint@Base 2.8.0 gdk_x11_ungrab_server@Base 2.8.0 gdk_x11_visual_get_xvisual@Base 2.8.0 - gdk_x11_window_get_drawable_impl@Base 2.17.11 + gdk_x11_window_get_drawable_impl@Base 2.18.0 gdk_x11_window_move_to_current_desktop@Base 2.8.0 gdk_x11_window_set_user_time@Base 2.8.0 gdk_x11_xatom_to_atom@Base 2.8.0 @@ -808,11 +809,11 @@ libgdk_pixbuf-2.0.so.0 libgtk2.0-0 #MINVER# gdk_pixbuf_scaled_anim_iter_get_type@Base 2.12.0 gdk_pixbuf_set_option@Base 2.8.0 gdk_pixbuf_simple_anim_add_frame@Base 2.8.0 - gdk_pixbuf_simple_anim_get_loop@Base 2.17.11 + gdk_pixbuf_simple_anim_get_loop@Base 2.18.0 gdk_pixbuf_simple_anim_get_type@Base 2.8.0 gdk_pixbuf_simple_anim_iter_get_type@Base 2.8.0 gdk_pixbuf_simple_anim_new@Base 2.8.0 - gdk_pixbuf_simple_anim_set_loop@Base 2.17.11 + gdk_pixbuf_simple_anim_set_loop@Base 2.18.0 gdk_pixbuf_unref@Base 2.8.0 gdk_pixbuf_version@Base 2.8.0 gdk_pixdata_deserialize@Base 2.8.0 @@ -1205,24 +1206,24 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_cell_renderer_combo_get_type@Base 2.8.0 gtk_cell_renderer_combo_new@Base 2.8.0 gtk_cell_renderer_editing_canceled@Base 2.8.0 - gtk_cell_renderer_get_alignment@Base 2.17.11 + gtk_cell_renderer_get_alignment@Base 2.18.0 gtk_cell_renderer_get_fixed_size@Base 2.8.0 - gtk_cell_renderer_get_padding@Base 2.17.11 - gtk_cell_renderer_get_sensitive@Base 2.17.11 + gtk_cell_renderer_get_padding@Base 2.18.0 + gtk_cell_renderer_get_sensitive@Base 2.18.0 gtk_cell_renderer_get_size@Base 2.8.0 gtk_cell_renderer_get_type@Base 2.8.0 - gtk_cell_renderer_get_visible@Base 2.17.11 + gtk_cell_renderer_get_visible@Base 2.18.0 gtk_cell_renderer_mode_get_type@Base 2.8.0 gtk_cell_renderer_pixbuf_get_type@Base 2.8.0 gtk_cell_renderer_pixbuf_new@Base 2.8.0 gtk_cell_renderer_progress_get_type@Base 2.8.0 gtk_cell_renderer_progress_new@Base 2.8.0 gtk_cell_renderer_render@Base 2.8.0 - gtk_cell_renderer_set_alignment@Base 2.17.11 + gtk_cell_renderer_set_alignment@Base 2.18.0 gtk_cell_renderer_set_fixed_size@Base 2.8.0 - gtk_cell_renderer_set_padding@Base 2.17.11 - gtk_cell_renderer_set_sensitive@Base 2.17.11 - gtk_cell_renderer_set_visible@Base 2.17.11 + gtk_cell_renderer_set_padding@Base 2.18.0 + gtk_cell_renderer_set_sensitive@Base 2.18.0 + gtk_cell_renderer_set_visible@Base 2.18.0 gtk_cell_renderer_spin_get_type@Base 2.10.0 gtk_cell_renderer_spin_new@Base 2.10.0 gtk_cell_renderer_start_editing@Base 2.8.0 @@ -1231,12 +1232,12 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_cell_renderer_text_get_type@Base 2.8.0 gtk_cell_renderer_text_new@Base 2.8.0 gtk_cell_renderer_text_set_fixed_height_from_font@Base 2.8.0 - gtk_cell_renderer_toggle_get_activatable@Base 2.17.11 + gtk_cell_renderer_toggle_get_activatable@Base 2.18.0 gtk_cell_renderer_toggle_get_active@Base 2.8.0 gtk_cell_renderer_toggle_get_radio@Base 2.8.0 gtk_cell_renderer_toggle_get_type@Base 2.8.0 gtk_cell_renderer_toggle_new@Base 2.8.0 - gtk_cell_renderer_toggle_set_activatable@Base 2.17.11 + gtk_cell_renderer_toggle_set_activatable@Base 2.18.0 gtk_cell_renderer_toggle_set_active@Base 2.8.0 gtk_cell_renderer_toggle_set_radio@Base 2.8.0 gtk_cell_type_get_type@Base 2.8.0 @@ -1575,7 +1576,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_curve_set_range@Base 2.8.0 gtk_curve_set_vector@Base 2.8.0 gtk_curve_type_get_type@Base 2.8.0 - gtk_custom_paper_unix_dialog_get_type@Base 2.17.11 + gtk_custom_paper_unix_dialog_get_type@Base 2.18.0 gtk_debug_flag_get_type@Base 2.8.0 gtk_debug_flags@Base 2.8.0 gtk_decorated_window_calculate_frame_size@Base 2.8.0 @@ -1681,18 +1682,18 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_editable_set_editable@Base 2.8.0 gtk_editable_set_position@Base 2.8.0 gtk_entry_append_text@Base 2.8.0 - gtk_entry_buffer_delete_text@Base 2.17.11 - gtk_entry_buffer_emit_deleted_text@Base 2.17.11 - gtk_entry_buffer_emit_inserted_text@Base 2.17.11 - gtk_entry_buffer_get_bytes@Base 2.17.11 - gtk_entry_buffer_get_length@Base 2.17.11 - gtk_entry_buffer_get_max_length@Base 2.17.11 - gtk_entry_buffer_get_text@Base 2.17.11 - gtk_entry_buffer_get_type@Base 2.17.11 - gtk_entry_buffer_insert_text@Base 2.17.11 - gtk_entry_buffer_new@Base 2.17.11 - gtk_entry_buffer_set_max_length@Base 2.17.11 - gtk_entry_buffer_set_text@Base 2.17.11 + gtk_entry_buffer_delete_text@Base 2.18.0 + gtk_entry_buffer_emit_deleted_text@Base 2.18.0 + gtk_entry_buffer_emit_inserted_text@Base 2.18.0 + gtk_entry_buffer_get_bytes@Base 2.18.0 + gtk_entry_buffer_get_length@Base 2.18.0 + gtk_entry_buffer_get_max_length@Base 2.18.0 + gtk_entry_buffer_get_text@Base 2.18.0 + gtk_entry_buffer_get_type@Base 2.18.0 + gtk_entry_buffer_insert_text@Base 2.18.0 + gtk_entry_buffer_new@Base 2.18.0 + gtk_entry_buffer_set_max_length@Base 2.18.0 + gtk_entry_buffer_set_text@Base 2.18.0 gtk_entry_completion_complete@Base 2.8.0 gtk_entry_completion_delete_action@Base 2.8.0 gtk_entry_completion_get_completion_prefix@Base 2.12.0 @@ -1721,7 +1722,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_entry_completion_set_text_column@Base 2.8.0 gtk_entry_get_activates_default@Base 2.8.0 gtk_entry_get_alignment@Base 2.8.0 - gtk_entry_get_buffer@Base 2.17.11 + gtk_entry_get_buffer@Base 2.18.0 gtk_entry_get_completion@Base 2.8.0 gtk_entry_get_current_icon_drag_source@Base 2.16.0 gtk_entry_get_cursor_hadjustment@Base 2.12.0 @@ -1752,14 +1753,14 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_entry_icon_position_get_type@Base 2.16.0 gtk_entry_layout_index_to_text_index@Base 2.8.0 gtk_entry_new@Base 2.8.0 - gtk_entry_new_with_buffer@Base 2.17.11 + gtk_entry_new_with_buffer@Base 2.18.0 gtk_entry_new_with_max_length@Base 2.8.0 gtk_entry_prepend_text@Base 2.8.0 gtk_entry_progress_pulse@Base 2.16.0 gtk_entry_select_region@Base 2.8.0 gtk_entry_set_activates_default@Base 2.8.0 gtk_entry_set_alignment@Base 2.8.0 - gtk_entry_set_buffer@Base 2.17.11 + gtk_entry_set_buffer@Base 2.18.0 gtk_entry_set_completion@Base 2.8.0 gtk_entry_set_cursor_hadjustment@Base 2.12.0 gtk_entry_set_editable@Base 2.8.0 @@ -1832,7 +1833,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_file_chooser_error_get_type@Base 2.8.0 gtk_file_chooser_error_quark@Base 2.8.0 gtk_file_chooser_get_action@Base 2.8.0 - gtk_file_chooser_get_create_folders@Base 2.17.11 + gtk_file_chooser_get_create_folders@Base 2.18.0 gtk_file_chooser_get_current_folder@Base 2.8.0 gtk_file_chooser_get_current_folder_file@Base 2.14.0 gtk_file_chooser_get_current_folder_uri@Base 2.8.0 @@ -1866,7 +1867,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_file_chooser_select_filename@Base 2.8.0 gtk_file_chooser_select_uri@Base 2.8.0 gtk_file_chooser_set_action@Base 2.8.0 - gtk_file_chooser_set_create_folders@Base 2.17.11 + gtk_file_chooser_set_create_folders@Base 2.18.0 gtk_file_chooser_set_current_folder@Base 2.8.0 gtk_file_chooser_set_current_folder_file@Base 2.14.0 gtk_file_chooser_set_current_folder_uri@Base 2.8.0 @@ -2108,7 +2109,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_icon_view_get_dest_item_at_pos@Base 2.8.0 gtk_icon_view_get_drag_dest_item@Base 2.8.0 gtk_icon_view_get_item_at_pos@Base 2.8.0 - gtk_icon_view_get_item_padding@Base 2.17.11 + gtk_icon_view_get_item_padding@Base 2.18.0 gtk_icon_view_get_item_width@Base 2.8.0 gtk_icon_view_get_margin@Base 2.8.0 gtk_icon_view_get_markup_column@Base 2.8.0 @@ -2138,7 +2139,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_icon_view_set_columns@Base 2.8.0 gtk_icon_view_set_cursor@Base 2.8.0 gtk_icon_view_set_drag_dest_item@Base 2.8.0 - gtk_icon_view_set_item_padding@Base 2.17.11 + gtk_icon_view_set_item_padding@Base 2.18.0 gtk_icon_view_set_item_width@Base 2.8.0 gtk_icon_view_set_margin@Base 2.8.0 gtk_icon_view_set_markup_column@Base 2.8.0 @@ -2232,19 +2233,19 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_image_set_from_stock@Base 2.8.0 gtk_image_set_pixel_size@Base 2.8.0 gtk_image_type_get_type@Base 2.8.0 - gtk_info_bar_add_action_widget@Base 2.17.11 - gtk_info_bar_add_button@Base 2.17.11 - gtk_info_bar_add_buttons@Base 2.17.11 - gtk_info_bar_get_action_area@Base 2.17.11 - gtk_info_bar_get_content_area@Base 2.17.11 - gtk_info_bar_get_message_type@Base 2.17.11 - gtk_info_bar_get_type@Base 2.17.11 - gtk_info_bar_new@Base 2.17.11 - gtk_info_bar_new_with_buttons@Base 2.17.11 - gtk_info_bar_response@Base 2.17.11 - gtk_info_bar_set_default_response@Base 2.17.11 - gtk_info_bar_set_message_type@Base 2.17.11 - gtk_info_bar_set_response_sensitive@Base 2.17.11 + gtk_info_bar_add_action_widget@Base 2.18.0 + gtk_info_bar_add_button@Base 2.18.0 + gtk_info_bar_add_buttons@Base 2.18.0 + gtk_info_bar_get_action_area@Base 2.18.0 + gtk_info_bar_get_content_area@Base 2.18.0 + gtk_info_bar_get_message_type@Base 2.18.0 + gtk_info_bar_get_type@Base 2.18.0 + gtk_info_bar_new@Base 2.18.0 + gtk_info_bar_new_with_buttons@Base 2.18.0 + gtk_info_bar_response@Base 2.18.0 + gtk_info_bar_set_default_response@Base 2.18.0 + gtk_info_bar_set_message_type@Base 2.18.0 + gtk_info_bar_set_response_sensitive@Base 2.18.0 gtk_init@Base 2.8.0 gtk_init_add@Base 2.8.0 gtk_init_check@Base 2.8.0 @@ -2293,7 +2294,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_label_get@Base 2.8.0 gtk_label_get_angle@Base 2.8.0 gtk_label_get_attributes@Base 2.8.0 - gtk_label_get_current_uri@Base 2.17.11 + gtk_label_get_current_uri@Base 2.18.0 gtk_label_get_ellipsize@Base 2.8.0 gtk_label_get_justify@Base 2.8.0 gtk_label_get_label@Base 2.8.0 @@ -2308,7 +2309,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_label_get_selection_bounds@Base 2.8.0 gtk_label_get_single_line_mode@Base 2.8.0 gtk_label_get_text@Base 2.8.0 - gtk_label_get_track_visited_links@Base 2.17.11 + gtk_label_get_track_visited_links@Base 2.18.0 gtk_label_get_type@Base 2.8.0 gtk_label_get_use_markup@Base 2.8.0 gtk_label_get_use_underline@Base 2.8.0 @@ -2333,7 +2334,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_label_set_single_line_mode@Base 2.8.0 gtk_label_set_text@Base 2.8.0 gtk_label_set_text_with_mnemonic@Base 2.8.0 - gtk_label_set_track_visited_links@Base 2.17.11 + gtk_label_set_track_visited_links@Base 2.18.0 gtk_label_set_use_markup@Base 2.8.0 gtk_label_set_use_underline@Base 2.8.0 gtk_label_set_width_chars@Base 2.8.0 @@ -2461,7 +2462,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_menu_get_attach_widget@Base 2.8.0 gtk_menu_get_for_attach_widget@Base 2.8.0 gtk_menu_get_monitor@Base 2.14.0 - gtk_menu_get_reserve_toggle_size@Base 2.17.11 + gtk_menu_get_reserve_toggle_size@Base 2.18.0 gtk_menu_get_tearoff_state@Base 2.8.0 gtk_menu_get_title@Base 2.8.0 gtk_menu_get_type@Base 2.8.0 @@ -2494,7 +2495,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_menu_set_accel_path@Base 2.8.0 gtk_menu_set_active@Base 2.8.0 gtk_menu_set_monitor@Base 2.8.0 - gtk_menu_set_reserve_toggle_size@Base 2.17.11 + gtk_menu_set_reserve_toggle_size@Base 2.18.0 gtk_menu_set_screen@Base 2.8.0 gtk_menu_set_tearoff_state@Base 2.8.0 gtk_menu_set_title@Base 2.8.0 @@ -2769,7 +2770,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_print_backend_printer_list_is_done@Base 2.10.0 gtk_print_backend_remove_printer@Base 2.10.0 gtk_print_backend_set_list_done@Base 2.10.0 - gtk_print_backend_set_password@Base 2.17.11 + gtk_print_backend_set_password@Base 2.18.0 gtk_print_capabilities_get_type@Base 2.10.0 gtk_print_context_create_pango_context@Base 2.10.0 gtk_print_context_create_pango_layout@Base 2.10.0 @@ -2801,14 +2802,14 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_print_operation_cancel@Base 2.10.0 gtk_print_operation_draw_page_finish@Base 2.16.0 gtk_print_operation_get_default_page_setup@Base 2.10.0 - gtk_print_operation_get_embed_page_setup@Base 2.17.11 + gtk_print_operation_get_embed_page_setup@Base 2.18.0 gtk_print_operation_get_error@Base 2.10.0 - gtk_print_operation_get_has_selection@Base 2.17.11 - gtk_print_operation_get_n_pages_to_print@Base 2.17.11 + gtk_print_operation_get_has_selection@Base 2.18.0 + gtk_print_operation_get_n_pages_to_print@Base 2.18.0 gtk_print_operation_get_print_settings@Base 2.10.0 gtk_print_operation_get_status@Base 2.10.0 gtk_print_operation_get_status_string@Base 2.10.0 - gtk_print_operation_get_support_selection@Base 2.17.11 + gtk_print_operation_get_support_selection@Base 2.18.0 gtk_print_operation_get_type@Base 2.10.0 gtk_print_operation_is_finished@Base 2.10.0 gtk_print_operation_new@Base 2.10.0 @@ -2823,14 +2824,14 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_print_operation_set_custom_tab_label@Base 2.10.0 gtk_print_operation_set_default_page_setup@Base 2.10.0 gtk_print_operation_set_defer_drawing@Base 2.16.0 - gtk_print_operation_set_embed_page_setup@Base 2.17.11 + gtk_print_operation_set_embed_page_setup@Base 2.18.0 gtk_print_operation_set_export_filename@Base 2.10.0 - gtk_print_operation_set_has_selection@Base 2.17.11 + gtk_print_operation_set_has_selection@Base 2.18.0 gtk_print_operation_set_job_name@Base 2.10.0 gtk_print_operation_set_n_pages@Base 2.10.0 gtk_print_operation_set_print_settings@Base 2.10.0 gtk_print_operation_set_show_progress@Base 2.10.0 - gtk_print_operation_set_support_selection@Base 2.17.11 + gtk_print_operation_set_support_selection@Base 2.18.0 gtk_print_operation_set_track_print_status@Base 2.10.0 gtk_print_operation_set_unit@Base 2.10.0 gtk_print_operation_set_use_full_page@Base 2.10.0 @@ -2916,23 +2917,23 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_print_status_get_type@Base 2.10.0 gtk_print_unix_dialog_add_custom_tab@Base 2.10.0 gtk_print_unix_dialog_get_current_page@Base 2.10.0 - gtk_print_unix_dialog_get_embed_page_setup@Base 2.17.11 - gtk_print_unix_dialog_get_has_selection@Base 2.17.11 - gtk_print_unix_dialog_get_manual_capabilities@Base 2.17.11 + gtk_print_unix_dialog_get_embed_page_setup@Base 2.18.0 + gtk_print_unix_dialog_get_has_selection@Base 2.18.0 + gtk_print_unix_dialog_get_manual_capabilities@Base 2.18.0 gtk_print_unix_dialog_get_page_setup@Base 2.10.0 - gtk_print_unix_dialog_get_page_setup_set@Base 2.17.11 + gtk_print_unix_dialog_get_page_setup_set@Base 2.18.0 gtk_print_unix_dialog_get_selected_printer@Base 2.10.0 gtk_print_unix_dialog_get_settings@Base 2.10.0 - gtk_print_unix_dialog_get_support_selection@Base 2.17.11 + gtk_print_unix_dialog_get_support_selection@Base 2.18.0 gtk_print_unix_dialog_get_type@Base 2.10.0 gtk_print_unix_dialog_new@Base 2.10.0 gtk_print_unix_dialog_set_current_page@Base 2.10.0 - gtk_print_unix_dialog_set_embed_page_setup@Base 2.17.11 - gtk_print_unix_dialog_set_has_selection@Base 2.17.11 + gtk_print_unix_dialog_set_embed_page_setup@Base 2.18.0 + gtk_print_unix_dialog_set_has_selection@Base 2.18.0 gtk_print_unix_dialog_set_manual_capabilities@Base 2.10.0 gtk_print_unix_dialog_set_page_setup@Base 2.10.0 gtk_print_unix_dialog_set_settings@Base 2.10.0 - gtk_print_unix_dialog_set_support_selection@Base 2.17.11 + gtk_print_unix_dialog_set_support_selection@Base 2.18.0 gtk_printer_accepts_pdf@Base 2.10.0 gtk_printer_accepts_ps@Base 2.10.0 gtk_printer_compare@Base 2.10.0 @@ -2958,12 +2959,12 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_printer_option_allocate_choices@Base 2.10.0 gtk_printer_option_choices_from_array@Base 2.10.0 gtk_printer_option_clear_has_conflict@Base 2.10.0 - gtk_printer_option_get_activates_default@Base 2.17.11 + gtk_printer_option_get_activates_default@Base 2.18.0 gtk_printer_option_get_type@Base 2.10.0 gtk_printer_option_has_choice@Base 2.10.0 gtk_printer_option_new@Base 2.10.0 gtk_printer_option_set@Base 2.10.0 - gtk_printer_option_set_activates_default@Base 2.17.11 + gtk_printer_option_set_activates_default@Base 2.18.0 gtk_printer_option_set_add@Base 2.10.0 gtk_printer_option_set_boolean@Base 2.10.0 gtk_printer_option_set_clear_conflicts@Base 2.10.0 @@ -3068,7 +3069,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_radio_tool_button_set_group@Base 2.8.0 gtk_range_get_adjustment@Base 2.8.0 gtk_range_get_fill_level@Base 2.12.0 - gtk_range_get_flippable@Base 2.17.11 + gtk_range_get_flippable@Base 2.18.0 gtk_range_get_inverted@Base 2.8.0 gtk_range_get_lower_stepper_sensitivity@Base 2.10.0 gtk_range_get_restrict_to_fill_level@Base 2.12.0 @@ -3079,7 +3080,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_range_get_value@Base 2.8.0 gtk_range_set_adjustment@Base 2.8.0 gtk_range_set_fill_level@Base 2.12.0 - gtk_range_set_flippable@Base 2.17.11 + gtk_range_set_flippable@Base 2.18.0 gtk_range_set_increments@Base 2.8.0 gtk_range_set_inverted@Base 2.8.0 gtk_range_set_lower_stepper_sensitivity@Base 2.10.0 @@ -3409,7 +3410,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_status_icon_get_size@Base 2.10.0 gtk_status_icon_get_stock@Base 2.10.0 gtk_status_icon_get_storage_type@Base 2.10.0 - gtk_status_icon_get_title@Base 2.17.11 + gtk_status_icon_get_title@Base 2.18.0 gtk_status_icon_get_tooltip_markup@Base 2.16.0 gtk_status_icon_get_tooltip_text@Base 2.16.0 gtk_status_icon_get_type@Base 2.10.0 @@ -3431,7 +3432,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_status_icon_set_from_stock@Base 2.10.0 gtk_status_icon_set_has_tooltip@Base 2.16.0 gtk_status_icon_set_screen@Base 2.12.0 - gtk_status_icon_set_title@Base 2.17.11 + gtk_status_icon_set_title@Base 2.18.0 gtk_status_icon_set_tooltip@Base 2.10.0 gtk_status_icon_set_tooltip_markup@Base 2.16.0 gtk_status_icon_set_tooltip_text@Base 2.16.0 @@ -4400,11 +4401,11 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_widget_freeze_child_notify@Base 2.8.0 gtk_widget_get_accessible@Base 2.8.0 gtk_widget_get_action@Base 2.10.0 - gtk_widget_get_allocation@Base 2.17.11 + gtk_widget_get_allocation@Base 2.18.0 gtk_widget_get_ancestor@Base 2.8.0 - gtk_widget_get_app_paintable@Base 2.17.11 - gtk_widget_get_can_default@Base 2.17.11 - gtk_widget_get_can_focus@Base 2.17.11 + gtk_widget_get_app_paintable@Base 2.18.0 + gtk_widget_get_can_default@Base 2.18.0 + gtk_widget_get_can_focus@Base 2.18.0 gtk_widget_get_child_requisition@Base 2.8.0 gtk_widget_get_child_visible@Base 2.8.0 gtk_widget_get_clipboard@Base 2.8.0 @@ -4416,11 +4417,11 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_widget_get_default_visual@Base 2.8.0 gtk_widget_get_direction@Base 2.8.0 gtk_widget_get_display@Base 2.8.0 - gtk_widget_get_double_buffered@Base 2.17.11 + gtk_widget_get_double_buffered@Base 2.18.0 gtk_widget_get_events@Base 2.8.0 gtk_widget_get_extension_events@Base 2.8.0 gtk_widget_get_has_tooltip@Base 2.12.0 - gtk_widget_get_has_window@Base 2.17.11 + gtk_widget_get_has_window@Base 2.18.0 gtk_widget_get_modifier_style@Base 2.8.0 gtk_widget_get_name@Base 2.8.0 gtk_widget_get_no_show_all@Base 2.8.0 @@ -4428,28 +4429,28 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_widget_get_parent@Base 2.8.0 gtk_widget_get_parent_window@Base 2.8.0 gtk_widget_get_pointer@Base 2.8.0 - gtk_widget_get_receives_default@Base 2.17.11 + gtk_widget_get_receives_default@Base 2.18.0 gtk_widget_get_root_window@Base 2.8.0 gtk_widget_get_screen@Base 2.8.0 - gtk_widget_get_sensitive@Base 2.17.11 + gtk_widget_get_sensitive@Base 2.18.0 gtk_widget_get_settings@Base 2.8.0 gtk_widget_get_size_request@Base 2.8.0 gtk_widget_get_snapshot@Base 2.14.0 - gtk_widget_get_state@Base 2.17.11 + gtk_widget_get_state@Base 2.18.0 gtk_widget_get_style@Base 2.8.0 gtk_widget_get_tooltip_markup@Base 2.12.0 gtk_widget_get_tooltip_text@Base 2.12.0 gtk_widget_get_tooltip_window@Base 2.12.0 gtk_widget_get_toplevel@Base 2.8.0 gtk_widget_get_type@Base 2.8.0 - gtk_widget_get_visible@Base 2.17.11 + gtk_widget_get_visible@Base 2.18.0 gtk_widget_get_visual@Base 2.8.0 gtk_widget_get_window@Base 2.14.0 gtk_widget_grab_default@Base 2.8.0 gtk_widget_grab_focus@Base 2.8.0 - gtk_widget_has_default@Base 2.17.11 - gtk_widget_has_focus@Base 2.17.11 - gtk_widget_has_grab@Base 2.17.11 + gtk_widget_has_default@Base 2.18.0 + gtk_widget_has_focus@Base 2.18.0 + gtk_widget_has_grab@Base 2.18.0 gtk_widget_has_screen@Base 2.8.0 gtk_widget_help_type_get_type@Base 2.8.0 gtk_widget_hide@Base 2.8.0 @@ -4459,10 +4460,10 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_widget_intersect@Base 2.8.0 gtk_widget_is_ancestor@Base 2.8.0 gtk_widget_is_composited@Base 2.10.0 - gtk_widget_is_drawable@Base 2.17.11 + gtk_widget_is_drawable@Base 2.18.0 gtk_widget_is_focus@Base 2.8.0 - gtk_widget_is_sensitive@Base 2.17.11 - gtk_widget_is_toplevel@Base 2.17.11 + gtk_widget_is_sensitive@Base 2.18.0 + gtk_widget_is_toplevel@Base 2.18.0 gtk_widget_keynav_failed@Base 2.12.0 gtk_widget_list_accel_closures@Base 2.8.0 gtk_widget_list_mnemonic_labels@Base 2.8.0 @@ -4499,10 +4500,10 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_widget_send_expose@Base 2.8.0 gtk_widget_set@Base 2.8.0 gtk_widget_set_accel_path@Base 2.8.0 - gtk_widget_set_allocation@Base 2.17.11 + gtk_widget_set_allocation@Base 2.18.0 gtk_widget_set_app_paintable@Base 2.8.0 - gtk_widget_set_can_default@Base 2.17.11 - gtk_widget_set_can_focus@Base 2.17.11 + gtk_widget_set_can_default@Base 2.18.0 + gtk_widget_set_can_focus@Base 2.18.0 gtk_widget_set_child_visible@Base 2.8.0 gtk_widget_set_colormap@Base 2.8.0 gtk_widget_set_composite_name@Base 2.8.0 @@ -4513,12 +4514,12 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_widget_set_events@Base 2.8.0 gtk_widget_set_extension_events@Base 2.8.0 gtk_widget_set_has_tooltip@Base 2.12.0 - gtk_widget_set_has_window@Base 2.17.11 + gtk_widget_set_has_window@Base 2.18.0 gtk_widget_set_name@Base 2.8.0 gtk_widget_set_no_show_all@Base 2.8.0 gtk_widget_set_parent@Base 2.8.0 gtk_widget_set_parent_window@Base 2.8.0 - gtk_widget_set_receives_default@Base 2.17.11 + gtk_widget_set_receives_default@Base 2.18.0 gtk_widget_set_redraw_on_allocate@Base 2.8.0 gtk_widget_set_scroll_adjustments@Base 2.8.0 gtk_widget_set_sensitive@Base 2.8.0 @@ -4530,8 +4531,8 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_widget_set_tooltip_window@Base 2.12.0 gtk_widget_set_uposition@Base 2.8.0 gtk_widget_set_usize@Base 2.8.0 - gtk_widget_set_visible@Base 2.17.11 - gtk_widget_set_window@Base 2.17.11 + gtk_widget_set_visible@Base 2.18.0 + gtk_widget_set_window@Base 2.18.0 gtk_widget_shape_combine_mask@Base 2.8.0 gtk_widget_show@Base 2.8.0 gtk_widget_show_all@Base 2.8.0 diff --git a/debian/patches/070_mandatory-relibtoolize.patch b/debian/patches/070_mandatory-relibtoolize.patch index 9ace3ae23b..b7145600cc 100644 --- a/debian/patches/070_mandatory-relibtoolize.patch +++ b/debian/patches/070_mandatory-relibtoolize.patch @@ -1,18 +1,77 @@ -diff -Naur gtk+2.0-2.17.11.old/aclocal.m4 gtk+2.0-2.17.11/aclocal.m4 ---- gtk+2.0-2.17.11.old/aclocal.m4 2009-09-05 04:54:12.000000000 +0200 -+++ gtk+2.0-2.17.11/aclocal.m4 2009-09-05 07:25:17.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/aclocal.m4 gtk+2.0-2.18.4/aclocal.m4 +--- gtk+2.0-2.18.4.old/aclocal.m4 2009-12-01 05:08:37.000000000 +0100 ++++ gtk+2.0-2.18.4/aclocal.m4 2009-12-01 13:03:27.352291520 +0100 @@ -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.63],, -[m4_warning([this file was generated for autoconf 2.63. -+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],, -+[m4_warning([this file was generated for autoconf 2.64. ++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, ++[m4_warning([this file was generated for autoconf 2.65. 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'.])]) -@@ -3171,13 +3171,10 @@ +@@ -114,9 +114,8 @@ + { + int major, minor, micro; + char *tmp_version; +- int ignored; + +- ignored = system ("touch conf.glibtest"); ++ fclose (fopen ("conf.glibtest", "w")); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = g_strdup("$min_glib_version"); +@@ -675,12 +674,6 @@ + [ + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first +- +- dnl check for tools we added during development +- AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check]) +- AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) +- AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) +- + dnl for overriding the documentation installation directory + AC_ARG_WITH([html-dir], + AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, +@@ -699,32 +692,16 @@ + [PKG_CHECK_EXISTS([gtk-doc],, + AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], + [PKG_CHECK_EXISTS([gtk-doc >= $1],, +- AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))]) ++ AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))]) + fi + + AC_MSG_CHECKING([whether to build gtk-doc documentation]) + AC_MSG_RESULT($enable_gtk_doc) + +- dnl enable/disable output formats +- AC_ARG_ENABLE([gtk-doc-html], +- AS_HELP_STRING([--enable-gtk-doc-html], +- [build documentation in html format [[default=yes]]]),, +- [enable_gtk_doc_html=yes]) +- AC_ARG_ENABLE([gtk-doc-pdf], +- AS_HELP_STRING([--enable-gtk-doc-pdf], +- [build documentation in pdf format [[default=no]]]),, +- [enable_gtk_doc_pdf=no]) +- +- if test -z "$GTKDOC_MKPDF"; then +- enable_gtk_doc_pdf=no +- fi +- ++ AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,) + + AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) +- AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) +- AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) + AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) +- AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"]) + ]) + + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- +@@ -3193,13 +3170,10 @@ # before this can be enabled. hardcode_into_libs=yes @@ -27,7 +86,7 @@ diff -Naur gtk+2.0-2.17.11.old/aclocal.m4 gtk+2.0-2.17.11/aclocal.m4 fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -3189,6 +3186,18 @@ +@@ -3211,6 +3185,18 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -46,7 +105,7 @@ diff -Naur gtk+2.0-2.17.11.old/aclocal.m4 gtk+2.0-2.17.11/aclocal.m4 netbsd*) version_type=sunos need_lib_prefix=no -@@ -3780,7 +3789,7 @@ +@@ -3802,7 +3788,7 @@ lt_cv_deplibs_check_method=pass_all ;; @@ -55,7 +114,7 @@ diff -Naur gtk+2.0-2.17.11.old/aclocal.m4 gtk+2.0-2.17.11/aclocal.m4 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 -@@ -4461,7 +4470,7 @@ +@@ -4483,7 +4469,7 @@ ;; esac ;; @@ -64,7 +123,7 @@ diff -Naur gtk+2.0-2.17.11.old/aclocal.m4 gtk+2.0-2.17.11/aclocal.m4 ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise -@@ -4886,6 +4895,9 @@ +@@ -4908,6 +4894,9 @@ cygwin* | mingw* | cegcc*) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -74,7 +133,7 @@ diff -Naur gtk+2.0-2.17.11.old/aclocal.m4 gtk+2.0-2.17.11/aclocal.m4 *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; -@@ -4950,6 +4962,9 @@ +@@ -4972,6 +4961,9 @@ openbsd*) with_gnu_ld=no ;; @@ -84,7 +143,7 @@ diff -Naur gtk+2.0-2.17.11.old/aclocal.m4 gtk+2.0-2.17.11/aclocal.m4 esac _LT_TAGVAR(ld_shlibs, $1)=yes -@@ -5132,7 +5147,7 @@ +@@ -5154,7 +5146,7 @@ fi ;; @@ -93,7 +152,7 @@ diff -Naur gtk+2.0-2.17.11.old/aclocal.m4 gtk+2.0-2.17.11/aclocal.m4 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= -@@ -5307,6 +5322,7 @@ +@@ -5329,6 +5321,7 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi @@ -101,7 +160,7 @@ diff -Naur gtk+2.0-2.17.11.old/aclocal.m4 gtk+2.0-2.17.11/aclocal.m4 else # not using gcc if test "$host_cpu" = ia64; then -@@ -5545,7 +5561,7 @@ +@@ -5567,7 +5560,7 @@ _LT_TAGVAR(link_all_deplibs, $1)=yes ;; @@ -110,7 +169,7 @@ diff -Naur gtk+2.0-2.17.11.old/aclocal.m4 gtk+2.0-2.17.11/aclocal.m4 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else -@@ -8722,14 +8738,16 @@ +@@ -8744,14 +8737,16 @@ # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) # --------------------------------------------- m4_define([_PKG_CONFIG], @@ -135,7 +194,7 @@ diff -Naur gtk+2.0-2.17.11.old/aclocal.m4 gtk+2.0-2.17.11/aclocal.m4 fi[]dnl ])# _PKG_CONFIG -@@ -8773,9 +8791,9 @@ +@@ -8795,9 +8790,9 @@ if test $pkg_failed = yes; then _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then @@ -147,10 +206,20 @@ diff -Naur gtk+2.0-2.17.11.old/aclocal.m4 gtk+2.0-2.17.11/aclocal.m4 fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD -diff -Naur gtk+2.0-2.17.11.old/config.h.in gtk+2.0-2.17.11/config.h.in ---- gtk+2.0-2.17.11.old/config.h.in 2009-09-05 04:54:16.000000000 +0200 -+++ gtk+2.0-2.17.11/config.h.in 2009-09-05 07:25:19.000000000 +0200 -@@ -235,6 +235,9 @@ +diff -Naur gtk+2.0-2.18.4.old/config.h.in gtk+2.0-2.18.4/config.h.in +--- gtk+2.0-2.18.4.old/config.h.in 2009-12-01 05:08:40.000000000 +0100 ++++ gtk+2.0-2.18.4/config.h.in 2009-12-01 13:03:29.352294428 +0100 +@@ -126,6 +126,9 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_STRING_H + ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_PARAM_H ++ + /* Define to 1 if sys/select.h is available */ + #undef HAVE_SYS_SELECT_H + +@@ -235,6 +238,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME @@ -160,21 +229,23 @@ diff -Naur gtk+2.0-2.17.11.old/config.h.in gtk+2.0-2.17.11/config.h.in /* Define to the version of this package. */ #undef PACKAGE_VERSION -diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure ---- gtk+2.0-2.17.11.old/configure 2009-09-05 04:54:28.000000000 +0200 -+++ gtk+2.0-2.17.11/configure 2009-09-05 07:25:18.000000000 +0200 -@@ -1,20 +1,22 @@ +diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure +--- gtk+2.0-2.18.4.old/configure 2009-12-01 05:08:51.000000000 +0100 ++++ gtk+2.0-2.18.4/configure 2009-12-01 13:03:29.003290708 +0100 +@@ -1,20 +1,24 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.63 for gtk+ 2.17.11. -+# Generated by GNU Autoconf 2.64 for gtk+ 2.17.11. +-# Generated by GNU Autoconf 2.63 for gtk+ 2.18.4. ++# Generated by GNU Autoconf 2.65 for gtk+ 2.18.4. # # Report bugs to . # ++# # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 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 # gives unlimited permission to copy, distribute and modify it. @@ -192,7 +263,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -@@ -22,23 +24,15 @@ +@@ -22,23 +26,15 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else @@ -221,7 +292,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure as_nl=' ' export as_nl -@@ -46,7 +40,13 @@ +@@ -46,7 +42,13 @@ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo @@ -236,7 +307,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure as_echo='printf %s\n' as_echo_n='printf %s' else -@@ -57,7 +57,7 @@ +@@ -57,7 +59,7 @@ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; @@ -245,7 +316,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -@@ -80,13 +80,6 @@ +@@ -80,13 +82,6 @@ } fi @@ -259,7 +330,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure # IFS # We need space, tab and new line, in precisely that order. Quoting is -@@ -96,15 +89,15 @@ +@@ -96,15 +91,15 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. @@ -278,7 +349,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure IFS=$as_save_IFS ;; -@@ -116,12 +109,16 @@ +@@ -116,12 +111,16 @@ fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 @@ -299,7 +370,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure done PS1='$ ' PS2='> ' -@@ -133,330 +130,301 @@ +@@ -133,330 +132,301 @@ LANGUAGE=C export LANGUAGE @@ -877,7 +948,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure sed -n ' p /[$]LINENO/= -@@ -473,8 +441,7 @@ +@@ -473,8 +443,7 @@ s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || @@ -887,7 +958,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the -@@ -484,29 +451,18 @@ +@@ -484,29 +453,18 @@ exit } @@ -922,7 +993,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then -@@ -536,7 +492,7 @@ +@@ -536,7 +494,7 @@ rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then @@ -931,7 +1002,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure else test -d ./-p && rmdir ./-p as_mkdir_p=false -@@ -555,10 +511,10 @@ +@@ -555,10 +513,10 @@ if test -d "$1"; then test -d "$1/."; else @@ -944,7 +1015,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure ???[sx]*):;;*)false;;esac;fi '\'' sh ' -@@ -573,7 +529,6 @@ +@@ -573,7 +531,6 @@ @@ -952,7 +1023,17 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure # Check that we are running under the correct shell. SHELL=${CONFIG_SHELL-/bin/sh} -@@ -740,7 +695,6 @@ +@@ -722,7 +679,8 @@ + + + +-exec 7<&0 &1 ++test -n "$DJDIR" || exec 7<&0 &1 + + # Name of the host. + # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +@@ -740,7 +698,6 @@ subdirs= MFLAGS= MAKEFLAGS= @@ -960,15 +1041,45 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure # Identity of this package. PACKAGE_NAME='gtk+' -@@ -748,6 +702,7 @@ - PACKAGE_VERSION='2.17.11' - PACKAGE_STRING='gtk+ 2.17.11' +@@ -748,6 +705,7 @@ + PACKAGE_VERSION='2.18.4' + PACKAGE_STRING='gtk+ 2.18.4' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B' +PACKAGE_URL='' ac_unique_file="gdk/gdktypes.h" # Factoring default headers for most tests. -@@ -839,6 +794,7 @@ +@@ -786,6 +744,7 @@ + # include + #endif" + ++ac_header_list= + ac_subst_vars='am__EXEEXT_FALSE + am__EXEEXT_TRUE + LTLIBOBJS +@@ -798,20 +757,12 @@ + HAVE_DOCBOOK_FALSE + HAVE_DOCBOOK_TRUE + DB2HTML +-GTK_DOC_USE_REBASE_FALSE +-GTK_DOC_USE_REBASE_TRUE + GTK_DOC_USE_LIBTOOL_FALSE + GTK_DOC_USE_LIBTOOL_TRUE +-GTK_DOC_BUILD_PDF_FALSE +-GTK_DOC_BUILD_PDF_TRUE +-GTK_DOC_BUILD_HTML_FALSE +-GTK_DOC_BUILD_HTML_TRUE + ENABLE_GTK_DOC_FALSE + ENABLE_GTK_DOC_TRUE +-HTML_DIR +-GTKDOC_MKPDF +-GTKDOC_REBASE + GTKDOC_CHECK ++HTML_DIR + TEST_PRINT_BACKEND_FALSE + TEST_PRINT_BACKEND_TRUE + HAVE_PAPI_CUPS_FALSE +@@ -847,6 +798,7 @@ GDK_DEP_LIBS GDK_EXTRA_CFLAGS GDK_EXTRA_LIBS @@ -976,7 +1087,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure GDK_PACKAGES USE_DIRECTFB_FALSE USE_DIRECTFB_TRUE -@@ -1044,6 +1000,8 @@ +@@ -1052,6 +1004,8 @@ CXXFLAGS ac_ct_CXX CXX @@ -985,7 +1096,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE -@@ -1141,6 +1099,7 @@ +@@ -1149,6 +1103,7 @@ program_transform_name prefix exec_prefix @@ -993,7 +1104,16 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure PACKAGE_BUGREPORT PACKAGE_STRING PACKAGE_VERSION -@@ -1319,8 +1278,7 @@ +@@ -1193,8 +1148,6 @@ + enable_test_print_backend + with_html_dir + enable_gtk_doc +-enable_gtk_doc_html +-enable_gtk_doc_pdf + enable_man + with_xml_catalog + ' +@@ -1329,8 +1282,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 && @@ -1003,7 +1123,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in -@@ -1346,8 +1304,7 @@ +@@ -1356,8 +1308,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 && @@ -1013,7 +1133,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in -@@ -1551,8 +1508,7 @@ +@@ -1561,8 +1512,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 && @@ -1023,7 +1143,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in -@@ -1568,8 +1524,7 @@ +@@ -1578,8 +1528,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 && @@ -1033,7 +1153,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in -@@ -1599,17 +1554,17 @@ +@@ -1609,17 +1558,17 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; @@ -1057,7 +1177,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure eval $ac_envvar=\$ac_optarg export $ac_envvar ;; -@@ -1626,15 +1581,13 @@ +@@ -1636,15 +1585,13 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` @@ -1075,7 +1195,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi -@@ -1657,8 +1610,7 @@ +@@ -1667,8 +1614,7 @@ [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac @@ -1085,7 +1205,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure done # There might be people who depend on the old broken behavior: `$host' -@@ -1688,11 +1640,9 @@ +@@ -1698,11 +1644,9 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || @@ -1099,7 +1219,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure # Find the source files, if location was not specified. -@@ -1731,13 +1681,11 @@ +@@ -1741,13 +1685,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." @@ -1115,12 +1235,32 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then -@@ -2000,463 +1948,969 @@ +@@ -1890,9 +1832,7 @@ + + --enable-test-print-backend + build test print backend +- --enable-gtk-doc use gtk-doc to build documentation [default=no] +- --enable-gtk-doc-html build documentation in html format [default=yes] +- --enable-gtk-doc-pdf build documentation in pdf format [default=no] ++ --enable-gtk-doc use gtk-doc to build documentation [[default=no]] + --enable-man regenerate man pages from Docbook [default=no] + + Optional Packages: +@@ -1922,7 +1862,7 @@ + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + LIBS libraries to pass to the linker, e.g. -l +- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if ++ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + CXX C++ compiler command + CXXFLAGS C++ compiler flags +@@ -2012,464 +1952,973 @@ if $ac_init_version; then cat <<\_ACEOF - gtk+ configure 2.17.11 + gtk+ configure 2.18.4 -generated by GNU Autoconf 2.63 -+generated by GNU Autoconf 2.64 ++generated by GNU Autoconf 2.65 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -1134,7 +1274,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. --It was created by gtk+ $as_me 2.17.11, which was +-It was created by gtk+ $as_me 2.18.4, which was -generated by GNU Autoconf 2.63. Invocation command line was +## ------------------------ ## +## Autoconf initialization. ## @@ -1175,7 +1315,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ return $ac_retval ++ as_fn_set_status $ac_retval -_ACEOF -exec 5>>config.log @@ -1224,7 +1364,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ return $ac_retval ++ as_fn_set_status $ac_retval -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` @@ -1280,7 +1420,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ return $ac_retval ++ as_fn_set_status $ac_retval -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH @@ -1361,7 +1501,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ return $ac_retval ++ as_fn_set_status $ac_retval -_ACEOF +} # ac_fn_c_try_cpp @@ -1451,7 +1591,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ return $ac_retval ++ as_fn_set_status $ac_retval -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. We remove comments because anyway the quotes in there @@ -1664,7 +1804,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ return $ac_retval ++ as_fn_set_status $ac_retval -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" @@ -1716,7 +1856,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ return $ac_retval ++ as_fn_set_status $ac_retval +} # ac_fn_cxx_try_link @@ -1970,8 +2110,8 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. -+It was created by gtk+ $as_me 2.17.11, which was -+generated by GNU Autoconf 2.64. Invocation command line was ++It was created by gtk+ $as_me 2.18.4, which was ++generated by GNU Autoconf 2.65. Invocation command line was + $ $0 $@ @@ -1988,10 +2128,10 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` - ++ +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` - ++ +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` @@ -2179,6 +2319,10 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -f -r conftest* confdefs.h ++$as_echo "/* confdefs.h */" > confdefs.h + ++# Predefined preprocessor variables. + -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -2187,16 +2331,23 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - - - -- -+$as_echo "/* confdefs.h */" > confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_NAME "$PACKAGE_NAME" ++_ACEOF + ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_TARNAME "$PACKAGE_TARNAME" ++_ACEOF -# Save this value here, since automake will set cflags later -cflags_set=${CFLAGS+set} -+# Predefined preprocessor variables. ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_VERSION "$PACKAGE_VERSION" ++_ACEOF -am__api_version='1.11' +cat >>confdefs.h <<_ACEOF -+#define PACKAGE_NAME "$PACKAGE_NAME" ++#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF -ac_aux_dir= @@ -2221,7 +2372,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - { (exit 1); exit 1; }; } -fi +cat >>confdefs.h <<_ACEOF -+#define PACKAGE_TARNAME "$PACKAGE_TARNAME" ++#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF -# These three variables are undocumented and unsupported, @@ -2232,12 +2383,9 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. +cat >>confdefs.h <<_ACEOF -+#define PACKAGE_VERSION "$PACKAGE_VERSION" ++#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_STRING "$PACKAGE_STRING" -+_ACEOF -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or @@ -2258,15 +2406,6 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - $as_echo_n "(cached) " >&6 -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -+_ACEOF -+ -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_URL "$PACKAGE_URL" -+_ACEOF -+ -+ +# Let the site file select an alternate cache file if it wants to. +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE @@ -2298,8 +2437,9 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + test "x$ac_site_file" = xNONE && continue -+ if test -r "$ac_site_file"; then ++ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $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 @@ -2308,9 +2448,9 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure +done + +if test -r "$cache_file"; then -+ # Some versions of bash will fail to source /dev/null (special -+ # files actually), so we avoid doing that. -+ if test -f "$cache_file"; then ++ # Some versions of bash will fail to source /dev/null (special files ++ # actually), so we avoid doing that. DJGPP emulates it as a regular file. ++ if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in @@ -2324,6 +2464,9 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure + >$cache_file +fi + ++as_fn_append ac_header_list " stdlib.h" ++as_fn_append ac_header_list " unistd.h" ++as_fn_append ac_header_list " sys/param.h" +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false @@ -2460,10 +2603,11 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -@@ -2486,7 +2940,7 @@ + # AIX install. It has an incompatible calling convention. +@@ -2498,7 +2947,7 @@ ;; esac @@ -2472,7 +2616,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir -@@ -2502,7 +2956,7 @@ +@@ -2514,7 +2963,7 @@ INSTALL=$ac_install_sh fi fi @@ -2481,7 +2625,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. -@@ -2513,7 +2967,7 @@ +@@ -2525,7 +2974,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' @@ -2490,7 +2634,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "checking whether build environment is sane... " >&6; } # Just in case sleep 1 -@@ -2524,15 +2978,11 @@ +@@ -2536,15 +2985,11 @@ ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) @@ -2508,7 +2652,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure esac # Do `set' in a subshell so we don't clobber the current shell's -@@ -2554,11 +3004,8 @@ +@@ -2566,11 +3011,8 @@ # 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". @@ -2522,7 +2666,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure fi test "$2" = conftest.file -@@ -2567,13 +3014,10 @@ +@@ -2579,13 +3021,10 @@ # Ok. : else @@ -2539,7 +2683,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "yes" >&6; } test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" -@@ -2601,7 +3045,7 @@ +@@ -2613,7 +3052,7 @@ am_missing_run="$MISSING --run " else am_missing_run= @@ -2548,7 +2692,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -@@ -2622,9 +3066,9 @@ +@@ -2634,9 +3073,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 @@ -2560,7 +2704,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then -@@ -2635,24 +3079,24 @@ +@@ -2647,24 +3086,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2590,7 +2734,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -2662,9 +3106,9 @@ +@@ -2674,9 +3113,9 @@ ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 @@ -2602,7 +2746,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then -@@ -2675,24 +3119,24 @@ +@@ -2687,24 +3126,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2632,7 +2776,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -2701,7 +3145,7 @@ +@@ -2713,7 +3152,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -2641,7 +2785,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -2714,10 +3158,10 @@ +@@ -2726,10 +3165,10 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" @@ -2654,7 +2798,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -@@ -2725,7 +3169,7 @@ +@@ -2737,7 +3176,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2663,7 +2807,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure for ac_exec_ext in '' $ac_executable_extensions; do { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( -@@ -2737,7 +3181,7 @@ +@@ -2749,11 +3188,12 @@ esac done done @@ -2672,7 +2816,16 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure IFS=$as_save_IFS fi -@@ -2753,7 +3197,7 @@ + ++ test -d ./--version && rmdir ./--version + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" + else +@@ -2761,11 +3201,10 @@ + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. +- test -d ./--version && rmdir ./--version MKDIR_P="$ac_install_sh -d" fi fi @@ -2681,7 +2834,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$MKDIR_P" >&6; } mkdir_p="$MKDIR_P" -@@ -2766,9 +3210,9 @@ +@@ -2778,9 +3217,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -2693,7 +2846,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then -@@ -2779,24 +3223,24 @@ +@@ -2791,24 +3230,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2723,7 +2876,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -2804,11 +3248,11 @@ +@@ -2816,11 +3255,11 @@ test -n "$AWK" && break done @@ -2737,7 +2890,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF -@@ -2826,11 +3270,11 @@ +@@ -2838,11 +3277,11 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then @@ -2751,7 +2904,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi -@@ -2850,9 +3294,7 @@ +@@ -2862,9 +3301,7 @@ am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then @@ -2762,7 +2915,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure fi fi -@@ -2906,7 +3348,7 @@ +@@ -2918,7 +3355,7 @@ # by either passing --enable-silent-rules to configure or passing V=0 # to make # Check whether --enable-silent-rules was given. @@ -2771,7 +2924,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure enableval=$enable_silent_rules; fi -@@ -2995,35 +3437,27 @@ +@@ -3007,35 +3444,27 @@ # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || @@ -2814,7 +2967,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' -@@ -3039,28 +3473,24 @@ +@@ -3051,28 +3480,24 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac @@ -2848,7 +3001,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' -@@ -3078,7 +3508,7 @@ +@@ -3090,7 +3515,7 @@ MATH_LIB=-lm @@ -2857,7 +3010,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "checking for native Win32... " >&6; } LIB_EXE_MACHINE_FLAG=X86 case "$host" in -@@ -3096,7 +3526,7 @@ +@@ -3108,7 +3533,7 @@ os_win32=no ;; esac @@ -2866,7 +3019,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$os_win32" >&6; } -@@ -3115,9 +3545,9 @@ +@@ -3127,9 +3552,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 @@ -2878,7 +3031,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -3128,24 +3558,24 @@ +@@ -3140,24 +3565,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2908,7 +3061,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -3155,9 +3585,9 @@ +@@ -3167,9 +3592,9 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 @@ -2920,7 +3073,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then -@@ -3168,24 +3598,24 @@ +@@ -3180,24 +3605,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2950,7 +3103,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -3194,7 +3624,7 @@ +@@ -3206,7 +3631,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -2959,7 +3112,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -3208,9 +3638,9 @@ +@@ -3220,9 +3645,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 @@ -2971,7 +3124,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -3221,24 +3651,24 @@ +@@ -3233,24 +3658,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -3001,7 +3154,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -3248,9 +3678,9 @@ +@@ -3260,9 +3685,9 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 @@ -3013,7 +3166,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -3262,18 +3692,18 @@ +@@ -3274,18 +3699,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -3035,7 +3188,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure IFS=$as_save_IFS if test $ac_prog_rejected = yes; then -@@ -3292,10 +3722,10 @@ +@@ -3304,10 +3729,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -3048,7 +3201,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -3307,9 +3737,9 @@ +@@ -3319,9 +3744,9 @@ 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 @@ -3060,7 +3213,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -3320,24 +3750,24 @@ +@@ -3332,24 +3757,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -3090,7 +3243,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -3351,9 +3781,9 @@ +@@ -3363,9 +3788,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -3102,7 +3255,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then -@@ -3364,24 +3794,24 @@ +@@ -3376,24 +3801,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -3132,7 +3285,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -3394,7 +3824,7 @@ +@@ -3406,7 +3831,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -3141,7 +3294,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -3405,73 +3835,55 @@ +@@ -3417,57 +3842,37 @@ fi @@ -3204,8 +3357,8 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 -+ rm -f conftest.er1 conftest.err + fi ++ rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done @@ -3217,30 +3370,20 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -- -+#include - int - main () - { -+FILE *f = fopen ("conftest.out", "w"); -+ return ferror (f) || fclose (f) != 0; - ; - return 0; - } - _ACEOF - ac_clean_files_save=$ac_clean_files --ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" -+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out" + int +@@ -3483,8 +3888,8 @@ # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 - $as_echo_n "checking for C compiler default output file name... " >&6; } +-$as_echo_n "checking for C compiler default output file name... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 ++$as_echo_n "checking whether the C compiler works... " >&6; } ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -@@ -3488,17 +3900,17 @@ + # The possible output files: +@@ -3500,17 +3905,17 @@ done rm -f $ac_rmfiles @@ -3263,7 +3406,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, -@@ -3515,7 +3927,7 @@ +@@ -3527,7 +3932,7 @@ # certainly right. break;; *.* ) @@ -3272,17 +3415,19 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi -@@ -3534,84 +3946,75 @@ +@@ -3546,84 +3951,42 @@ else ac_file='' fi - -{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 - $as_echo "$ac_file" >&6; } +-$as_echo "$ac_file" >&6; } -if test -z "$ac_file"; then +- $as_echo "$as_me: failed program was:" >&5 +if test -z "$ac_file"; then : - $as_echo "$as_me: failed program was:" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 @@ -3296,70 +3441,64 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure +{ as_fn_set_status 77 +as_fn_error "C compiler cannot create executables +See \`config.log' for more details." "$LINENO" 5; }; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } fi - ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 ++$as_echo_n "checking for C compiler default output file name... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 ++$as_echo "$ac_file" >&6; } ac_exeext=$ac_cv_exeext - # Check that the compiler produces executables we can run. If not, either - # the compiler is broken, or we cross compile. +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 - $as_echo_n "checking whether the C compiler works... " >&6; } +-$as_echo_n "checking whether the C compiler works... " >&6; } -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 - # If not cross compiling, check that we can run a simple program. - if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' +-# If not cross compiling, check that we can run a simple program. +-if test "$cross_compiling" != yes; then +- if { ac_try='./$ac_file' - { (case "(($ac_try" in -+ { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? +- (eval "$ac_try") 2>&5 +- ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else +- cross_compiling=no +- else +- if test "$cross_compiling" = maybe; then +- cross_compiling=yes +- else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. -+as_fn_error "cannot run C compiled programs. - If you meant to cross compile, use \`--host'. +-If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } -+See \`config.log' for more details." "$LINENO" 5; } - fi - fi - fi +- fi +- fi +-fi -{ $as_echo "$as_me:$LINENO: result: yes" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - --rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out -+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out +-$as_echo "yes" >&6; } +- + rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save - # Check that the compiler produces executables we can run. If not, either - # the compiler is broken, or we cross compile. +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 - $as_echo_n "checking whether we are cross compiling... " >&6; } +-$as_echo_n "checking whether we are cross compiling... " >&6; } -{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 - $as_echo "$cross_compiling" >&6; } - +-$as_echo "$cross_compiling" >&6; } +- -{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 $as_echo_n "checking for suffix of executables... " >&6; } @@ -3382,7 +3521,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with -@@ -3626,32 +4029,24 @@ +@@ -3638,32 +4001,83 @@ esac done else @@ -3398,8 +3537,9 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure +See \`config.log' for more details." "$LINENO" 5; } fi - - rm -f conftest$ac_cv_exeext +-rm -f conftest$ac_cv_exeext -{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 ++rm -f conftest conftest$ac_cv_exeext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 $as_echo "$ac_cv_exeext" >&6; } @@ -3407,6 +3547,65 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include ++int ++main () ++{ ++FILE *f = fopen ("conftest.out", "w"); ++ return ferror (f) || fclose (f) != 0; ++ ++ ; ++ return 0; ++} ++_ACEOF ++ac_clean_files="$ac_clean_files conftest.out" ++# Check that the compiler produces executables we can run. If not, either ++# the compiler is broken, or we cross compile. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 ++$as_echo_n "checking whether we are cross compiling... " >&6; } ++if test "$cross_compiling" != yes; then ++ { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if { ac_try='./conftest$ac_cv_exeext' ++ { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then ++ cross_compiling=no ++ else ++ if test "$cross_compiling" = maybe; then ++ cross_compiling=yes ++ 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 "cannot run C compiled programs. ++If you meant to cross compile, use \`--host'. ++See \`config.log' for more details." "$LINENO" 5; } ++ fi ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 ++$as_echo "$cross_compiling" >&6; } ++ ++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ++ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then @@ -3422,7 +3621,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ int -@@ -3663,17 +4058,17 @@ +@@ -3675,17 +4089,17 @@ } _ACEOF rm -f conftest.o conftest.obj @@ -3445,7 +3644,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in -@@ -3686,31 +4081,23 @@ +@@ -3698,31 +4112,23 @@ $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -3484,7 +3683,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ int -@@ -3724,37 +4111,16 @@ +@@ -3736,37 +4142,16 @@ return 0; } _ACEOF @@ -3525,7 +3724,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes -@@ -3763,20 +4129,16 @@ +@@ -3775,20 +4160,16 @@ fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS @@ -3549,7 +3748,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ int -@@ -3787,35 +4149,11 @@ +@@ -3799,35 +4180,11 @@ return 0; } _ACEOF @@ -3588,7 +3787,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ int -@@ -3826,36 +4164,12 @@ +@@ -3838,36 +4195,12 @@ return 0; } _ACEOF @@ -3629,7 +3828,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ int -@@ -3866,42 +4180,17 @@ +@@ -3878,42 +4211,17 @@ return 0; } _ACEOF @@ -3674,7 +3873,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS -@@ -3918,18 +4207,14 @@ +@@ -3930,18 +4238,14 @@ CFLAGS= fi fi @@ -3696,7 +3895,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ #include #include -@@ -3986,32 +4271,9 @@ +@@ -3998,32 +4302,9 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" @@ -3730,7 +3929,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done -@@ -4022,17 +4284,19 @@ +@@ -4034,17 +4315,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) @@ -3753,7 +3952,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure ac_ext=c ac_cpp='$CPP $CPPFLAGS' -@@ -4051,7 +4315,7 @@ +@@ -4063,7 +4346,7 @@ .PHONY: am__doit END # If we don't find an include directive, just comment out the code. @@ -3762,7 +3961,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= -@@ -4079,12 +4343,12 @@ +@@ -4091,12 +4374,12 @@ fi @@ -3777,7 +3976,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure enableval=$enable_dependency_tracking; fi -@@ -4104,9 +4368,9 @@ +@@ -4116,9 +4399,9 @@ depcc="$CC" am_compiler_list= @@ -3789,7 +3988,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -@@ -4214,7 +4478,7 @@ +@@ -4226,7 +4509,7 @@ fi fi @@ -3798,7 +3997,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type -@@ -4230,7 +4494,7 @@ +@@ -4242,7 +4525,7 @@ # Check whether --enable-static was given. @@ -3807,7 +4006,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; -@@ -4260,15 +4524,23 @@ +@@ -4272,15 +4555,23 @@ @@ -3833,7 +4032,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$CXX"; then -@@ -4279,24 +4551,24 @@ +@@ -4291,24 +4582,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -3863,7 +4062,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -4310,9 +4582,9 @@ +@@ -4322,9 +4613,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -3875,7 +4074,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CXX"; then -@@ -4323,24 +4595,24 @@ +@@ -4335,24 +4626,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -3905,7 +4104,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -4353,7 +4625,7 @@ +@@ -4365,7 +4656,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -3914,7 +4113,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -4383,9 +4655,9 @@ +@@ -4395,9 +4686,9 @@ 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 @@ -3926,7 +4125,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$CXX"; then -@@ -4396,24 +4668,24 @@ +@@ -4408,24 +4699,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -3956,7 +4155,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -4427,9 +4699,9 @@ +@@ -4439,9 +4730,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -3968,7 +4167,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CXX"; then -@@ -4440,24 +4712,24 @@ +@@ -4452,24 +4743,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -3998,7 +4197,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -4470,7 +4742,7 @@ +@@ -4482,7 +4773,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -4007,7 +4206,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -4481,53 +4753,36 @@ +@@ -4493,53 +4784,36 @@ fi fi # Provide some information about the compiler. @@ -4058,8 +4257,8 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 -+ rm -f conftest.er1 conftest.err + fi ++ rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done @@ -4080,7 +4279,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ int -@@ -4541,37 +4796,16 @@ +@@ -4553,37 +4827,16 @@ return 0; } _ACEOF @@ -4121,7 +4320,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$ac_cv_cxx_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GXX=yes -@@ -4580,20 +4814,16 @@ +@@ -4592,20 +4845,16 @@ fi ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS @@ -4145,7 +4344,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ int -@@ -4604,35 +4834,11 @@ +@@ -4616,35 +4865,11 @@ return 0; } _ACEOF @@ -4184,7 +4383,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ int -@@ -4643,36 +4849,12 @@ +@@ -4655,36 +4880,12 @@ return 0; } _ACEOF @@ -4225,7 +4424,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ int -@@ -4683,42 +4865,17 @@ +@@ -4695,42 +4896,17 @@ return 0; } _ACEOF @@ -4270,7 +4469,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$ac_cv_prog_cxx_g" >&6; } if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS -@@ -4743,9 +4900,9 @@ +@@ -4755,9 +4931,9 @@ depcc="$CXX" am_compiler_list= @@ -4282,7 +4481,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -@@ -4853,7 +5010,7 @@ +@@ -4865,7 +5041,7 @@ fi fi @@ -4291,7 +4490,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type -@@ -4869,11 +5026,7 @@ +@@ -4881,11 +5057,7 @@ @@ -4304,7 +4503,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ int -@@ -4884,32 +5037,11 @@ +@@ -4896,32 +5068,11 @@ return 0; } _ACEOF @@ -4340,7 +4539,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "$CXX" != ""; then HAVE_CXX_TRUE= -@@ -4922,11 +5054,7 @@ +@@ -4934,11 +5085,7 @@ gtk_save_cxxflags="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -x objective-c++" @@ -4353,7 +4552,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ @interface Foo @end int -@@ -4937,32 +5065,11 @@ +@@ -4949,32 +5096,11 @@ return 0; } _ACEOF @@ -4388,7 +4587,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "$OBJC" = "yes"; then HAVE_OBJC_TRUE= -@@ -4982,12 +5089,12 @@ +@@ -4994,12 +5120,12 @@ if test "$os_win32" = "yes"; then if test x$enable_static = xyes -o x$enable_static = x; then @@ -4403,7 +4602,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: WARNING: Enabling shared library build, must build as DLL on Windows." >&2;} fi enable_shared=yes -@@ -5000,9 +5107,9 @@ +@@ -5012,9 +5138,9 @@ 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 @@ -4415,7 +4614,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$AS"; then -@@ -5013,24 +5120,24 @@ +@@ -5025,24 +5151,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4445,7 +4644,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -5040,9 +5147,9 @@ +@@ -5052,9 +5178,9 @@ ac_ct_AS=$AS # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 @@ -4457,7 +4656,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AS"; then -@@ -5053,24 +5160,24 @@ +@@ -5065,24 +5191,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4487,7 +4686,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -5079,7 +5186,7 @@ +@@ -5091,7 +5217,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -4496,7 +4695,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -5092,9 +5199,9 @@ +@@ -5104,9 +5230,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 @@ -4508,7 +4707,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$DLLTOOL"; then -@@ -5105,24 +5212,24 @@ +@@ -5117,24 +5243,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4538,7 +4737,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -5132,9 +5239,9 @@ +@@ -5144,9 +5270,9 @@ ac_ct_DLLTOOL=$DLLTOOL # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 @@ -4550,7 +4749,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DLLTOOL"; then -@@ -5145,24 +5252,24 @@ +@@ -5157,24 +5283,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4580,7 +4779,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -5171,7 +5278,7 @@ +@@ -5183,7 +5309,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -4589,7 +4788,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -5184,9 +5291,9 @@ +@@ -5196,9 +5322,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 @@ -4601,7 +4800,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$OBJDUMP"; then -@@ -5197,24 +5304,24 @@ +@@ -5209,24 +5335,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4631,7 +4830,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -5224,9 +5331,9 @@ +@@ -5236,9 +5362,9 @@ ac_ct_OBJDUMP=$OBJDUMP # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 @@ -4643,7 +4842,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OBJDUMP"; then -@@ -5237,24 +5344,24 @@ +@@ -5249,24 +5375,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4673,7 +4872,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -5263,7 +5370,7 @@ +@@ -5275,7 +5401,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -4682,7 +4881,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -5298,7 +5405,7 @@ +@@ -5310,7 +5436,7 @@ case `pwd` in *\ * | *\ *) @@ -4691,7 +4890,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; esac -@@ -5321,9 +5428,9 @@ +@@ -5333,9 +5459,9 @@ ltmain="$ac_aux_dir/ltmain.sh" @@ -4703,7 +4902,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ -@@ -5331,7 +5438,7 @@ +@@ -5343,7 +5469,7 @@ ac_script="$ac_script$as_nl$ac_script" done echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed @@ -4712,7 +4911,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure if test -z "$SED"; then ac_path_SED_found=false # Loop through the user's path and test for each of PROGNAME-LIST -@@ -5340,7 +5447,7 @@ +@@ -5352,7 +5478,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4721,7 +4920,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue -@@ -5360,7 +5467,7 @@ +@@ -5372,7 +5498,7 @@ $as_echo '' >> "conftest.nl" "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break @@ -4730,7 +4929,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure if test $ac_count -gt ${ac_path_SED_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_SED="$ac_path_SED" -@@ -5375,19 +5482,17 @@ +@@ -5387,19 +5513,17 @@ $ac_path_SED_found && break 3 done done @@ -4753,7 +4952,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$ac_cv_path_SED" >&6; } SED="$ac_cv_path_SED" rm -f conftest.sed -@@ -5405,9 +5510,9 @@ +@@ -5417,9 +5541,9 @@ @@ -4765,7 +4964,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then -@@ -5418,7 +5523,7 @@ +@@ -5430,7 +5554,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4774,7 +4973,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue -@@ -5438,7 +5543,7 @@ +@@ -5450,7 +5574,7 @@ $as_echo 'GREP' >> "conftest.nl" "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break @@ -4783,7 +4982,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure if test $ac_count -gt ${ac_path_GREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_GREP="$ac_path_GREP" -@@ -5453,26 +5558,24 @@ +@@ -5465,26 +5589,24 @@ $ac_path_GREP_found && break 3 done done @@ -4815,7 +5014,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 -@@ -5486,7 +5589,7 @@ +@@ -5498,7 +5620,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4824,7 +5023,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue -@@ -5506,7 +5609,7 @@ +@@ -5518,7 +5640,7 @@ $as_echo 'EGREP' >> "conftest.nl" "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break @@ -4833,7 +5032,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure if test $ac_count -gt ${ac_path_EGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_EGREP="$ac_path_EGREP" -@@ -5521,12 +5624,10 @@ +@@ -5533,12 +5655,10 @@ $ac_path_EGREP_found && break 3 done done @@ -4848,7 +5047,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure fi else ac_cv_path_EGREP=$EGREP -@@ -5534,14 +5635,14 @@ +@@ -5546,14 +5666,14 @@ fi fi @@ -4866,7 +5065,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 -@@ -5555,7 +5656,7 @@ +@@ -5567,7 +5687,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4875,7 +5074,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue -@@ -5575,7 +5676,7 @@ +@@ -5587,7 +5707,7 @@ $as_echo 'FGREP' >> "conftest.nl" "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break @@ -4884,7 +5083,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure if test $ac_count -gt ${ac_path_FGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_FGREP="$ac_path_FGREP" -@@ -5590,12 +5691,10 @@ +@@ -5602,12 +5722,10 @@ $ac_path_FGREP_found && break 3 done done @@ -4899,7 +5098,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure fi else ac_cv_path_FGREP=$FGREP -@@ -5603,7 +5702,7 @@ +@@ -5615,7 +5733,7 @@ fi fi @@ -4908,7 +5107,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$ac_cv_path_FGREP" >&6; } FGREP="$ac_cv_path_FGREP" -@@ -5629,7 +5728,7 @@ +@@ -5641,7 +5759,7 @@ # Check whether --with-gnu-ld was given. @@ -4917,7 +5116,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no -@@ -5638,7 +5737,7 @@ +@@ -5650,7 +5768,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. @@ -4926,7 +5125,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) -@@ -5668,13 +5767,13 @@ +@@ -5680,13 +5798,13 @@ ;; esac elif test "$with_gnu_ld" = yes; then @@ -4943,7 +5142,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -z "$LD"; then -@@ -5705,18 +5804,16 @@ +@@ -5717,18 +5835,16 @@ LD="$lt_cv_path_LD" if test -n "$LD"; then @@ -4967,7 +5166,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. -@@ -5729,7 +5826,7 @@ +@@ -5741,7 +5857,7 @@ ;; esac fi @@ -4976,7 +5175,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld -@@ -5741,9 +5838,9 @@ +@@ -5753,9 +5869,9 @@ @@ -4988,7 +5187,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$NM"; then -@@ -5790,7 +5887,7 @@ +@@ -5802,7 +5918,7 @@ : ${lt_cv_path_NM=no} fi fi @@ -4997,7 +5196,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$lt_cv_path_NM" >&6; } if test "$lt_cv_path_NM" != "no"; then NM="$lt_cv_path_NM" -@@ -5801,9 +5898,9 @@ +@@ -5813,9 +5929,9 @@ 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 @@ -5009,7 +5208,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$DUMPBIN"; then -@@ -5814,24 +5911,24 @@ +@@ -5826,24 +5942,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5039,7 +5238,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -5845,9 +5942,9 @@ +@@ -5857,9 +5973,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -5051,7 +5250,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DUMPBIN"; then -@@ -5858,24 +5955,24 @@ +@@ -5870,24 +5986,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5081,7 +5280,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -5888,7 +5985,7 @@ +@@ -5900,7 +6016,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -5090,7 +5289,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -5908,44 +6005,44 @@ +@@ -5920,44 +6036,44 @@ @@ -5103,16 +5302,16 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext -- (eval echo "\"\$as_me:5918: $ac_compile\"" >&5) -+ (eval echo "\"\$as_me:6015: $ac_compile\"" >&5) +- (eval echo "\"\$as_me:5930: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:6046: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 -- (eval echo "\"\$as_me:5921: $NM \\\"conftest.$ac_objext\\\"\"" >&5) -+ (eval echo "\"\$as_me:6018: $NM \\\"conftest.$ac_objext\\\"\"" >&5) +- (eval echo "\"\$as_me:5933: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:6049: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 -- (eval echo "\"\$as_me:5924: output\"" >&5) -+ (eval echo "\"\$as_me:6021: output\"" >&5) +- (eval echo "\"\$as_me:5936: output\"" >&5) ++ (eval echo "\"\$as_me:6052: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5146,7 +5345,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else i=0 -@@ -6063,10 +6160,10 @@ +@@ -6075,10 +6191,10 @@ fi if test -n $lt_cv_sys_max_cmd_len ; then @@ -5159,7 +5358,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "none" >&6; } fi max_cmd_len=$lt_cv_sys_max_cmd_len -@@ -6080,7 +6177,7 @@ +@@ -6092,7 +6208,7 @@ : ${MV="mv -f"} : ${RM="rm -f"} @@ -5168,7 +5367,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } # Try some XSI features xsi_shell=no -@@ -6090,17 +6187,17 @@ +@@ -6102,17 +6218,17 @@ && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes @@ -5189,7 +5388,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$lt_shell_append" >&6; } -@@ -6135,14 +6232,14 @@ +@@ -6147,14 +6263,14 @@ @@ -5207,7 +5406,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$lt_cv_ld_reload_flag" >&6; } reload_flag=$lt_cv_ld_reload_flag case $reload_flag in -@@ -6171,9 +6268,9 @@ +@@ -6183,9 +6299,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 @@ -5219,7 +5418,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$OBJDUMP"; then -@@ -6184,24 +6281,24 @@ +@@ -6196,24 +6312,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5249,7 +5448,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -6211,9 +6308,9 @@ +@@ -6223,9 +6339,9 @@ ac_ct_OBJDUMP=$OBJDUMP # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 @@ -5261,7 +5460,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OBJDUMP"; then -@@ -6224,24 +6321,24 @@ +@@ -6236,24 +6352,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5291,7 +5490,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -6250,7 +6347,7 @@ +@@ -6262,7 +6378,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -5300,7 +5499,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -6267,9 +6364,9 @@ +@@ -6279,9 +6395,9 @@ @@ -5312,7 +5511,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else lt_cv_file_magic_cmd='$MAGIC_CMD' -@@ -6388,7 +6485,7 @@ +@@ -6400,7 +6516,7 @@ lt_cv_deplibs_check_method=pass_all ;; @@ -5321,7 +5520,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure 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 -@@ -6463,7 +6560,7 @@ +@@ -6475,7 +6591,7 @@ esac fi @@ -5330,7 +5529,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$lt_cv_deplibs_check_method" >&6; } file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method -@@ -6483,9 +6580,9 @@ +@@ -6495,9 +6611,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -5342,7 +5541,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$AR"; then -@@ -6496,24 +6593,24 @@ +@@ -6508,24 +6624,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5372,7 +5571,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -6523,9 +6620,9 @@ +@@ -6535,9 +6651,9 @@ ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 @@ -5384,7 +5583,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AR"; then -@@ -6536,24 +6633,24 @@ +@@ -6548,24 +6664,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5414,7 +5613,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -6562,7 +6659,7 @@ +@@ -6574,7 +6690,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -5423,7 +5622,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -6588,9 +6685,9 @@ +@@ -6600,9 +6716,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 @@ -5435,7 +5634,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then -@@ -6601,24 +6698,24 @@ +@@ -6613,24 +6729,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5465,7 +5664,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -6628,9 +6725,9 @@ +@@ -6640,9 +6756,9 @@ ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 @@ -5477,7 +5676,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then -@@ -6641,24 +6738,24 @@ +@@ -6653,24 +6769,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5507,7 +5706,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -6667,7 +6764,7 @@ +@@ -6679,7 +6795,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -5516,7 +5715,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -6687,9 +6784,9 @@ +@@ -6699,9 +6815,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 @@ -5528,7 +5727,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then -@@ -6700,24 +6797,24 @@ +@@ -6712,24 +6828,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5558,7 +5757,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -6727,9 +6824,9 @@ +@@ -6739,9 +6855,9 @@ ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 @@ -5570,7 +5769,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then -@@ -6740,24 +6837,24 @@ +@@ -6752,24 +6868,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5600,7 +5799,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -6766,7 +6863,7 @@ +@@ -6778,7 +6894,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -5609,7 +5808,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -6844,9 +6941,9 @@ +@@ -6856,9 +6972,9 @@ # Check for command to grab the raw symbol name followed by C symbol from nm. @@ -5621,7 +5820,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else -@@ -6962,18 +7059,18 @@ +@@ -6974,18 +7090,18 @@ int main(){nm_test_var='a';nm_test_func();return(0);} _LT_EOF @@ -5646,7 +5845,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" -@@ -7026,11 +7123,11 @@ +@@ -7038,11 +7154,11 @@ lt_save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" @@ -5661,7 +5860,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure pipe_works=yes fi LIBS="$lt_save_LIBS" -@@ -7064,10 +7161,10 @@ +@@ -7076,10 +7192,10 @@ lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then @@ -5674,7 +5873,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "ok" >&6; } fi -@@ -7094,7 +7191,7 @@ +@@ -7106,7 +7222,7 @@ # Check whether --enable-libtool-lock was given. @@ -5683,7 +5882,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure enableval=$enable_libtool_lock; fi -@@ -7106,11 +7203,11 @@ +@@ -7118,11 +7234,11 @@ ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -5698,13 +5897,13 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE="32" -@@ -7124,12 +7221,12 @@ +@@ -7136,12 +7252,12 @@ ;; *-*-irix6*) # Find out which ABI we are using. -- echo '#line 7127 "configure"' > conftest.$ac_ext +- echo '#line 7139 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ echo '#line 7224 "configure"' > conftest.$ac_ext ++ echo '#line 7255 "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5715,7 +5914,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) -@@ -7163,11 +7260,11 @@ +@@ -7175,11 +7291,11 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -5730,7 +5929,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure case `/usr/bin/file conftest.o` in *32-bit*) case $host in -@@ -7216,9 +7313,9 @@ +@@ -7228,9 +7344,9 @@ # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" @@ -5742,7 +5941,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else ac_ext=c -@@ -7227,11 +7324,7 @@ +@@ -7239,11 +7355,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -5755,7 +5954,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ int -@@ -7242,38 +7335,13 @@ +@@ -7254,38 +7366,13 @@ return 0; } _ACEOF @@ -5798,7 +5997,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -7281,7 +7349,7 @@ +@@ -7293,7 +7380,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi @@ -5807,7 +6006,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$lt_cv_cc_needs_belf" >&6; } if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf -@@ -7291,11 +7359,11 @@ +@@ -7303,11 +7390,11 @@ sparc*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -5822,7 +6021,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in -@@ -7321,9 +7389,9 @@ +@@ -7333,9 +7420,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 @@ -5834,7 +6033,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$DSYMUTIL"; then -@@ -7334,24 +7402,24 @@ +@@ -7346,24 +7433,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5864,7 +6063,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -7361,9 +7429,9 @@ +@@ -7373,9 +7460,9 @@ ac_ct_DSYMUTIL=$DSYMUTIL # Extract the first word of "dsymutil", so it can be a program name with args. set dummy dsymutil; ac_word=$2 @@ -5876,7 +6075,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DSYMUTIL"; then -@@ -7374,24 +7442,24 @@ +@@ -7386,24 +7473,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5906,7 +6105,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -7400,7 +7468,7 @@ +@@ -7412,7 +7499,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -5915,7 +6114,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -7413,9 +7481,9 @@ +@@ -7425,9 +7512,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. set dummy ${ac_tool_prefix}nmedit; ac_word=$2 @@ -5927,7 +6126,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$NMEDIT"; then -@@ -7426,24 +7494,24 @@ +@@ -7438,24 +7525,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5957,7 +6156,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -7453,9 +7521,9 @@ +@@ -7465,9 +7552,9 @@ ac_ct_NMEDIT=$NMEDIT # Extract the first word of "nmedit", so it can be a program name with args. set dummy nmedit; ac_word=$2 @@ -5969,7 +6168,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_NMEDIT"; then -@@ -7466,24 +7534,24 @@ +@@ -7478,24 +7565,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5999,7 +6198,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -7492,7 +7560,7 @@ +@@ -7504,7 +7591,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -6008,7 +6207,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -7505,9 +7573,9 @@ +@@ -7517,9 +7604,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. set dummy ${ac_tool_prefix}lipo; ac_word=$2 @@ -6020,7 +6219,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$LIPO"; then -@@ -7518,24 +7586,24 @@ +@@ -7530,24 +7617,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6050,7 +6249,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -7545,9 +7613,9 @@ +@@ -7557,9 +7644,9 @@ ac_ct_LIPO=$LIPO # Extract the first word of "lipo", so it can be a program name with args. set dummy lipo; ac_word=$2 @@ -6062,7 +6261,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_LIPO"; then -@@ -7558,24 +7626,24 @@ +@@ -7570,24 +7657,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6092,7 +6291,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -7584,7 +7652,7 @@ +@@ -7596,7 +7683,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -6101,7 +6300,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -7597,9 +7665,9 @@ +@@ -7609,9 +7696,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. set dummy ${ac_tool_prefix}otool; ac_word=$2 @@ -6113,7 +6312,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$OTOOL"; then -@@ -7610,24 +7678,24 @@ +@@ -7622,24 +7709,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6143,7 +6342,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -7637,9 +7705,9 @@ +@@ -7649,9 +7736,9 @@ ac_ct_OTOOL=$OTOOL # Extract the first word of "otool", so it can be a program name with args. set dummy otool; ac_word=$2 @@ -6155,7 +6354,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL"; then -@@ -7650,24 +7718,24 @@ +@@ -7662,24 +7749,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6185,7 +6384,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -7676,7 +7744,7 @@ +@@ -7688,7 +7775,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -6194,7 +6393,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -7689,9 +7757,9 @@ +@@ -7701,9 +7788,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. set dummy ${ac_tool_prefix}otool64; ac_word=$2 @@ -6206,7 +6405,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$OTOOL64"; then -@@ -7702,24 +7770,24 @@ +@@ -7714,24 +7801,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6236,7 +6435,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -7729,9 +7797,9 @@ +@@ -7741,9 +7828,9 @@ ac_ct_OTOOL64=$OTOOL64 # Extract the first word of "otool64", so it can be a program name with args. set dummy otool64; ac_word=$2 @@ -6248,7 +6447,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL64"; then -@@ -7742,24 +7810,24 @@ +@@ -7754,24 +7841,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6278,7 +6477,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -7768,7 +7836,7 @@ +@@ -7780,7 +7867,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -6287,7 +6486,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -7804,9 +7872,9 @@ +@@ -7816,9 +7903,9 @@ @@ -6299,7 +6498,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no -@@ -7831,22 +7899,18 @@ +@@ -7843,22 +7930,18 @@ rm -f conftest.* fi fi @@ -6326,7 +6525,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ int -@@ -7857,42 +7921,17 @@ +@@ -7869,42 +7952,17 @@ return 0; } _ACEOF @@ -6374,7 +6573,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } case $host_os in rhapsody* | darwin1.[012]) -@@ -7934,14 +7973,14 @@ +@@ -7946,14 +8004,14 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -6391,7 +6590,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded -@@ -7956,11 +7995,7 @@ +@@ -7968,11 +8026,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. @@ -6404,7 +6603,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ #ifdef __STDC__ # include -@@ -7969,78 +8004,34 @@ +@@ -7981,78 +8035,34 @@ #endif Syntax error _ACEOF @@ -6488,7 +6687,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure break fi -@@ -8052,7 +8043,7 @@ +@@ -8064,7 +8074,7 @@ else ac_cv_prog_CPP=$CPP fi @@ -6497,7 +6696,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes -@@ -8063,11 +8054,7 @@ +@@ -8075,11 +8085,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. @@ -6510,7 +6709,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ #ifdef __STDC__ # include -@@ -8076,87 +8063,40 @@ +@@ -8088,87 +8094,40 @@ #endif Syntax error _ACEOF @@ -6607,7 +6806,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure fi ac_ext=c -@@ -8166,16 +8106,12 @@ +@@ -8178,16 +8137,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -6627,7 +6826,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ #include #include -@@ -8190,48 +8126,23 @@ +@@ -8202,48 +8157,23 @@ return 0; } _ACEOF @@ -6681,7 +6880,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure else ac_cv_header_stdc=no fi -@@ -8241,18 +8152,14 @@ +@@ -8253,18 +8183,14 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. @@ -6703,7 +6902,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure else ac_cv_header_stdc=no fi -@@ -8262,14 +8169,10 @@ +@@ -8274,14 +8200,10 @@ if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. @@ -6720,7 +6919,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ #include #include -@@ -8296,118 +8199,34 @@ +@@ -8308,118 +8230,34 @@ return 0; } _ACEOF @@ -6852,7 +7051,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -8417,62 +8236,13 @@ +@@ -8429,62 +8267,13 @@ done @@ -6920,7 +7119,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure _ACEOF fi -@@ -8495,9 +8265,9 @@ +@@ -8507,9 +8296,9 @@ 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 @@ -6932,7 +7131,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$CXX"; then -@@ -8508,24 +8278,24 @@ +@@ -8520,24 +8309,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6962,7 +7161,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -8539,9 +8309,9 @@ +@@ -8551,9 +8340,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -6974,7 +7173,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CXX"; then -@@ -8552,24 +8322,24 @@ +@@ -8564,24 +8353,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -7004,7 +7203,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -8582,7 +8352,7 @@ +@@ -8594,7 +8383,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -7013,7 +7212,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -8593,53 +8363,36 @@ +@@ -8605,53 +8394,36 @@ fi fi # Provide some information about the compiler. @@ -7033,6 +7232,17 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -v >&5") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -V >&5" +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in @@ -7041,31 +7251,20 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compiler -v >&5") 2>&5 +- (eval "$ac_compiler -V >&5") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } --{ (ac_try="$ac_compiler -V >&5" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compiler -V >&5") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 -+ rm -f conftest.er1 conftest.err + fi ++ rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done @@ -7086,7 +7285,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ int -@@ -8653,37 +8406,16 @@ +@@ -8665,37 +8437,16 @@ return 0; } _ACEOF @@ -7127,7 +7326,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$ac_cv_cxx_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GXX=yes -@@ -8692,20 +8424,16 @@ +@@ -8704,20 +8455,16 @@ fi ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS @@ -7151,7 +7350,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ int -@@ -8716,35 +8444,11 @@ +@@ -8728,35 +8475,11 @@ return 0; } _ACEOF @@ -7190,7 +7389,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ int -@@ -8755,36 +8459,12 @@ +@@ -8767,36 +8490,12 @@ return 0; } _ACEOF @@ -7231,7 +7430,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ int -@@ -8795,42 +8475,17 @@ +@@ -8807,42 +8506,17 @@ return 0; } _ACEOF @@ -7276,7 +7475,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$ac_cv_prog_cxx_g" >&6; } if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS -@@ -8855,9 +8510,9 @@ +@@ -8867,9 +8541,9 @@ depcc="$CXX" am_compiler_list= @@ -7288,7 +7487,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -@@ -8965,7 +8620,7 @@ +@@ -8977,7 +8651,7 @@ fi fi @@ -7297,7 +7496,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type -@@ -8988,10 +8643,10 @@ +@@ -9000,10 +8674,10 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu @@ -7310,7 +7509,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else # Double quotes because CXXCPP needs to be expanded -@@ -9006,11 +8661,7 @@ +@@ -9018,11 +8692,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. @@ -7323,7 +7522,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ #ifdef __STDC__ # include -@@ -9019,78 +8670,34 @@ +@@ -9031,78 +8701,34 @@ #endif Syntax error _ACEOF @@ -7407,7 +7606,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure break fi -@@ -9102,7 +8709,7 @@ +@@ -9114,7 +8740,7 @@ else ac_cv_prog_CXXCPP=$CXXCPP fi @@ -7416,7 +7615,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$CXXCPP" >&6; } ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes -@@ -9113,11 +8720,7 @@ +@@ -9125,11 +8751,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. @@ -7429,7 +7628,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ #ifdef __STDC__ # include -@@ -9126,81 +8729,37 @@ +@@ -9138,81 +8760,37 @@ #endif Syntax error _ACEOF @@ -7518,7 +7717,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} _lt_caught_CXX_error=yes; } fi -@@ -9227,7 +8786,7 @@ +@@ -9239,7 +8817,7 @@ # Check whether --enable-shared was given. @@ -7527,7 +7726,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; -@@ -9260,7 +8819,7 @@ +@@ -9272,7 +8850,7 @@ # Check whether --with-pic was given. @@ -7536,7 +7735,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure withval=$with_pic; pic_mode="$withval" else pic_mode=default -@@ -9276,7 +8835,7 @@ +@@ -9288,7 +8866,7 @@ # Check whether --enable-fast-install was given. @@ -7545,7 +7744,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; -@@ -9357,9 +8916,9 @@ +@@ -9369,9 +8947,9 @@ setopt NO_GLOB_SUBST fi @@ -7557,7 +7756,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else rm -f .libs 2>/dev/null -@@ -9372,7 +8931,7 @@ +@@ -9384,7 +8962,7 @@ fi rmdir .libs 2>/dev/null fi @@ -7566,7 +7765,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir -@@ -9465,9 +9024,9 @@ +@@ -9477,9 +9055,9 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then @@ -7578,7 +7777,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in -@@ -9518,10 +9077,10 @@ +@@ -9530,10 +9108,10 @@ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then @@ -7591,7 +7790,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -9531,9 +9090,9 @@ +@@ -9543,9 +9121,9 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then @@ -7603,7 +7802,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in -@@ -9584,10 +9143,10 @@ +@@ -9596,10 +9174,10 @@ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then @@ -7616,7 +7815,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -9664,9 +9223,9 @@ +@@ -9676,9 +9254,9 @@ if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag=' -fno-builtin' @@ -7628,21 +7827,21 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_rtti_exceptions=no -@@ -9682,11 +9241,11 @@ +@@ -9694,11 +9272,11 @@ -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:9685: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9244: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:9697: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9275: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 -- echo "$as_me:9689: \$? = $ac_status" >&5 -+ echo "$as_me:9248: \$? = $ac_status" >&5 +- echo "$as_me:9701: \$? = $ac_status" >&5 ++ echo "$as_me:9279: \$? = $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. -@@ -9699,7 +9258,7 @@ +@@ -9711,7 +9289,7 @@ $RM conftest* fi @@ -7651,7 +7850,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then -@@ -9719,7 +9278,7 @@ +@@ -9731,7 +9309,7 @@ lt_prog_compiler_pic= lt_prog_compiler_static= @@ -7660,7 +7859,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "checking for $compiler option to produce PIC... " >&6; } if test "$GCC" = yes; then -@@ -9991,7 +9550,7 @@ +@@ -10003,7 +9581,7 @@ lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -7669,7 +7868,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$lt_prog_compiler_pic" >&6; } -@@ -10003,9 +9562,9 @@ +@@ -10015,9 +9593,9 @@ # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then @@ -7681,21 +7880,21 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works=no -@@ -10021,11 +9580,11 @@ +@@ -10033,11 +9611,11 @@ -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:10024: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9583: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:10036: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9614: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 -- echo "$as_me:10028: \$? = $ac_status" >&5 -+ echo "$as_me:9587: \$? = $ac_status" >&5 +- echo "$as_me:10040: \$? = $ac_status" >&5 ++ echo "$as_me:9618: \$? = $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. -@@ -10038,7 +9597,7 @@ +@@ -10050,7 +9628,7 @@ $RM conftest* fi @@ -7704,7 +7903,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } if test x"$lt_cv_prog_compiler_pic_works" = xyes; then -@@ -10062,9 +9621,9 @@ +@@ -10074,9 +9652,9 @@ # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" @@ -7716,7 +7915,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no -@@ -10090,7 +9649,7 @@ +@@ -10102,7 +9680,7 @@ LDFLAGS="$save_LDFLAGS" fi @@ -7725,7 +7924,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$lt_cv_prog_compiler_static_works" >&6; } if test x"$lt_cv_prog_compiler_static_works" = xyes; then -@@ -10105,9 +9664,9 @@ +@@ -10117,9 +9695,9 @@ @@ -7737,21 +7936,21 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no -@@ -10126,11 +9685,11 @@ +@@ -10138,11 +9716,11 @@ -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:10129: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9688: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:10141: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9719: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 -- echo "$as_me:10133: \$? = $ac_status" >&5 -+ echo "$as_me:9692: \$? = $ac_status" >&5 +- echo "$as_me:10145: \$? = $ac_status" >&5 ++ echo "$as_me:9723: \$? = $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 -@@ -10152,7 +9711,7 @@ +@@ -10164,7 +9742,7 @@ $RM conftest* fi @@ -7760,7 +7959,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$lt_cv_prog_compiler_c_o" >&6; } -@@ -10160,9 +9719,9 @@ +@@ -10172,9 +9750,9 @@ @@ -7772,21 +7971,21 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no -@@ -10181,11 +9740,11 @@ +@@ -10193,11 +9771,11 @@ -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:10184: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9743: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:10196: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9774: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 -- echo "$as_me:10188: \$? = $ac_status" >&5 -+ echo "$as_me:9747: \$? = $ac_status" >&5 +- echo "$as_me:10200: \$? = $ac_status" >&5 ++ echo "$as_me:9778: \$? = $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 -@@ -10207,7 +9766,7 @@ +@@ -10219,7 +9797,7 @@ $RM conftest* fi @@ -7795,7 +7994,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$lt_cv_prog_compiler_c_o" >&6; } -@@ -10216,7 +9775,7 @@ +@@ -10228,7 +9806,7 @@ hard_links="nottested" if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user @@ -7804,7 +8003,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes $RM conftest* -@@ -10224,10 +9783,10 @@ +@@ -10236,10 +9814,10 @@ touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no @@ -7817,7 +8016,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi -@@ -10240,7 +9799,7 @@ +@@ -10252,7 +9830,7 @@ @@ -7826,7 +8025,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } runpath_var= -@@ -10300,6 +9859,9 @@ +@@ -10312,6 +9890,9 @@ openbsd*) with_gnu_ld=no ;; @@ -7836,7 +8035,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure esac ld_shlibs=yes -@@ -10482,7 +10044,7 @@ +@@ -10494,7 +10075,7 @@ fi ;; @@ -7845,7 +8044,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= -@@ -10657,6 +10219,7 @@ +@@ -10669,6 +10250,7 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi @@ -7853,7 +8052,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure else # not using gcc if test "$host_cpu" = ia64; then -@@ -10682,11 +10245,7 @@ +@@ -10694,11 +10276,7 @@ allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -7866,7 +8065,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ int -@@ -10697,27 +10256,7 @@ +@@ -10709,27 +10287,7 @@ return 0; } _ACEOF @@ -7895,7 +8094,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -10731,16 +10270,9 @@ +@@ -10743,16 +10301,9 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi @@ -7914,7 +8113,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" -@@ -10753,11 +10285,7 @@ +@@ -10765,11 +10316,7 @@ else # Determine the default libpath from the value encoded in an # empty executable. @@ -7927,7 +8126,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ int -@@ -10768,27 +10296,7 @@ +@@ -10780,27 +10327,7 @@ return 0; } _ACEOF @@ -7956,7 +8155,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -10802,16 +10310,9 @@ +@@ -10814,16 +10341,9 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi @@ -7975,7 +8174,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" -@@ -11023,42 +10524,16 @@ +@@ -11035,42 +10555,16 @@ # implicitly export all symbols. save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" @@ -8023,7 +8222,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure LDFLAGS="$save_LDFLAGS" else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -@@ -11071,7 +10546,7 @@ +@@ -11083,7 +10577,7 @@ link_all_deplibs=yes ;; @@ -8032,7 +8231,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else -@@ -11314,7 +10789,7 @@ +@@ -11326,7 +10820,7 @@ fi fi @@ -8041,7 +8240,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$ld_shlibs" >&6; } test "$ld_shlibs" = no && can_build_shared=no -@@ -11351,16 +10826,16 @@ +@@ -11363,16 +10857,16 @@ # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. @@ -8062,7 +8261,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure soname=conftest lib=conftest libobjs=conftest.$ac_objext -@@ -11374,11 +10849,11 @@ +@@ -11386,11 +10880,11 @@ libname=conftest lt_save_allow_undefined_flag=$allow_undefined_flag allow_undefined_flag= @@ -8077,7 +8276,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure then archive_cmds_need_lc=no else -@@ -11389,7 +10864,7 @@ +@@ -11401,7 +10895,7 @@ cat conftest.err 1>&5 fi $RM conftest* @@ -8086,7 +8285,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$archive_cmds_need_lc" >&6; } ;; esac -@@ -11553,7 +11028,7 @@ +@@ -11565,7 +11059,7 @@ @@ -8095,7 +8294,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "checking dynamic linker characteristics... " >&6; } if test "$GCC" = yes; then -@@ -11975,11 +11450,7 @@ +@@ -11987,11 +11481,7 @@ save_libdir=$libdir eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" @@ -8108,7 +8307,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ int -@@ -11990,41 +11461,13 @@ +@@ -12002,41 +11492,13 @@ return 0; } _ACEOF @@ -8154,7 +8353,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure LDFLAGS=$save_LDFLAGS libdir=$save_libdir -@@ -12033,13 +11476,10 @@ +@@ -12045,13 +11507,10 @@ # before this can be enabled. hardcode_into_libs=yes @@ -8169,7 +8368,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -12051,6 +11491,18 @@ +@@ -12063,6 +11522,18 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -8188,7 +8387,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure netbsd*) version_type=sunos need_lib_prefix=no -@@ -12239,7 +11691,7 @@ +@@ -12251,7 +11722,7 @@ dynamic_linker=no ;; esac @@ -8197,7 +8396,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no -@@ -12341,7 +11793,7 @@ +@@ -12353,7 +11824,7 @@ @@ -8206,7 +8405,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || -@@ -12366,7 +11818,7 @@ +@@ -12378,7 +11849,7 @@ # directories. hardcode_action=unsupported fi @@ -8215,7 +8414,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$hardcode_action" >&6; } if test "$hardcode_action" = relink || -@@ -12411,18 +11863,14 @@ +@@ -12423,18 +11894,14 @@ darwin*) # if libdl is installed we need to link against it @@ -8237,7 +8436,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -12440,43 +11888,18 @@ +@@ -12452,43 +11919,18 @@ return 0; } _ACEOF @@ -8287,7 +8486,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else -@@ -12489,33 +11912,19 @@ +@@ -12501,33 +11943,19 @@ ;; *) @@ -8331,7 +8530,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -12524,13 +11933,6 @@ +@@ -12536,13 +11964,6 @@ extern "C" #endif char shl_load (); @@ -8345,7 +8544,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure int main () { -@@ -12539,56 +11941,32 @@ +@@ -12551,56 +11972,32 @@ return 0; } _ACEOF @@ -8421,7 +8620,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -12597,81 +11975,38 @@ +@@ -12609,222 +12006,37 @@ #ifdef __cplusplus extern "C" #endif @@ -8465,42 +8664,29 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dld_shl_load=no -+ ac_cv_lib_dl_dlopen=no - fi +-fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi +-LIBS=$ac_check_lib_save_LIBS +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -$as_echo "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = x""yes; then - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -+$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : -+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" - else +-else - { $as_echo "$as_me:$LINENO: checking for dlopen" >&5 -$as_echo_n "checking for dlopen... " >&6; } -if test "${ac_cv_func_dlopen+set}" = set; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 -+$as_echo_n "checking for dlopen in -lsvld... " >&6; } -+if test "${ac_cv_lib_svld_dlopen+set}" = set; then : - $as_echo_n "(cached) " >&6 - else +- $as_echo_n "(cached) " >&6 +-else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lsvld $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -/* Define dlopen to an innocuous variant, in case declares dlopen. - For example, HP-UX 11i declares gettimeofday. */ -#define dlopen innocuous_dlopen @@ -8517,13 +8703,14 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -#endif - -#undef dlopen - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -@@ -12680,13 +12015,6 @@ - extern "C" - #endif - char dlopen (); +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char dlopen (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ @@ -8531,13 +8718,14 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -choke me -#endif - - int - main () - { -@@ -12695,56 +12023,28 @@ - return 0; - } - _ACEOF +-int +-main () +-{ +-return dlopen (); +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -8560,67 +8748,51 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_dlopen=yes -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_svld_dlopen=yes - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_dlopen=no -+ ac_cv_lib_svld_dlopen=no - fi +-fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS - fi +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -$as_echo "$ac_cv_func_dlopen" >&6; } -if test "x$ac_cv_func_dlopen" = x""yes; then - lt_cv_dlopen="dlopen" -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 -+$as_echo "$ac_cv_lib_svld_dlopen" >&6; } -+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : -+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" - else +-else - { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 -+$as_echo_n "checking for dld_link in -ldld... " >&6; } -+if test "${ac_cv_lib_dld_dld_link+set}" = set; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+LIBS="-ldld $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. -@@ -12753,188 +12053,27 @@ - #ifdef __cplusplus - extern "C" - #endif +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif -char dlopen (); -+char dld_link (); - int - main () - { +-int +-main () +-{ -return dlopen (); -+return dld_link (); - ; - return 0; - } - _ACEOF +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -8648,47 +8820,45 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dl_dlopen=no --fi ++ ac_cv_lib_dl_dlopen=no + fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 --$as_echo "$ac_cv_lib_dl_dlopen" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 + $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then -- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" --else ++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + else - { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 --$as_echo_n "checking for dlopen in -lsvld... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 + $as_echo_n "checking for dlopen in -lsvld... " >&6; } -if test "${ac_cv_lib_svld_dlopen+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lsvld $LIBS" ++if test "${ac_cv_lib_svld_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsvld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char dlopen (); --int --main () --{ --return dlopen (); -- ; -- return 0; --} --_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -12842,57 +12054,28 @@ + return 0; + } + _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -8710,53 +8880,52 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -- ac_cv_lib_svld_dlopen=yes --else ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_svld_dlopen=yes + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_svld_dlopen=no --fi ++ ac_cv_lib_svld_dlopen=no + fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 --$as_echo "$ac_cv_lib_svld_dlopen" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 + $as_echo "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = x""yes; then -- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" --else ++if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" + else - { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 --$as_echo_n "checking for dld_link in -ldld... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 + $as_echo_n "checking for dld_link in -ldld... " >&6; } -if test "${ac_cv_lib_dld_dld_link+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ldld $LIBS" ++if test "${ac_cv_lib_dld_dld_link+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char dld_link (); --int --main () --{ --return dld_link (); -- ; -- return 0; --} --_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -12910,43 +12093,18 @@ + return 0; + } + _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -8803,7 +8972,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi -@@ -12973,9 +12112,9 @@ +@@ -12985,9 +12143,9 @@ save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" @@ -8815,16 +8984,16 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : -@@ -12984,7 +12123,7 @@ +@@ -12996,7 +12154,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 12987 "configure" -+#line 12126 "configure" +-#line 12999 "configure" ++#line 12157 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -13043,11 +12182,11 @@ +@@ -13055,11 +12213,11 @@ return status; } _LT_EOF @@ -8839,7 +9008,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in -@@ -13064,14 +12203,14 @@ +@@ -13076,14 +12234,14 @@ fi @@ -8857,16 +9026,16 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : -@@ -13080,7 +12219,7 @@ +@@ -13092,7 +12250,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 13083 "configure" -+#line 12222 "configure" +-#line 13095 "configure" ++#line 12253 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -13139,11 +12278,11 @@ +@@ -13151,11 +12309,11 @@ return status; } _LT_EOF @@ -8881,7 +9050,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in -@@ -13160,7 +12299,7 @@ +@@ -13172,7 +12330,7 @@ fi @@ -8890,7 +9059,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$lt_cv_dlopen_self_static" >&6; } fi -@@ -13199,12 +12338,12 @@ +@@ -13211,12 +12369,12 @@ striplib= old_striplib= @@ -8905,7 +9074,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "yes" >&6; } else # FIXME - insert some real tests, host_os isn't really good enough -@@ -13213,15 +12352,15 @@ +@@ -13225,15 +12383,15 @@ if test -n "$STRIP" ; then striplib="$STRIP -x" old_striplib="$STRIP -S" @@ -8924,7 +9093,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } ;; esac -@@ -13239,12 +12378,12 @@ +@@ -13251,12 +12409,12 @@ # Report which library types will actually be built @@ -8940,7 +9109,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "checking whether to build shared libraries... " >&6; } test "$can_build_shared" = "no" && enable_shared=no -@@ -13265,14 +12404,14 @@ +@@ -13277,14 +12435,14 @@ fi ;; esac @@ -8958,7 +9127,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$enable_static" >&6; } -@@ -13413,7 +12552,7 @@ +@@ -13425,7 +12583,7 @@ # Check whether --with-gnu-ld was given. @@ -8967,7 +9136,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no -@@ -13422,7 +12561,7 @@ +@@ -13434,7 +12592,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. @@ -8976,7 +9145,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) -@@ -13452,13 +12591,13 @@ +@@ -13464,13 +12622,13 @@ ;; esac elif test "$with_gnu_ld" = yes; then @@ -8993,7 +9162,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -z "$LD"; then -@@ -13489,18 +12628,16 @@ +@@ -13501,18 +12659,16 @@ LD="$lt_cv_path_LD" if test -n "$LD"; then @@ -9017,7 +9186,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. -@@ -13513,7 +12650,7 @@ +@@ -13525,7 +12681,7 @@ ;; esac fi @@ -9026,7 +9195,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld -@@ -13568,7 +12705,7 @@ +@@ -13580,7 +12736,7 @@ fi # PORTME: fill in a description of your system's C++ link characteristics @@ -9035,7 +9204,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } ld_shlibs_CXX=yes case $host_os in -@@ -13669,11 +12806,7 @@ +@@ -13681,11 +12837,7 @@ allow_undefined_flag_CXX='-berok' # Determine the default libpath from the value encoded in an empty # executable. @@ -9048,7 +9217,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ int -@@ -13684,27 +12817,7 @@ +@@ -13696,27 +12848,7 @@ return 0; } _ACEOF @@ -9077,7 +9246,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -13718,16 +12831,9 @@ +@@ -13730,16 +12862,9 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi @@ -9096,7 +9265,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" -@@ -13741,11 +12847,7 @@ +@@ -13753,11 +12878,7 @@ else # Determine the default libpath from the value encoded in an # empty executable. @@ -9109,7 +9278,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ int -@@ -13756,27 +12858,7 @@ +@@ -13768,27 +12889,7 @@ return 0; } _ACEOF @@ -9138,7 +9307,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -13790,16 +12872,9 @@ +@@ -13802,16 +12903,9 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi @@ -9157,7 +9326,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" -@@ -14543,7 +13618,7 @@ +@@ -14555,7 +13649,7 @@ ;; esac @@ -9166,7 +9335,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$ld_shlibs_CXX" >&6; } test "$ld_shlibs_CXX" = no && can_build_shared=no -@@ -14571,11 +13646,11 @@ +@@ -14583,11 +13677,11 @@ }; _LT_EOF @@ -9181,7 +9350,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure # Parse the compiler output and extract the necessary # objects, libraries and library flags. -@@ -14756,7 +13831,7 @@ +@@ -14768,7 +13862,7 @@ lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX= @@ -9190,7 +9359,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "checking for $compiler option to produce PIC... " >&6; } # C++ specific cases for pic, static, wl, etc. -@@ -14976,7 +14051,7 @@ +@@ -14988,7 +14082,7 @@ ;; esac ;; @@ -9199,7 +9368,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise -@@ -15073,7 +14148,7 @@ +@@ -15085,7 +14179,7 @@ lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" ;; esac @@ -9208,7 +9377,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$lt_prog_compiler_pic_CXX" >&6; } -@@ -15082,9 +14157,9 @@ +@@ -15094,9 +14188,9 @@ # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_CXX"; then @@ -9220,21 +9389,21 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works_CXX=no -@@ -15100,11 +14175,11 @@ +@@ -15112,11 +14206,11 @@ -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:15103: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:14178: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:15115: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14209: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 -- echo "$as_me:15107: \$? = $ac_status" >&5 -+ echo "$as_me:14182: \$? = $ac_status" >&5 +- echo "$as_me:15119: \$? = $ac_status" >&5 ++ echo "$as_me:14213: \$? = $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. -@@ -15117,7 +14192,7 @@ +@@ -15129,7 +14223,7 @@ $RM conftest* fi @@ -9243,7 +9412,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then -@@ -15138,9 +14213,9 @@ +@@ -15150,9 +14244,9 @@ # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" @@ -9255,7 +9424,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works_CXX=no -@@ -15166,7 +14241,7 @@ +@@ -15178,7 +14272,7 @@ LDFLAGS="$save_LDFLAGS" fi @@ -9264,7 +9433,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then -@@ -15178,9 +14253,9 @@ +@@ -15190,9 +14284,9 @@ @@ -9276,21 +9445,21 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o_CXX=no -@@ -15199,11 +14274,11 @@ +@@ -15211,11 +14305,11 @@ -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:15202: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:14277: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:15214: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14308: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 -- echo "$as_me:15206: \$? = $ac_status" >&5 -+ echo "$as_me:14281: \$? = $ac_status" >&5 +- echo "$as_me:15218: \$? = $ac_status" >&5 ++ echo "$as_me:14312: \$? = $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 -@@ -15225,14 +14300,14 @@ +@@ -15237,14 +14331,14 @@ $RM conftest* fi @@ -9308,21 +9477,21 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o_CXX=no -@@ -15251,11 +14326,11 @@ +@@ -15263,11 +14357,11 @@ -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:15254: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:14329: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:15266: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14360: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 -- echo "$as_me:15258: \$? = $ac_status" >&5 -+ echo "$as_me:14333: \$? = $ac_status" >&5 +- echo "$as_me:15270: \$? = $ac_status" >&5 ++ echo "$as_me:14364: \$? = $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 -@@ -15277,7 +14352,7 @@ +@@ -15289,7 +14383,7 @@ $RM conftest* fi @@ -9331,7 +9500,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } -@@ -15286,7 +14361,7 @@ +@@ -15298,7 +14392,7 @@ hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user @@ -9340,7 +9509,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes $RM conftest* -@@ -15294,10 +14369,10 @@ +@@ -15306,10 +14400,10 @@ touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no @@ -9353,7 +9522,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi -@@ -15307,7 +14382,7 @@ +@@ -15319,7 +14413,7 @@ @@ -9362,7 +9531,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -@@ -15327,13 +14402,16 @@ +@@ -15339,13 +14433,16 @@ 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' ;; @@ -9380,7 +9549,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$ld_shlibs_CXX" >&6; } test "$ld_shlibs_CXX" = no && can_build_shared=no -@@ -15361,16 +14439,16 @@ +@@ -15373,16 +14470,16 @@ # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. @@ -9401,7 +9570,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure soname=conftest lib=conftest libobjs=conftest.$ac_objext -@@ -15384,11 +14462,11 @@ +@@ -15396,11 +14493,11 @@ libname=conftest lt_save_allow_undefined_flag=$allow_undefined_flag_CXX allow_undefined_flag_CXX= @@ -9416,7 +9585,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure then archive_cmds_need_lc_CXX=no else -@@ -15399,7 +14477,7 @@ +@@ -15411,7 +14508,7 @@ cat conftest.err 1>&5 fi $RM conftest* @@ -9425,7 +9594,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$archive_cmds_need_lc_CXX" >&6; } ;; esac -@@ -15470,7 +14548,7 @@ +@@ -15482,7 +14579,7 @@ @@ -9434,7 +9603,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "checking dynamic linker characteristics... " >&6; } library_names_spec= -@@ -15840,11 +14918,7 @@ +@@ -15852,11 +14949,7 @@ save_libdir=$libdir eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" @@ -9447,7 +9616,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ int -@@ -15855,41 +14929,13 @@ +@@ -15867,41 +14960,13 @@ return 0; } _ACEOF @@ -9493,7 +9662,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure LDFLAGS=$save_LDFLAGS libdir=$save_libdir -@@ -15898,13 +14944,10 @@ +@@ -15910,13 +14975,10 @@ # before this can be enabled. hardcode_into_libs=yes @@ -9508,7 +9677,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -15916,6 +14959,18 @@ +@@ -15928,6 +14990,18 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -9527,7 +9696,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure netbsd*) version_type=sunos need_lib_prefix=no -@@ -16104,7 +15159,7 @@ +@@ -16116,7 +15190,7 @@ dynamic_linker=no ;; esac @@ -9536,7 +9705,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no -@@ -16155,7 +15210,7 @@ +@@ -16167,7 +15241,7 @@ @@ -9545,7 +9714,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action_CXX= if test -n "$hardcode_libdir_flag_spec_CXX" || -@@ -16180,7 +15235,7 @@ +@@ -16192,7 +15266,7 @@ # directories. hardcode_action_CXX=unsupported fi @@ -9554,7 +9723,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$hardcode_action_CXX" >&6; } if test "$hardcode_action_CXX" = relink || -@@ -16239,7 +15294,7 @@ +@@ -16251,7 +15325,7 @@ : ${CONFIG_LT=./config.lt} @@ -9563,7 +9732,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: creating $CONFIG_LT" >&6;} cat >"$CONFIG_LT" <<_LTEOF #! $SHELL -@@ -16251,13 +15306,13 @@ +@@ -16263,13 +15337,13 @@ _LTEOF cat >>"$CONFIG_LT" <<\_LTEOF @@ -9581,7 +9750,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -@@ -16265,23 +15320,15 @@ +@@ -16277,23 +15351,15 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else @@ -9610,7 +9779,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure as_nl=' ' export as_nl -@@ -16289,7 +15336,13 @@ +@@ -16301,7 +15367,13 @@ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo @@ -9625,7 +9794,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure as_echo='printf %s\n' as_echo_n='printf %s' else -@@ -16300,7 +15353,7 @@ +@@ -16312,7 +15384,7 @@ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; @@ -9634,7 +9803,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -@@ -16323,13 +15376,6 @@ +@@ -16335,13 +15407,6 @@ } fi @@ -9648,7 +9817,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure # IFS # We need space, tab and new line, in precisely that order. Quoting is -@@ -16339,15 +15385,15 @@ +@@ -16351,15 +15416,15 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. @@ -9667,7 +9836,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure IFS=$as_save_IFS ;; -@@ -16359,12 +15405,16 @@ +@@ -16371,12 +15436,16 @@ fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 @@ -9688,7 +9857,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure done PS1='$ ' PS2='> ' -@@ -16376,7 +15426,90 @@ +@@ -16388,7 +15457,90 @@ LANGUAGE=C export LANGUAGE @@ -9780,7 +9949,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr -@@ -16390,8 +15523,12 @@ +@@ -16402,8 +15554,12 @@ as_basename=false fi @@ -9794,7 +9963,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ -@@ -16411,77 +15548,25 @@ +@@ -16423,77 +15579,25 @@ } s/.*/./; q'` @@ -9883,16 +10052,10 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then -@@ -16510,12 +15595,60 @@ +@@ -16522,8 +15626,56 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null --if mkdir -p . 2>/dev/null; then -- as_mkdir_p=: --else -- test -d ./-p && rmdir ./-p -- as_mkdir_p=false --fi + +# as_fn_mkdir_p +# ------------- @@ -9941,16 +10104,13 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure + + +} # as_fn_mkdir_p -+if mkdir -p . 2>/dev/null; then + if mkdir -p . 2>/dev/null; then +- as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' -+else -+ test -d ./-p && rmdir ./-p -+ as_mkdir_p=false -+fi - - if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -@@ -16530,10 +15663,10 @@ + else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +@@ -16542,10 +15694,10 @@ if test -d "$1"; then test -d "$1/."; else @@ -9963,16 +10123,16 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure ???[sx]*):;;*)false;;esac;fi '\'' sh ' -@@ -16573,7 +15706,7 @@ +@@ -16585,7 +15737,7 @@ lt_cl_version="\ - gtk+ config.lt 2.17.11 + gtk+ config.lt 2.18.4 -configured by $0, generated by GNU Autoconf 2.63. -+configured by $0, generated by GNU Autoconf 2.64. ++configured by $0, generated by GNU Autoconf 2.65. Copyright (C) 2008 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation -@@ -16591,17 +15724,11 @@ +@@ -16603,17 +15755,11 @@ --quiet | --q* | --silent | --s* | -q ) lt_cl_silent=: ;; @@ -9995,7 +10155,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure esac shift done -@@ -16967,7 +16094,7 @@ +@@ -16979,7 +16125,7 @@ _LTEOF cat >>"$CONFIG_LT" <<\_LTEOF @@ -10004,7 +10164,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: creating $ofile" >&6;} -@@ -17777,7 +16904,7 @@ +@@ -17789,7 +16935,7 @@ _LT_EOF @@ -10013,7 +10173,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure _LTEOF chmod +x "$CONFIG_LT" -@@ -17792,22 +16919,22 @@ +@@ -17804,22 +16950,22 @@ exec 5>/dev/null $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false exec 5>>config.log @@ -10040,7 +10200,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else ac_cv_sys_largefile_CC=no -@@ -17816,11 +16943,7 @@ +@@ -17828,11 +16974,7 @@ while :; do # IRIX 6.2 and later do not support large files by default, # so use the C compiler's -n32 option if that helps. @@ -10053,7 +10213,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ #include /* Check that off_t can represent 2**63 - 1 correctly. -@@ -17839,60 +16962,14 @@ +@@ -17851,60 +16993,14 @@ return 0; } _ACEOF @@ -10116,7 +10276,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure rm -f core conftest.err conftest.$ac_objext break done -@@ -17900,23 +16977,19 @@ +@@ -17912,23 +17008,19 @@ rm -f conftest.$ac_ext fi fi @@ -10144,7 +10304,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ #include /* Check that off_t can represent 2**63 - 1 correctly. -@@ -17935,38 +17008,11 @@ +@@ -17947,38 +17039,11 @@ return 0; } _ACEOF @@ -10185,7 +10345,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ #define _FILE_OFFSET_BITS 64 #include -@@ -17986,38 +17032,15 @@ +@@ -17998,38 +17063,15 @@ return 0; } _ACEOF @@ -10226,7 +10386,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$ac_cv_sys_file_offset_bits" >&6; } case $ac_cv_sys_file_offset_bits in #( no | unknown) ;; -@@ -18029,17 +17052,13 @@ +@@ -18041,17 +17083,13 @@ esac rm -rf conftest* if test $ac_cv_sys_file_offset_bits = unknown; then @@ -10247,7 +10407,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ #include /* Check that off_t can represent 2**63 - 1 correctly. -@@ -18058,38 +17077,11 @@ +@@ -18070,38 +17108,11 @@ return 0; } _ACEOF @@ -10288,7 +10448,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ #define _LARGE_FILES 1 #include -@@ -18109,38 +17101,15 @@ +@@ -18121,38 +17132,15 @@ return 0; } _ACEOF @@ -10329,7 +10489,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$ac_cv_sys_large_files" >&6; } case $ac_cv_sys_large_files in #( no | unknown) ;; -@@ -18164,9 +17133,9 @@ +@@ -18176,9 +17164,9 @@ depcc="$CCAS" am_compiler_list= @@ -10341,7 +10501,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -@@ -18272,7 +17241,7 @@ +@@ -18284,7 +17272,7 @@ fi fi @@ -10350,7 +10510,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; } CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type -@@ -18289,9 +17258,9 @@ +@@ -18301,9 +17289,9 @@ # Extract the first word of "nm", so it can be a program name with args. set dummy nm; ac_word=$2 @@ -10362,7 +10522,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else case $NM in -@@ -18304,14 +17273,14 @@ +@@ -18316,14 +17304,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -10380,7 +10540,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure IFS=$as_save_IFS test -z "$ac_cv_path_NM" && ac_cv_path_NM="nm" -@@ -18320,26 +17289,26 @@ +@@ -18332,26 +17320,26 @@ fi NM=$ac_cv_path_NM if test -n "$NM"; then @@ -10412,7 +10572,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$USE_MAINTAINER_MODE" >&6; } if test $USE_MAINTAINER_MODE = yes; then MAINTAINER_MODE_TRUE= -@@ -18353,7 +17322,7 @@ +@@ -18365,7 +17353,7 @@ @@ -10421,7 +10581,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "checking for some Win32 platform... " >&6; } case "$host" in *-*-mingw*|*-*-cygwin*) -@@ -18363,7 +17332,7 @@ +@@ -18375,7 +17363,7 @@ platform_win32=no ;; esac @@ -10430,7 +10590,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$platform_win32" >&6; } if test "$platform_win32" = "yes"; then PLATFORM_WIN32_TRUE= -@@ -18403,9 +17372,9 @@ +@@ -18415,9 +17403,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. set dummy ${ac_tool_prefix}windres; ac_word=$2 @@ -10442,7 +10602,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$WINDRES"; then -@@ -18416,24 +17385,24 @@ +@@ -18428,24 +17416,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -10472,7 +10632,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -18443,9 +17412,9 @@ +@@ -18455,9 +17443,9 @@ ac_ct_WINDRES=$WINDRES # Extract the first word of "windres", so it can be a program name with args. set dummy windres; ac_word=$2 @@ -10484,7 +10644,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_WINDRES"; then -@@ -18456,24 +17425,24 @@ +@@ -18468,24 +17456,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -10514,7 +10674,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -18482,7 +17451,7 @@ +@@ -18494,7 +17482,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -10523,7 +10683,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -18493,15 +17462,13 @@ +@@ -18505,15 +17493,13 @@ fi if test "$WINDRES" = no; then @@ -10542,7 +10702,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$ms_librarian"; then -@@ -18512,14 +17479,14 @@ +@@ -18524,14 +17510,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -10560,7 +10720,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure IFS=$as_save_IFS test -z "$ac_cv_prog_ms_librarian" && ac_cv_prog_ms_librarian="no" -@@ -18527,10 +17494,10 @@ +@@ -18539,10 +17525,10 @@ fi ms_librarian=$ac_cv_prog_ms_librarian if test -n "$ms_librarian"; then @@ -10573,7 +10733,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -18548,42 +17515,42 @@ +@@ -18560,42 +17546,42 @@ # Check whether --enable-debug was given. @@ -10581,7 +10741,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure +if test "${enable_debug+set}" = set; then : enableval=$enable_debug; else - enable_debug=yes + enable_debug=minimum fi # Check whether --enable-shm was given. @@ -10622,7 +10782,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure enableval=$enable_visibility; else enable_visibility=yes -@@ -18592,7 +17559,7 @@ +@@ -18604,7 +17590,7 @@ # Check whether --with-xinput was given. @@ -10631,7 +10791,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure withval=$with_xinput; fi -@@ -18605,7 +17572,7 @@ +@@ -18617,7 +17603,7 @@ # Check whether --with-gdktarget was given. @@ -10640,7 +10800,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure withval=$with_gdktarget; gdktarget=$with_gdktarget fi -@@ -18613,9 +17580,7 @@ +@@ -18625,9 +17611,7 @@ case $gdktarget in x11|win32|quartz|directfb) ;; @@ -10651,7 +10811,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure esac gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la -@@ -18649,7 +17614,7 @@ +@@ -18661,7 +17645,7 @@ # Build time sanity check... @@ -10660,7 +10820,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "checking whether build environment is sane... " >&6; } # Just in case sleep 1 -@@ -18660,15 +17625,11 @@ +@@ -18672,15 +17656,11 @@ ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) @@ -10678,7 +10838,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure esac # Do `set' in a subshell so we don't clobber the current shell's -@@ -18690,11 +17651,8 @@ +@@ -18702,11 +17682,8 @@ # 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". @@ -10692,7 +10852,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure fi test "$2" = conftest.file -@@ -18703,27 +17661,20 @@ +@@ -18715,27 +17692,20 @@ # Ok. : else @@ -10726,7 +10886,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -18748,54 +17699,27 @@ +@@ -18760,54 +17730,27 @@ ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi @@ -10789,7 +10949,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi -@@ -18808,9 +17732,9 @@ +@@ -18820,9 +17763,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 @@ -10801,7 +10961,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -18821,24 +17745,24 @@ +@@ -18833,24 +17776,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -10831,7 +10991,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -18848,9 +17772,9 @@ +@@ -18860,9 +17803,9 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 @@ -10843,7 +11003,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then -@@ -18861,24 +17785,24 @@ +@@ -18873,24 +17816,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -10873,7 +11033,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -18887,7 +17811,7 @@ +@@ -18899,7 +17842,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -10882,7 +11042,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -18901,9 +17825,9 @@ +@@ -18913,9 +17856,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 @@ -10894,7 +11054,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -18914,24 +17838,24 @@ +@@ -18926,24 +17869,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -10924,7 +11084,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -18941,9 +17865,9 @@ +@@ -18953,9 +17896,9 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 @@ -10936,7 +11096,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -18955,18 +17879,18 @@ +@@ -18967,18 +17910,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -10958,7 +11118,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure IFS=$as_save_IFS if test $ac_prog_rejected = yes; then -@@ -18985,10 +17909,10 @@ +@@ -18997,10 +17940,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -10971,7 +11131,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -19000,9 +17924,9 @@ +@@ -19012,9 +17955,9 @@ 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 @@ -10983,7 +11143,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -19013,24 +17937,24 @@ +@@ -19025,24 +17968,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -11013,7 +11173,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -19044,9 +17968,9 @@ +@@ -19056,9 +17999,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -11025,7 +11185,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then -@@ -19057,24 +17981,24 @@ +@@ -19069,24 +18012,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -11055,7 +11215,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -19087,7 +18011,7 @@ +@@ -19099,7 +18042,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -11064,7 +11224,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -19098,62 +18022,42 @@ +@@ -19110,62 +18053,42 @@ fi @@ -11096,6 +11256,17 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -v >&5") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -V >&5" +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in @@ -11104,31 +11275,20 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compiler -v >&5") 2>&5 +- (eval "$ac_compiler -V >&5") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } --{ (ac_try="$ac_compiler -V >&5" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compiler -V >&5") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 -+ rm -f conftest.er1 conftest.err + fi ++ rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done @@ -11149,7 +11309,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ int -@@ -19167,37 +18071,16 @@ +@@ -19179,37 +18102,16 @@ return 0; } _ACEOF @@ -11190,7 +11350,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes -@@ -19206,20 +18089,16 @@ +@@ -19218,20 +18120,16 @@ fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS @@ -11214,7 +11374,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ int -@@ -19230,35 +18109,11 @@ +@@ -19242,35 +18140,11 @@ return 0; } _ACEOF @@ -11253,7 +11413,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ int -@@ -19269,36 +18124,12 @@ +@@ -19281,36 +18155,12 @@ return 0; } _ACEOF @@ -11294,7 +11454,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ int -@@ -19309,42 +18140,17 @@ +@@ -19321,42 +18171,17 @@ return 0; } _ACEOF @@ -11339,7 +11499,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS -@@ -19361,18 +18167,14 @@ +@@ -19373,18 +18198,14 @@ CFLAGS= fi fi @@ -11361,7 +11521,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ #include #include -@@ -19429,32 +18231,9 @@ +@@ -19441,32 +18262,9 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" @@ -11395,7 +11555,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done -@@ -19465,17 +18244,19 @@ +@@ -19477,17 +18275,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) @@ -11418,7 +11578,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure ac_ext=c ac_cpp='$CPP $CPPFLAGS' -@@ -19485,9 +18266,9 @@ +@@ -19497,9 +18297,9 @@ depcc="$CC" am_compiler_list= @@ -11430,7 +11590,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -@@ -19595,7 +18376,7 @@ +@@ -19607,7 +18407,7 @@ fi fi @@ -11439,7 +11599,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type -@@ -19614,22 +18395,18 @@ +@@ -19626,22 +18426,18 @@ am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc if test "x$CC" != xcc; then @@ -11466,7 +11626,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ int -@@ -19645,63 +18422,63 @@ +@@ -19657,63 +18453,63 @@ # existing .o file with -o, though they will create one. ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' rm -f conftest2.* @@ -11555,7 +11715,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure then # cc works too. : -@@ -19718,15 +18495,13 @@ +@@ -19730,15 +18526,13 @@ fi if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then @@ -11574,7 +11734,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure fi -@@ -19745,104 +18520,12 @@ +@@ -19757,104 +18551,12 @@ fi @@ -11681,7 +11841,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF -@@ -19860,11 +18543,11 @@ +@@ -19872,11 +18574,11 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then @@ -11695,7 +11855,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi -@@ -19898,7 +18581,7 @@ +@@ -19910,7 +18612,7 @@ if test x"$os_win32" = xyes; then if test x"$GCC" = xyes; then msnative_struct='' @@ -11704,7 +11864,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "checking how to get MSVC-compatible struct packing... " >&6; } if test -z "$ac_cv_prog_CC"; then our_gcc="$CC" -@@ -19918,13 +18601,13 @@ +@@ -19930,13 +18632,13 @@ ;; esac if test x"$msnative_struct" = x ; then @@ -11721,7 +11881,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "${msnative_struct}" >&6; } fi fi -@@ -19945,9 +18628,9 @@ +@@ -19957,9 +18659,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 @@ -11733,7 +11893,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in -@@ -19960,14 +18643,14 @@ +@@ -19972,14 +18674,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -11751,7 +11911,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure IFS=$as_save_IFS ;; -@@ -19975,10 +18658,10 @@ +@@ -19987,10 +18689,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then @@ -11764,7 +11924,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -19988,9 +18671,9 @@ +@@ -20000,9 +18702,9 @@ ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 @@ -11776,7 +11936,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in -@@ -20003,14 +18686,14 @@ +@@ -20015,14 +18717,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -11794,7 +11954,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure IFS=$as_save_IFS ;; -@@ -20018,10 +18701,10 @@ +@@ -20030,10 +18732,10 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then @@ -11807,7 +11967,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -20030,7 +18713,7 @@ +@@ -20042,7 +18744,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -11816,7 +11976,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -20043,13 +18726,13 @@ +@@ -20055,13 +18757,13 @@ fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.9.0 @@ -11833,7 +11993,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } PKG_CONFIG="" fi -@@ -20057,40 +18740,44 @@ +@@ -20069,40 +18771,44 @@ fi pkg_failed=no @@ -11897,7 +12057,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure fi -@@ -20103,25 +18790,14 @@ +@@ -20115,25 +18821,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then @@ -11926,7 +12086,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $BASE_DEPENDENCIES_PKG_ERRORS -@@ -20131,22 +18807,11 @@ +@@ -20143,22 +18838,11 @@ 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. @@ -11952,7 +12112,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -@@ -20155,12 +18820,11 @@ +@@ -20167,12 +18851,11 @@ See the pkg-config man page for more details. To get pkg-config, see . @@ -11967,7 +12127,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "yes" >&6; } : fi -@@ -20177,40 +18841,44 @@ +@@ -20189,40 +18872,44 @@ fi pkg_failed=no @@ -12031,7 +12191,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure fi -@@ -20223,25 +18891,14 @@ +@@ -20235,25 +18922,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then @@ -12060,7 +12220,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $CAIRO_BACKEND_PKG_ERRORS -@@ -20251,22 +18908,11 @@ +@@ -20263,22 +18939,11 @@ 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. @@ -12086,7 +12246,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -@@ -20275,12 +18921,11 @@ +@@ -20287,12 +18952,11 @@ See the pkg-config man page for more details. To get pkg-config, see . @@ -12101,7 +12261,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "yes" >&6; } : fi -@@ -20297,14 +18942,14 @@ +@@ -20309,14 +18973,14 @@ # Check whether --enable-explicit-deps was given. @@ -12118,7 +12278,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "checking Whether to write dependencies into .pc files... " >&6; } case $enable_explicit_deps in auto) -@@ -20318,12 +18963,10 @@ +@@ -20330,12 +18994,10 @@ ;; yes|no) ;; @@ -12133,7 +12293,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$enable_explicit_deps" >&6; } if test $enable_explicit_deps = no; then -@@ -20342,9 +18985,9 @@ +@@ -20354,9 +19016,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -12145,7 +12305,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else case $PERL in -@@ -20357,14 +19000,14 @@ +@@ -20369,14 +19031,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -12163,7 +12323,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure IFS=$as_save_IFS ;; -@@ -20372,10 +19015,10 @@ +@@ -20384,10 +19046,10 @@ fi PERL=$ac_cv_path_PERL if test -n "$PERL"; then @@ -12176,7 +12336,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -20387,9 +19030,9 @@ +@@ -20399,9 +19061,9 @@ # We would like indent, but don't require it. # Extract the first word of "indent", so it can be a program name with args. set dummy indent; ac_word=$2 @@ -12188,7 +12348,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$INDENT"; then -@@ -20400,24 +19043,24 @@ +@@ -20412,24 +19074,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -12218,7 +12378,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -20431,288 +19074,72 @@ +@@ -20443,283 +19105,67 @@ fi @@ -12329,21 +12489,13 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -+if ac_fn_c_try_link "$LINENO"; then : -+ gtk_ok=yes - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -+ gtk_ok=no - fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gtk_ok" >&5 -+$as_echo "$gtk_ok" >&6; } -+if test "$gtk_ok" = "yes"; then - +-fi +- -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext @@ -12358,12 +12510,11 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF -+$as_echo "#define HAVE__NL_TIME_FIRST_WEEKDAY 1" >>confdefs.h - - fi +- +-fi -done - - +- -for ac_func in localtime_r -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -12377,11 +12528,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+# _NL_MEASUREMENT_MEASUREMENT is an enum and not a define -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _NL_MEASUREMENT_MEASUREMENT" >&5 -+$as_echo_n "checking for _NL_MEASUREMENT_MEASUREMENT... " >&6; } -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func @@ -12511,48 +12658,47 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -- gtk_ok=yes --else ++if ac_fn_c_try_link "$LINENO"; then : + gtk_ok=yes + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - gtk_ok=no --fi ++ gtk_ok=no + fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $gtk_ok" >&5 --$as_echo "$gtk_ok" >&6; } --if test "$gtk_ok" = "yes"; then -- ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gtk_ok" >&5 + $as_echo "$gtk_ok" >&6; } + if test "$gtk_ok" = "yes"; then + -cat >>confdefs.h <<\_ACEOF -#define HAVE__NL_TIME_FIRST_WEEKDAY 1 -_ACEOF -- --fi -- --# _NL_MEASUREMENT_MEASUREMENT is an enum and not a define ++$as_echo "#define HAVE__NL_TIME_FIRST_WEEKDAY 1" >>confdefs.h + + fi + + # _NL_MEASUREMENT_MEASUREMENT is an enum and not a define -{ $as_echo "$as_me:$LINENO: checking for _NL_MEASUREMENT_MEASUREMENT" >&5 --$as_echo_n "checking for _NL_MEASUREMENT_MEASUREMENT... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _NL_MEASUREMENT_MEASUREMENT" >&5 + $as_echo_n "checking for _NL_MEASUREMENT_MEASUREMENT... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include --int --main () --{ -+#include -+int -+main () -+{ - - char c; - c = *((unsigned char *) nl_langinfo(_NL_MEASUREMENT_MEASUREMENT)); -@@ -20721,56 +19148,25 @@ ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +@@ -20733,56 +19179,25 @@ return 0; } _ACEOF @@ -12617,7 +12763,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ #include int -@@ -20784,56 +19180,25 @@ +@@ -20796,56 +19211,25 @@ return 0; } _ACEOF @@ -12682,7 +12828,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ #include int -@@ -20847,56 +19212,25 @@ +@@ -20859,56 +19243,25 @@ return 0; } _ACEOF @@ -12747,7 +12893,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ #include int -@@ -20910,196 +19244,30 @@ +@@ -20922,424 +19275,92 @@ return 0; } _ACEOF @@ -12802,7 +12948,14 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure # i18n stuff ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`" -- ++ for ac_header in locale.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" ++if test "x$ac_cv_header_locale_h" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LOCALE_H 1 ++_ACEOF + -for ac_header in locale.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -12811,12 +12964,20 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 --fi + fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } --else ++ ++done ++ ++ if test $ac_cv_header_locale_h = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 ++$as_echo_n "checking for LC_MESSAGES... " >&6; } ++if test "${am_cv_val_LC_MESSAGES+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } @@ -12825,10 +12986,19 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> --_ACEOF ++#include ++int ++main () ++{ ++return LC_MESSAGES ++ ; ++ return 0; ++} + _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -12848,17 +13018,27 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes --else ++if ac_fn_c_try_link "$LINENO"; then : ++ am_cv_val_LC_MESSAGES=yes + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no --fi -- ++ am_cv_val_LC_MESSAGES=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5 ++$as_echo "$am_cv_val_LC_MESSAGES" >&6; } ++ if test $am_cv_val_LC_MESSAGES = yes; then + -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } -- ++$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h + -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } @@ -12891,10 +13071,13 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++ fi ++ fi ++ USE_NLS=yes + - ac_header_preproc=no -fi -- + -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } @@ -12945,40 +13128,35 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then -+ for ac_header in locale.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" -+if test "x$ac_cv_header_locale_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF +- cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_LOCALE_H 1 - _ACEOF - - fi -@@ -21107,16 +19275,12 @@ - done - - if test $ac_cv_header_locale_h = yes; then +-_ACEOF +- +-fi +- +-done +- +- if test $ac_cv_header_locale_h = yes; then - { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 - $as_echo_n "checking for LC_MESSAGES... " >&6; } +-$as_echo_n "checking for LC_MESSAGES... " >&6; } -if test "${am_cv_val_LC_MESSAGES+set}" = set; then -+if test "${am_cv_val_LC_MESSAGES+set}" = set; then : - $as_echo_n "(cached) " >&6 - else +- $as_echo_n "(cached) " >&6 +-else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - int -@@ -21127,46 +19291,19 @@ - return 0; - } - _ACEOF +-/* end confdefs.h. */ +-#include +-int +-main () +-{ +-return LC_MESSAGES +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -13000,35 +13178,35 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -+if ac_fn_c_try_link "$LINENO"; then : - am_cv_val_LC_MESSAGES=yes - else +- am_cv_val_LC_MESSAGES=yes +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - am_cv_val_LC_MESSAGES=no -+ am_cv_val_LC_MESSAGES=no - fi +-fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - fi +-fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5 - $as_echo "$am_cv_val_LC_MESSAGES" >&6; } - if test $am_cv_val_LC_MESSAGES = yes; then - +-$as_echo "$am_cv_val_LC_MESSAGES" >&6; } +- if test $am_cv_val_LC_MESSAGES = yes; then +- -cat >>confdefs.h <<\_ACEOF -#define HAVE_LC_MESSAGES 1 -_ACEOF -+$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h +- +- fi +- fi +- USE_NLS=yes +- +- +- gt_cv_have_gettext=no ++ gt_cv_have_gettext=no - fi - fi -@@ -21179,155 +19316,20 @@ + CATOBJEXT=NONE XGETTEXT=: INTLLIBS= @@ -13189,7 +13367,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ #include -@@ -21340,54 +19342,25 @@ +@@ -21352,54 +19373,25 @@ return 0; } _ACEOF @@ -13252,7 +13430,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ #include -@@ -21400,141 +19373,26 @@ +@@ -21412,141 +19404,26 @@ return 0; } _ACEOF @@ -13404,7 +13582,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure _ACEOF fi -@@ -21549,18 +19407,14 @@ +@@ -21561,18 +19438,14 @@ || test "$gt_cv_func_ngettext_libc" != "yes" \ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then @@ -13426,7 +13604,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -21578,55 +19432,26 @@ +@@ -21590,55 +19463,26 @@ return 0; } _ACEOF @@ -13491,7 +13669,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -21644,55 +19469,26 @@ +@@ -21656,55 +19500,26 @@ return 0; } _ACEOF @@ -13556,7 +13734,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -21710,43 +19506,18 @@ +@@ -21722,43 +19537,18 @@ return 0; } _ACEOF @@ -13606,7 +13784,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure gt_cv_func_dgettext_libintl=yes fi -@@ -21756,22 +19527,18 @@ +@@ -21768,22 +19558,18 @@ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then @@ -13634,7 +13812,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -21789,55 +19556,26 @@ +@@ -21801,55 +19587,26 @@ return 0; } _ACEOF @@ -13699,7 +13877,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -21855,43 +19593,18 @@ +@@ -21867,43 +19624,18 @@ return 0; } _ACEOF @@ -13749,7 +13927,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure gt_cv_func_dgettext_libintl=yes libintl_extra_libs=-liconv else -@@ -21913,106 +19626,16 @@ +@@ -21925,102 +19657,12 @@ glib_save_LIBS="$LIBS" LIBS="$LIBS -lintl $libintl_extra_libs" unset ac_cv_func_bind_textdomain_codeset @@ -13764,20 +13942,14 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -+ for ac_func in bind_textdomain_codeset -+do : -+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_BIND_TEXTDOMAIN_CODESET 1 - _ACEOF +-_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - +- -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since @@ -13853,18 +14025,17 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF ++ for ac_func in bind_textdomain_codeset ++do : ++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" ++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : + cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 --_ACEOF -- --fi --done -+fi -+done ++#define HAVE_BIND_TEXTDOMAIN_CODESET 1 + _ACEOF - LIBS="$glib_save_LIBS" - -@@ -22038,15 +19661,13 @@ + fi +@@ -22050,15 +19692,13 @@ if test "$gt_cv_have_gettext" = "yes"; then @@ -13883,7 +14054,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else case "$MSGFMT" in -@@ -22071,118 +19692,28 @@ +@@ -22083,118 +19723,28 @@ fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != "no"; then @@ -14010,7 +14181,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "checking if msgfmt accepts -c... " >&6; } cat >conftest.foo <<_ACEOF -@@ -22197,14 +19728,14 @@ +@@ -22209,14 +19759,14 @@ "Content-Transfer-Encoding: 8bit\n" _ACEOF @@ -14030,7 +14201,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } echo "$as_me: failed input was:" >&5 sed 's/^/| /' conftest.foo >&5 -@@ -22212,9 +19743,9 @@ +@@ -22224,9 +19774,9 @@ # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 @@ -14042,7 +14213,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else case $GMSGFMT in -@@ -22227,14 +19758,14 @@ +@@ -22239,14 +19789,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -14060,7 +14231,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure IFS=$as_save_IFS test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" -@@ -22243,19 +19774,19 @@ +@@ -22255,19 +19805,19 @@ fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then @@ -14084,7 +14255,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else case "$XGETTEXT" in -@@ -22280,18 +19811,14 @@ +@@ -22292,18 +19842,14 @@ fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then @@ -14106,7 +14277,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ int -@@ -22303,121 +19830,14 @@ +@@ -22315,121 +19861,14 @@ return 0; } _ACEOF @@ -14232,7 +14403,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure CATOBJEXT=.gmo DATADIRNAME=share else -@@ -22432,10 +19852,8 @@ +@@ -22444,10 +19883,8 @@ ;; esac fi @@ -14245,7 +14416,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure LIBS="$glib_save_LIBS" INSTOBJEXT=.mo else -@@ -22449,9 +19867,7 @@ +@@ -22461,9 +19898,7 @@ if test "$gt_cv_have_gettext" = "yes" ; then @@ -14256,7 +14427,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure fi -@@ -22459,7 +19875,7 @@ +@@ -22471,7 +19906,7 @@ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then : ; else @@ -14265,7 +14436,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } XGETTEXT=":" fi -@@ -22492,7 +19908,7 @@ +@@ -22504,7 +19939,7 @@ if test "x$ALL_LINGUAS" = "x"; then LINGUAS= else @@ -14274,7 +14445,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "checking for catalogs to be installed... " >&6; } NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do -@@ -22517,7 +19933,7 @@ +@@ -22529,7 +19964,7 @@ fi done LINGUAS=$NEW_LINGUAS @@ -14283,7 +14454,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$LINGUAS" >&6; } fi -@@ -22588,129 +20004,67 @@ +@@ -22600,129 +20035,67 @@ @@ -14433,7 +14604,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } ;; esac -@@ -22718,27 +20072,23 @@ +@@ -22730,27 +20103,23 @@ # # see bug 162979 # @@ -14466,7 +14637,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ #include int -@@ -22749,37 +20099,13 @@ +@@ -22761,37 +20130,13 @@ return 0; } _ACEOF @@ -14508,7 +14679,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ #include int -@@ -22790,40 +20116,18 @@ +@@ -22802,40 +20147,18 @@ return 0; } _ACEOF @@ -14553,7 +14724,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # -@@ -22833,7 +20137,7 @@ +@@ -22845,7 +20168,7 @@ GLIB_PACKAGES="gobject-2.0 gmodule-no-export-2.0" # Check whether --enable-glibtest was given. @@ -14562,7 +14733,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure enableval=$enable_glibtest; else enable_glibtest=yes -@@ -22868,9 +20172,9 @@ +@@ -22880,9 +20203,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 @@ -14574,7 +14745,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in -@@ -22883,14 +20187,14 @@ +@@ -22895,14 +20218,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -14592,7 +14763,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure IFS=$as_save_IFS ;; -@@ -22898,10 +20202,10 @@ +@@ -22910,10 +20233,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then @@ -14605,7 +14776,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -22911,9 +20215,9 @@ +@@ -22923,9 +20246,9 @@ ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 @@ -14617,7 +14788,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in -@@ -22926,14 +20230,14 @@ +@@ -22938,14 +20261,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -14635,7 +14806,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure IFS=$as_save_IFS ;; -@@ -22941,10 +20245,10 @@ +@@ -22953,10 +20276,10 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then @@ -14648,7 +14819,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -22953,7 +20257,7 @@ +@@ -22965,7 +20288,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -14657,7 +14828,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -22966,13 +20270,13 @@ +@@ -22978,13 +20301,13 @@ fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.16 @@ -14674,7 +14845,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } PKG_CONFIG="" fi -@@ -22987,7 +20291,7 @@ +@@ -22999,7 +20322,7 @@ fi min_glib_version=2.21.3 @@ -14683,7 +14854,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "checking for GLIB - version >= $min_glib_version... " >&6; } if test x$PKG_CONFIG != xno ; then -@@ -23023,14 +20327,10 @@ +@@ -23035,14 +20358,10 @@ CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$GLIB_LIBS $LIBS" rm -f conf.glibtest @@ -14700,7 +14871,18 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ #include -@@ -23106,52 +20406,25 @@ +@@ -23054,9 +20373,8 @@ + { + int major, minor, micro; + char *tmp_version; +- int ignored; + +- ignored = system ("touch conf.glibtest"); ++ fclose (fopen ("conf.glibtest", "w")); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = g_strdup("$min_glib_version"); +@@ -23118,52 +20436,25 @@ } _ACEOF @@ -14760,7 +14942,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } if test "$PKG_CONFIG" = "no" ; then echo "*** A new enough version of pkg-config was not found." -@@ -23165,11 +20438,7 @@ +@@ -23177,11 +20468,7 @@ ac_save_LIBS="$LIBS" CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS" @@ -14773,7 +14955,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ #include -@@ -23183,27 +20452,7 @@ +@@ -23195,27 +20482,7 @@ return 0; } _ACEOF @@ -14802,7 +14984,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GLIB or finding the wrong" echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" -@@ -23214,16 +20463,11 @@ +@@ -23226,16 +20493,11 @@ echo "*** If you have an old version installed, it is best to remove it, although" echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" else @@ -14822,42 +15004,28 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" fi -@@ -23231,4512 +20475,341 @@ - GLIB_CFLAGS="" - GLIB_LIBS="" +@@ -23245,13 +20507,9 @@ GLIB_GENMARSHAL="" -- GOBJECT_QUERY="" -- GLIB_MKENUMS="" + GOBJECT_QUERY="" + GLIB_MKENUMS="" - { { $as_echo "$as_me:$LINENO: error: --*** GLIB 2.21.3 or better is required. The latest version of ++ as_fn_error " + *** GLIB 2.21.3 or better is required. The latest version of -*** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/." >&5 -$as_echo "$as_me: error: -*** GLIB 2.21.3 or better is required. The latest version of -*** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/." >&2;} - { (exit 1); exit 1; }; } -- fi ++*** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/." "$LINENO" 5 + fi + + +@@ -23273,413 +20531,354 @@ + + gtk_save_LIBS=$LIBS + LIBS="$LIBS $GLIB_LIBS" - -- -- -- -- -- rm -f conf.glibtest -- -- --# See if it's safe to turn G_DISABLE_DEPRECATED on. --GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"` --GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo 2.21.3 | sed "s/\.[^.]*\$//"` --if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then -- CFLAGS="-DG_DISABLE_DEPRECATED $CFLAGS" --fi -- --CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CFLAGS" -- -- --gtk_save_LIBS=$LIBS --LIBS="$LIBS $GLIB_LIBS" -- --for ac_func in bind_textdomain_codeset + for ac_func in bind_textdomain_codeset -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -14867,27 +15035,44 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ --_ACEOF ++do : ++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" ++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_BIND_TEXTDOMAIN_CODESET 1 + _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func -- + -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -- ++fi ++done + -#ifdef __STDC__ -# include -#else -# include -#endif -- ++LIBS=$gtk_save_LIBS ++ ++for ac_header in pwd.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "pwd.h" "ac_cv_header_pwd_h" "$ac_includes_default" ++if test "x$ac_cv_header_pwd_h" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_PWD_H 1 ++_ACEOF + -#undef $ac_func -- ++$as_echo "#define HAVE_PWD_H 1" >>confdefs.h + -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ @@ -14901,15 +15086,69 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif -- --int --main () --{ ++fi ++ ++done + ++for ac_header in sys/time.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default" ++if test "x$ac_cv_header_sys_time_h" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_SYS_TIME_H 1 ++_ACEOF ++ ++$as_echo "#define HAVE_SYS_TIME_H 1" >>confdefs.h ++ ++fi ++ ++done ++ ++for ac_header in unistd.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default" ++if test "x$ac_cv_header_unistd_h" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_UNISTD_H 1 ++_ACEOF ++ ++$as_echo "#define HAVE_UNISTD_H 1" >>confdefs.h ++ ++fi ++ ++done ++ ++for ac_header in ftw.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "ftw.h" "ac_cv_header_ftw_h" "$ac_includes_default" ++if test "x$ac_cv_header_ftw_h" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_FTW_H 1 ++_ACEOF ++ ++$as_echo "#define HAVE_FTW_H 1" >>confdefs.h ++ ++fi ++ ++done ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ftw extensions" >&5 ++$as_echo_n "checking for GNU ftw extensions... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#define _XOPEN_SOURCE 500 ++#define _GNU_SOURCE ++#include + int + main () + { -return $ac_func (); -- ; -- return 0; --} --_ACEOF ++int flags = FTW_ACTIONRETVAL; + ; + return 0; + } + _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -14932,13 +15171,20 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" --else ++if ac_fn_c_try_compile "$LINENO"; then : ++ gtk_ok=yes + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" --fi -- ++ gtk_ok=no + fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++if test $gtk_ok = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } + -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext @@ -14953,13 +15199,19 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF -- --fi ++$as_echo "#define HAVE_GNU_FTW 1" >>confdefs.h + ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi -done -- + -LIBS=$gtk_save_LIBS -- -- ++saved_cflags="$CFLAGS" ++saved_ldflags="$LDFLAGS" + + -for ac_header in pwd.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -14967,13 +15219,17 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 ++# Checks for header files. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 ++$as_echo_n "checking for ANSI C header files... " >&6; } ++if test "${ac_cv_header_stdc+set}" = set; then : + $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } --else + else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } @@ -14982,10 +15238,23 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> --_ACEOF ++#include ++#include ++#include ++#include ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} + _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -15005,17 +15274,20 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes --else ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_header_stdc=yes + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no --fi ++ ac_cv_header_stdc=no + fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } -- + -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } @@ -15024,9 +15296,14 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++if test $ac_cv_header_stdc = yes; then ++ # SunOS 4.x string.h does not declare mem*, contrary to ANSI. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ -#include <$ac_header> --_ACEOF ++#include ++ + _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -15045,17 +15322,32 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - test ! -s conftest.err - }; then - ac_header_preproc=yes --else ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "memchr" >/dev/null 2>&1; then : ++ + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++ ac_cv_header_stdc=no ++fi ++rm -f conftest* + - ac_header_preproc=no --fi -- + fi + -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } -- ++if test $ac_cv_header_stdc = yes; then ++ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include ++ ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "free" >/dev/null 2>&1; then : + -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) @@ -15090,31 +15382,76 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 --else + else - eval "$as_ac_Header=\$ac_header_preproc" --fi ++ ac_cv_header_stdc=no + fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -- --fi ++rm -f conftest* + + fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF -- + -cat >>confdefs.h <<\_ACEOF -#define HAVE_PWD_H 1 --_ACEOF -- --fi -- ++if test $ac_cv_header_stdc = yes; then ++ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. ++ if test "$cross_compiling" = yes; then : ++ : ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include ++#include ++#if ((' ' & 0x0FF) == 0x020) ++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') ++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) ++#else ++# define ISLOWER(c) \ ++ (('a' <= (c) && (c) <= 'i') \ ++ || ('j' <= (c) && (c) <= 'r') \ ++ || ('s' <= (c) && (c) <= 'z')) ++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) ++#endif ++ ++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) ++int ++main () ++{ ++ int i; ++ for (i = 0; i < 256; i++) ++ if (XOR (islower (i), ISLOWER (i)) ++ || toupper (i) != TOUPPER (i)) ++ return 2; ++ return 0; ++} + _ACEOF ++if ac_fn_c_try_run "$LINENO"; then : + ++else ++ ac_cv_header_stdc=no ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext + fi + -done -- -- ++fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 ++$as_echo "$ac_cv_header_stdc" >&6; } ++if test $ac_cv_header_stdc = yes; then + ++$as_echo "#define STDC_HEADERS 1" >>confdefs.h + -for ac_header in sys/time.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -15123,12 +15460,19 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 --fi + fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } --else ++ ++ ++# Checks for typedefs, structures, and compiler characteristics. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 ++$as_echo_n "checking for an ANSI C-conforming const... " >&6; } ++if test "${ac_cv_c_const+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } @@ -15137,7 +15481,8 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF @@ -15163,14 +15508,65 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- + - ac_header_compiler=no -fi -- ++int ++main () ++{ ++/* FIXME: Include the comments suggested by Paul. */ ++#ifndef __cplusplus ++ /* Ultrix mips cc rejects this. */ ++ typedef int charset[2]; ++ const charset cs; ++ /* SunOS 4.1.1 cc rejects this. */ ++ char const *const *pcpcc; ++ char **ppc; ++ /* NEC SVR4.0.2 mips cc rejects this. */ ++ struct point {int x, y;}; ++ static struct point const zero = {0,0}; ++ /* AIX XL C 1.02.0.0 rejects this. ++ It does not let you subtract one const X* pointer from another in ++ an arm of an if-expression whose if-part is not a constant ++ expression */ ++ const char *g = "string"; ++ pcpcc = &g + (g ? g-g : 0); ++ /* HPUX 7.0 cc rejects these. */ ++ ++pcpcc; ++ ppc = (char**) pcpcc; ++ pcpcc = (char const *const *) ppc; ++ { /* SCO 3.2v4 cc rejects this. */ ++ char *t; ++ char const *s = 0 ? (char *) 0 : (char const *) 0; + -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } -- ++ *t++ = 0; ++ if (s) return 0; ++ } ++ { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ ++ int x[] = {25, 17}; ++ const int *foo = &x[0]; ++ ++foo; ++ } ++ { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ ++ typedef const int *iptr; ++ iptr p = 0; ++ ++p; ++ } ++ { /* AIX XL C 1.02.0.0 rejects this saying ++ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ ++ struct s { int j; const int *ap[3]; }; ++ struct s *b; b->j = 5; ++ } ++ { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ ++ const int foo = 10; ++ if (!foo) return 0; ++ } ++ return !cs[0] && !zero.x; ++#endif + -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } @@ -15181,7 +15577,10 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> --_ACEOF ++ ; ++ return 0; ++} + _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -15200,17 +15599,28 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - test ! -s conftest.err - }; then - ac_header_preproc=yes --else ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_c_const=yes + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++ ac_cv_c_const=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 ++$as_echo "$ac_cv_c_const" >&6; } ++if test $ac_cv_c_const = no; then ++ ++$as_echo "#define const /**/" >>confdefs.h + - ac_header_preproc=no --fi -- + fi + -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } -- + -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) @@ -15244,32 +15654,72 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else ++# Checks for library functions. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 ++$as_echo_n "checking return type of signal handlers... " >&6; } ++if test "${ac_cv_type_signal+set}" = set; then : + $as_echo_n "(cached) " >&6 + else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -- --fi ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include ++#include + ++int ++main () ++{ ++return *(signal (0, 0)) (0) == 1; ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_type_signal=int ++else ++ ac_cv_type_signal=void + fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5 ++$as_echo "$ac_cv_type_signal" >&6; } ++ ++cat >>confdefs.h <<_ACEOF ++#define RETSIGTYPE $ac_cv_type_signal + _ACEOF + -cat >>confdefs.h <<\_ACEOF -#define HAVE_SYS_TIME_H 1 --_ACEOF -- --fi -- --done -- -- ++ ++ ++ ++ ++ for ac_header in $ac_header_list ++do : ++ 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 ++" ++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 + + fi +@@ -23687,910 +20886,599 @@ + done + + -for ac_header in unistd.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -15318,23 +15768,45 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- + - ac_header_compiler=no -fi -- + -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } -- + -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ --_ACEOF ++ ++ ++ ++for ac_func in getpagesize ++do : ++ ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize" ++if test "x$ac_cv_func_getpagesize" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_GETPAGESIZE 1 + _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++ ++fi ++done ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5 ++$as_echo_n "checking for working mmap... " >&6; } ++if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test "$cross_compiling" = yes; then : ++ ac_cv_func_mmap_fixed_mapped=no ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" @@ -15358,14 +15830,37 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++$ac_includes_default ++/* malloc might have been renamed as rpl_malloc. */ ++#undef malloc + - ac_header_preproc=no -fi -- ++/* Thanks to Mike Haertel and Jim Avera for this test. ++ Here is a matrix of mmap possibilities: ++ mmap private not fixed ++ mmap private fixed at somewhere currently unmapped ++ mmap private fixed at somewhere already mapped ++ mmap shared not fixed ++ mmap shared fixed at somewhere currently unmapped ++ mmap shared fixed at somewhere already mapped ++ For private mappings, we should verify that changes cannot be read() ++ back from the file, nor mmap's back from the file at a different ++ address. (There have been systems where private was not correctly ++ implemented like the infamous i386 svr4.0, and systems where the ++ VM page cache was not coherent with the file system buffer cache ++ like early versions of FreeBSD and possibly contemporary NetBSD.) ++ For shared mappings, we should conversely verify that changes get ++ propagated back to all the places they're supposed to be. + -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } -- ++ Grep wants private fixed already mapped. ++ The main things grep needs to know about mmap are: ++ * does it exist and is it safe to write into the mmap'd area ++ * how to use it (BSD variants) */ + -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) @@ -15407,7 +15902,9 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -- ++#include ++#include + -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` @@ -15415,16 +15912,57 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF -- ++#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H ++char *malloc (); ++#endif + -cat >>confdefs.h <<\_ACEOF -#define HAVE_UNISTD_H 1 -_ACEOF -- ++/* This mess was copied from the GNU getpagesize.h. */ ++#ifndef HAVE_GETPAGESIZE ++# ifdef _SC_PAGESIZE ++# define getpagesize() sysconf(_SC_PAGESIZE) ++# else /* no _SC_PAGESIZE */ ++# ifdef HAVE_SYS_PARAM_H ++# include ++# ifdef EXEC_PAGESIZE ++# define getpagesize() EXEC_PAGESIZE ++# else /* no EXEC_PAGESIZE */ ++# ifdef NBPG ++# define getpagesize() NBPG * CLSIZE ++# ifndef CLSIZE ++# define CLSIZE 1 ++# endif /* no CLSIZE */ ++# else /* no NBPG */ ++# ifdef NBPC ++# define getpagesize() NBPC ++# else /* no NBPC */ ++# ifdef PAGESIZE ++# define getpagesize() PAGESIZE ++# endif /* PAGESIZE */ ++# endif /* no NBPC */ ++# endif /* no NBPG */ ++# endif /* no EXEC_PAGESIZE */ ++# else /* no HAVE_SYS_PARAM_H */ ++# define getpagesize() 8192 /* punt totally */ ++# endif /* no HAVE_SYS_PARAM_H */ ++# endif /* no _SC_PAGESIZE */ + -fi -- ++#endif /* no HAVE_GETPAGESIZE */ + -done -- -- ++int ++main () ++{ ++ char *data, *data2, *data3; ++ const char *cdata2; ++ int i, pagesize; ++ int fd, fd2; + ++ pagesize = getpagesize (); + -for ac_header in ftw.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -15473,14 +16011,56 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++ /* First, make a file with some known garbage in it. */ ++ data = (char *) malloc (pagesize); ++ if (!data) ++ return 1; ++ for (i = 0; i < pagesize; ++i) ++ *(data + i) = rand (); ++ umask (0); ++ fd = creat ("conftest.mmap", 0600); ++ if (fd < 0) ++ return 2; ++ if (write (fd, data, pagesize) != pagesize) ++ return 3; ++ close (fd); + - ac_header_compiler=no -fi -- ++ /* Next, check that the tail of a page is zero-filled. File must have ++ non-zero length, otherwise we risk SIGBUS for entire page. */ ++ fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600); ++ if (fd2 < 0) ++ return 4; ++ cdata2 = ""; ++ if (write (fd2, cdata2, 1) != 1) ++ return 5; ++ data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L); ++ if (data2 == MAP_FAILED) ++ return 6; ++ for (i = 0; i < pagesize; ++i) ++ if (*(data2 + i)) ++ return 7; ++ close (fd2); ++ if (munmap (data2, pagesize)) ++ return 8; + -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } -- ++ /* Next, try to mmap the file at a fixed address which already has ++ something else allocated at it. If we can, also make sure that ++ we see the same garbage. */ ++ fd = open ("conftest.mmap", O_RDWR); ++ if (fd < 0) ++ return 9; ++ if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, ++ MAP_PRIVATE | MAP_FIXED, fd, 0L)) ++ return 10; ++ for (i = 0; i < pagesize; ++i) ++ if (*(data + i) != *(data2 + i)) ++ return 11; + -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } @@ -15491,7 +16071,23 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> --_ACEOF ++ /* Finally, make sure that changes to the mapped area do not ++ percolate back to the file as seen by read(). (This is a bug on ++ some variants of i386 svr4.0.) */ ++ for (i = 0; i < pagesize; ++i) ++ *(data2 + i) = *(data2 + i) + 1; ++ data3 = (char *) malloc (pagesize); ++ if (!data3) ++ return 12; ++ if (read (fd, data3, pagesize) != pagesize) ++ return 13; ++ for (i = 0; i < pagesize; ++i) ++ if (*(data + i) != *(data3 + i)) ++ return 14; ++ close (fd); ++ return 0; ++} + _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -15510,17 +16106,28 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - test ! -s conftest.err - }; then - ac_header_preproc=yes --else ++if ac_fn_c_try_run "$LINENO"; then : ++ ac_cv_func_mmap_fixed_mapped=yes + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++ ac_cv_func_mmap_fixed_mapped=no ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext ++fi + - ac_header_preproc=no --fi -- + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5 ++$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; } ++if test $ac_cv_func_mmap_fixed_mapped = yes; then + -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } -- ++$as_echo "#define HAVE_MMAP 1" >>confdefs.h + -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) @@ -15557,48 +16164,99 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" --fi + fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -- ++rm -f conftest.mmap conftest.txt + -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF ++ ++for ac_func in mallinfo ++do : ++ ac_fn_c_check_func "$LINENO" "mallinfo" "ac_cv_func_mallinfo" ++if test "x$ac_cv_func_mallinfo" = x""yes; then : + cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- ++#define HAVE_MALLINFO 1 + _ACEOF + -cat >>confdefs.h <<\_ACEOF -#define HAVE_FTW_H 1 --_ACEOF -- --fi -- --done -- ++fi ++done ++ ++for ac_func in getresuid ++do : ++ ac_fn_c_check_func "$LINENO" "getresuid" "ac_cv_func_getresuid" ++if test "x$ac_cv_func_getresuid" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_GETRESUID 1 + _ACEOF + + fi - + done + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5 ++$as_echo_n "checking for uid_t in sys/types.h... " >&6; } ++if test "${ac_cv_type_uid_t+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include + -{ $as_echo "$as_me:$LINENO: checking for GNU ftw extensions" >&5 -$as_echo_n "checking for GNU ftw extensions... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ --_ACEOF + _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "uid_t" >/dev/null 2>&1; then : ++ ac_cv_type_uid_t=yes ++else ++ ac_cv_type_uid_t=no ++fi ++rm -f conftest* ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5 ++$as_echo "$ac_cv_type_uid_t" >&6; } ++if test $ac_cv_type_uid_t = no; then ++ ++$as_echo "#define uid_t int" >>confdefs.h ++ ++ ++$as_echo "#define gid_t int" >>confdefs.h ++ ++fi ++ ++ ++# Check if needs to be included for fd_set ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fd_set" >&5 ++$as_echo_n "checking for fd_set... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ -#define _XOPEN_SOURCE 500 -#define _GNU_SOURCE -#include --int --main () --{ ++#include + int + main () + { -int flags = FTW_ACTIONRETVAL; -- ; -- return 0; --} --_ACEOF ++fd_set readMask, writeMask; + ; + return 0; + } + _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -15617,16 +16275,18 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then -- gtk_ok=yes --else ++if ac_fn_c_try_compile "$LINENO"; then : + gtk_ok=yes + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - gtk_ok=no --fi ++ gtk_ok=no + fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --if test $gtk_ok = yes; then + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test $gtk_ok = yes; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - @@ -15634,15 +16294,27 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -#define HAVE_GNU_FTW 1 -_ACEOF - --else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, found in sys/types.h" >&5 ++$as_echo "yes, found in sys/types.h" >&6; } + else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi -- ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include + -saved_cflags="$CFLAGS" -saved_ldflags="$LDFLAGS" -- -- ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "fd_mask" >/dev/null 2>&1; then : ++ gtk_ok=yes ++fi ++rm -f conftest* + ++ if test $gtk_ok = yes; then + -# Checks for header files. -{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } @@ -15659,11 +16331,15 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -#include -#include -#include -- ++$as_echo "#define HAVE_SYS_SELECT_H 1" >>confdefs.h + -int -main () -{ -- ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, found in sys/select.h" >&5 ++$as_echo "yes, found in sys/select.h" >&6; } ++ else + - ; - return 0; -} @@ -15690,10 +16366,14 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++$as_echo "#define NO_FD_SET 1" >>confdefs.h + - ac_cv_header_stdc=no --fi -- ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ fi + fi + -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then @@ -15703,20 +16383,34 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++# `widechar' tests for gdki18n.h ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wchar.h" >&5 ++$as_echo_n "checking for wchar.h... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ -#include - --_ACEOF ++#include + _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : --else ++if ac_fn_c_try_cpp "$LINENO"; then : ++ gdk_wchar_h=yes + else - ac_cv_header_stdc=no --fi ++ gdk_wchar_h=no + fi -rm -f conftest* -- --fi -- ++rm -f conftest.err conftest.$ac_ext ++if test $gdk_wchar_h = yes; then ++ ++$as_echo "#define HAVE_WCHAR_H 1" >>confdefs.h + + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdk_wchar_h" >&5 ++$as_echo "$gdk_wchar_h" >&6; } + -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF @@ -15724,31 +16418,58 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++# Check for wctype.h (for iswalnum) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wctype.h" >&5 ++$as_echo_n "checking for wctype.h... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ -#include - --_ACEOF ++#include + _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : --else ++if ac_fn_c_try_cpp "$LINENO"; then : ++ gdk_wctype_h=yes + else - ac_cv_header_stdc=no --fi ++ gdk_wctype_h=no + fi -rm -f conftest* -- --fi -- ++rm -f conftest.err conftest.$ac_ext ++if test $gdk_wctype_h = yes; then ++ ++$as_echo "#define HAVE_WCTYPE_H 1" >>confdefs.h + + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdk_wctype_h" >&5 ++$as_echo "$gdk_wctype_h" >&6; } ++ ++# in Solaris 2.5, `iswalnum' is in -lw ++GDK_WLIBS= ++ac_fn_c_check_func "$LINENO" "iswalnum" "ac_cv_func_iswalnum" ++if test "x$ac_cv_func_iswalnum" = x""yes; then : + -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : --else + else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iswalnum in -lw" >&5 ++$as_echo_n "checking for iswalnum in -lw... " >&6; } ++if test "${ac_cv_lib_w_iswalnum+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lw $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) @@ -15761,19 +16482,28 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif -- + -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) --int --main () --{ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char iswalnum (); + int + main () + { - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; -- return 0; --} --_ACEOF ++return iswalnum (); ++ ; + return 0; + } + _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -15797,7 +16527,9 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : --else ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_w_iswalnum=yes + else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 @@ -15807,11 +16539,19 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext --fi ++ ac_cv_lib_w_iswalnum=no + fi - - --fi --fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_w_iswalnum" >&5 ++$as_echo "$ac_cv_lib_w_iswalnum" >&6; } ++if test "x$ac_cv_lib_w_iswalnum" = x""yes; then : ++ GDK_WLIBS=-lw + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then @@ -15819,10 +16559,10 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF -- --fi -- -- + + fi + + -# Checks for typedefs, structures, and compiler characteristics. -{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 -$as_echo_n "checking for an ANSI C-conforming const... " >&6; } @@ -15834,11 +16574,18 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++oLIBS="$LIBS" ++LIBS="$LIBS $GDK_WLIBS" ++# The following is necessary for Linux libc-5.4.38 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if iswalnum() and friends are properly defined" >&5 ++$as_echo_n "checking if iswalnum() and friends are properly defined... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ - --int --main () --{ ++#include + int + main () + { -/* FIXME: Include the comments suggested by Paul. */ -#ifndef __cplusplus - /* Ultrix mips cc rejects this. */ @@ -15863,7 +16610,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - { /* SCO 3.2v4 cc rejects this. */ - char *t; - char const *s = 0 ? (char *) 0 : (char const *) 0; -- + - *t++ = 0; - if (s) return 0; - } @@ -15887,12 +16634,23 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - if (!foo) return 0; - } - return !cs[0] && !zero.x; --#endif -- -- ; -- return 0; --} --_ACEOF ++#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H)) ++# ifdef HAVE_WCTYPE_H ++# include ++# else ++# ifdef HAVE_WCHAR_H ++# include ++# endif ++# endif ++#else ++# define iswalnum(c) ((wchar_t)(c) <= 0xFF && isalnum(c)) + #endif ++iswalnum((wchar_t) 0); + + ; + return 0; + } + _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -15912,26 +16670,37 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_c_const=yes --else ++if ac_fn_c_try_link "$LINENO"; then : ++ gdk_working_wctype=yes + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_c_const=no --fi -- ++ gdk_working_wctype=no + fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS="$oLIBS" + -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 -$as_echo "$ac_cv_c_const" >&6; } -if test $ac_cv_c_const = no; then -- ++if test $gdk_working_wctype = no; then + -cat >>confdefs.h <<\_ACEOF -#define const /**/ -_ACEOF -- --fi -- -- ++$as_echo "#define HAVE_BROKEN_WCTYPE 1" >>confdefs.h + ++ GDK_WLIBS= + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdk_working_wctype" >&5 ++$as_echo "$gdk_working_wctype" >&6; } + + -# Checks for library functions. -{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5 -$as_echo_n "checking return type of signal handlers... " >&6; } @@ -15943,7 +16712,11 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++# Check for uxtheme.h (for MS-Windows Engine) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uxtheme.h" >&5 ++$as_echo_n "checking for uxtheme.h... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ -#include -#include - @@ -15954,7 +16727,8 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - ; - return 0; -} --_ACEOF ++#include + _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -15974,25 +16748,50 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_type_signal=int --else ++if ac_fn_c_try_cpp "$LINENO"; then : ++ gtk_uxtheme_h=yes + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_signal=void --fi -- ++ gtk_uxtheme_h=no + fi ++rm -f conftest.err conftest.$ac_ext ++if test $gtk_uxtheme_h = yes; then ++ ++$as_echo "#define HAVE_UXTHEME_H 1" >>confdefs.h + -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 -$as_echo "$ac_cv_type_signal" >&6; } -- ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gtk_uxtheme_h" >&5 ++$as_echo "$gtk_uxtheme_h" >&6; } + -cat >>confdefs.h <<_ACEOF -#define RETSIGTYPE $ac_cv_type_signal --_ACEOF -- -- -- -- ++# Checks for gdkspawn ++for ac_header in crt_externs.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "crt_externs.h" "ac_cv_header_crt_externs_h" "$ac_includes_default" ++if test "x$ac_cv_header_crt_externs_h" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_CRT_EXTERNS_H 1 + _ACEOF + ++fi + ++done + ++for ac_func in _NSGetEnviron ++do : ++ ac_fn_c_check_func "$LINENO" "_NSGetEnviron" "ac_cv_func__NSGetEnviron" ++if test "x$ac_cv_func__NSGetEnviron" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE__NSGETENVIRON 1 ++_ACEOF + -for ac_header in stdlib.h unistd.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -16001,7 +16800,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 --fi + fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 @@ -16024,7 +16823,19 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; --esac ++done ++ ++ ++ ++################################################## ++# Checks for gdk-pixbuf ++################################################## ++ ++ ++use_la_modules=false ++case $host in ++ *-aix*) use_la_modules=true + esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 @@ -16041,14 +16852,18 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- + - ac_header_compiler=no --fi -- ++if $use_la_modules ; then ++ ++$as_echo "#define USE_LA_MODULES 1" >>confdefs.h ++ + fi + -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } -- + -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } @@ -16081,14 +16896,19 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gmodulized gdk-pixbuf" >&5 ++$as_echo_n "checking whether to build gmodulized gdk-pixbuf... " >&6; } + - ac_header_preproc=no --fi -- ++# Check whether --enable-modules was given. ++if test "${enable_modules+set}" = set; then : ++ enableval=$enable_modules; + fi + -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } -- + -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) @@ -16123,27 +16943,77 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 --else ++dynworks=false ++deps= ++if test x$enable_modules = xno; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + else - eval "$as_ac_Header=\$ac_header_preproc" --fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether dynamic modules work" >&5 ++$as_echo_n "checking whether dynamic modules work... " >&6; } ++ ## for loop is to strip newline ++ tmp=`$PKG_CONFIG --variable=gmodule_supported gmodule-no-export-2.0` ++ for I in $tmp; do ++ dynworks=$I ++ done ++ ++ if $dynworks; then ++ pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" ++ pixbuf_deplibs_check=`$pixbuf_libtool_config | \ ++ grep '^[a-z_]*check[a-z_]*_method=['\''"]' | \ ++ sed 's/.*['\''"]\(.*\)['\''"]$/\1/'` ++ if test "x$pixbuf_deplibs_check" = "xnone" || \ ++ test "x$pixbuf_deplibs_check" = "xunknown" || \ ++ test "x$pixbuf_deplibs_check" = "x"; then ++ dynworks=false ++ fi ++ fi ++ ++ if $dynworks; then ++ ++$as_echo "#define USE_GMODULE 1" >>confdefs.h ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ fi + fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -- --fi + ++ ++ ++# Check whether --with-libpng was given. ++if test "${with_libpng+set}" = set; then : ++ withval=$with_libpng; + fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF -- --fi -- + ++ ++# Check whether --with-libjpeg was given. ++if test "${with_libjpeg+set}" = set; then : ++ withval=$with_libjpeg; + fi + -done -- -- + ++# Check whether --with-libtiff was given. ++if test "${with_libtiff+set}" = set; then : ++ withval=$with_libtiff; ++fi + -for ac_func in getpagesize -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -16151,7 +17021,17 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 --else ++ ++# Check whether --with-libjasper was given. ++if test "${with_libjasper+set}" = set; then : ++ withval=$with_libjasper; ++fi ++ ++ ++# Check whether --enable-gdiplus was given. ++if test "${enable_gdiplus+set}" = set; then : ++ enableval=$enable_gdiplus; + else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF @@ -16161,26 +17041,47 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func -- ++ enable_gdiplus=no ++fi + -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -- + -#ifdef __STDC__ -# include -#else -# include -#endif -- ++ if test x$os_win32 = xyes && test x$enable_gdiplus != xno ; then ++ BUILD_GDIPLUS_LOADERS_TRUE= ++ BUILD_GDIPLUS_LOADERS_FALSE='#' ++else ++ BUILD_GDIPLUS_LOADERS_TRUE='#' ++ BUILD_GDIPLUS_LOADERS_FALSE= ++fi + -#undef $ac_func -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif ++ ++if test x$os_win32 = xno || test x$enable_gdiplus = xno; then ++ if test x$with_libtiff != xno && test -z "$LIBTIFF"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFReadRGBAImageOriented in -ltiff" >&5 ++$as_echo_n "checking for TIFFReadRGBAImageOriented in -ltiff... " >&6; } ++if test "${ac_cv_lib_tiff_TIFFReadRGBAImageOriented+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ltiff -lm $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -24598,290 +21486,93 @@ + #ifdef __cplusplus + extern "C" + #endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named @@ -16189,14 +17090,16 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -choke me -#endif - --int --main () --{ ++char TIFFReadRGBAImageOriented (); + int + main () + { -return $ac_func (); -- ; -- return 0; --} --_ACEOF ++return TIFFReadRGBAImageOriented (); + ; + return 0; + } + _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -16219,17 +17122,23 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" --else ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_tiff_TIFFReadRGBAImageOriented=yes + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" --fi ++ ac_cv_lib_tiff_TIFFReadRGBAImageOriented=no + fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext --fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS + fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 @@ -16241,23 +17150,40 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - --fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFReadRGBAImageOriented" >&5 ++$as_echo "$ac_cv_lib_tiff_TIFFReadRGBAImageOriented" >&6; } ++if test "x$ac_cv_lib_tiff_TIFFReadRGBAImageOriented" = x""yes; then : ++ ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default" ++if test "x$ac_cv_header_tiffio_h" = x""yes; then : ++ TIFF='tiff'; LIBTIFF='-ltiff' ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 ++$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} + fi -done -- + -{ $as_echo "$as_me:$LINENO: checking for working mmap" >&5 -$as_echo_n "checking for working mmap... " >&6; } -if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then - $as_echo_n "(cached) " >&6 --else ++ + else - if test "$cross_compiling" = yes; then - ac_cv_func_mmap_fixed_mapped=no --else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFWriteScanline in -ltiff" >&5 ++$as_echo_n "checking for TIFFWriteScanline in -ltiff... " >&6; } ++if test "${ac_cv_lib_tiff_TIFFWriteScanline+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ltiff -ljpeg -lz -lm $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ -$ac_includes_default -/* malloc might have been renamed as rpl_malloc. */ -#undef malloc @@ -16278,7 +17204,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - like early versions of FreeBSD and possibly contemporary NetBSD.) - For shared mappings, we should conversely verify that changes get - propagated back to all the places they're supposed to be. -- + - Grep wants private fixed already mapped. - The main things grep needs to know about mmap are: - * does it exist and is it safe to write into the mmap'd area @@ -16289,7 +17215,12 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - -#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H -char *malloc (); --#endif ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" + #endif - -/* This mess was copied from the GNU getpagesize.h. */ -#ifndef HAVE_GETPAGESIZE @@ -16328,9 +17259,10 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - -#endif /* no HAVE_GETPAGESIZE */ - --int --main () --{ ++char TIFFWriteScanline (); + int + main () + { - char *data, *data2, *data3; - int i, pagesize; - int fd; @@ -16382,9 +17314,11 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - if (*(data + i) != *(data3 + i)) - return 1; - close (fd); -- return 0; --} --_ACEOF ++return TIFFWriteScanline (); ++ ; + return 0; + } + _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -16408,20 +17342,26 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_mmap_fixed_mapped=yes --else ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_tiff_TIFFWriteScanline=yes + else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_mmap_fixed_mapped=no --fi ++ ac_cv_lib_tiff_TIFFWriteScanline=no + fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - --fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 -$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; } -if test $ac_cv_func_mmap_fixed_mapped = yes; then @@ -16430,25 +17370,41 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -#define HAVE_MMAP 1 -_ACEOF - --fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFWriteScanline" >&5 ++$as_echo "$ac_cv_lib_tiff_TIFFWriteScanline" >&6; } ++if test "x$ac_cv_lib_tiff_TIFFWriteScanline" = x""yes; then : ++ ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default" ++if test "x$ac_cv_header_tiffio_h" = x""yes; then : ++ TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz' ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 ++$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} + fi -rm -f conftest.mmap - -- -- + + -for ac_func in mallinfo -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFFlushData in -ltiff34" >&5 ++$as_echo_n "checking for TIFFFlushData in -ltiff34... " >&6; } ++if test "${ac_cv_lib_tiff34_TIFFFlushData+set}" = set; then : + $as_echo_n "(cached) " >&6 + else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ltiff34 -ljpeg -lz -lm $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func @@ -16465,13 +17421,13 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -#endif - -#undef $ac_func -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -24889,100 +21580,66 @@ + #ifdef __cplusplus + extern "C" + #endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named @@ -16480,14 +17436,16 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -choke me -#endif - --int --main () --{ ++char TIFFFlushData (); + int + main () + { -return $ac_func (); -- ; -- return 0; --} --_ACEOF ++return TIFFFlushData (); + ; + return 0; + } + _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -16510,17 +17468,39 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" --else ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_tiff34_TIFFFlushData=yes + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++ ac_cv_lib_tiff34_TIFFFlushData=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff34_TIFFFlushData" >&5 ++$as_echo "$ac_cv_lib_tiff34_TIFFFlushData" >&6; } ++if test "x$ac_cv_lib_tiff34_TIFFFlushData" = x""yes; then : ++ ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default" ++if test "x$ac_cv_header_tiffio_h" = x""yes; then : ++ TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz' ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 ++$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} ++fi ++ + - eval "$as_ac_var=no" --fi -- ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** TIFF loader will not be built (TIFF library not found) ***" >&5 ++$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF library not found) ***" >&2;} + fi + -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext --fi + fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 @@ -16531,25 +17511,42 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF -- --fi + + fi -done -- -- + ++ fi + -for ac_func in getresuid -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else ++ if test x$with_libtiff != xno && test -z "$LIBTIFF"; then ++ as_fn_error " ++*** Checks for TIFF loader failed. You can build without it by passing ++*** --without-libtiff to configure but some programs using GTK+ may ++*** not work properly" "$LINENO" 5 ++ fi ++fi ++ ++if test x$os_win32 = xno || test x$enable_gdiplus = xno; then ++ if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_destroy_decompress in -ljpeg" >&5 ++$as_echo_n "checking for jpeg_destroy_decompress in -ljpeg... " >&6; } ++if test "${ac_cv_lib_jpeg_jpeg_destroy_decompress+set}" = set; then : + $as_echo_n "(cached) " >&6 + else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ljpeg $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func @@ -16566,13 +17563,13 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -#endif - -#undef $ac_func -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -24990,314 +21647,136 @@ + #ifdef __cplusplus + extern "C" + #endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named @@ -16581,14 +17578,16 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -choke me -#endif - --int --main () --{ ++char jpeg_destroy_decompress (); + int + main () + { -return $ac_func (); -- ; -- return 0; --} --_ACEOF ++return jpeg_destroy_decompress (); + ; + return 0; + } + _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -16611,17 +17610,23 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" --else ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_jpeg_jpeg_destroy_decompress=yes + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" --fi ++ ac_cv_lib_jpeg_jpeg_destroy_decompress=no + fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext --fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS + fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 @@ -16633,9 +17638,17 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - --fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5 ++$as_echo "$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6; } ++if test "x$ac_cv_lib_jpeg_jpeg_destroy_decompress" = x""yes; then : ++ jpeg_ok=yes ++else ++ jpeg_ok=no ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** JPEG loader will not be built (JPEG library not found) ***" >&5 ++$as_echo "$as_me: WARNING: *** JPEG loader will not be built (JPEG library not found) ***" >&2;} + fi -done -- + -{ $as_echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 -$as_echo_n "checking for uid_t in sys/types.h... " >&6; } -if test "${ac_cv_type_uid_t+set}" = set; then @@ -16646,14 +17659,25 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++ if test "$jpeg_ok" = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeglib.h" >&5 ++$as_echo_n "checking for jpeglib.h... " >&6; } ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ -#include - --_ACEOF ++#include ++#undef PACKAGE ++#undef VERSION ++#undef HAVE_STDLIB_H ++#include + _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "uid_t" >/dev/null 2>&1; then - ac_cv_type_uid_t=yes --else ++if ac_fn_c_try_cpp "$LINENO"; then : ++ jpeg_ok=yes + else - ac_cv_type_uid_t=no -fi -rm -f conftest* @@ -16672,7 +17696,8 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -#define gid_t int -_ACEOF - --fi ++ jpeg_ok=no + fi - - -# Check if needs to be included for fd_set @@ -16683,16 +17708,38 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++rm -f conftest.err conftest.$ac_ext ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jpeg_ok" >&5 ++$as_echo "$jpeg_ok" >&6; } ++ if test "$jpeg_ok" = yes; then ++ LIBJPEG='-ljpeg' ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_simple_progression in -ljpeg" >&5 ++$as_echo_n "checking for jpeg_simple_progression in -ljpeg... " >&6; } ++if test "${ac_cv_lib_jpeg_jpeg_simple_progression+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ljpeg $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ -#include --int --main () --{ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char jpeg_simple_progression (); + int + main () + { -fd_set readMask, writeMask; -- ; -- return 0; --} --_ACEOF ++return jpeg_simple_progression (); + ; + return 0; + } + _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -16723,7 +17770,9 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -if test $gtk_ok = yes; then - { $as_echo "$as_me:$LINENO: result: yes, found in sys/types.h" >&5 -$as_echo "yes, found in sys/types.h" >&6; } --else ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_jpeg_jpeg_simple_progression=yes + else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF @@ -16756,7 +17805,8 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - fi --fi ++ ac_cv_lib_jpeg_jpeg_simple_progression=no + fi - -# `widechar' tests for gdki18n.h -{ $as_echo "$as_me:$LINENO: checking for wchar.h" >&5 @@ -16792,8 +17842,14 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -sed 's/^/| /' conftest.$ac_ext >&5 - - gdk_wchar_h=no --fi -- ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_simple_progression" >&5 ++$as_echo "$ac_cv_lib_jpeg_jpeg_simple_progression" >&6; } ++if test "x$ac_cv_lib_jpeg_jpeg_simple_progression" = x""yes; then : + -rm -f conftest.err conftest.$ac_ext -if test $gdk_wchar_h = yes; then - @@ -16804,7 +17860,8 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -fi -{ $as_echo "$as_me:$LINENO: result: $gdk_wchar_h" >&5 -$as_echo "$gdk_wchar_h" >&6; } -- ++$as_echo "#define HAVE_PROGRESSIVE_JPEG 1" >>confdefs.h + -# Check for wctype.h (for iswalnum) -{ $as_echo "$as_me:$LINENO: checking for wctype.h" >&5 -$as_echo_n "checking for wctype.h... " >&6; } @@ -16834,37 +17891,69 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - test ! -s conftest.err - }; then - gdk_wctype_h=yes --else + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - gdk_wctype_h=no --fi -- ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: JPEG library does not support progressive saving." >&5 ++$as_echo "$as_me: WARNING: JPEG library does not support progressive saving." >&2;} + fi + -rm -f conftest.err conftest.$ac_ext -if test $gdk_wctype_h = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_WCTYPE_H 1 -_ACEOF -- --fi ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** JPEG loader will not be built (JPEG header file not found) ***" >&5 ++$as_echo "$as_me: WARNING: *** JPEG loader will not be built (JPEG header file not found) ***" >&2;} ++ fi ++ fi ++ fi + ++ if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then ++ as_fn_error " ++*** Checks for JPEG loader failed. You can build without it by passing ++*** --without-libjpeg to configure but some programs using GTK+ may ++*** not work properly" "$LINENO" 5 ++ fi + fi -{ $as_echo "$as_me:$LINENO: result: $gdk_wctype_h" >&5 -$as_echo "$gdk_wctype_h" >&6; } -- + -# in Solaris 2.5, `iswalnum' is in -lw -GDK_WLIBS= -{ $as_echo "$as_me:$LINENO: checking for iswalnum" >&5 -$as_echo_n "checking for iswalnum... " >&6; } -if test "${ac_cv_func_iswalnum+set}" = set; then -- $as_echo_n "(cached) " >&6 --else ++ if test x$with_libpng != xno && test -z "$LIBPNG"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng12" >&5 ++$as_echo_n "checking for libpng12... " >&6; } ++ if $PKG_CONFIG --exists libpng12 ; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ PNG='png' ++ PNG_DEP_CFLAGS_PACKAGES=libpng12 ++ LIBPNG=`$PKG_CONFIG --libs libpng12` ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_read_info in -lpng" >&5 ++$as_echo_n "checking for png_read_info in -lpng... " >&6; } ++if test "${ac_cv_lib_png_png_read_info+set}" = set; then : + $as_echo_n "(cached) " >&6 + else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lpng -lz -lm $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ -/* Define iswalnum to an innocuous variant, in case declares iswalnum. - For example, HP-UX 11i declares gettimeofday. */ -#define iswalnum innocuous_iswalnum @@ -16881,13 +17970,13 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -#endif - -#undef iswalnum -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -25305,72 +21784,92 @@ + #ifdef __cplusplus + extern "C" + #endif -char iswalnum (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named @@ -16896,14 +17985,16 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -choke me -#endif - --int --main () --{ ++char png_read_info (); + int + main () + { -return iswalnum (); -- ; -- return 0; --} --_ACEOF ++return png_read_info (); + ; + return 0; + } + _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -16926,51 +18017,121 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_iswalnum=yes --else ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_png_png_read_info=yes + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_iswalnum=no --fi -- ++ ac_cv_lib_png_png_read_info=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_read_info" >&5 ++$as_echo "$ac_cv_lib_png_png_read_info" >&6; } ++if test "x$ac_cv_lib_png_png_read_info" = x""yes; then : ++ ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default" ++if test "x$ac_cv_header_png_h" = x""yes; then : ++ png_ok=yes ++else ++ png_ok=no + fi + -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext --fi ++ ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&5 ++$as_echo "$as_me: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&2;} + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_iswalnum" >&5 -$as_echo "$ac_cv_func_iswalnum" >&6; } -if test "x$ac_cv_func_iswalnum" = x""yes; then - : --else ++ ++ if test "$png_ok" = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_structp in png.h" >&5 ++$as_echo_n "checking for png_structp in png.h... " >&6; } ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include ++int ++main () ++{ ++png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct; ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ png_ok=yes + else - { $as_echo "$as_me:$LINENO: checking for iswalnum in -lw" >&5 -$as_echo_n "checking for iswalnum in -lw... " >&6; } -if test "${ac_cv_lib_w_iswalnum+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS ++ png_ok=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $png_ok" >&5 ++$as_echo "$png_ok" >&6; } ++ if test "$png_ok" = yes; then ++ PNG='png'; LIBPNG='-lpng -lz' ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** PNG loader will not be built (PNG library is too old) ***" >&5 ++$as_echo "$as_me: WARNING: *** PNG loader will not be built (PNG library is too old) ***" >&2;} ++ fi ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** PNG loader will not be built (PNG header file not found) ***" >&5 ++$as_echo "$as_me: WARNING: *** PNG loader will not be built (PNG header file not found) ***" >&2;} ++ fi ++ fi ++ fi ++ ++ if test x$with_libpng != xno && test -z "$LIBPNG"; then ++ as_fn_error " ++*** Checks for PNG loader failed. You can build without it by passing ++*** --without-libpng to configure but many programs using GTK+ will ++*** not work properly. The PNG loader is also needed if you are compiling ++*** from CVS." "$LINENO" 5 ++ fi ++ ++ if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jas_init in -ljasper" >&5 ++$as_echo_n "checking for jas_init in -ljasper... " >&6; } ++if test "${ac_cv_lib_jasper_jas_init+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS -LIBS="-lw $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif ++LIBS="-ljasper -ljpeg $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -25379,1212 +21878,663 @@ + #ifdef __cplusplus + extern "C" + #endif -char iswalnum (); --int --main () --{ ++char jas_init (); + int + main () + { -return iswalnum (); -- ; -- return 0; --} --_ACEOF ++return jas_init (); + ; + return 0; + } + _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -16993,27 +18154,37 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_w_iswalnum=yes --else ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_jasper_jas_init=yes + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_w_iswalnum=no --fi ++ ac_cv_lib_jasper_jas_init=no + fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_w_iswalnum" >&5 -$as_echo "$ac_cv_lib_w_iswalnum" >&6; } -if test "x$ac_cv_lib_w_iswalnum" = x""yes; then - GDK_WLIBS=-lw -fi - --fi -- -- ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jasper_jas_init" >&5 ++$as_echo "$ac_cv_lib_jasper_jas_init" >&6; } ++if test "x$ac_cv_lib_jasper_jas_init" = x""yes; then : ++ LIBJASPER=-ljasper + fi + ++ fi + -oLIBS="$LIBS" -LIBS="$LIBS $GDK_WLIBS" -# The following is necessary for Linux libc-5.4.38 @@ -17042,7 +18213,12 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -# define iswalnum(c) ((wchar_t)(c) <= 0xFF && isalnum(c)) -#endif -iswalnum((wchar_t) 0); -- ++ if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then ++ as_fn_error " ++*** Checks for JPEG2000 loader failed. You can build without it by passing ++*** --without-libjasper to configure" "$LINENO" 5 ++ fi + - ; - return 0; -} @@ -17072,27 +18248,33 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- + - gdk_working_wctype=no -fi -- + -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS="$oLIBS" -- + -if test $gdk_working_wctype = no; then -- + -cat >>confdefs.h <<\_ACEOF -#define HAVE_BROKEN_WCTYPE 1 -_ACEOF -- + - GDK_WLIBS= --fi ++ if $dynworks; then ++ BUILD_DYNAMIC_MODULES_TRUE= ++ BUILD_DYNAMIC_MODULES_FALSE='#' ++else ++ BUILD_DYNAMIC_MODULES_TRUE='#' ++ BUILD_DYNAMIC_MODULES_FALSE= + fi -{ $as_echo "$as_me:$LINENO: result: $gdk_working_wctype" >&5 -$as_echo "$gdk_working_wctype" >&6; } -- -- + + -# Check for uxtheme.h (for MS-Windows Engine) -{ $as_echo "$as_me:$LINENO: checking for uxtheme.h" >&5 -$as_echo_n "checking for uxtheme.h... " >&6; } @@ -17125,23 +18307,42 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++# ++# Allow building some or all gdk-pixbuf loaders included ++# ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pixbuf loaders to build" >&5 ++$as_echo_n "checking pixbuf loaders to build... " >&6; } + - gtk_uxtheme_h=no -fi -- + -rm -f conftest.err conftest.$ac_ext -if test $gtk_uxtheme_h = yes; then -- ++# Check whether --with-included_loaders was given. ++if test "${with_included_loaders+set}" = set; then : ++ withval=$with_included_loaders; ++fi + -cat >>confdefs.h <<\_ACEOF -#define HAVE_UXTHEME_H 1 -_ACEOF -- --fi + ++if $dynworks; then ++ : ++else ++ ## if the option was specified, leave it; otherwise disable included loaders ++ if test x$with_included_loaders = xno; then ++ with_included_loaders=yes ++ fi + fi -{ $as_echo "$as_me:$LINENO: result: $gtk_uxtheme_h" >&5 -$as_echo "$gtk_uxtheme_h" >&6; } -- + -# Checks for gdkspawn -- ++# Use the traditional png loader instead of the GDI+ one on Windows, ++# because some important apps like GIMP need to read and write ++# arbitrary tEXt chunks which doesn't seem to be possible through GDI+ + -for ac_header in crt_externs.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -17150,12 +18351,21 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 --fi ++all_loaders="ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm" ++if test x$with_libjasper != xno; then ++ all_loaders="$all_loaders,jasper" + fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } --else ++if test x$os_win32 = xyes && test x$enable_gdiplus != xno; then ++ # Skip PNG, see comment above ++ gdip_formats="bmp emf gif ico jpeg tiff wmf" ++ for f in $gdip_formats; do ++ all_loaders="$all_loaders,gdip-$f" ++ done + else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } @@ -17187,17 +18397,26 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes --else ++ all_loaders="$all_loaders,bmp,gif,ico,jpeg,tiff" ++fi ++included_loaders="" ++# If no loaders specified, include all ++if test "x$with_included_loaders" = xyes ; then ++ included_loaders="$all_loaders" + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no --fi -- ++ included_loaders="$with_included_loaders" + fi + -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } -- ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $included_loaders" >&5 ++$as_echo "$included_loaders" >&6; } + -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } @@ -17230,14 +18449,25 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++INCLUDED_LOADER_OBJ= ++INCLUDED_LOADER_DEFINE= + - ac_header_preproc=no -fi -- ++IFS="${IFS= }"; gtk_save_ifs="$IFS"; IFS="," ++for loader in $included_loaders; do ++ if echo "$all_loaders" | egrep "(^|,)$loader(\$|,)" > /dev/null; then ++ : ++ else ++ as_fn_error "the specified loader $loader does not exist" "$LINENO" 5 ++ fi + -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } -- ++ loader_underscores=`echo $loader | sed -e 's/-/_/g'` ++ INCLUDED_LOADER_OBJ="$INCLUDED_LOADER_OBJ libstatic-pixbufloader-$loader.la" + -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) @@ -17279,20 +18509,32 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -- --fi ++ # Don't bother defining separate -DINCLUDE_gdip_foo for each gdip-foo loader ++ case $loader in ++ gdip-*) ;; ++ *) INCLUDED_LOADER_DEFINE="$INCLUDED_LOADER_DEFINE -DINCLUDE_$loader_underscores";; ++ esac ++ eval INCLUDE_$loader_underscores=yes ++done + ++# Just define one -DINCLUDE_gdiplus for all the gdip-foo loaders ++# (except gdip-png, which isn't built at all) ++if test x"$INCLUDE_gdip_ico" = xyes; then ++ INCLUDED_LOADER_DEFINE="$INCLUDED_LOADER_DEFINE -DINCLUDE_gdiplus" + fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF -- + -fi -- ++IFS="$gtk_save_ifs" + -done -- -- + + -for ac_func in _NSGetEnviron -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -17300,7 +18542,10 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 --else ++ if test x"$INCLUDE_png" = xyes; then ++ INCLUDE_PNG_TRUE= ++ INCLUDE_PNG_FALSE='#' + else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF @@ -17315,13 +18560,23 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -- ++ INCLUDE_PNG_TRUE='#' ++ INCLUDE_PNG_FALSE= ++fi + -#ifdef __STDC__ -# include -#else -# include -#endif -- ++ if test x"$INCLUDE_bmp" = xyes; then ++ INCLUDE_BMP_TRUE= ++ INCLUDE_BMP_FALSE='#' ++else ++ INCLUDE_BMP_TRUE='#' ++ INCLUDE_BMP_FALSE= ++fi + -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. @@ -17368,17 +18623,28 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" --else ++ if test x"$INCLUDE_wbmp" = xyes; then ++ INCLUDE_WBMP_TRUE= ++ INCLUDE_WBMP_FALSE='#' + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" --fi -- ++ INCLUDE_WBMP_TRUE='#' ++ INCLUDE_WBMP_FALSE= + fi + -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext --fi ++ if test x"$INCLUDE_gif" = xyes; then ++ INCLUDE_GIF_TRUE= ++ INCLUDE_GIF_FALSE='#' ++else ++ INCLUDE_GIF_TRUE='#' ++ INCLUDE_GIF_FALSE= + fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 @@ -17389,46 +18655,132 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF -- --fi + ++ if test x"$INCLUDE_ico" = xyes; then ++ INCLUDE_ICO_TRUE= ++ INCLUDE_ICO_FALSE='#' ++else ++ INCLUDE_ICO_TRUE='#' ++ INCLUDE_ICO_FALSE= + fi -done - -- -- + ++ if test x"$INCLUDE_ani" = xyes; then ++ INCLUDE_ANI_TRUE= ++ INCLUDE_ANI_FALSE='#' ++else ++ INCLUDE_ANI_TRUE='#' ++ INCLUDE_ANI_FALSE= ++fi + -################################################## -# Checks for gdk-pixbuf -################################################## -- -- ++ if test x"$INCLUDE_jpeg" = xyes; then ++ INCLUDE_JPEG_TRUE= ++ INCLUDE_JPEG_FALSE='#' ++else ++ INCLUDE_JPEG_TRUE='#' ++ INCLUDE_JPEG_FALSE= ++fi + ++ if test x"$INCLUDE_pnm" = xyes; then ++ INCLUDE_PNM_TRUE= ++ INCLUDE_PNM_FALSE='#' ++else ++ INCLUDE_PNM_TRUE='#' ++ INCLUDE_PNM_FALSE= ++fi + -use_la_modules=false -case $host in - *-aix*) use_la_modules=true -esac -- ++ if test x"$INCLUDE_ras" = xyes; then ++ INCLUDE_RAS_TRUE= ++ INCLUDE_RAS_FALSE='#' ++else ++ INCLUDE_RAS_TRUE='#' ++ INCLUDE_RAS_FALSE= ++fi + -if $use_la_modules ; then -- ++ if test x"$INCLUDE_tiff" = xyes; then ++ INCLUDE_TIFF_TRUE= ++ INCLUDE_TIFF_FALSE='#' ++else ++ INCLUDE_TIFF_TRUE='#' ++ INCLUDE_TIFF_FALSE= ++fi + -cat >>confdefs.h <<\_ACEOF -#define USE_LA_MODULES 1 -_ACEOF -- --fi -- -- ++ if test x"$INCLUDE_xpm" = xyes; then ++ INCLUDE_XPM_TRUE= ++ INCLUDE_XPM_FALSE='#' ++else ++ INCLUDE_XPM_TRUE='#' ++ INCLUDE_XPM_FALSE= ++fi + ++ if test x"$INCLUDE_xbm" = xyes; then ++ INCLUDE_XBM_TRUE= ++ INCLUDE_XBM_FALSE='#' ++else ++ INCLUDE_XBM_TRUE='#' ++ INCLUDE_XBM_FALSE= + fi + ++ if test x"$INCLUDE_tga" = xyes; then ++ INCLUDE_TGA_TRUE= ++ INCLUDE_TGA_FALSE='#' ++else ++ INCLUDE_TGA_TRUE='#' ++ INCLUDE_TGA_FALSE= ++fi + -{ $as_echo "$as_me:$LINENO: checking whether to build gmodulized gdk-pixbuf" >&5 -$as_echo_n "checking whether to build gmodulized gdk-pixbuf... " >&6; } -- ++ if test x"$INCLUDE_pcx" = xyes; then ++ INCLUDE_PCX_TRUE= ++ INCLUDE_PCX_FALSE='#' ++else ++ INCLUDE_PCX_TRUE='#' ++ INCLUDE_PCX_FALSE= ++fi + -# Check whether --enable-modules was given. -if test "${enable_modules+set}" = set; then - enableval=$enable_modules; --fi -- -- ++ if test x"$INCLUDE_icns" = xyes; then ++ INCLUDE_ICNS_TRUE= ++ INCLUDE_ICNS_FALSE='#' ++else ++ INCLUDE_ICNS_TRUE='#' ++ INCLUDE_ICNS_FALSE= + fi + ++ if test x"$INCLUDE_jasper" = xyes; then ++ INCLUDE_JASPER_TRUE= ++ INCLUDE_JASPER_FALSE='#' ++else ++ INCLUDE_JASPER_TRUE='#' ++ INCLUDE_JASPER_FALSE= ++fi + -dynworks=false -deps= -if test x$enable_modules = xno; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } --else ++# As all GDI+ loaders are either built-in or not, arbitrarily just ++# check one of the variables here ++ if test x"$INCLUDE_gdip_ico" = xyes; then ++ INCLUDE_GDIPLUS_TRUE= ++ INCLUDE_GDIPLUS_FALSE='#' + else - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - { $as_echo "$as_me:$LINENO: checking whether dynamic modules work" >&5 @@ -17438,7 +18790,10 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - for I in $tmp; do - dynworks=$I - done -- ++ INCLUDE_GDIPLUS_TRUE='#' ++ INCLUDE_GDIPLUS_FALSE= ++fi + - if $dynworks; then - pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" - pixbuf_deplibs_check=`$pixbuf_libtool_config | \ @@ -17450,13 +18805,58 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - dynworks=false - fi - fi -- + - if $dynworks; then -- ++if test x$gio_can_sniff = x; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if gio can sniff png" >&5 ++$as_echo_n "checking if gio can sniff png... " >&6; } ++ gtk_save_LIBS="$LIBS" ++ gtk_save_CFLAGS="$CFLAGS" ++ LIBS="`$PKG_CONFIG --libs gio-2.0`" ++ CFLAGS="`$PKG_CONFIG --cflags gio-2.0`" ++ if test "$cross_compiling" = yes; then : ++ { { $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 run test program while cross compiling ++See \`config.log' for more details." "$LINENO" 5; } ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ + -cat >>confdefs.h <<\_ACEOF -#define USE_GMODULE 1 --_ACEOF -- ++ #include ++ static const gsize data_size = 159; ++ static const guint8 data[] = ++ { ++ 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, ++ 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, ++ 0x08, 0x02, 0x00, 0x00, 0x00, 0x90, 0x77, 0x53, 0xde, 0x00, 0x00, 0x00, ++ 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00, ++ 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00, ++ 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74, ++ 0x49, 0x4d, 0x45, 0x07, 0xd8, 0x07, 0x0f, 0x10, 0x08, 0x15, 0x61, 0xd8, ++ 0x35, 0x37, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f, ++ 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, ++ 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0x57, ++ 0x81, 0x0e, 0x17, 0x00, 0x00, 0x00, 0x0c, 0x49, 0x44, 0x41, 0x54, 0x08, ++ 0xd7, 0x63, 0xf8, 0xff, 0xff, 0x3f, 0x00, 0x05, 0xfe, 0x02, 0xfe, 0xdc, ++ 0xcc, 0x59, 0xe7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, ++ 0x42, 0x60, 0x82 ++ }; ++ int ++ main (int argc, char **argv) ++ { ++ char *content_type; ++ char *image_png; ++ content_type = g_content_type_guess (NULL, data, data_size, NULL); ++ image_png = g_content_type_from_mime_type ("image/png"); ++ return !!strcmp (content_type, image_png); ++ } + _ACEOF ++if ac_fn_c_try_run "$LINENO"; then : ++ gio_can_sniff=yes + - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - else @@ -17466,38 +18866,62 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -fi - - -- ++$as_echo "#define GDK_PIXBUF_USE_GIO_MIME 1" >>confdefs.h + -# Check whether --with-libpng was given. -if test "${with_libpng+set}" = set; then - withval=$with_libpng; --fi ++else ++ gio_can_sniff=no + fi - - -# Check whether --with-libjpeg was given. -if test "${with_libjpeg+set}" = set; then - withval=$with_libjpeg; --fi -- ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext + fi + - -# Check whether --with-libtiff was given. -if test "${with_libtiff+set}" = set; then - withval=$with_libtiff; --fi -- -- ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gio_can_sniff" >&5 ++$as_echo "$gio_can_sniff" >&6; } ++ LIBS="$gtk_save_LIBS" ++ CFLAGS="$gtk_save_CFLAGS" + fi + ++# ++# Allow building some or all immodules included ++# ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking immodules to build" >&5 ++$as_echo_n "checking immodules to build... " >&6; } ++ + -# Check whether --with-libjasper was given. -if test "${with_libjasper+set}" = set; then - withval=$with_libjasper; --fi -- -- ++# Check whether --with-included_immodules was given. ++if test "${with_included_immodules+set}" = set; then : ++ withval=$with_included_immodules; + fi + + -# Check whether --enable-gdiplus was given. -if test "${enable_gdiplus+set}" = set; then - enableval=$enable_gdiplus; --else ++if $dynworks; then ++ : + else - enable_gdiplus=no --fi -- ++ ## if the option was specified, leave it; otherwise disable included immodules ++ if test x$with_included_immodules = xno; then ++ with_included_immodules=yes ++ fi + fi + - - if test x$os_win32 = xyes && test x$enable_gdiplus != xno ; then - BUILD_GDIPLUS_LOADERS_TRUE= @@ -17505,8 +18929,15 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -else - BUILD_GDIPLUS_LOADERS_TRUE='#' - BUILD_GDIPLUS_LOADERS_FALSE= --fi -- ++all_immodules="am-et,cedilla,cyrillic-translit" ++if test "$gdktarget" = "win32"; then ++ all_immodules="${all_immodules},ime" ++fi ++all_immodules="${all_immodules},inuktitut,ipa,multipress,thai,ti-er,ti-et,viqr" ++if test "$gdktarget" = "x11"; then ++ all_immodules="${all_immodules},xim" + fi + - -if test x$os_win32 = xno || test x$enable_gdiplus = xno; then - if test x$with_libtiff != xno && test -z "$LIBTIFF"; then @@ -17514,7 +18945,11 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -$as_echo_n "checking for TIFFReadRGBAImageOriented in -ltiff... " >&6; } -if test "${ac_cv_lib_tiff_TIFFReadRGBAImageOriented+set}" = set; then - $as_echo_n "(cached) " >&6 --else ++included_immodules="" ++# If the switch specified without listing any specific ones, include all ++if test "x$with_included_immodules" = xyes ; then ++ included_immodules="$all_immodules" + else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ltiff -lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF @@ -17523,7 +18958,9 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -- ++ included_immodules="$with_included_immodules" ++fi + -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ @@ -17561,18 +18998,52 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_tiff_TIFFReadRGBAImageOriented=yes --else ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $included_immodules" >&5 ++$as_echo "$included_immodules" >&6; } ++ if test "x$included_immodules" != x; then ++ HAVE_INCLUDED_IMMMODULES_TRUE= ++ HAVE_INCLUDED_IMMMODULES_FALSE='#' + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_tiff_TIFFReadRGBAImageOriented=no --fi -- ++ HAVE_INCLUDED_IMMMODULES_TRUE='#' ++ HAVE_INCLUDED_IMMMODULES_FALSE= + fi + -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS --fi ++ ++INCLUDED_IMMODULE_OBJ= ++INCLUDED_IMMODULE_DEFINE= ++ ++IFS="${IFS= }"; gtk_save_ifs="$IFS"; IFS="," ++for immodule in $included_immodules; do ++ immodule_underscores=`echo $immodule | sed -e 's/-/_/g'` ++ if echo "$all_immodules" | egrep "(^|,)$immodule(\$|,)" > /dev/null; then ++ : ++ else ++ 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" ++ INCLUDED_IMMODULE_DEFINE="$INCLUDED_IMMODULE_DEFINE -DINCLUDE_IM_$immodule_underscores" ++ eval INCLUDE_$immodule_underscores=yes ++done ++IFS="$gtk_save_ifs" ++ ++ ++ ++ if test x"$INCLUDE_am_et" = xyes; then ++ INCLUDE_IM_AM_ET_TRUE= ++ INCLUDE_IM_AM_ET_FALSE='#' ++else ++ INCLUDE_IM_AM_ET_TRUE='#' ++ INCLUDE_IM_AM_ET_FALSE= + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFReadRGBAImageOriented" >&5 -$as_echo "$ac_cv_lib_tiff_TIFFReadRGBAImageOriented" >&6; } -if test "x$ac_cv_lib_tiff_TIFFReadRGBAImageOriented" = x""yes; then @@ -17581,10 +19052,21 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -$as_echo_n "checking for tiffio.h... " >&6; } -if test "${ac_cv_header_tiffio_h+set}" = set; then - $as_echo_n "(cached) " >&6 --fi ++ ++ if test x"$INCLUDE_cedilla" = xyes; then ++ INCLUDE_IM_CEDILLA_TRUE= ++ INCLUDE_IM_CEDILLA_FALSE='#' ++else ++ INCLUDE_IM_CEDILLA_TRUE='#' ++ INCLUDE_IM_CEDILLA_FALSE= + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -$as_echo "$ac_cv_header_tiffio_h" >&6; } --else ++ ++ if test x"$INCLUDE_cyrillic_translit" = xyes; then ++ INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE= ++ INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE='#' + else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking tiffio.h usability" >&5 -$as_echo_n "checking tiffio.h usability... " >&6; } @@ -17616,17 +19098,40 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes --else ++ INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE='#' ++ INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE= ++fi ++ ++ if test x"$INCLUDE_ime" = xyes; then ++ INCLUDE_IM_IME_TRUE= ++ INCLUDE_IM_IME_FALSE='#' + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++ INCLUDE_IM_IME_TRUE='#' ++ INCLUDE_IM_IME_FALSE= ++fi + - ac_header_compiler=no --fi -- ++ if test x"$INCLUDE_inuktitut" = xyes; then ++ INCLUDE_IM_INUKTITUT_TRUE= ++ INCLUDE_IM_INUKTITUT_FALSE='#' ++else ++ INCLUDE_IM_INUKTITUT_TRUE='#' ++ INCLUDE_IM_INUKTITUT_FALSE= + fi + -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } -- ++ if test x"$INCLUDE_ipa" = xyes; then ++ INCLUDE_IM_IPA_TRUE= ++ INCLUDE_IM_IPA_FALSE='#' ++else ++ INCLUDE_IM_IPA_TRUE='#' ++ INCLUDE_IM_IPA_FALSE= ++fi + -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking tiffio.h presence" >&5 -$as_echo_n "checking tiffio.h presence... " >&6; } @@ -17656,17 +19161,36 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - test ! -s conftest.err - }; then - ac_header_preproc=yes --else ++ if test x"$INCLUDE_multipress" = xyes; then ++ INCLUDE_IM_MULTIPRESS_TRUE= ++ INCLUDE_IM_MULTIPRESS_FALSE='#' + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++ INCLUDE_IM_MULTIPRESS_TRUE='#' ++ INCLUDE_IM_MULTIPRESS_FALSE= ++fi + - ac_header_preproc=no --fi -- ++ if test x"$INCLUDE_thai" = xyes; then ++ INCLUDE_IM_THAI_TRUE= ++ INCLUDE_IM_THAI_FALSE='#' ++else ++ INCLUDE_IM_THAI_TRUE='#' ++ INCLUDE_IM_THAI_FALSE= + fi + -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } -- ++ if test x"$INCLUDE_ti_er" = xyes; then ++ INCLUDE_IM_TI_ER_TRUE= ++ INCLUDE_IM_TI_ER_FALSE='#' ++else ++ INCLUDE_IM_TI_ER_TRUE='#' ++ INCLUDE_IM_TI_ER_FALSE= ++fi + -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) @@ -17701,27 +19225,47 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -$as_echo_n "checking for tiffio.h... " >&6; } -if test "${ac_cv_header_tiffio_h+set}" = set; then - $as_echo_n "(cached) " >&6 --else ++ if test x"$INCLUDE_ti_et" = xyes; then ++ INCLUDE_IM_TI_ET_TRUE= ++ INCLUDE_IM_TI_ET_FALSE='#' + else - ac_cv_header_tiffio_h=$ac_header_preproc --fi ++ INCLUDE_IM_TI_ET_TRUE='#' ++ INCLUDE_IM_TI_ET_FALSE= + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -$as_echo "$ac_cv_header_tiffio_h" >&6; } -- --fi + ++ if test x"$INCLUDE_viqr" = xyes; then ++ INCLUDE_IM_VIQR_TRUE= ++ INCLUDE_IM_VIQR_FALSE='#' ++else ++ INCLUDE_IM_VIQR_TRUE='#' ++ INCLUDE_IM_VIQR_FALSE= + fi -if test "x$ac_cv_header_tiffio_h" = x""yes; then - TIFF='tiff'; LIBTIFF='-ltiff' --else ++ ++ if test x"$INCLUDE_xim" = xyes; then ++ INCLUDE_IM_XIM_TRUE= ++ INCLUDE_IM_XIM_FALSE='#' + else - { $as_echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 -$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} --fi -- -- ++ INCLUDE_IM_XIM_TRUE='#' ++ INCLUDE_IM_XIM_FALSE= + fi + + -else - { $as_echo "$as_me:$LINENO: checking for TIFFWriteScanline in -ltiff" >&5 -$as_echo_n "checking for TIFFWriteScanline in -ltiff... " >&6; } -if test "${ac_cv_lib_tiff_TIFFWriteScanline+set}" = set; then -- $as_echo_n "(cached) " >&6 --else ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5 ++$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } ++if test "${ac_cv_header_sys_wait_h+set}" = set; then : + $as_echo_n "(cached) " >&6 + else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ltiff -ljpeg -lz -lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF @@ -17729,23 +19273,35 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" --#endif ++#include ++#include ++#ifndef WEXITSTATUS ++# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8) + #endif -char TIFFWriteScanline (); --int --main () --{ ++#ifndef WIFEXITED ++# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) ++#endif ++ + int + main () + { -return TIFFWriteScanline (); -- ; -- return 0; --} --_ACEOF ++ int s; ++ wait (&s); ++ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; + ; + return 0; + } + _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -17768,13 +19324,23 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_tiff_TIFFWriteScanline=yes --else ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_header_sys_wait_h=yes + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_tiff_TIFFWriteScanline=no --fi -- ++ ac_cv_header_sys_wait_h=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5 ++$as_echo "$ac_cv_header_sys_wait_h" >&6; } ++if test $ac_cv_header_sys_wait_h = yes; then ++ ++$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h + -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext @@ -17920,15 +19486,18 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -else - { $as_echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 -$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} --fi -- -- + fi + + -else - { $as_echo "$as_me:$LINENO: checking for TIFFFlushData in -ltiff34" >&5 -$as_echo_n "checking for TIFFFlushData in -ltiff34... " >&6; } -if test "${ac_cv_lib_tiff34_TIFFFlushData+set}" = set; then -- $as_echo_n "(cached) " >&6 --else ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 ++$as_echo_n "checking return type of signal handlers... " >&6; } ++if test "${ac_cv_type_signal+set}" = set; then : + $as_echo_n "(cached) " >&6 + else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ltiff34 -ljpeg -lz -lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF @@ -17936,8 +19505,11 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ ++#include ++#include + -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ @@ -17945,14 +19517,15 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -extern "C" -#endif -char TIFFFlushData (); --int --main () --{ + int + main () + { -return TIFFFlushData (); -- ; -- return 0; --} --_ACEOF ++return *(signal (0, 0)) (0) == 1; + ; + return 0; + } + _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -17975,7 +19548,9 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_tiff34_TIFFFlushData=yes --else ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_type_signal=int + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - @@ -17986,7 +19561,8 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS --fi ++ ac_cv_type_signal=void + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tiff34_TIFFFlushData" >&5 -$as_echo "$ac_cv_lib_tiff34_TIFFFlushData" >&6; } -if test "x$ac_cv_lib_tiff34_TIFFFlushData" = x""yes; then @@ -17995,7 +19571,8 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -$as_echo_n "checking for tiffio.h... " >&6; } -if test "${ac_cv_header_tiffio_h+set}" = set; then - $as_echo_n "(cached) " >&6 --fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -$as_echo "$ac_cv_header_tiffio_h" >&6; } -else @@ -18010,7 +19587,12 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -/* end confdefs.h. */ -$ac_includes_default -#include --_ACEOF ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5 ++$as_echo "$ac_cv_type_signal" >&6; } ++ ++cat >>confdefs.h <<_ACEOF ++#define RETSIGTYPE $ac_cv_type_signal + _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -18033,14 +19615,14 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- + - ac_header_compiler=no -fi -- + -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } -- + -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking tiffio.h presence" >&5 -$as_echo_n "checking tiffio.h presence... " >&6; } @@ -18070,13 +19652,18 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - test ! -s conftest.err - }; then - ac_header_preproc=yes --else ++ if test "x$LIBTIFF" != x; then ++ HAVE_TIFF_TRUE= ++ HAVE_TIFF_FALSE='#' + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no --fi -- ++ HAVE_TIFF_TRUE='#' ++ HAVE_TIFF_FALSE= + fi + -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } @@ -18115,32 +19702,71 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -$as_echo_n "checking for tiffio.h... " >&6; } -if test "${ac_cv_header_tiffio_h+set}" = set; then - $as_echo_n "(cached) " >&6 --else ++ if test "x$LIBPNG" != x; then ++ HAVE_PNG_TRUE= ++ HAVE_PNG_FALSE='#' + else - ac_cv_header_tiffio_h=$ac_header_preproc --fi ++ HAVE_PNG_TRUE='#' ++ HAVE_PNG_FALSE= + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -$as_echo "$ac_cv_header_tiffio_h" >&6; } -- --fi + ++ if test "x$LIBJPEG" != x; then ++ HAVE_JPEG_TRUE= ++ HAVE_JPEG_FALSE='#' ++else ++ HAVE_JPEG_TRUE='#' ++ HAVE_JPEG_FALSE= + fi -if test "x$ac_cv_header_tiffio_h" = x""yes; then - TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz' --else ++ ++ if test "x$LIBJASPER" != x; then ++ HAVE_JASPER_TRUE= ++ HAVE_JASPER_FALSE='#' + else - { $as_echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 -$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} --fi -- -- --else ++ HAVE_JASPER_TRUE='#' ++ HAVE_JASPER_FALSE= + fi + + ++if $dynworks ; then ++ STATIC_LIB_DEPS= ++ if echo "$included_loaders" | egrep '(^|,)tiff($|,)' > /dev/null; then ++ STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBTIFF" ++ fi ++ if echo "$included_loaders" | egrep '(^|,)jpeg($|,)' > /dev/null; then ++ STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJPEG" ++ fi ++ if echo "$included_loaders" | egrep '(^|,)png($|,)' > /dev/null; then ++ STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG" ++ fi ++ if echo "$included_loaders" | egrep '(^|,)jasper($|,)' > /dev/null; then ++ STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJASPER" ++ fi + else - { $as_echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF library not found) ***" >&5 -$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF library not found) ***" >&2;} ++ STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG $LIBJASPER" + fi + -fi -- --fi -- --fi -- ++# Checks to see whether we should include mediaLib ++# support. ++# ++ac_fn_c_check_header_mongrel "$LINENO" "sys/systeminfo.h" "ac_cv_header_sys_systeminfo_h" "$ac_includes_default" ++if test "x$ac_cv_header_sys_systeminfo_h" = x""yes; then : ++ ++$as_echo "#define HAVE_SYS_SYSTEMINFO_H 1" >>confdefs.h + + fi + - fi -- + - if test x$with_libtiff != xno && test -z "$LIBTIFF"; then - { { $as_echo "$as_me:$LINENO: error: -*** Checks for TIFF loader failed. You can build without it by passing @@ -18152,39 +19778,57 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -*** not work properly" >&2;} - { (exit 1); exit 1; }; } - fi --fi -- ++ac_fn_c_check_header_mongrel "$LINENO" "sys/sysinfo.h" "ac_cv_header_sys_sysinfo_h" "$ac_includes_default" ++if test "x$ac_cv_header_sys_sysinfo_h" = x""yes; then : ++ ++$as_echo "#define HAVE_SYS_SYSINFO_H 1" >>confdefs.h ++ + fi + -if test x$os_win32 = xno || test x$enable_gdiplus = xno; then - if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then - { $as_echo "$as_me:$LINENO: checking for jpeg_destroy_decompress in -ljpeg" >&5 -$as_echo_n "checking for jpeg_destroy_decompress in -ljpeg... " >&6; } -if test "${ac_cv_lib_jpeg_jpeg_destroy_decompress+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mediaLib 2.3" >&5 ++$as_echo_n "checking for mediaLib 2.3... " >&6; } ++use_mlib25=no ++# Check for a mediaLib 2.3 function since that is what the GTK+ mediaLib ++# patch requires. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mlib_ImageSetStruct in -lmlib" >&5 ++$as_echo_n "checking for mlib_ImageSetStruct in -lmlib... " >&6; } ++if test "${ac_cv_lib_mlib_mlib_ImageSetStruct+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS -LIBS="-ljpeg $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif ++LIBS="-lmlib $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -26593,116 +22543,50 @@ + #ifdef __cplusplus + extern "C" + #endif -char jpeg_destroy_decompress (); --int --main () --{ ++char mlib_ImageSetStruct (); + int + main () + { -return jpeg_destroy_decompress (); -- ; -- return 0; --} --_ACEOF ++return mlib_ImageSetStruct (); + ; + return 0; + } + _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -18207,18 +19851,23 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_jpeg_jpeg_destroy_decompress=yes --else ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_mlib_mlib_ImageSetStruct=yes + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_jpeg_jpeg_destroy_decompress=no --fi ++ ac_cv_lib_mlib_mlib_ImageSetStruct=no + fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5 -$as_echo "$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6; } -if test "x$ac_cv_lib_jpeg_jpeg_destroy_decompress" = x""yes; then @@ -18227,8 +19876,14 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - jpeg_ok=no - { $as_echo "$as_me:$LINENO: WARNING: *** JPEG loader will not be built (JPEG library not found) ***" >&5 -$as_echo "$as_me: WARNING: *** JPEG loader will not be built (JPEG library not found) ***" >&2;} --fi -- ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mlib_mlib_ImageSetStruct" >&5 ++$as_echo "$ac_cv_lib_mlib_mlib_ImageSetStruct" >&6; } ++if test "x$ac_cv_lib_mlib_mlib_ImageSetStruct" = x""yes; then : ++ use_mlib=yes ++else ++ use_mlib=no + fi + - if test "$jpeg_ok" = yes; then - { $as_echo "$as_me:$LINENO: checking for jpeglib.h" >&5 -$as_echo_n "checking for jpeglib.h... " >&6; } @@ -18265,10 +19920,12 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++if test $use_mlib = yes; then + - jpeg_ok=no -fi -- ++$as_echo "#define USE_MEDIALIB 1" >>confdefs.h + -rm -f conftest.err conftest.$ac_ext - { $as_echo "$as_me:$LINENO: result: $jpeg_ok" >&5 -$as_echo "$jpeg_ok" >&6; } @@ -18277,32 +19934,44 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - { $as_echo "$as_me:$LINENO: checking for jpeg_simple_progression in -ljpeg" >&5 -$as_echo_n "checking for jpeg_simple_progression in -ljpeg... " >&6; } -if test "${ac_cv_lib_jpeg_jpeg_simple_progression+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS ++ MEDIA_LIB=-lmlib ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mediaLib 2.5" >&5 ++$as_echo_n "checking for mediaLib 2.5... " >&6; } ++ # Check for a mediaLib 2.5 function since that is what is needed for ++ # gdk_rgb_convert integration. ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mlib_VideoColorRGBint_to_BGRAint in -lmlib" >&5 ++$as_echo_n "checking for mlib_VideoColorRGBint_to_BGRAint in -lmlib... " >&6; } ++if test "${ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS -LIBS="-ljpeg $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif ++LIBS="-lmlib $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -26711,3376 +22595,554 @@ + #ifdef __cplusplus + extern "C" + #endif -char jpeg_simple_progression (); --int --main () --{ ++char mlib_VideoColorRGBint_to_BGRAint (); + int + main () + { -return jpeg_simple_progression (); -- ; -- return 0; --} --_ACEOF ++return mlib_VideoColorRGBint_to_BGRAint (); + ; + return 0; + } + _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -18325,18 +19994,23 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_jpeg_jpeg_simple_progression=yes --else ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=yes + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_jpeg_jpeg_simple_progression=no --fi ++ ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=no + fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_simple_progression" >&5 -$as_echo "$ac_cv_lib_jpeg_jpeg_simple_progression" >&6; } -if test "x$ac_cv_lib_jpeg_jpeg_simple_progression" = x""yes; then @@ -18345,18 +20019,24 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -#define HAVE_PROGRESSIVE_JPEG 1 -_ACEOF - --else ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&5 ++$as_echo "$ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&6; } ++if test "x$ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" = x""yes; then : ++ use_mlib25=yes + else - { $as_echo "$as_me:$LINENO: WARNING: JPEG library does not support progressive saving." >&5 -$as_echo "$as_me: WARNING: JPEG library does not support progressive saving." >&2;} --fi -- ++ use_mlib25=no + fi + - else - { $as_echo "$as_me:$LINENO: WARNING: *** JPEG loader will not be built (JPEG header file not found) ***" >&5 -$as_echo "$as_me: WARNING: *** JPEG loader will not be built (JPEG header file not found) ***" >&2;} - fi - fi - fi -- ++ if test $use_mlib25 = yes; then + - if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then - { { $as_echo "$as_me:$LINENO: error: -*** Checks for JPEG loader failed. You can build without it by passing @@ -18369,7 +20049,8 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - { (exit 1); exit 1; }; } - fi -fi -- ++$as_echo "#define USE_MEDIALIB25 1" >>confdefs.h + - if test x$with_libpng != xno && test -z "$LIBPNG"; then - { $as_echo "$as_me:$LINENO: checking for libpng12" >&5 -$as_echo_n "checking for libpng12... " >&6; } @@ -18386,7 +20067,12 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -$as_echo_n "checking for png_read_info in -lpng... " >&6; } -if test "${ac_cv_lib_png_png_read_info+set}" = set; then - $as_echo_n "(cached) " >&6 --else ++ fi ++fi ++ if test $use_mlib = yes; then ++ USE_MEDIALIB_TRUE= ++ USE_MEDIALIB_FALSE='#' + else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpng -lz -lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF @@ -18395,7 +20081,10 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -- ++ USE_MEDIALIB_TRUE='#' ++ USE_MEDIALIB_FALSE= ++fi + -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ @@ -18433,13 +20122,18 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_png_png_read_info=yes --else ++ if test $use_mlib25 = yes; then ++ USE_MEDIALIB25_TRUE= ++ USE_MEDIALIB25_FALSE='#' + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_png_png_read_info=no --fi -- ++ USE_MEDIALIB25_TRUE='#' ++ USE_MEDIALIB25_FALSE= + fi + -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext @@ -18474,11 +20168,39 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; --esac ++ ++# Checks to see if we should compile in MMX support (there will be ++# a runtime test when the code is actually run to see if it should ++# be used - this just checks if we can compile it.) ++# ++# This code is partially taken from Mesa ++# ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x86 platform" >&5 ++$as_echo_n "checking for x86 platform... " >&6; } ++case $host_cpu in ++ i386|i486|i586|i686|i786|k6|k7) ++ use_x86_asm=yes ++ ;; ++ *) ++ use_x86_asm=no + esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_x86_asm" >&5 ++$as_echo "$use_x86_asm" >&6; } ++ ++use_mmx_asm=no ++if test $use_x86_asm = yes; then ++ save_ac_ext=$ac_ext ++ ac_ext=S ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking compiler support for MMX" >&5 ++$as_echo_n "checking compiler support for MMX... " >&6; } ++ cp $srcdir/gdk-pixbuf/pixops/scale_line_22_33_mmx.S conftest.S ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 ++ (eval $ac_compile) 2>&5 + ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 @@ -18491,14 +20213,21 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ use_mmx_asm=yes ++ fi + - ac_header_compiler=no -fi -- ++ rm -rf conftest* + -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } -- ++ ac_ext=$save_ac_ext ++ if test $use_mmx_asm = yes; then + -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking png.h presence" >&5 -$as_echo_n "checking png.h presence... " >&6; } @@ -18531,10 +20260,17 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++$as_echo "#define USE_MMX 1" >>confdefs.h + - ac_header_preproc=no --fi -- ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ fi + fi + -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } @@ -18573,25 +20309,39 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -$as_echo_n "checking for png.h... " >&6; } -if test "${ac_cv_header_png_h+set}" = set; then - $as_echo_n "(cached) " >&6 --else ++ if test x$use_mmx_asm = xyes; then ++ USE_MMX_TRUE= ++ USE_MMX_FALSE='#' + else - ac_cv_header_png_h=$ac_header_preproc --fi ++ USE_MMX_TRUE='#' ++ USE_MMX_FALSE= + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 -$as_echo "$ac_cv_header_png_h" >&6; } -- + -fi -if test "x$ac_cv_header_png_h" = x""yes; then - png_ok=yes -else - png_ok=no --fi -- -- --else ++ ++REBUILD_PNGS= ++if test -z "$LIBPNG" && test x"$os_win32" = xno -o x$enable_gdiplus = xno; then ++ REBUILD_PNGS=# + fi + + ++ if test $cross_compiling = yes; then ++ CROSS_COMPILING_TRUE= ++ CROSS_COMPILING_FALSE='#' + else - { $as_echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&5 -$as_echo "$as_me: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&2;} --fi -- ++ CROSS_COMPILING_TRUE='#' ++ CROSS_COMPILING_FALSE= + fi + - if test "$png_ok" = yes; then - { $as_echo "$as_me:$LINENO: checking for png_structp in png.h" >&5 -$as_echo_n "checking for png_structp in png.h... " >&6; } @@ -18629,13 +20379,51 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - png_ok=yes --else ++ ++if test $cross_compiling = yes; then ++ # Extract the first word of "gdk-pixbuf-csource", so it can be a program name with args. ++set dummy gdk-pixbuf-csource; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_GDK_PIXBUF_CSOURCE+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++ case $GDK_PIXBUF_CSOURCE in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_GDK_PIXBUF_CSOURCE="$GDK_PIXBUF_CSOURCE" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_path_GDK_PIXBUF_CSOURCE="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS + - png_ok=no --fi -- ++ test -z "$ac_cv_path_GDK_PIXBUF_CSOURCE" && ac_cv_path_GDK_PIXBUF_CSOURCE="no" ++ ;; ++esac ++fi ++GDK_PIXBUF_CSOURCE=$ac_cv_path_GDK_PIXBUF_CSOURCE ++if test -n "$GDK_PIXBUF_CSOURCE"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDK_PIXBUF_CSOURCE" >&5 ++$as_echo "$GDK_PIXBUF_CSOURCE" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: result: $png_ok" >&5 -$as_echo "$png_ok" >&6; } @@ -18665,13 +20453,18 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -*** from CVS." >&2;} - { (exit 1); exit 1; }; } - fi -- + - if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then - { $as_echo "$as_me:$LINENO: checking for jas_init in -ljasper" >&5 -$as_echo_n "checking for jas_init in -ljasper... " >&6; } -if test "${ac_cv_lib_jasper_jas_init+set}" = set; then -- $as_echo_n "(cached) " >&6 --else ++ # Extract the first word of "gtk-update-icon-cache", so it can be a program name with args. ++set dummy gtk-update-icon-cache; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_GTK_UPDATE_ICON_CACHE+set}" = set; then : + $as_echo_n "(cached) " >&6 + else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ljasper -ljpeg $LIBS" -cat >conftest.$ac_ext <<_ACEOF @@ -18680,7 +20473,26 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -- ++ case $GTK_UPDATE_ICON_CACHE in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_GTK_UPDATE_ICON_CACHE="$GTK_UPDATE_ICON_CACHE" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_path_GTK_UPDATE_ICON_CACHE="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS + -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ @@ -18701,7 +20513,9 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; --esac ++ test -z "$ac_cv_path_GTK_UPDATE_ICON_CACHE" && ac_cv_path_GTK_UPDATE_ICON_CACHE="no" ++ ;; + esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 @@ -18718,13 +20532,20 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_jasper_jas_init=yes --else ++fi ++GTK_UPDATE_ICON_CACHE=$ac_cv_path_GTK_UPDATE_ICON_CACHE ++if test -n "$GTK_UPDATE_ICON_CACHE"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_UPDATE_ICON_CACHE" >&5 ++$as_echo "$GTK_UPDATE_ICON_CACHE" >&6; } + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_jasper_jas_init=no --fi -- ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext @@ -18735,9 +20556,12 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -if test "x$ac_cv_lib_jasper_jas_init" = x""yes; then - LIBJASPER=-ljasper -fi -- -- fi -- + ++ if test x$GTK_UPDATE_ICON_CACHE = xno; then ++ REBUILD_PNGS=# + fi ++fi + - if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then - { { $as_echo "$as_me:$LINENO: error: -*** Checks for JPEG2000 loader failed. You can build without it by passing @@ -18747,12 +20571,30 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -*** --without-libjasper to configure" >&2;} - { (exit 1); exit 1; }; } - fi -- -- -- -- -- -- ++if test ! -f $srcdir/gtk/gtkbuiltincache.h && ++ test "x$REBUILD_PNGS" = "x#" ; then ++ 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 ++fi + + + ++GDK_PIXBUF_PACKAGES="gmodule-no-export-2.0 gobject-2.0 gio-2.0" ++GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB $MEDIA_LIB" ++GDK_PIXBUF_EXTRA_CFLAGS= ++GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" ++GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS" + ++######################################## ++# Windowing system checks ++######################################## + ++GDK_PIXBUF_XLIB_PACKAGES= ++GDK_PIXBUF_XLIB_EXTRA_CFLAGS= ++GDK_PIXBUF_XLIB_EXTRA_LIBS= + - if $dynworks; then - BUILD_DYNAMIC_MODULES_TRUE= - BUILD_DYNAMIC_MODULES_FALSE='#' @@ -18760,21 +20602,53 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - BUILD_DYNAMIC_MODULES_TRUE='#' - BUILD_DYNAMIC_MODULES_FALSE= -fi -- -- ++GDK_EXTRA_LIBS="$GDK_WLIBS" ++GDK_EXTRA_CFLAGS= + ++# GTK+ uses some X calls, so needs to link against X directly ++GTK_DEP_PACKAGES_FOR_X= ++GTK_DEP_LIBS_FOR_X= + -# -# Allow building some or all gdk-pixbuf loaders included -# -{ $as_echo "$as_me:$LINENO: checking pixbuf loaders to build" >&5 -$as_echo_n "checking pixbuf loaders to build... " >&6; } -- -- ++if test "x$gdktarget" = "xx11"; then ++ X_PACKAGES=fontconfig + ++ # ++ # We use fontconfig very peripherally when decoding the default ++ # settings. ++ # ++ if $PKG_CONFIG --exists fontconfig; then : ; else ++ as_fn_error " ++*** fontconfig (http://www.fontconfig.org) is required by the X11 backend." "$LINENO" 5 ++ fi + -# Check whether --with-included_loaders was given. -if test "${with_included_loaders+set}" = set; then - withval=$with_included_loaders; -fi -- -- ++ # ++ # Check for basic X packages; we use pkg-config if available ++ # ++ if $PKG_CONFIG --exists x11 xext xrender; then ++ have_base_x_pc=true ++ X_PACKAGES="$X_PACKAGES x11 xext xrender" ++ x_libs="`$PKG_CONFIG --libs x11 xext xrender`" ++ X_CFLAGS="`$PKG_CONFIG --cflags x11 xext xrender`" + ++ # Strip out any .la files that pkg-config might give us (this happens ++ # with -uninstalled.pc files) ++ x_libs_for_checks= ++ for I in $x_libs ; do ++ case $I in ++ *.la) ;; ++ *) x_libs_for_checks="$x_libs_for_checks $I" ;; ++ esac ++ done + -if $dynworks; then - : -else @@ -18783,29 +20657,47 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - with_included_loaders=yes - fi -fi -- ++ GDK_PIXBUF_XLIB_PACKAGES="x11" ++ GTK_PACKAGES_FOR_X="x11" ++ else ++ have_base_x_pc=false ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 ++$as_echo_n "checking for X... " >&6; } + -# Use the traditional png loader instead of the GDI+ one on Windows, -# because some important apps like GIMP need to read and write -# arbitrary tEXt chunks which doesn't seem to be possible through GDI+ -- + -all_loaders="ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm" -if test x$with_libjasper != xno; then - all_loaders="$all_loaders,jasper" --fi ++# Check whether --with-x was given. ++if test "${with_x+set}" = set; then : ++ withval=$with_x; + fi -if test x$os_win32 = xyes && test x$enable_gdiplus != xno; then - # Skip PNG, see comment above - gdip_formats="bmp emf gif ico jpeg tiff wmf" - for f in $gdip_formats; do - all_loaders="$all_loaders,gdip-$f" - done --else ++ ++# $have_x is `yes', `no', `disabled', or empty when we do not yet know. ++if test "x$with_x" = xno; then ++ # The user explicitly disabled X. ++ have_x=disabled + else - all_loaders="$all_loaders,bmp,gif,ico,jpeg,tiff" -fi -included_loaders="" -# If no loaders specified, include all -if test "x$with_included_loaders" = xyes ; then - included_loaders="$all_loaders" --else ++ case $x_includes,$x_libraries in #( ++ *\'*) 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 - included_loaders="$with_included_loaders" -fi - @@ -19060,70 +20952,43 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - gio_can_sniff=yes -+ GOBJECT_QUERY="" -+ GLIB_MKENUMS="" -+ as_fn_error " -+*** GLIB 2.21.3 or better is required. The latest version of -+*** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/." "$LINENO" 5 -+ fi - +- -cat >>confdefs.h <<\_ACEOF -#define GDK_PIXBUF_USE_GIO_MIME 1 -_ACEOF - +- -else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +- -( exit $ac_status ) -gio_can_sniff=no -fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - +- +- - { $as_echo "$as_me:$LINENO: result: $gio_can_sniff" >&5 -$as_echo "$gio_can_sniff" >&6; } - LIBS="$gtk_save_LIBS" - CFLAGS="$gtk_save_CFLAGS" -+ rm -f conf.glibtest -+ -+ -+# See if it's safe to turn G_DISABLE_DEPRECATED on. -+GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"` -+GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo 2.21.3 | sed "s/\.[^.]*\$//"` -+if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then -+ CFLAGS="-DG_DISABLE_DEPRECATED $CFLAGS" - fi - +-fi +- -# -# Allow building some or all immodules included -# -{ $as_echo "$as_me:$LINENO: checking immodules to build" >&5 -$as_echo_n "checking immodules to build... " >&6; } -+CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CFLAGS" - - +- +- -# Check whether --with-included_immodules was given. -if test "${with_included_immodules+set}" = set; then - withval=$with_included_immodules; -+gtk_save_LIBS=$LIBS -+LIBS="$LIBS $GLIB_LIBS" -+for ac_func in bind_textdomain_codeset -+do : -+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_BIND_TEXTDOMAIN_CODESET 1 -+_ACEOF -+ - fi -+done - -+LIBS=$gtk_save_LIBS - +-fi +- +- -if $dynworks; then - : -else @@ -19132,14 +20997,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - with_included_immodules=yes - fi -fi -+for ac_header in pwd.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "pwd.h" "ac_cv_header_pwd_h" "$ac_includes_default" -+if test "x$ac_cv_header_pwd_h" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_PWD_H 1 -+_ACEOF - +- -all_immodules="am-et,cedilla,cyrillic-translit" -if test "$gdktarget" = "win32"; then - all_immodules="${all_immodules},ime" @@ -19148,16 +21006,15 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -if test "$gdktarget" = "x11"; then - all_immodules="${all_immodules},xim" -fi -+$as_echo "#define HAVE_PWD_H 1" >>confdefs.h - +- -included_immodules="" -# If the switch specified without listing any specific ones, include all -if test "x$with_included_immodules" = xyes ; then - included_immodules="$all_immodules" -else - included_immodules="$with_included_immodules" - fi - +-fi +- -{ $as_echo "$as_me:$LINENO: result: $included_immodules" >&5 -$as_echo "$included_immodules" >&6; } - if test "x$included_immodules" != x; then @@ -19166,32 +21023,12 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -else - HAVE_INCLUDED_IMMMODULES_TRUE='#' - HAVE_INCLUDED_IMMMODULES_FALSE= -+done -+ -+for ac_header in sys/time.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default" -+if test "x$ac_cv_header_sys_time_h" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_SYS_TIME_H 1 -+_ACEOF -+ -+$as_echo "#define HAVE_SYS_TIME_H 1" >>confdefs.h -+ - fi - -+done - +-fi +- +- -INCLUDED_IMMODULE_OBJ= -INCLUDED_IMMODULE_DEFINE= -+for ac_header in unistd.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default" -+if test "x$ac_cv_header_unistd_h" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_UNISTD_H 1 -+_ACEOF - +- -IFS="${IFS= }"; gtk_save_ifs="$IFS"; IFS="," -for immodule in $included_immodules; do - immodule_underscores=`echo $immodule | sed -e 's/-/_/g'` @@ -19202,263 +21039,123 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -$as_echo "$as_me: error: the specified input method $immodule does not exist" >&2;} - { (exit 1); exit 1; }; } - fi -+$as_echo "#define HAVE_UNISTD_H 1" >>confdefs.h -+ -+fi - +- - INCLUDED_IMMODULE_OBJ="$INCLUDED_IMMODULE_OBJ ../modules/input/libstatic-im-$immodule.la" - INCLUDED_IMMODULE_DEFINE="$INCLUDED_IMMODULE_DEFINE -DINCLUDE_IM_$immodule_underscores" - eval INCLUDE_$immodule_underscores=yes - done +-done -IFS="$gtk_save_ifs" - -+for ac_header in ftw.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "ftw.h" "ac_cv_header_ftw_h" "$ac_includes_default" -+if test "x$ac_cv_header_ftw_h" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_FTW_H 1 -+_ACEOF - -+$as_echo "#define HAVE_FTW_H 1" >>confdefs.h - +- +- +- - if test x"$INCLUDE_am_et" = xyes; then - INCLUDE_IM_AM_ET_TRUE= - INCLUDE_IM_AM_ET_FALSE='#' -else - INCLUDE_IM_AM_ET_TRUE='#' - INCLUDE_IM_AM_ET_FALSE= - fi - +-fi +- - if test x"$INCLUDE_cedilla" = xyes; then - INCLUDE_IM_CEDILLA_TRUE= - INCLUDE_IM_CEDILLA_FALSE='#' -+done -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ftw extensions" >&5 -+$as_echo_n "checking for GNU ftw extensions... " >&6; } -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#define _XOPEN_SOURCE 500 -+#define _GNU_SOURCE -+#include -+int -+main () -+{ -+int flags = FTW_ACTIONRETVAL; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ gtk_ok=yes - else +-else - INCLUDE_IM_CEDILLA_TRUE='#' - INCLUDE_IM_CEDILLA_FALSE= -+ gtk_ok=no - fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+if test $gtk_ok = yes; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } -+ -+$as_echo "#define HAVE_GNU_FTW 1" >>confdefs.h - +-fi +- - if test x"$INCLUDE_cyrillic_translit" = xyes; then - INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE= - INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE='#' - else +-else - INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE='#' - INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE= -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - +-fi +- - if test x"$INCLUDE_ime" = xyes; then - INCLUDE_IM_IME_TRUE= - INCLUDE_IM_IME_FALSE='#' -+saved_cflags="$CFLAGS" -+saved_ldflags="$LDFLAGS" -+ -+ -+# Checks for header files. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -+$as_echo_n "checking for ANSI C header files... " >&6; } -+if test "${ac_cv_header_stdc+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else +-else - INCLUDE_IM_IME_TRUE='#' - INCLUDE_IM_IME_FALSE= -fi -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+#include -+#include -+#include - +- - if test x"$INCLUDE_inuktitut" = xyes; then - INCLUDE_IM_INUKTITUT_TRUE= - INCLUDE_IM_INUKTITUT_FALSE='#' -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_header_stdc=yes - else +-else - INCLUDE_IM_INUKTITUT_TRUE='#' - INCLUDE_IM_INUKTITUT_FALSE= -+ ac_cv_header_stdc=no - fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+if test $ac_cv_header_stdc = yes; then -+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+ -+_ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "memchr" >/dev/null 2>&1; then : - +-fi +- - if test x"$INCLUDE_ipa" = xyes; then - INCLUDE_IM_IPA_TRUE= - INCLUDE_IM_IPA_FALSE='#' - else +-else - INCLUDE_IM_IPA_TRUE='#' - INCLUDE_IM_IPA_FALSE= -+ ac_cv_header_stdc=no - fi -+rm -f conftest* - +-fi +- - if test x"$INCLUDE_multipress" = xyes; then - INCLUDE_IM_MULTIPRESS_TRUE= - INCLUDE_IM_MULTIPRESS_FALSE='#' -else - INCLUDE_IM_MULTIPRESS_TRUE='#' - INCLUDE_IM_MULTIPRESS_FALSE= - fi - +-fi +- - if test x"$INCLUDE_thai" = xyes; then - INCLUDE_IM_THAI_TRUE= - INCLUDE_IM_THAI_FALSE='#' -+if test $ac_cv_header_stdc = yes; then -+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+ -+_ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "free" >/dev/null 2>&1; then : -+ - else +-else - INCLUDE_IM_THAI_TRUE='#' - INCLUDE_IM_THAI_FALSE= -+ ac_cv_header_stdc=no - fi -+rm -f conftest* - +-fi +- - if test x"$INCLUDE_ti_er" = xyes; then - INCLUDE_IM_TI_ER_TRUE= - INCLUDE_IM_TI_ER_FALSE='#' -else - INCLUDE_IM_TI_ER_TRUE='#' - INCLUDE_IM_TI_ER_FALSE= - fi - +-fi +- - if test x"$INCLUDE_ti_et" = xyes; then - INCLUDE_IM_TI_ET_TRUE= - INCLUDE_IM_TI_ET_FALSE='#' -+if test $ac_cv_header_stdc = yes; then -+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -+ if test "$cross_compiling" = yes; then : -+ : - else +-else - INCLUDE_IM_TI_ET_TRUE='#' - INCLUDE_IM_TI_ET_FALSE= -fi -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+#include -+#if ((' ' & 0x0FF) == 0x020) -+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -+#else -+# define ISLOWER(c) \ -+ (('a' <= (c) && (c) <= 'i') \ -+ || ('j' <= (c) && (c) <= 'r') \ -+ || ('s' <= (c) && (c) <= 'z')) -+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -+#endif -+ -+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -+int -+main () -+{ -+ int i; -+ for (i = 0; i < 256; i++) -+ if (XOR (islower (i), ISLOWER (i)) -+ || toupper (i) != TOUPPER (i)) -+ return 2; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_run "$LINENO"; then : - +- - if test x"$INCLUDE_viqr" = xyes; then - INCLUDE_IM_VIQR_TRUE= - INCLUDE_IM_VIQR_FALSE='#' - else +-else - INCLUDE_IM_VIQR_TRUE='#' - INCLUDE_IM_VIQR_FALSE= -+ ac_cv_header_stdc=no -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext - fi - +-fi +- - if test x"$INCLUDE_xim" = xyes; then - INCLUDE_IM_XIM_TRUE= - INCLUDE_IM_XIM_FALSE='#' -else - INCLUDE_IM_XIM_TRUE='#' - INCLUDE_IM_XIM_FALSE= - fi -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -+$as_echo "$ac_cv_header_stdc" >&6; } -+if test $ac_cv_header_stdc = yes; then - -+$as_echo "#define STDC_HEADERS 1" >>confdefs.h - +-fi +- +- -{ $as_echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5 -$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } -if test "${ac_cv_header_sys_wait_h+set}" = set; then -+fi -+ -+ -+# Checks for typedefs, structures, and compiler characteristics. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 -+$as_echo_n "checking for an ANSI C-conforming const... " >&6; } -+if test "${ac_cv_c_const+set}" = set; then : - $as_echo_n "(cached) " >&6 - else +- $as_echo_n "(cached) " >&6 +-else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -#include -#include -#ifndef WEXITSTATUS @@ -19467,67 +21164,17 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -#ifndef WIFEXITED -# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) -#endif - - int - main () - { +- +-int +-main () +-{ - int s; - wait (&s); - s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; -+/* FIXME: Include the comments suggested by Paul. */ -+#ifndef __cplusplus -+ /* Ultrix mips cc rejects this. */ -+ typedef int charset[2]; -+ const charset cs; -+ /* SunOS 4.1.1 cc rejects this. */ -+ char const *const *pcpcc; -+ char **ppc; -+ /* NEC SVR4.0.2 mips cc rejects this. */ -+ struct point {int x, y;}; -+ static struct point const zero = {0,0}; -+ /* AIX XL C 1.02.0.0 rejects this. -+ It does not let you subtract one const X* pointer from another in -+ an arm of an if-expression whose if-part is not a constant -+ expression */ -+ const char *g = "string"; -+ pcpcc = &g + (g ? g-g : 0); -+ /* HPUX 7.0 cc rejects these. */ -+ ++pcpcc; -+ ppc = (char**) pcpcc; -+ pcpcc = (char const *const *) ppc; -+ { /* SCO 3.2v4 cc rejects this. */ -+ char *t; -+ char const *s = 0 ? (char *) 0 : (char const *) 0; -+ -+ *t++ = 0; -+ if (s) return 0; -+ } -+ { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ -+ int x[] = {25, 17}; -+ const int *foo = &x[0]; -+ ++foo; -+ } -+ { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ -+ typedef const int *iptr; -+ iptr p = 0; -+ ++p; -+ } -+ { /* AIX XL C 1.02.0.0 rejects this saying -+ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ -+ struct s { int j; const int *ap[3]; }; -+ struct s *b; b->j = 5; -+ } -+ { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ -+ const int foo = 10; -+ if (!foo) return 0; -+ } -+ return !cs[0] && !zero.x; -+#endif -+ - ; - return 0; - } - _ACEOF +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -19547,54 +21194,48 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_header_sys_wait_h=yes -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_c_const=yes - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_sys_wait_h=no -+ ac_cv_c_const=no - fi +-fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 -$as_echo "$ac_cv_header_sys_wait_h" >&6; } -if test $ac_cv_header_sys_wait_h = yes; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 -+$as_echo "$ac_cv_c_const" >&6; } -+if test $ac_cv_c_const = no; then - +- -cat >>confdefs.h <<\_ACEOF -#define HAVE_SYS_WAIT_H 1 -_ACEOF -+$as_echo "#define const /**/" >>confdefs.h - - fi - - +- +-fi +- +- -{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5 -+# Checks for library functions. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 - $as_echo_n "checking return type of signal handlers... " >&6; } +-$as_echo_n "checking return type of signal handlers... " >&6; } -if test "${ac_cv_type_signal+set}" = set; then -+if test "${ac_cv_type_signal+set}" = set; then : - $as_echo_n "(cached) " >&6 - else +- $as_echo_n "(cached) " >&6 +-else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - #include -@@ -27749,35 +20822,14 @@ - return 0; - } - _ACEOF +-/* end confdefs.h. */ +-#include +-#include +- +-int +-main () +-{ +-return *(signal (0, 0)) (0) == 1; +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -19613,205 +21254,40 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then -+if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_type_signal=int - else +- ac_cv_type_signal=int +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_signal=void -+ ac_cv_type_signal=void - fi +-fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5 - $as_echo "$ac_cv_type_signal" >&6; } - - cat >>confdefs.h <<_ACEOF -@@ -27785,444 +20837,347 @@ - _ACEOF - - -+for ac_header in stdlib.h unistd.h -+do : -+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -+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 - +-$as_echo "$ac_cv_type_signal" >&6; } +- +-cat >>confdefs.h <<_ACEOF +-#define RETSIGTYPE $ac_cv_type_signal +-_ACEOF +- +- +- - if test "x$LIBTIFF" != x; then - HAVE_TIFF_TRUE= - HAVE_TIFF_FALSE='#' -else - HAVE_TIFF_TRUE='#' - HAVE_TIFF_FALSE= - fi - +-fi +- - if test "x$LIBPNG" != x; then - HAVE_PNG_TRUE= - HAVE_PNG_FALSE='#' -+done -+ -+for ac_func in getpagesize -+do : -+ ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize" -+if test "x$ac_cv_func_getpagesize" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_GETPAGESIZE 1 -+_ACEOF -+ -+fi -+done -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5 -+$as_echo_n "checking for working mmap... " >&6; } -+if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test "$cross_compiling" = yes; then : -+ ac_cv_func_mmap_fixed_mapped=no -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$ac_includes_default -+/* malloc might have been renamed as rpl_malloc. */ -+#undef malloc -+ -+/* Thanks to Mike Haertel and Jim Avera for this test. -+ Here is a matrix of mmap possibilities: -+ mmap private not fixed -+ mmap private fixed at somewhere currently unmapped -+ mmap private fixed at somewhere already mapped -+ mmap shared not fixed -+ mmap shared fixed at somewhere currently unmapped -+ mmap shared fixed at somewhere already mapped -+ For private mappings, we should verify that changes cannot be read() -+ back from the file, nor mmap's back from the file at a different -+ address. (There have been systems where private was not correctly -+ implemented like the infamous i386 svr4.0, and systems where the -+ VM page cache was not coherent with the file system buffer cache -+ like early versions of FreeBSD and possibly contemporary NetBSD.) -+ For shared mappings, we should conversely verify that changes get -+ propagated back to all the places they're supposed to be. -+ -+ Grep wants private fixed already mapped. -+ The main things grep needs to know about mmap are: -+ * does it exist and is it safe to write into the mmap'd area -+ * how to use it (BSD variants) */ -+ -+#include -+#include -+ -+#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H -+char *malloc (); -+#endif -+ -+/* This mess was copied from the GNU getpagesize.h. */ -+#ifndef HAVE_GETPAGESIZE -+/* Assume that all systems that can run configure have sys/param.h. */ -+# ifndef HAVE_SYS_PARAM_H -+# define HAVE_SYS_PARAM_H 1 -+# endif -+ -+# ifdef _SC_PAGESIZE -+# define getpagesize() sysconf(_SC_PAGESIZE) -+# else /* no _SC_PAGESIZE */ -+# ifdef HAVE_SYS_PARAM_H -+# include -+# ifdef EXEC_PAGESIZE -+# define getpagesize() EXEC_PAGESIZE -+# else /* no EXEC_PAGESIZE */ -+# ifdef NBPG -+# define getpagesize() NBPG * CLSIZE -+# ifndef CLSIZE -+# define CLSIZE 1 -+# endif /* no CLSIZE */ -+# else /* no NBPG */ -+# ifdef NBPC -+# define getpagesize() NBPC -+# else /* no NBPC */ -+# ifdef PAGESIZE -+# define getpagesize() PAGESIZE -+# endif /* PAGESIZE */ -+# endif /* no NBPC */ -+# endif /* no NBPG */ -+# endif /* no EXEC_PAGESIZE */ -+# else /* no HAVE_SYS_PARAM_H */ -+# define getpagesize() 8192 /* punt totally */ -+# endif /* no HAVE_SYS_PARAM_H */ -+# endif /* no _SC_PAGESIZE */ -+ -+#endif /* no HAVE_GETPAGESIZE */ -+ -+int -+main () -+{ -+ char *data, *data2, *data3; -+ int i, pagesize; -+ int fd; -+ -+ pagesize = getpagesize (); -+ -+ /* First, make a file with some known garbage in it. */ -+ data = (char *) malloc (pagesize); -+ if (!data) -+ return 1; -+ for (i = 0; i < pagesize; ++i) -+ *(data + i) = rand (); -+ umask (0); -+ fd = creat ("conftest.mmap", 0600); -+ if (fd < 0) -+ return 1; -+ if (write (fd, data, pagesize) != pagesize) -+ return 1; -+ close (fd); -+ -+ /* Next, try to mmap the file at a fixed address which already has -+ something else allocated at it. If we can, also make sure that -+ we see the same garbage. */ -+ fd = open ("conftest.mmap", O_RDWR); -+ if (fd < 0) -+ return 1; -+ data2 = (char *) malloc (2 * pagesize); -+ if (!data2) -+ return 1; -+ data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1); -+ if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, -+ MAP_PRIVATE | MAP_FIXED, fd, 0L)) -+ return 1; -+ for (i = 0; i < pagesize; ++i) -+ if (*(data + i) != *(data2 + i)) -+ return 1; -+ -+ /* Finally, make sure that changes to the mapped area do not -+ percolate back to the file as seen by read(). (This is a bug on -+ some variants of i386 svr4.0.) */ -+ for (i = 0; i < pagesize; ++i) -+ *(data2 + i) = *(data2 + i) + 1; -+ data3 = (char *) malloc (pagesize); -+ if (!data3) -+ return 1; -+ if (read (fd, data3, pagesize) != pagesize) -+ return 1; -+ for (i = 0; i < pagesize; ++i) -+ if (*(data + i) != *(data3 + i)) -+ return 1; -+ close (fd); -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_run "$LINENO"; then : -+ ac_cv_func_mmap_fixed_mapped=yes - else +-else - HAVE_PNG_TRUE='#' - HAVE_PNG_FALSE= -+ ac_cv_func_mmap_fixed_mapped=no - fi +-fi - - if test "x$LIBJPEG" != x; then - HAVE_JPEG_TRUE= @@ -19819,23 +21295,17 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -else - HAVE_JPEG_TRUE='#' - HAVE_JPEG_FALSE= -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext - fi - +-fi +- - if test "x$LIBJASPER" != x; then - HAVE_JASPER_TRUE= - HAVE_JASPER_FALSE='#' -else - HAVE_JASPER_TRUE='#' - HAVE_JASPER_FALSE= - fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5 -+$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; } -+if test $ac_cv_func_mmap_fixed_mapped = yes; then - -+$as_echo "#define HAVE_MMAP 1" >>confdefs.h - +-fi +- +- -if $dynworks ; then - STATIC_LIB_DEPS= - if echo "$included_loaders" | egrep '(^|,)tiff($|,)' > /dev/null; then @@ -19852,9 +21322,8 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - fi -else - STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG $LIBJASPER" - fi -+rm -f conftest.mmap - +-fi +- -# Checks to see whether we should include mediaLib -# support. -# @@ -19878,14 +21347,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -/* end confdefs.h. */ -$ac_includes_default -#include -+ -+for ac_func in mallinfo -+do : -+ ac_fn_c_check_func "$LINENO" "mallinfo" "ac_cv_func_mallinfo" -+if test "x$ac_cv_func_mallinfo" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_MALLINFO 1 - _ACEOF +-_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -19908,11 +21370,10 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +- - ac_header_compiler=no - fi -+done - +-fi +- -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } @@ -19927,13 +21388,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -+for ac_func in getresuid -+do : -+ ac_fn_c_check_func "$LINENO" "getresuid" "ac_cv_func_getresuid" -+if test "x$ac_cv_func_getresuid" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_GETRESUID 1 - _ACEOF +-_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -19955,11 +21410,10 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +- - ac_header_preproc=no - fi -+done - +-fi +- -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } @@ -19997,48 +21451,29 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -{ $as_echo "$as_me:$LINENO: checking for sys/systeminfo.h" >&5 -$as_echo_n "checking for sys/systeminfo.h... " >&6; } -if test "${ac_cv_header_sys_systeminfo_h+set}" = set; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5 -+$as_echo_n "checking for uid_t in sys/types.h... " >&6; } -+if test "${ac_cv_type_uid_t+set}" = set; then : - $as_echo_n "(cached) " >&6 - else +- $as_echo_n "(cached) " >&6 +-else - ac_cv_header_sys_systeminfo_h=$ac_header_preproc -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+ -+_ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "uid_t" >/dev/null 2>&1; then : -+ ac_cv_type_uid_t=yes -+else -+ ac_cv_type_uid_t=no - fi +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_systeminfo_h" >&5 -$as_echo "$ac_cv_header_sys_systeminfo_h" >&6; } -+rm -f conftest* - - fi +- +-fi -if test "x$ac_cv_header_sys_systeminfo_h" = x""yes; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5 -+$as_echo "$ac_cv_type_uid_t" >&6; } -+if test $ac_cv_type_uid_t = no; then - +- -cat >>confdefs.h <<\_ACEOF -#define HAVE_SYS_SYSTEMINFO_H 1 -_ACEOF -+$as_echo "#define uid_t int" >>confdefs.h - +- -fi - -+$as_echo "#define gid_t int" >>confdefs.h - +- +- -if test "${ac_cv_header_sys_sysinfo_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for sys/sysinfo.h" >&5 -$as_echo_n "checking for sys/sysinfo.h... " >&6; } -if test "${ac_cv_header_sys_sysinfo_h+set}" = set; then - $as_echo_n "(cached) " >&6 - fi +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysinfo_h" >&5 -$as_echo "$ac_cv_header_sys_sysinfo_h" >&6; } -else @@ -20050,24 +21485,10 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ -+ -+# Check if needs to be included for fd_set -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fd_set" >&5 -+$as_echo_n "checking for fd_set... " >&6; } -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -$ac_includes_default -#include -+#include -+int -+main () -+{ -+fd_set readMask, writeMask; -+ ; -+ return 0; -+} - _ACEOF +-_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -20087,17 +21508,14 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -+if ac_fn_c_try_compile "$LINENO"; then : -+ gtk_ok=yes - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -+ gtk_ok=no - fi +-fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - @@ -20130,29 +21548,17 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - test ! -s conftest.err - }; then - ac_header_preproc=yes -+if test $gtk_ok = yes; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, found in sys/types.h" >&5 -+$as_echo "yes, found in sys/types.h" >&6; } - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include - +- - ac_header_preproc=no -+_ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "fd_mask" >/dev/null 2>&1; then : -+ gtk_ok=yes - fi -+rm -f conftest* - +-fi +- -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } -+ if test $gtk_ok = yes; then - +- -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) @@ -20192,24 +21598,16 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysinfo_h" >&5 -$as_echo "$ac_cv_header_sys_sysinfo_h" >&6; } -+$as_echo "#define HAVE_SYS_SELECT_H 1" >>confdefs.h - +- -fi -if test "x$ac_cv_header_sys_sysinfo_h" = x""yes; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, found in sys/select.h" >&5 -+$as_echo "yes, found in sys/select.h" >&6; } -+ else - +- -cat >>confdefs.h <<\_ACEOF -#define HAVE_SYS_SYSINFO_H 1 -_ACEOF -+$as_echo "#define NO_FD_SET 1" >>confdefs.h - -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+ fi - fi - +- +-fi +- - - -{ $as_echo "$as_me:$LINENO: checking for mediaLib 2.3" >&5 @@ -20229,11 +21627,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+# `widechar' tests for gdki18n.h -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wchar.h" >&5 -+$as_echo_n "checking for wchar.h... " >&6; } -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC @@ -20249,8 +21643,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - ; - return 0; -} -+#include - _ACEOF +-_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -20273,18 +21666,13 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_mlib_mlib_ImageSetStruct=yes -+if ac_fn_c_try_cpp "$LINENO"; then : -+ gdk_wchar_h=yes - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_mlib_mlib_ImageSetStruct=no -+ gdk_wchar_h=no - fi -+rm -f conftest.err conftest.$ac_ext -+if test $gdk_wchar_h = yes; then - +-fi +- -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext @@ -20294,44 +21682,18 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -$as_echo "$ac_cv_lib_mlib_mlib_ImageSetStruct" >&6; } -if test "x$ac_cv_lib_mlib_mlib_ImageSetStruct" = x""yes; then - use_mlib=yes -+$as_echo "#define HAVE_WCHAR_H 1" >>confdefs.h -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdk_wchar_h" >&5 -+$as_echo "$gdk_wchar_h" >&6; } -+ -+# Check for wctype.h (for iswalnum) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wctype.h" >&5 -+$as_echo_n "checking for wctype.h... " >&6; } -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+_ACEOF -+if ac_fn_c_try_cpp "$LINENO"; then : -+ gdk_wctype_h=yes - else +-else - use_mlib=no -+ gdk_wctype_h=no - fi -+rm -f conftest.err conftest.$ac_ext -+if test $gdk_wctype_h = yes; then - +-fi +- -if test $use_mlib = yes; then -+$as_echo "#define HAVE_WCTYPE_H 1" >>confdefs.h - +- -cat >>confdefs.h <<\_ACEOF -#define USE_MEDIALIB 1 -_ACEOF -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdk_wctype_h" >&5 -+$as_echo "$gdk_wctype_h" >&6; } - +- - MEDIA_LIB=-lmlib -+# in Solaris 2.5, `iswalnum' is in -lw -+GDK_WLIBS= -+ac_fn_c_check_func "$LINENO" "iswalnum" "ac_cv_func_iswalnum" -+if test "x$ac_cv_func_iswalnum" = x""yes; then : - +- - { $as_echo "$as_me:$LINENO: checking for mediaLib 2.5" >&5 -$as_echo_n "checking for mediaLib 2.5... " >&6; } - # Check for a mediaLib 2.5 function since that is what is needed for @@ -20339,39 +21701,32 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - { $as_echo "$as_me:$LINENO: checking for mlib_VideoColorRGBint_to_BGRAint in -lmlib" >&5 -$as_echo_n "checking for mlib_VideoColorRGBint_to_BGRAint in -lmlib... " >&6; } -if test "${ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint+set}" = set; then -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iswalnum in -lw" >&5 -+$as_echo_n "checking for iswalnum in -lw... " >&6; } -+if test "${ac_cv_lib_w_iswalnum+set}" = set; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS -LIBS="-lmlib $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+LIBS="-lw $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. -@@ -28231,705 +21186,545 @@ - #ifdef __cplusplus - extern "C" - #endif +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif -char mlib_VideoColorRGBint_to_BGRAint (); -+char iswalnum (); - int - main () - { +-int +-main () +-{ -return mlib_VideoColorRGBint_to_BGRAint (); -+return iswalnum (); - ; - return 0; - } - _ACEOF +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -20394,42 +21749,32 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=yes -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_w_iswalnum=yes - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=no -+ ac_cv_lib_w_iswalnum=no - fi +-fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi +-LIBS=$ac_check_lib_save_LIBS +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&5 -$as_echo "$ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&6; } -if test "x$ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" = x""yes; then - use_mlib25=yes -else - use_mlib25=no -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_w_iswalnum" >&5 -+$as_echo "$ac_cv_lib_w_iswalnum" >&6; } -+if test "x$ac_cv_lib_w_iswalnum" = x""yes; then : -+ GDK_WLIBS=-lw - fi - +-fi +- - if test $use_mlib25 = yes; then -+fi - +- -cat >>confdefs.h <<\_ACEOF -#define USE_MEDIALIB25 1 -_ACEOF - +- - fi -fi - if test $use_mlib = yes; then @@ -20439,51 +21784,16 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - USE_MEDIALIB_TRUE='#' - USE_MEDIALIB_FALSE= -fi -+oLIBS="$LIBS" -+LIBS="$LIBS $GDK_WLIBS" -+# The following is necessary for Linux libc-5.4.38 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if iswalnum() and friends are properly defined" >&5 -+$as_echo_n "checking if iswalnum() and friends are properly defined... " >&6; } -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main () -+{ - +- - if test $use_mlib25 = yes; then - USE_MEDIALIB25_TRUE= - USE_MEDIALIB25_FALSE='#' -+#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H)) -+# ifdef HAVE_WCTYPE_H -+# include -+# else -+# ifdef HAVE_WCHAR_H -+# include -+# endif -+# endif -+#else -+# define iswalnum(c) ((wchar_t)(c) <= 0xFF && isalnum(c)) -+#endif -+iswalnum((wchar_t) 0); -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ gdk_working_wctype=yes - else +-else - USE_MEDIALIB25_TRUE='#' - USE_MEDIALIB25_FALSE= -+ gdk_working_wctype=no - fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS="$oLIBS" - -+if test $gdk_working_wctype = no; then - +-fi +- +- -# Checks to see if we should compile in MMX support (there will be -# a runtime test when the code is actually run to see if it should -# be used - this just checks if we can compile it.) @@ -20517,26 +21827,15 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - (exit $ac_status); }; then - use_mmx_asm=yes - fi -+$as_echo "#define HAVE_BROKEN_WCTYPE 1" >>confdefs.h - +- - rm -rf conftest* -+ GDK_WLIBS= -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdk_working_wctype" >&5 -+$as_echo "$gdk_working_wctype" >&6; } - +- - ac_ext=$save_ac_ext - if test $use_mmx_asm = yes; then - +- -cat >>confdefs.h <<\_ACEOF -#define USE_MMX 1 -+# Check for uxtheme.h (for MS-Windows Engine) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uxtheme.h" >&5 -+$as_echo_n "checking for uxtheme.h... " >&6; } -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include - _ACEOF +-_ACEOF - - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } @@ -20549,42 +21848,26 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - if test x$use_mmx_asm = xyes; then - USE_MMX_TRUE= - USE_MMX_FALSE='#' -+if ac_fn_c_try_cpp "$LINENO"; then : -+ gtk_uxtheme_h=yes - else +-else - USE_MMX_TRUE='#' - USE_MMX_FALSE= -+ gtk_uxtheme_h=no - fi -+rm -f conftest.err conftest.$ac_ext -+if test $gtk_uxtheme_h = yes; then - -+$as_echo "#define HAVE_UXTHEME_H 1" >>confdefs.h - +-fi +- +- -REBUILD_PNGS= -if test -z "$LIBPNG" && test x"$os_win32" = xno -o x$enable_gdiplus = xno; then - REBUILD_PNGS=# - fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gtk_uxtheme_h" >&5 -+$as_echo "$gtk_uxtheme_h" >&6; } - -+# Checks for gdkspawn -+for ac_header in crt_externs.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "crt_externs.h" "ac_cv_header_crt_externs_h" "$ac_includes_default" -+if test "x$ac_cv_header_crt_externs_h" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_CRT_EXTERNS_H 1 -+_ACEOF - +-fi +- +- - if test $cross_compiling = yes; then - CROSS_COMPILING_TRUE= - CROSS_COMPILING_FALSE='#' -else - CROSS_COMPILING_TRUE='#' - CROSS_COMPILING_FALSE= - fi - +-fi +- - -if test $cross_compiling = yes; then - # Extract the first word of "gdk-pixbuf-csource", so it can be a program name with args. @@ -20610,7 +21893,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done +-done -done -IFS=$as_save_IFS - @@ -20626,15 +21909,8 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - -+for ac_func in _NSGetEnviron -+do : -+ ac_fn_c_check_func "$LINENO" "_NSGetEnviron" "ac_cv_func__NSGetEnviron" -+if test "x$ac_cv_func__NSGetEnviron" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE__NSGETENVIRON 1 -+_ACEOF - +- +- - # Extract the first word of "gtk-update-icon-cache", so it can be a program name with args. -set dummy gtk-update-icon-cache; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -20659,10 +21935,9 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - break 2 - fi -done -+fi - done +-done -IFS=$as_save_IFS - +- - test -z "$ac_cv_path_GTK_UPDATE_ICON_CACHE" && ac_cv_path_GTK_UPDATE_ICON_CACHE="no" - ;; -esac @@ -20675,26 +21950,13 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - +- +- - if test x$GTK_UPDATE_ICON_CACHE = xno; then - REBUILD_PNGS=# - fi -fi -+################################################## -+# Checks for gdk-pixbuf -+################################################## -+ -+ -+use_la_modules=false -+case $host in -+ *-aix*) use_la_modules=true -+esac -+ -+if $use_la_modules ; then -+ -+$as_echo "#define USE_LA_MODULES 1" >>confdefs.h - +- -if test ! -f $srcdir/gtk/gtkbuiltincache.h && - test "x$REBUILD_PNGS" = "x#" ; then - { { $as_echo "$as_me:$LINENO: error: @@ -20706,68 +21968,34 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -*** because you don't have libpng, or (when cross-compiling) you -*** don't have a prebuilt gtk-update-icon-cache on the build system." >&2;} - { (exit 1); exit 1; }; } - fi - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gmodulized gdk-pixbuf" >&5 -+$as_echo_n "checking whether to build gmodulized gdk-pixbuf... " >&6; } - +-fi +- +- +- -GDK_PIXBUF_PACKAGES="gmodule-no-export-2.0 gobject-2.0 gio-2.0" -GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB $MEDIA_LIB" -GDK_PIXBUF_EXTRA_CFLAGS= -GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" -GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS" -+# Check whether --enable-modules was given. -+if test "${enable_modules+set}" = set; then : -+ enableval=$enable_modules; -+fi - +- -######################################## -# Windowing system checks -######################################## - +- -GDK_PIXBUF_XLIB_PACKAGES= -GDK_PIXBUF_XLIB_EXTRA_CFLAGS= -GDK_PIXBUF_XLIB_EXTRA_LIBS= -+dynworks=false -+deps= -+if test x$enable_modules = xno; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether dynamic modules work" >&5 -+$as_echo_n "checking whether dynamic modules work... " >&6; } -+ ## for loop is to strip newline -+ tmp=`$PKG_CONFIG --variable=gmodule_supported gmodule-no-export-2.0` -+ for I in $tmp; do -+ dynworks=$I -+ done - +- -GDK_EXTRA_LIBS="$GDK_WLIBS" -GDK_EXTRA_CFLAGS= -+ if $dynworks; then -+ pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" -+ pixbuf_deplibs_check=`$pixbuf_libtool_config | \ -+ grep '^[a-z_]*check[a-z_]*_method=['\''"]' | \ -+ sed 's/.*['\''"]\(.*\)['\''"]$/\1/'` -+ if test "x$pixbuf_deplibs_check" = "xnone" || \ -+ test "x$pixbuf_deplibs_check" = "xunknown" || \ -+ test "x$pixbuf_deplibs_check" = "x"; then -+ dynworks=false -+ fi -+ fi - +- -# GTK+ uses some X calls, so needs to link against X directly -GTK_DEP_PACKAGES_FOR_X= -GTK_DEP_LIBS_FOR_X= -+ if $dynworks; then - +- -if test "x$gdktarget" = "xx11"; then - X_PACKAGES=fontconfig -+$as_echo "#define USE_GMODULE 1" >>confdefs.h - +- - # - # We use fontconfig very peripherally when decoding the default - # settings. @@ -20779,14 +22007,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -*** fontconfig (http://www.fontconfig.org) is required by the X11 backend." >&2;} - { (exit 1); exit 1; }; } - fi -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+ fi -+fi - +- - # - # Check for basic X packages; we use pkg-config if available - # @@ -20795,7 +22016,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - X_PACKAGES="$X_PACKAGES x11 xext xrender" - x_libs="`$PKG_CONFIG --libs x11 xext xrender`" - X_CFLAGS="`$PKG_CONFIG --cflags x11 xext xrender`" - +- - # Strip out any .la files that pkg-config might give us (this happens - # with -uninstalled.pc files) - x_libs_for_checks= @@ -20805,27 +22026,20 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - *) x_libs_for_checks="$x_libs_for_checks $I" ;; - esac - done - +- - GDK_PIXBUF_XLIB_PACKAGES="x11" - GTK_PACKAGES_FOR_X="x11" - else - have_base_x_pc=false - { $as_echo "$as_me:$LINENO: checking for X" >&5 -$as_echo_n "checking for X... " >&6; } -+# Check whether --with-libpng was given. -+if test "${with_libpng+set}" = set; then : -+ withval=$with_libpng; -+fi - - +- +- -# Check whether --with-x was given. -if test "${with_x+set}" = set; then - withval=$with_x; -+# Check whether --with-libjpeg was given. -+if test "${with_libjpeg+set}" = set; then : -+ withval=$with_libjpeg; - fi - +-fi +- -# $have_x is `yes', `no', `disabled', or empty when we do not yet know. -if test "x$with_x" = xno; then - # The user explicitly disabled X. @@ -20877,12 +22091,8 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - fi - cd .. - rm -f -r conftest.dir -+ -+# Check whether --with-libtiff was given. -+if test "${with_libtiff+set}" = set; then : -+ withval=$with_libtiff; - fi - +-fi +- -# Standard set of common directories for X headers. -# Check X11 before X11Rn because it is often a symlink to the current release. -ac_x_header_dirs=' @@ -20890,135 +22100,47 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -/usr/X11R6/include -/usr/X11R5/include -/usr/X11R4/include - +- -/usr/include/X11 -/usr/include/X11R6 -/usr/include/X11R5 -/usr/include/X11R4 -+# Check whether --with-libjasper was given. -+if test "${with_libjasper+set}" = set; then : -+ withval=$with_libjasper; -+fi - +- -/usr/local/X11/include -/usr/local/X11R6/include -/usr/local/X11R5/include -/usr/local/X11R4/include - +- -/usr/local/include/X11 -/usr/local/include/X11R6 -/usr/local/include/X11R5 -/usr/local/include/X11R4 -+# Check whether --enable-gdiplus was given. -+if test "${enable_gdiplus+set}" = set; then : -+ enableval=$enable_gdiplus; -+else -+ enable_gdiplus=no -+fi - +- -/usr/X386/include -/usr/x386/include -/usr/XFree86/include/X11 - +- -/usr/include -/usr/local/include -/usr/unsupported/include -/usr/athena/include -/usr/local/x11r5/include -/usr/lpp/Xamples/include -+ if test x$os_win32 = xyes && test x$enable_gdiplus != xno ; then -+ BUILD_GDIPLUS_LOADERS_TRUE= -+ BUILD_GDIPLUS_LOADERS_FALSE='#' -+else -+ BUILD_GDIPLUS_LOADERS_TRUE='#' -+ BUILD_GDIPLUS_LOADERS_FALSE= -+fi - +- -/usr/openwin/include -/usr/openwin/share/include' - +- -if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Xlib.h. - # First, try using that file with no special directory specified. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -+if test x$os_win32 = xno || test x$enable_gdiplus = xno; then -+ if test x$with_libtiff != xno && test -z "$LIBTIFF"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFReadRGBAImageOriented in -ltiff" >&5 -+$as_echo_n "checking for TIFFReadRGBAImageOriented in -ltiff... " >&6; } -+if test "${ac_cv_lib_tiff_TIFFReadRGBAImageOriented+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ltiff -lm $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char TIFFReadRGBAImageOriented (); -+int -+main () -+{ -+return TIFFReadRGBAImageOriented (); -+ ; -+ return 0; -+} - _ACEOF +-_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_tiff_TIFFReadRGBAImageOriented=yes -+else -+ ac_cv_lib_tiff_TIFFReadRGBAImageOriented=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFReadRGBAImageOriented" >&5 -+$as_echo "$ac_cv_lib_tiff_TIFFReadRGBAImageOriented" >&6; } -+if test "x$ac_cv_lib_tiff_TIFFReadRGBAImageOriented" = x""yes; then : -+ ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default" -+if test "x$ac_cv_header_tiffio_h" = x""yes; then : -+ TIFF='tiff'; LIBTIFF='-ltiff' -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 -+$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} -+fi -+ -+ -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFWriteScanline in -ltiff" >&5 -+$as_echo_n "checking for TIFFWriteScanline in -ltiff... " >&6; } -+if test "${ac_cv_lib_tiff_TIFFWriteScanline+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ltiff -ljpeg -lz -lm $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -#include -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char TIFFWriteScanline (); -+int -+main () -+{ -+return TIFFWriteScanline (); -+ ; -+ return 0; -+} - _ACEOF +-_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -21038,9 +22160,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - }; then - # We can compile using X headers with no special include directory. -ac_x_includes= -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_tiff_TIFFWriteScanline=yes - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - @@ -21050,26 +22170,11 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - break - fi -done -+ ac_cv_lib_tiff_TIFFWriteScanline=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFWriteScanline" >&5 -+$as_echo "$ac_cv_lib_tiff_TIFFWriteScanline" >&6; } -+if test "x$ac_cv_lib_tiff_TIFFWriteScanline" = x""yes; then : -+ ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default" -+if test "x$ac_cv_header_tiffio_h" = x""yes; then : -+ TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz' -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 -+$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} - fi - +-fi +- -rm -f conftest.err conftest.$ac_ext -fi # $ac_x_includes = no - +- -if test "$ac_x_libraries" = no; then - # Check for the libraries. - # See if we find them without any special options. @@ -21081,34 +22186,16 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFFlushData in -ltiff34" >&5 -+$as_echo_n "checking for TIFFFlushData in -ltiff34... " >&6; } -+if test "${ac_cv_lib_tiff34_TIFFFlushData+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ltiff34 -ljpeg -lz -lm $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -#include -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char TIFFFlushData (); - int - main () - { +-int +-main () +-{ -XrmInitialize () -+return TIFFFlushData (); - ; - return 0; - } - _ACEOF +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -21133,9 +22220,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - LIBS=$ac_save_LIBS -# We can link X programs with no special library path. -ac_x_libraries= -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_tiff34_TIFFFlushData=yes - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - @@ -21150,28 +22235,13 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - fi - done -done -+ ac_cv_lib_tiff34_TIFFFlushData=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff34_TIFFFlushData" >&5 -+$as_echo "$ac_cv_lib_tiff34_TIFFFlushData" >&6; } -+if test "x$ac_cv_lib_tiff34_TIFFFlushData" = x""yes; then : -+ ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default" -+if test "x$ac_cv_header_tiffio_h" = x""yes; then : -+ TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz' -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 -+$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} - fi - +-fi +- -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi # $ac_x_libraries = no - +- -case $ac_x_includes,$ac_x_libraries in #( - no,* | *,no | *\'*) - # Didn't find X, or a directory has "'" in its name. @@ -21182,16 +22252,13 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - ac_x_includes='$ac_x_includes'\ - ac_x_libraries='$ac_x_libraries'" -esac -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** TIFF loader will not be built (TIFF library not found) ***" >&5 -+$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF library not found) ***" >&2;} - fi +-fi -;; #( - *) have_x=yes;; - esac - eval "$ac_cv_have_x" -fi # $with_x != no - +- -if test "$have_x" != yes; then - { $as_echo "$as_me:$LINENO: result: $have_x" >&5 -$as_echo "$have_x" >&6; } @@ -21206,29 +22273,21 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - ac_x_libraries='$x_libraries'" - { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 -$as_echo "libraries $x_libraries, headers $x_includes" >&6; } - fi - +-fi +- -if test "$no_x" = yes; then - # Not all programs may use this symbol, but it does not hurt to define it. -+fi - +- -cat >>confdefs.h <<\_ACEOF -#define X_DISPLAY_MISSING 1 -_ACEOF -+ fi - +- - X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= -else - if test -n "$x_includes"; then - X_CFLAGS="$X_CFLAGS -I$x_includes" -+ if test x$with_libtiff != xno && test -z "$LIBTIFF"; then -+ as_fn_error " -+*** Checks for TIFF loader failed. You can build without it by passing -+*** --without-libtiff to configure but some programs using GTK+ may -+*** not work properly" "$LINENO" 5 - fi -+fi - +- fi +- - # It would also be nice to do this for all -L options, not just this one. - if test -n "$x_libraries"; then - X_LIBS="$X_LIBS -L$x_libraries" @@ -21244,34 +22303,16 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+if test x$os_win32 = xno || test x$enable_gdiplus = xno; then -+ if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_destroy_decompress in -ljpeg" >&5 -+$as_echo_n "checking for jpeg_destroy_decompress in -ljpeg... " >&6; } -+if test "${ac_cv_lib_jpeg_jpeg_destroy_decompress+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ljpeg $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char jpeg_destroy_decompress (); - int - main () - { +-/* end confdefs.h. */ - -+return jpeg_destroy_decompress (); - ; - return 0; - } - _ACEOF +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -21296,79 +22337,26 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - X_LIBS="$X_LIBS -R$x_libraries" -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_jpeg_jpeg_destroy_decompress=yes - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ ac_cv_lib_jpeg_jpeg_destroy_decompress=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5 -+$as_echo "$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6; } -+if test "x$ac_cv_lib_jpeg_jpeg_destroy_decompress" = x""yes; then : -+ jpeg_ok=yes -+else -+ jpeg_ok=no -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** JPEG loader will not be built (JPEG library not found) ***" >&5 -+$as_echo "$as_me: WARNING: *** JPEG loader will not be built (JPEG library not found) ***" >&2;} -+fi - +- - LIBS="$ac_xsave_LIBS -R $x_libraries" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -+ if test "$jpeg_ok" = yes; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeglib.h" >&5 -+$as_echo_n "checking for jpeglib.h... " >&6; } -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+#undef PACKAGE -+#undef VERSION -+#undef HAVE_STDLIB_H -+#include - _ACEOF +-_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+if ac_fn_c_try_cpp "$LINENO"; then : -+ jpeg_ok=yes -+else -+ jpeg_ok=no -+fi -+rm -f conftest.err conftest.$ac_ext -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jpeg_ok" >&5 -+$as_echo "$jpeg_ok" >&6; } -+ if test "$jpeg_ok" = yes; then -+ LIBJPEG='-ljpeg' -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_simple_progression in -ljpeg" >&5 -+$as_echo_n "checking for jpeg_simple_progression in -ljpeg... " >&6; } -+if test "${ac_cv_lib_jpeg_jpeg_simple_progression+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ljpeg $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char jpeg_simple_progression (); - int - main () - { +-/* end confdefs.h. */ - -+return jpeg_simple_progression (); - ; - return 0; - } - _ACEOF +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -21393,57 +22381,30 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - X_LIBS="$X_LIBS -R $x_libraries" -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_jpeg_jpeg_simple_progression=yes - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: neither works" >&5 -$as_echo "neither works" >&6; } -+ ac_cv_lib_jpeg_jpeg_simple_progression=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS - fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_simple_progression" >&5 -+$as_echo "$ac_cv_lib_jpeg_jpeg_simple_progression" >&6; } -+if test "x$ac_cv_lib_jpeg_jpeg_simple_progression" = x""yes; then : - +-fi +- -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -+$as_echo "#define HAVE_PROGRESSIVE_JPEG 1" >>confdefs.h -+ -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: JPEG library does not support progressive saving." >&5 -+$as_echo "$as_me: WARNING: JPEG library does not support progressive saving." >&2;} - fi - +-fi +- -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - ac_c_werror_flag=$ac_xsave_c_werror_flag - LIBS=$ac_xsave_LIBS -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** JPEG loader will not be built (JPEG header file not found) ***" >&5 -+$as_echo "$as_me: WARNING: *** JPEG loader will not be built (JPEG header file not found) ***" >&2;} -+ fi -+ fi - fi - +- fi +- - # Check for system-dependent libraries X programs must link with. - # Do this before checking for the system-independent R6 libraries - # (-lICE), since we may need -lsocket or whatever for X linking. -+ if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then -+ as_fn_error " -+*** Checks for JPEG loader failed. You can build without it by passing -+*** --without-libjpeg to configure but some programs using GTK+ may -+*** not work properly" "$LINENO" 5 -+ fi -+fi - +- - if test "$ISC" = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" - else @@ -21456,44 +22417,23 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ if test x$with_libpng != xno && test -z "$LIBPNG"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng12" >&5 -+$as_echo_n "checking for libpng12... " >&6; } -+ if $PKG_CONFIG --exists libpng12 ; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } -+ PNG='png' -+ PNG_DEP_CFLAGS_PACKAGES=libpng12 -+ LIBPNG=`$PKG_CONFIG --libs libpng12` -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_read_info in -lpng" >&5 -+$as_echo_n "checking for png_read_info in -lpng... " >&6; } -+if test "${ac_cv_lib_png_png_read_info+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lpng -lz -lm $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. -@@ -28938,53 +21733,92 @@ - #ifdef __cplusplus - extern "C" - #endif +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif -char XOpenDisplay (); -+char png_read_info (); - int - main () - { +-int +-main () +-{ -return XOpenDisplay (); -+return png_read_info (); - ; - return 0; - } - _ACEOF +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -21516,112 +22456,39 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_test_x conftest$ac_exeext - }; then - : -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_png_png_read_info=yes - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ ac_cv_lib_png_png_read_info=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_read_info" >&5 -+$as_echo "$ac_cv_lib_png_png_read_info" >&6; } -+if test "x$ac_cv_lib_png_png_read_info" = x""yes; then : -+ ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default" -+if test "x$ac_cv_header_png_h" = x""yes; then : -+ png_ok=yes -+else -+ png_ok=no -+fi - +- - { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 -$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } -if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then -+ -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&5 -+$as_echo "$as_me: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&2;} -+fi -+ -+ if test "$png_ok" = yes; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_structp in png.h" >&5 -+$as_echo_n "checking for png_structp in png.h... " >&6; } -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main () -+{ -+png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ png_ok=yes -+else -+ png_ok=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $png_ok" >&5 -+$as_echo "$png_ok" >&6; } -+ if test "$png_ok" = yes; then -+ PNG='png'; LIBPNG='-lpng -lz' -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** PNG loader will not be built (PNG library is too old) ***" >&5 -+$as_echo "$as_me: WARNING: *** PNG loader will not be built (PNG library is too old) ***" >&2;} -+ fi -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** PNG loader will not be built (PNG header file not found) ***" >&5 -+$as_echo "$as_me: WARNING: *** PNG loader will not be built (PNG header file not found) ***" >&2;} -+ fi -+ fi -+ fi -+ -+ if test x$with_libpng != xno && test -z "$LIBPNG"; then -+ as_fn_error " -+*** Checks for PNG loader failed. You can build without it by passing -+*** --without-libpng to configure but many programs using GTK+ will -+*** not work properly. The PNG loader is also needed if you are compiling -+*** from CVS." "$LINENO" 5 -+ fi -+ -+ if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jas_init in -ljasper" >&5 -+$as_echo_n "checking for jas_init in -ljasper... " >&6; } -+if test "${ac_cv_lib_jasper_jas_init+set}" = set; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS -LIBS="-ldnet $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+LIBS="-ljasper -ljpeg $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. -@@ -28993,794 +21827,663 @@ - #ifdef __cplusplus - extern "C" - #endif +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif -char dnet_ntoa (); -+char jas_init (); - int - main () - { +-int +-main () +-{ -return dnet_ntoa (); -+return jas_init (); - ; - return 0; - } - _ACEOF +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -21644,233 +22511,30 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_dnet_dnet_ntoa=yes -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_jasper_jas_init=yes -+else -+ ac_cv_lib_jasper_jas_init=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jasper_jas_init" >&5 -+$as_echo "$ac_cv_lib_jasper_jas_init" >&6; } -+if test "x$ac_cv_lib_jasper_jas_init" = x""yes; then : -+ LIBJASPER=-ljasper -+fi -+ -+ fi -+ -+ if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then -+ as_fn_error " -+*** Checks for JPEG2000 loader failed. You can build without it by passing -+*** --without-libjasper to configure" "$LINENO" 5 -+ fi -+ -+ -+ -+ -+ -+ -+ if $dynworks; then -+ BUILD_DYNAMIC_MODULES_TRUE= -+ BUILD_DYNAMIC_MODULES_FALSE='#' -+else -+ BUILD_DYNAMIC_MODULES_TRUE='#' -+ BUILD_DYNAMIC_MODULES_FALSE= -+fi -+ -+ -+# -+# Allow building some or all gdk-pixbuf loaders included -+# -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pixbuf loaders to build" >&5 -+$as_echo_n "checking pixbuf loaders to build... " >&6; } -+ -+ -+# Check whether --with-included_loaders was given. -+if test "${with_included_loaders+set}" = set; then : -+ withval=$with_included_loaders; -+fi -+ -+ -+if $dynworks; then -+ : -+else -+ ## if the option was specified, leave it; otherwise disable included loaders -+ if test x$with_included_loaders = xno; then -+ with_included_loaders=yes -+ fi -+fi -+ -+# Use the traditional png loader instead of the GDI+ one on Windows, -+# because some important apps like GIMP need to read and write -+# arbitrary tEXt chunks which doesn't seem to be possible through GDI+ -+ -+all_loaders="ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm" -+if test x$with_libjasper != xno; then -+ all_loaders="$all_loaders,jasper" -+fi -+if test x$os_win32 = xyes && test x$enable_gdiplus != xno; then -+ # Skip PNG, see comment above -+ gdip_formats="bmp emf gif ico jpeg tiff wmf" -+ for f in $gdip_formats; do -+ all_loaders="$all_loaders,gdip-$f" -+ done -+else -+ all_loaders="$all_loaders,bmp,gif,ico,jpeg,tiff" -+fi -+included_loaders="" -+# If no loaders specified, include all -+if test "x$with_included_loaders" = xyes ; then -+ included_loaders="$all_loaders" -+else -+ included_loaders="$with_included_loaders" -+fi -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $included_loaders" >&5 -+$as_echo "$included_loaders" >&6; } -+ -+INCLUDED_LOADER_OBJ= -+INCLUDED_LOADER_DEFINE= -+ -+IFS="${IFS= }"; gtk_save_ifs="$IFS"; IFS="," -+for loader in $included_loaders; do -+ if echo "$all_loaders" | egrep "(^|,)$loader(\$|,)" > /dev/null; then -+ : -+ else -+ as_fn_error "the specified loader $loader does not exist" "$LINENO" 5 -+ fi -+ -+ loader_underscores=`echo $loader | sed -e 's/-/_/g'` -+ INCLUDED_LOADER_OBJ="$INCLUDED_LOADER_OBJ libstatic-pixbufloader-$loader.la" -+ -+ # Don't bother defining separate -DINCLUDE_gdip_foo for each gdip-foo loader -+ case $loader in -+ gdip-*) ;; -+ *) INCLUDED_LOADER_DEFINE="$INCLUDED_LOADER_DEFINE -DINCLUDE_$loader_underscores";; -+ esac -+ eval INCLUDE_$loader_underscores=yes -+done -+ -+# Just define one -DINCLUDE_gdiplus for all the gdip-foo loaders -+# (except gdip-png, which isn't built at all) -+if test x"$INCLUDE_gdip_ico" = xyes; then -+ INCLUDED_LOADER_DEFINE="$INCLUDED_LOADER_DEFINE -DINCLUDE_gdiplus" -+fi -+ -+IFS="$gtk_save_ifs" -+ -+ -+ -+ if test x"$INCLUDE_png" = xyes; then -+ INCLUDE_PNG_TRUE= -+ INCLUDE_PNG_FALSE='#' -+else -+ INCLUDE_PNG_TRUE='#' -+ INCLUDE_PNG_FALSE= -+fi -+ -+ if test x"$INCLUDE_bmp" = xyes; then -+ INCLUDE_BMP_TRUE= -+ INCLUDE_BMP_FALSE='#' -+else -+ INCLUDE_BMP_TRUE='#' -+ INCLUDE_BMP_FALSE= -+fi -+ -+ if test x"$INCLUDE_wbmp" = xyes; then -+ INCLUDE_WBMP_TRUE= -+ INCLUDE_WBMP_FALSE='#' -+else -+ INCLUDE_WBMP_TRUE='#' -+ INCLUDE_WBMP_FALSE= -+fi -+ -+ if test x"$INCLUDE_gif" = xyes; then -+ INCLUDE_GIF_TRUE= -+ INCLUDE_GIF_FALSE='#' -+else -+ INCLUDE_GIF_TRUE='#' -+ INCLUDE_GIF_FALSE= -+fi -+ -+ if test x"$INCLUDE_ico" = xyes; then -+ INCLUDE_ICO_TRUE= -+ INCLUDE_ICO_FALSE='#' -+else -+ INCLUDE_ICO_TRUE='#' -+ INCLUDE_ICO_FALSE= -+fi -+ -+ if test x"$INCLUDE_ani" = xyes; then -+ INCLUDE_ANI_TRUE= -+ INCLUDE_ANI_FALSE='#' -+else -+ INCLUDE_ANI_TRUE='#' -+ INCLUDE_ANI_FALSE= -+fi -+ -+ if test x"$INCLUDE_jpeg" = xyes; then -+ INCLUDE_JPEG_TRUE= -+ INCLUDE_JPEG_FALSE='#' -+else -+ INCLUDE_JPEG_TRUE='#' -+ INCLUDE_JPEG_FALSE= -+fi -+ -+ if test x"$INCLUDE_pnm" = xyes; then -+ INCLUDE_PNM_TRUE= -+ INCLUDE_PNM_FALSE='#' - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ INCLUDE_PNM_TRUE='#' -+ INCLUDE_PNM_FALSE= -+fi - +- - ac_cv_lib_dnet_dnet_ntoa=no -+ if test x"$INCLUDE_ras" = xyes; then -+ INCLUDE_RAS_TRUE= -+ INCLUDE_RAS_FALSE='#' -+else -+ INCLUDE_RAS_TRUE='#' -+ INCLUDE_RAS_FALSE= - fi - +-fi +- -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -+ if test x"$INCLUDE_tiff" = xyes; then -+ INCLUDE_TIFF_TRUE= -+ INCLUDE_TIFF_FALSE='#' -+else -+ INCLUDE_TIFF_TRUE='#' -+ INCLUDE_TIFF_FALSE= - fi +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } -if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" -+ -+ if test x"$INCLUDE_xpm" = xyes; then -+ INCLUDE_XPM_TRUE= -+ INCLUDE_XPM_FALSE='#' -+else -+ INCLUDE_XPM_TRUE='#' -+ INCLUDE_XPM_FALSE= - fi - +-fi +- - if test $ac_cv_lib_dnet_dnet_ntoa = no; then - { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 -$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } -if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then - $as_echo_n "(cached) " >&6 -+ if test x"$INCLUDE_xbm" = xyes; then -+ INCLUDE_XBM_TRUE= -+ INCLUDE_XBM_FALSE='#' - else +-else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldnet_stub $LIBS" -cat >conftest.$ac_ext <<_ACEOF @@ -21879,10 +22543,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -+ INCLUDE_XBM_TRUE='#' -+ INCLUDE_XBM_FALSE= -+fi - +- -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ @@ -21920,65 +22581,32 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_dnet_stub_dnet_ntoa=yes -+ if test x"$INCLUDE_tga" = xyes; then -+ INCLUDE_TGA_TRUE= -+ INCLUDE_TGA_FALSE='#' - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ INCLUDE_TGA_TRUE='#' -+ INCLUDE_TGA_FALSE= -+fi - +- - ac_cv_lib_dnet_stub_dnet_ntoa=no -+ if test x"$INCLUDE_pcx" = xyes; then -+ INCLUDE_PCX_TRUE= -+ INCLUDE_PCX_FALSE='#' -+else -+ INCLUDE_PCX_TRUE='#' -+ INCLUDE_PCX_FALSE= - fi - +-fi +- -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -+ if test x"$INCLUDE_icns" = xyes; then -+ INCLUDE_ICNS_TRUE= -+ INCLUDE_ICNS_FALSE='#' -+else -+ INCLUDE_ICNS_TRUE='#' -+ INCLUDE_ICNS_FALSE= - fi +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } -if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" -+ -+ if test x"$INCLUDE_jasper" = xyes; then -+ INCLUDE_JASPER_TRUE= -+ INCLUDE_JASPER_FALSE='#' -+else -+ INCLUDE_JASPER_TRUE='#' -+ INCLUDE_JASPER_FALSE= - fi - +-fi +- - fi -+# As all GDI+ loaders are either built-in or not, arbitrarily just -+# check one of the variables here -+ if test x"$INCLUDE_gdip_ico" = xyes; then -+ INCLUDE_GDIPLUS_TRUE= -+ INCLUDE_GDIPLUS_FALSE='#' -+else -+ INCLUDE_GDIPLUS_TRUE='#' -+ INCLUDE_GDIPLUS_FALSE= - fi - +-fi +- -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$ac_xsave_LIBS" - +- - # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, - # to get the SysV transport functions. - # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4) @@ -21991,26 +22619,13 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -$as_echo_n "checking for gethostbyname... " >&6; } -if test "${ac_cv_func_gethostbyname+set}" = set; then - $as_echo_n "(cached) " >&6 -+if test x$gio_can_sniff = x; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if gio can sniff png" >&5 -+$as_echo_n "checking if gio can sniff png... " >&6; } -+ gtk_save_LIBS="$LIBS" -+ gtk_save_CFLAGS="$CFLAGS" -+ LIBS="`$PKG_CONFIG --libs gio-2.0`" -+ CFLAGS="`$PKG_CONFIG --cflags gio-2.0`" -+ if test "$cross_compiling" = yes; then : -+ { { $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 run test program while cross compiling -+See \`config.log' for more details." "$LINENO" 5; } - else +-else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -/* Define gethostbyname to an innocuous variant, in case declares gethostbyname. - For example, HP-UX 11i declares gettimeofday. */ -#define gethostbyname innocuous_gethostbyname @@ -22025,40 +22640,9 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -#else -# include -#endif - +- -#undef gethostbyname -+ #include -+ static const gsize data_size = 159; -+ static const guint8 data[] = -+ { -+ 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, -+ 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, -+ 0x08, 0x02, 0x00, 0x00, 0x00, 0x90, 0x77, 0x53, 0xde, 0x00, 0x00, 0x00, -+ 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00, -+ 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00, -+ 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74, -+ 0x49, 0x4d, 0x45, 0x07, 0xd8, 0x07, 0x0f, 0x10, 0x08, 0x15, 0x61, 0xd8, -+ 0x35, 0x37, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f, -+ 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, -+ 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0x57, -+ 0x81, 0x0e, 0x17, 0x00, 0x00, 0x00, 0x0c, 0x49, 0x44, 0x41, 0x54, 0x08, -+ 0xd7, 0x63, 0xf8, 0xff, 0xff, 0x3f, 0x00, 0x05, 0xfe, 0x02, 0xfe, 0xdc, -+ 0xcc, 0x59, 0xe7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, -+ 0x42, 0x60, 0x82 -+ }; -+ int -+ main (int argc, char **argv) -+ { -+ char *content_type; -+ char *image_png; -+ content_type = g_content_type_guess (NULL, data, data_size, NULL); -+ image_png = g_content_type_from_mime_type ("image/png"); -+ return !!strcmp (content_type, image_png); -+ } -+_ACEOF -+if ac_fn_c_try_run "$LINENO"; then : -+ gio_can_sniff=yes - +- -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ @@ -22072,8 +22656,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -#if defined __stub_gethostbyname || defined __stub___gethostbyname -choke me -#endif -+$as_echo "#define GDK_PIXBUF_USE_GIO_MIME 1" >>confdefs.h - +- -int -main () -{ @@ -22104,28 +22687,20 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_gethostbyname=yes - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_gethostbyname=no -+ gio_can_sniff=no -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext - fi - +-fi +- -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gio_can_sniff" >&5 -+$as_echo "$gio_can_sniff" >&6; } -+ LIBS="$gtk_save_LIBS" -+ CFLAGS="$gtk_save_CFLAGS" - fi +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 -$as_echo "$ac_cv_func_gethostbyname" >&6; } - +- - if test $ac_cv_func_gethostbyname = no; then - { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 -$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } @@ -22140,18 +22715,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -+# -+# Allow building some or all immodules included -+# -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking immodules to build" >&5 -+$as_echo_n "checking immodules to build... " >&6; } -+ -+ -+# Check whether --with-included_immodules was given. -+if test "${with_included_immodules+set}" = set; then : -+ withval=$with_included_immodules; -+fi - +- -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ @@ -22192,44 +22756,27 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +- - ac_cv_lib_nsl_gethostbyname=no -+if $dynworks; then -+ : -+else -+ ## if the option was specified, leave it; otherwise disable included immodules -+ if test x$with_included_immodules = xno; then -+ with_included_immodules=yes -+ fi - fi - +-fi +- -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -+all_immodules="am-et,cedilla,cyrillic-translit" -+if test "$gdktarget" = "win32"; then -+ all_immodules="${all_immodules},ime" - fi +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 -$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } -if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" -+all_immodules="${all_immodules},inuktitut,ipa,multipress,thai,ti-er,ti-et,viqr" -+if test "$gdktarget" = "x11"; then -+ all_immodules="${all_immodules},xim" - fi - +-fi +- - if test $ac_cv_lib_nsl_gethostbyname = no; then - { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 -$as_echo_n "checking for gethostbyname in -lbsd... " >&6; } -if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then - $as_echo_n "(cached) " >&6 -+included_immodules="" -+# If the switch specified without listing any specific ones, include all -+if test "x$with_included_immodules" = xyes ; then -+ included_immodules="$all_immodules" - else +-else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lbsd $LIBS" -cat >conftest.$ac_ext <<_ACEOF @@ -22238,9 +22785,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -+ included_immodules="$with_included_immodules" -+fi - +- -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ @@ -22278,20 +22823,13 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_bsd_gethostbyname=yes -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $included_immodules" >&5 -+$as_echo "$included_immodules" >&6; } -+ if test "x$included_immodules" != x; then -+ HAVE_INCLUDED_IMMMODULES_TRUE= -+ HAVE_INCLUDED_IMMMODULES_FALSE='#' - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_bsd_gethostbyname=no -+ HAVE_INCLUDED_IMMMODULES_TRUE='#' -+ HAVE_INCLUDED_IMMMODULES_FALSE= - fi - +-fi +- -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext @@ -22302,12 +22840,10 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" -fi - +- - fi - fi -+INCLUDED_IMMODULE_OBJ= -+INCLUDED_IMMODULE_DEFINE= - +- - # lieder@skyler.mavd.honeywell.com says without -lsocket, - # socket/setsockopt and other routines are undefined under SCO ODT - # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary @@ -22329,33 +22865,20 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -/* Define connect to an innocuous variant, in case declares connect. - For example, HP-UX 11i declares gettimeofday. */ -#define connect innocuous_connect -+IFS="${IFS= }"; gtk_save_ifs="$IFS"; IFS="," -+for immodule in $included_immodules; do -+ immodule_underscores=`echo $immodule | sed -e 's/-/_/g'` -+ if echo "$all_immodules" | egrep "(^|,)$immodule(\$|,)" > /dev/null; then -+ : -+ else -+ as_fn_error "the specified input method $immodule does not exist" "$LINENO" 5 -+ fi - +- -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char connect (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -+ INCLUDED_IMMODULE_OBJ="$INCLUDED_IMMODULE_OBJ ../modules/input/libstatic-im-$immodule.la" -+ INCLUDED_IMMODULE_DEFINE="$INCLUDED_IMMODULE_DEFINE -DINCLUDE_IM_$immodule_underscores" -+ eval INCLUDE_$immodule_underscores=yes -+done -+IFS="$gtk_save_ifs" - +- -#ifdef __STDC__ -# include -#else -# include -#endif - +- -#undef connect - +- -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ @@ -22369,14 +22892,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -#if defined __stub_connect || defined __stub___connect -choke me -#endif -+ if test x"$INCLUDE_am_et" = xyes; then -+ INCLUDE_IM_AM_ET_TRUE= -+ INCLUDE_IM_AM_ET_FALSE='#' -+else -+ INCLUDE_IM_AM_ET_TRUE='#' -+ INCLUDE_IM_AM_ET_FALSE= -+fi - +- -int -main () -{ @@ -22407,47 +22923,26 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_connect=yes -+ if test x"$INCLUDE_cedilla" = xyes; then -+ INCLUDE_IM_CEDILLA_TRUE= -+ INCLUDE_IM_CEDILLA_FALSE='#' - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ INCLUDE_IM_CEDILLA_TRUE='#' -+ INCLUDE_IM_CEDILLA_FALSE= -+fi - +- - ac_cv_func_connect=no -+ if test x"$INCLUDE_cyrillic_translit" = xyes; then -+ INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE= -+ INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE='#' -+else -+ INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE='#' -+ INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE= - fi - +-fi +- -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -+ if test x"$INCLUDE_ime" = xyes; then -+ INCLUDE_IM_IME_TRUE= -+ INCLUDE_IM_IME_FALSE='#' -+else -+ INCLUDE_IM_IME_TRUE='#' -+ INCLUDE_IM_IME_FALSE= - fi +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 -$as_echo "$ac_cv_func_connect" >&6; } - +- - if test $ac_cv_func_connect = no; then - { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 -$as_echo_n "checking for connect in -lsocket... " >&6; } -if test "${ac_cv_lib_socket_connect+set}" = set; then - $as_echo_n "(cached) " >&6 -+ if test x"$INCLUDE_inuktitut" = xyes; then -+ INCLUDE_IM_INUKTITUT_TRUE= -+ INCLUDE_IM_INUKTITUT_FALSE='#' - else +-else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsocket $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF @@ -22456,10 +22951,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -+ INCLUDE_IM_INUKTITUT_TRUE='#' -+ INCLUDE_IM_INUKTITUT_FALSE= -+fi - +- -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ @@ -22497,91 +22989,38 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_socket_connect=yes -+ if test x"$INCLUDE_ipa" = xyes; then -+ INCLUDE_IM_IPA_TRUE= -+ INCLUDE_IM_IPA_FALSE='#' - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ INCLUDE_IM_IPA_TRUE='#' -+ INCLUDE_IM_IPA_FALSE= -+fi - +- - ac_cv_lib_socket_connect=no -+ if test x"$INCLUDE_multipress" = xyes; then -+ INCLUDE_IM_MULTIPRESS_TRUE= -+ INCLUDE_IM_MULTIPRESS_FALSE='#' -+else -+ INCLUDE_IM_MULTIPRESS_TRUE='#' -+ INCLUDE_IM_MULTIPRESS_FALSE= - fi - +-fi +- -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -+ if test x"$INCLUDE_thai" = xyes; then -+ INCLUDE_IM_THAI_TRUE= -+ INCLUDE_IM_THAI_FALSE='#' -+else -+ INCLUDE_IM_THAI_TRUE='#' -+ INCLUDE_IM_THAI_FALSE= - fi +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 -$as_echo "$ac_cv_lib_socket_connect" >&6; } -if test "x$ac_cv_lib_socket_connect" = x""yes; then - X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" -+ -+ if test x"$INCLUDE_ti_er" = xyes; then -+ INCLUDE_IM_TI_ER_TRUE= -+ INCLUDE_IM_TI_ER_FALSE='#' -+else -+ INCLUDE_IM_TI_ER_TRUE='#' -+ INCLUDE_IM_TI_ER_FALSE= -+fi -+ -+ if test x"$INCLUDE_ti_et" = xyes; then -+ INCLUDE_IM_TI_ET_TRUE= -+ INCLUDE_IM_TI_ET_FALSE='#' -+else -+ INCLUDE_IM_TI_ET_TRUE='#' -+ INCLUDE_IM_TI_ET_FALSE= -+fi -+ -+ if test x"$INCLUDE_viqr" = xyes; then -+ INCLUDE_IM_VIQR_TRUE= -+ INCLUDE_IM_VIQR_FALSE='#' -+else -+ INCLUDE_IM_VIQR_TRUE='#' -+ INCLUDE_IM_VIQR_FALSE= -+fi -+ -+ if test x"$INCLUDE_xim" = xyes; then -+ INCLUDE_IM_XIM_TRUE= -+ INCLUDE_IM_XIM_FALSE='#' -+else -+ INCLUDE_IM_XIM_TRUE='#' -+ INCLUDE_IM_XIM_FALSE= - fi - +-fi +- - fi - +- - # Guillermo Gomez says -lposix is necessary on A/UX. - { $as_echo "$as_me:$LINENO: checking for remove" >&5 -$as_echo_n "checking for remove... " >&6; } -if test "${ac_cv_func_remove+set}" = set; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5 -+$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } -+if test "${ac_cv_header_sys_wait_h+set}" = set; then : - $as_echo_n "(cached) " >&6 - else +- $as_echo_n "(cached) " >&6 +-else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -/* Define remove to an innocuous variant, in case declares remove. - For example, HP-UX 11i declares gettimeofday. */ -#define remove innocuous_remove @@ -22604,32 +23043,23 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -+#include -+#include -+#ifndef WEXITSTATUS -+# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8) - #endif +-#endif -char remove (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_remove || defined __stub___remove -choke me -+#ifndef WIFEXITED -+# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) - #endif - - int - main () - { +-#endif +- +-int +-main () +-{ -return remove (); -+ int s; -+ wait (&s); -+ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; - ; - return 0; - } - _ACEOF +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -22652,40 +23082,26 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_remove=yes -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_header_sys_wait_h=yes - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_remove=no -+ ac_cv_header_sys_wait_h=no - fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5 -+$as_echo "$ac_cv_header_sys_wait_h" >&6; } -+if test $ac_cv_header_sys_wait_h = yes; then -+ -+$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h - +-fi +- -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 -$as_echo "$ac_cv_func_remove" >&6; } - +- - if test $ac_cv_func_remove = no; then - { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5 -$as_echo_n "checking for remove in -lposix... " >&6; } -if test "${ac_cv_lib_posix_remove+set}" = set; then -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 -+$as_echo_n "checking return type of signal handlers... " >&6; } -+if test "${ac_cv_type_signal+set}" = set; then : - $as_echo_n "(cached) " >&6 - else +- $as_echo_n "(cached) " >&6 +-else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lposix $LIBS" -cat >conftest.$ac_ext <<_ACEOF @@ -22693,11 +23109,8 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -+#include -+#include - +-/* end confdefs.h. */ +- -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ @@ -22705,14 +23118,25 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -extern "C" -#endif -char remove (); - int - main () - { +-int +-main () +-{ -return remove (); -+return *(signal (0, 0)) (0) == 1; - ; - return 0; - } +- ; +- return 0; +-} ++ # One or both of the vars are not set, and there is no cached value. ++ac_x_includes=no ac_x_libraries=no ++rm -f -r conftest.dir ++if mkdir conftest.dir; then ++ cd conftest.dir ++ cat >Imakefile <<'_ACEOF' ++incroot: ++ @echo incroot='${INCROOT}' ++usrlibdir: ++ @echo usrlibdir='${USRLIBDIR}' ++libdir: ++ @echo libdir='${LIBDIR}' _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" @@ -22736,87 +23160,58 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_posix_remove=yes -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_type_signal=int - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ ac_cv_type_signal=void -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5 -+$as_echo "$ac_cv_type_signal" >&6; } -+ -+cat >>confdefs.h <<_ACEOF -+#define RETSIGTYPE $ac_cv_type_signal -+_ACEOF -+ -+ - +- - ac_cv_lib_posix_remove=no -+ if test "x$LIBTIFF" != x; then -+ HAVE_TIFF_TRUE= -+ HAVE_TIFF_FALSE='#' -+else -+ HAVE_TIFF_TRUE='#' -+ HAVE_TIFF_FALSE= - fi - +-fi +- -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -+ if test "x$LIBPNG" != x; then -+ HAVE_PNG_TRUE= -+ HAVE_PNG_FALSE='#' -+else -+ HAVE_PNG_TRUE='#' -+ HAVE_PNG_FALSE= - fi +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 -$as_echo "$ac_cv_lib_posix_remove" >&6; } -if test "x$ac_cv_lib_posix_remove" = x""yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" -+ -+ if test "x$LIBJPEG" != x; then -+ HAVE_JPEG_TRUE= -+ HAVE_JPEG_FALSE='#' -+else -+ HAVE_JPEG_TRUE='#' -+ HAVE_JPEG_FALSE= ++ 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. ++ 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 ++ # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. ++ for ac_extension in a so sl dylib la dll; do ++ if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && ++ test -f "$ac_im_libdir/libX11.$ac_extension"; then ++ ac_im_usrlibdir=$ac_im_libdir; break ++ fi ++ done ++ # Screen out bogus values from the imake configuration. They are ++ # bogus both because they are the default anyway, and because ++ # using them would break gcc on systems where it needs fixed includes. ++ case $ac_im_incroot in ++ /usr/include) ac_x_includes= ;; ++ *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; ++ esac ++ case $ac_im_usrlibdir in ++ /usr/lib | /usr/lib64 | /lib | /lib64) ;; ++ *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; ++ esac ++ fi ++ cd .. ++ rm -f -r conftest.dir fi - fi -+ if test "x$LIBJASPER" != x; then -+ HAVE_JASPER_TRUE= -+ HAVE_JASPER_FALSE='#' -+else -+ HAVE_JASPER_TRUE='#' -+ HAVE_JASPER_FALSE= -+fi - +- - # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - { $as_echo "$as_me:$LINENO: checking for shmat" >&5 -$as_echo_n "checking for shmat... " >&6; } -if test "${ac_cv_func_shmat+set}" = set; then - $as_echo_n "(cached) " >&6 -+ -+if $dynworks ; then -+ STATIC_LIB_DEPS= -+ if echo "$included_loaders" | egrep '(^|,)tiff($|,)' > /dev/null; then -+ STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBTIFF" -+ fi -+ if echo "$included_loaders" | egrep '(^|,)jpeg($|,)' > /dev/null; then -+ STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJPEG" -+ fi -+ if echo "$included_loaders" | egrep '(^|,)png($|,)' > /dev/null; then -+ STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG" -+ fi -+ if echo "$included_loaders" | egrep '(^|,)jasper($|,)' > /dev/null; then -+ STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJASPER" -+ fi - else +-else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF @@ -22826,28 +23221,37 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -/* Define shmat to an innocuous variant, in case declares shmat. - For example, HP-UX 11i declares gettimeofday. */ -#define shmat innocuous_shmat -+ STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG $LIBJASPER" -+fi - +- -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shmat (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -+# Checks to see whether we should include mediaLib -+# support. -+# -+ac_fn_c_check_header_mongrel "$LINENO" "sys/systeminfo.h" "ac_cv_header_sys_systeminfo_h" "$ac_includes_default" -+if test "x$ac_cv_header_sys_systeminfo_h" = x""yes; then : ++# Standard set of common directories for X headers. ++# Check X11 before X11Rn because it is often a symlink to the current release. ++ac_x_header_dirs=' ++/usr/X11/include ++/usr/X11R7/include ++/usr/X11R6/include ++/usr/X11R5/include ++/usr/X11R4/include -#ifdef __STDC__ -# include -#else -# include -#endif -+$as_echo "#define HAVE_SYS_SYSTEMINFO_H 1" >>confdefs.h ++/usr/include/X11 ++/usr/include/X11R7 ++/usr/include/X11R6 ++/usr/include/X11R5 ++/usr/include/X11R4 -#undef shmat -+fi ++/usr/local/X11/include ++/usr/local/X11R7/include ++/usr/local/X11R6/include ++/usr/local/X11R5/include ++/usr/local/X11R4/include -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC @@ -22862,6 +23266,11 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -#if defined __stub_shmat || defined __stub___shmat -choke me -#endif ++/usr/local/include/X11 ++/usr/local/include/X11R7 ++/usr/local/include/X11R6 ++/usr/local/include/X11R5 ++/usr/local/include/X11R4 -int -main () @@ -22896,63 +23305,62 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ac_fn_c_check_header_mongrel "$LINENO" "sys/sysinfo.h" "ac_cv_header_sys_sysinfo_h" "$ac_includes_default" -+if test "x$ac_cv_header_sys_sysinfo_h" = x""yes; then : ++/usr/X386/include ++/usr/x386/include ++/usr/XFree86/include/X11 - ac_cv_func_shmat=no -fi -+$as_echo "#define HAVE_SYS_SYSINFO_H 1" >>confdefs.h ++/usr/include ++/usr/local/include ++/usr/unsupported/include ++/usr/athena/include ++/usr/local/x11r5/include ++/usr/lpp/Xamples/include -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 -$as_echo "$ac_cv_func_shmat" >&6; } ++/usr/openwin/include ++/usr/openwin/share/include' - if test $ac_cv_func_shmat = no; then - { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 -$as_echo_n "checking for shmat in -lipc... " >&6; } -if test "${ac_cv_lib_ipc_shmat+set}" = set; then -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mediaLib 2.3" >&5 -+$as_echo_n "checking for mediaLib 2.3... " >&6; } -+use_mlib25=no -+# Check for a mediaLib 2.3 function since that is what the GTK+ mediaLib -+# patch requires. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mlib_ImageSetStruct in -lmlib" >&5 -+$as_echo_n "checking for mlib_ImageSetStruct in -lmlib... " >&6; } -+if test "${ac_cv_lib_mlib_mlib_ImageSetStruct+set}" = set; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS -LIBS="-lipc $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+LIBS="-lmlib $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++if test "$ac_x_includes" = no; then ++ # Guess where to find include files, by looking for Xlib.h. ++ # First, try using that file with no special directory specified. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. -@@ -29789,79 +22492,50 @@ - #ifdef __cplusplus - extern "C" - #endif +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif -char shmat (); -+char mlib_ImageSetStruct (); - int - main () - { +-int +-main () +-{ -return shmat (); -+return mlib_ImageSetStruct (); - ; - return 0; - } - _ACEOF +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -22975,39 +23383,27 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_ipc_shmat=yes -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_mlib_mlib_ImageSetStruct=yes - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_ipc_shmat=no -+ ac_cv_lib_mlib_mlib_ImageSetStruct=no - fi +-fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi +-LIBS=$ac_check_lib_save_LIBS +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 -$as_echo "$ac_cv_lib_ipc_shmat" >&6; } -if test "x$ac_cv_lib_ipc_shmat" = x""yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mlib_mlib_ImageSetStruct" >&5 -+$as_echo "$ac_cv_lib_mlib_mlib_ImageSetStruct" >&6; } -+if test "x$ac_cv_lib_mlib_mlib_ImageSetStruct" = x""yes; then : -+ use_mlib=yes -+else -+ use_mlib=no - fi - +-fi +- - fi - fi -+if test $use_mlib = yes; then - +- - # Check for libraries that X11R6 Xt/Xaw programs need. - ac_save_LDFLAGS=$LDFLAGS - test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" @@ -23020,42 +23416,52 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 -$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } -if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then -+$as_echo "#define USE_MEDIALIB 1" >>confdefs.h -+ -+ MEDIA_LIB=-lmlib -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mediaLib 2.5" >&5 -+$as_echo_n "checking for mediaLib 2.5... " >&6; } -+ # Check for a mediaLib 2.5 function since that is what is needed for -+ # gdk_rgb_convert integration. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mlib_VideoColorRGBint_to_BGRAint in -lmlib" >&5 -+$as_echo_n "checking for mlib_VideoColorRGBint_to_BGRAint in -lmlib... " >&6; } -+if test "${ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint+set}" = set; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS -LIBS="-lICE $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ --_ACEOF ++#include + _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+LIBS="-lmlib $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ ++if ac_fn_c_try_cpp "$LINENO"; then : ++ # We can compile using X headers with no special include directory. ++ac_x_includes= ++else ++ for ac_dir in $ac_x_header_dirs; do ++ if test -r "$ac_dir/X11/Xlib.h"; then ++ ac_x_includes=$ac_dir ++ break ++ fi ++done ++fi ++rm -f conftest.err conftest.$ac_ext ++fi # $ac_x_includes = no - /* Override any GCC internal prototype to avoid an error. -@@ -29870,499 +22544,582 @@ - #ifdef __cplusplus - extern "C" - #endif +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif -char IceConnectionNumber (); -+char mlib_VideoColorRGBint_to_BGRAint (); ++if test "$ac_x_libraries" = no; then ++ # Check for the libraries. ++ # See if we find them without any special options. ++ # Don't add to $LIBS permanently. ++ ac_save_LIBS=$LIBS ++ LIBS="-lX11 $LIBS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include int main () { -return IceConnectionNumber (); -+return mlib_VideoColorRGBint_to_BGRAint (); ++XrmInitialize () ; return 0; } @@ -23083,130 +23489,118 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - }; then - ac_cv_lib_ICE_IceConnectionNumber=yes +if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=yes ++ LIBS=$ac_save_LIBS ++# We can link X programs with no special library path. ++ac_x_libraries= else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_ICE_IceConnectionNumber=no -+ ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=no ++ LIBS=$ac_save_LIBS ++for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` ++do ++ # Don't even attempt the hair of trying to link an X program! ++ for ac_extension in a so sl dylib la dll; do ++ if test -r "$ac_dir/libX11.$ac_extension"; then ++ ac_x_libraries=$ac_dir ++ break 2 ++ fi ++ done ++done fi -- ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++fi # $ac_x_libraries = no + -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi +-LIBS=$ac_check_lib_save_LIBS +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } -if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then - X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&5 -+$as_echo "$ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&6; } -+if test "x$ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" = x""yes; then : -+ use_mlib25=yes -+else -+ use_mlib25=no ++case $ac_x_includes,$ac_x_libraries in #( ++ no,* | *,no | *\'*) ++ # Didn't find X, or a directory has "'" in its name. ++ ac_cv_have_x="have_x=no";; #( ++ *) ++ # Record where we found X for the cache. ++ ac_cv_have_x="have_x=yes\ ++ ac_x_includes='$ac_x_includes'\ ++ ac_x_libraries='$ac_x_libraries'" ++esac fi ++;; #( ++ *) have_x=yes;; ++ esac ++ eval "$ac_cv_have_x" ++fi # $with_x != no - LDFLAGS=$ac_save_LDFLAGS -+ if test $use_mlib25 = yes; then - -+$as_echo "#define USE_MEDIALIB25 1" >>confdefs.h -+ -+ fi -+fi -+ if test $use_mlib = yes; then -+ USE_MEDIALIB_TRUE= -+ USE_MEDIALIB_FALSE='#' +- ++if test "$have_x" != yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5 ++$as_echo "$have_x" >&6; } ++ no_x=yes +else -+ USE_MEDIALIB_TRUE='#' -+ USE_MEDIALIB_FALSE= ++ # If each of the values was on the command line, it overrides each guess. ++ test "x$x_includes" = xNONE && x_includes=$ac_x_includes ++ test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries ++ # Update the cache value to reflect the command line values. ++ ac_cv_have_x="have_x=yes\ ++ ac_x_includes='$x_includes'\ ++ ac_x_libraries='$x_libraries'" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5 ++$as_echo "libraries $x_libraries, headers $x_includes" >&6; } fi - if test x$no_x = xyes ; then - { { $as_echo "$as_me:$LINENO: error: X development libraries not found" >&5 -$as_echo "$as_me: error: X development libraries not found" >&2;} - { (exit 1); exit 1; }; } -+ if test $use_mlib25 = yes; then -+ USE_MEDIALIB25_TRUE= -+ USE_MEDIALIB25_FALSE='#' -+else -+ USE_MEDIALIB25_TRUE='#' -+ USE_MEDIALIB25_FALSE= -+fi -+ -+ -+# Checks to see if we should compile in MMX support (there will be -+# a runtime test when the code is actually run to see if it should -+# be used - this just checks if we can compile it.) -+# -+# This code is partially taken from Mesa -+# -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x86 platform" >&5 -+$as_echo_n "checking for x86 platform... " >&6; } -+case $host_cpu in -+ i386|i486|i586|i686|i786|k6|k7) -+ use_x86_asm=yes -+ ;; -+ *) -+ use_x86_asm=no -+esac -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_x86_asm" >&5 -+$as_echo "$use_x86_asm" >&6; } -+ -+use_mmx_asm=no -+if test $use_x86_asm = yes; then -+ save_ac_ext=$ac_ext -+ ac_ext=S -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking compiler support for MMX" >&5 -+$as_echo_n "checking compiler support for MMX... " >&6; } -+ cp $srcdir/gdk-pixbuf/pixops/scale_line_22_33_mmx.S conftest.S -+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ use_mmx_asm=yes - fi +- fi ++if test "$no_x" = yes; then ++ # Not all programs may use this symbol, but it does not hurt to define it. - x_cflags="$X_CFLAGS" - x_libs_for_checks="$X_LIBS -lXext -lXrender -lX11 $X_EXTRA_LIBS" -+ rm -rf conftest* ++$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h - GDK_PIXBUF_XLIB_EXTRA_CFLAGS="$x_cflags" - GDK_PIXBUF_XLIB_EXTRA_LIBS="$X_LIBS -lX11 $X_EXTRA_LIBS" - GTK_DEP_LIBS_FOR_X="$X_LIBS -lXrender -lX11 $X_EXTRA_LIBS" -- fi -+ ac_ext=$save_ac_ext -+ if test $use_mmx_asm = yes; then ++ X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= ++else ++ if test -n "$x_includes"; then ++ X_CFLAGS="$X_CFLAGS -I$x_includes" + fi - # Extra libraries found during checks (-lXinerama, etc), not from pkg-config. - x_extra_libs= -+$as_echo "#define USE_MMX 1" >>confdefs.h - +- - gtk_save_cppflags="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $X_CFLAGS" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+ fi -+fi ++ # It would also be nice to do this for all -L options, not just this one. ++ if test -n "$x_libraries"; then ++ X_LIBS="$X_LIBS -L$x_libraries" ++ # For Solaris; some versions of Sun CC require a space after -R and ++ # others require no space. Words are not sufficient . . . . ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5 ++$as_echo_n "checking whether -R must be followed by a space... " >&6; } ++ ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" ++ ac_xsave_c_werror_flag=$ac_c_werror_flag ++ ac_c_werror_flag=yes ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ - gtk_save_LIBS=$LIBS - LIBS="$x_libs_for_checks $LIBS" -+ if test x$use_mmx_asm = xyes; then -+ USE_MMX_TRUE= -+ USE_MMX_FALSE='#' -+else -+ USE_MMX_TRUE='#' -+ USE_MMX_FALSE= -+fi ++int ++main () ++{ - # Sanity check for the X11 and Xext libraries. While everything we need from - # Xext is optional, the chances a system has *none* of these things is so @@ -23214,191 +23608,41 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - { $as_echo "$as_me:$LINENO: checking for XOpenDisplay" >&5 -$as_echo_n "checking for XOpenDisplay... " >&6; } -if test "${ac_cv_func_XOpenDisplay+set}" = set; then -+ -+REBUILD_PNGS= -+if test -z "$LIBPNG" && test x"$os_win32" = xno -o x$enable_gdiplus = xno; then -+ REBUILD_PNGS=# -+fi -+ -+ -+ if test $cross_compiling = yes; then -+ CROSS_COMPILING_TRUE= -+ CROSS_COMPILING_FALSE='#' -+else -+ CROSS_COMPILING_TRUE='#' -+ CROSS_COMPILING_FALSE= -+fi -+ -+ -+if test $cross_compiling = yes; then -+ # Extract the first word of "gdk-pixbuf-csource", so it can be a program name with args. -+set dummy gdk-pixbuf-csource; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_path_GDK_PIXBUF_CSOURCE+set}" = set; then : - $as_echo_n "(cached) " >&6 - else +- $as_echo_n "(cached) " >&6 +-else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ --_ACEOF ++ ; ++ return 0; ++} + _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++if ac_fn_c_try_link "$LINENO"; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ X_LIBS="$X_LIBS -R$x_libraries" ++else ++ LIBS="$ac_xsave_LIBS -R $x_libraries" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ -/* Define XOpenDisplay to an innocuous variant, in case declares XOpenDisplay. - For example, HP-UX 11i declares gettimeofday. */ -#define XOpenDisplay innocuous_XOpenDisplay -+ case $GDK_PIXBUF_CSOURCE in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_GDK_PIXBUF_CSOURCE="$GDK_PIXBUF_CSOURCE" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_path_GDK_PIXBUF_CSOURCE="$as_dir/$ac_word$ac_exec_ext" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS - +- -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char XOpenDisplay (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -+ test -z "$ac_cv_path_GDK_PIXBUF_CSOURCE" && ac_cv_path_GDK_PIXBUF_CSOURCE="no" -+ ;; -+esac -+fi -+GDK_PIXBUF_CSOURCE=$ac_cv_path_GDK_PIXBUF_CSOURCE -+if test -n "$GDK_PIXBUF_CSOURCE"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDK_PIXBUF_CSOURCE" >&5 -+$as_echo "$GDK_PIXBUF_CSOURCE" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi - +- -#ifdef __STDC__ -# include -#else -# include -#endif - +- -#undef XOpenDisplay -+ # Extract the first word of "gtk-update-icon-cache", so it can be a program name with args. -+set dummy gtk-update-icon-cache; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_path_GTK_UPDATE_ICON_CACHE+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $GTK_UPDATE_ICON_CACHE in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_GTK_UPDATE_ICON_CACHE="$GTK_UPDATE_ICON_CACHE" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_path_GTK_UPDATE_ICON_CACHE="$as_dir/$ac_word$ac_exec_ext" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+ test -z "$ac_cv_path_GTK_UPDATE_ICON_CACHE" && ac_cv_path_GTK_UPDATE_ICON_CACHE="no" -+ ;; -+esac -+fi -+GTK_UPDATE_ICON_CACHE=$ac_cv_path_GTK_UPDATE_ICON_CACHE -+if test -n "$GTK_UPDATE_ICON_CACHE"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_UPDATE_ICON_CACHE" >&5 -+$as_echo "$GTK_UPDATE_ICON_CACHE" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+ if test x$GTK_UPDATE_ICON_CACHE = xno; then -+ REBUILD_PNGS=# -+ fi -+fi -+ -+if test ! -f $srcdir/gtk/gtkbuiltincache.h && -+ test "x$REBUILD_PNGS" = "x#" ; then -+ 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 -+fi -+ -+ -+ -+GDK_PIXBUF_PACKAGES="gmodule-no-export-2.0 gobject-2.0 gio-2.0" -+GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB $MEDIA_LIB" -+GDK_PIXBUF_EXTRA_CFLAGS= -+GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" -+GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS" -+ -+######################################## -+# Windowing system checks -+######################################## -+ -+GDK_PIXBUF_XLIB_PACKAGES= -+GDK_PIXBUF_XLIB_EXTRA_CFLAGS= -+GDK_PIXBUF_XLIB_EXTRA_LIBS= -+ -+GDK_EXTRA_LIBS="$GDK_WLIBS" -+GDK_EXTRA_CFLAGS= -+ -+# GTK+ uses some X calls, so needs to link against X directly -+GTK_DEP_PACKAGES_FOR_X= -+GTK_DEP_LIBS_FOR_X= -+ -+if test "x$gdktarget" = "xx11"; then -+ X_PACKAGES=fontconfig -+ -+ # -+ # We use fontconfig very peripherally when decoding the default -+ # settings. -+ # -+ if $PKG_CONFIG --exists fontconfig; then : ; else -+ as_fn_error " -+*** fontconfig (http://www.fontconfig.org) is required by the X11 backend." "$LINENO" 5 -+ fi -+ -+ # -+ # Check for basic X packages; we use pkg-config if available -+ # -+ if $PKG_CONFIG --exists x11 xext xrender; then -+ have_base_x_pc=true -+ X_PACKAGES="$X_PACKAGES x11 xext xrender" -+ x_libs="`$PKG_CONFIG --libs x11 xext xrender`" -+ X_CFLAGS="`$PKG_CONFIG --cflags x11 xext xrender`" -+ -+ # Strip out any .la files that pkg-config might give us (this happens -+ # with -uninstalled.pc files) -+ x_libs_for_checks= -+ for I in $x_libs ; do -+ case $I in -+ *.la) ;; -+ *) x_libs_for_checks="$x_libs_for_checks $I" ;; -+ esac -+ done - +- -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ @@ -23412,21 +23656,16 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -#if defined __stub_XOpenDisplay || defined __stub___XOpenDisplay -choke me -#endif -+ GDK_PIXBUF_XLIB_PACKAGES="x11" -+ GTK_PACKAGES_FOR_X="x11" -+ else -+ have_base_x_pc=false -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 -+$as_echo_n "checking for X... " >&6; } --int --main () --{ + int + main () + { -return XOpenDisplay (); -- ; -- return 0; --} --_ACEOF ++ + ; + return 0; + } + _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -23449,128 +23688,86 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_XOpenDisplay=yes --else ++if ac_fn_c_try_link "$LINENO"; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ X_LIBS="$X_LIBS -R $x_libraries" + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +- - ac_cv_func_XOpenDisplay=no -+# Check whether --with-x was given. -+if test "${with_x+set}" = set; then : -+ withval=$with_x; - fi - +-fi +- -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext --fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5 ++$as_echo "neither works" >&6; } + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XOpenDisplay" >&5 -$as_echo "$ac_cv_func_XOpenDisplay" >&6; } -if test "x$ac_cv_func_XOpenDisplay" = x""yes; then - : -+# $have_x is `yes', `no', `disabled', or empty when we do not yet know. -+if test "x$with_x" = xno; then -+ # The user explicitly disabled X. -+ have_x=disabled - else +-else - { { $as_echo "$as_me:$LINENO: error: *** libX11 not found. Check 'config.log' for more details." >&5 -$as_echo "$as_me: error: *** libX11 not found. Check 'config.log' for more details." >&2;} - { (exit 1); exit 1; }; } --fi -- ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ ac_c_werror_flag=$ac_xsave_c_werror_flag ++ LIBS=$ac_xsave_LIBS ++ fi + - { $as_echo "$as_me:$LINENO: checking for XextFindDisplay" >&5 -$as_echo_n "checking for XextFindDisplay... " >&6; } -if test "${ac_cv_func_XextFindDisplay+set}" = set; then -+ case $x_includes,$x_libraries in #( -+ *\'*) 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 +- $as_echo_n "(cached) " >&6 +-else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -+ # One or both of the vars are not set, and there is no cached value. -+ac_x_includes=no ac_x_libraries=no -+rm -f -r conftest.dir -+if mkdir conftest.dir; then -+ cd conftest.dir -+ cat >Imakefile <<'_ACEOF' -+incroot: -+ @echo incroot='${INCROOT}' -+usrlibdir: -+ @echo usrlibdir='${USRLIBDIR}' -+libdir: -+ @echo libdir='${LIBDIR}' - _ACEOF +-_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define XextFindDisplay to an innocuous variant, in case declares XextFindDisplay. - For example, HP-UX 11i declares gettimeofday. */ -#define XextFindDisplay innocuous_XextFindDisplay -+ 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. -+ 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 -+ # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. -+ for ac_extension in a so sl dylib la dll; do -+ if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && -+ test -f "$ac_im_libdir/libX11.$ac_extension"; then -+ ac_im_usrlibdir=$ac_im_libdir; break -+ fi -+ done -+ # Screen out bogus values from the imake configuration. They are -+ # bogus both because they are the default anyway, and because -+ # using them would break gcc on systems where it needs fixed includes. -+ case $ac_im_incroot in -+ /usr/include) ac_x_includes= ;; -+ *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; -+ esac -+ case $ac_im_usrlibdir in -+ /usr/lib | /usr/lib64 | /lib | /lib64) ;; -+ *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; -+ esac -+ fi -+ cd .. -+ rm -f -r conftest.dir -+fi - +- -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char XextFindDisplay (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -+# Standard set of common directories for X headers. -+# Check X11 before X11Rn because it is often a symlink to the current release. -+ac_x_header_dirs=' -+/usr/X11/include -+/usr/X11R7/include -+/usr/X11R6/include -+/usr/X11R5/include -+/usr/X11R4/include - +- -#ifdef __STDC__ -# include -#else -# include -#endif -+/usr/include/X11 -+/usr/include/X11R7 -+/usr/include/X11R6 -+/usr/include/X11R5 -+/usr/include/X11R4 ++ # Check for system-dependent libraries X programs must link with. ++ # Do this before checking for the system-independent R6 libraries ++ # (-lICE), since we may need -lsocket or whatever for X linking. -#undef XextFindDisplay -+/usr/local/X11/include -+/usr/local/X11R7/include -+/usr/local/X11R6/include -+/usr/local/X11R5/include -+/usr/local/X11R4/include ++ if test "$ISC" = yes; then ++ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" ++ else ++ # Martyn Johnson says this is needed for Ultrix, if the X ++ # libraries were built with DECnet support. And Karl Berry says ++ # the Alpha needs dnet_stub (dnet does not exist). ++ ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -30088,92 +23150,27 @@ + #ifdef __cplusplus + extern "C" + #endif -char XextFindDisplay (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named @@ -23578,20 +23775,17 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -#if defined __stub_XextFindDisplay || defined __stub___XextFindDisplay -choke me -#endif -+/usr/local/include/X11 -+/usr/local/include/X11R7 -+/usr/local/include/X11R6 -+/usr/local/include/X11R5 -+/usr/local/include/X11R4 - --int --main () --{ +- ++char XOpenDisplay (); + int + main () + { -return XextFindDisplay (); -- ; -- return 0; --} --_ACEOF ++return XOpenDisplay (); + ; + return 0; + } + _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -23617,19 +23811,10 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+/usr/X386/include -+/usr/x386/include -+/usr/XFree86/include/X11 - +- - ac_cv_func_XextFindDisplay=no -fi -+/usr/include -+/usr/local/include -+/usr/unsupported/include -+/usr/athena/include -+/usr/local/x11r5/include -+/usr/lpp/Xamples/include - +- -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext @@ -23638,51 +23823,24 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -$as_echo "$ac_cv_func_XextFindDisplay" >&6; } -if test "x$ac_cv_func_XextFindDisplay" = x""yes; then - : -+/usr/openwin/include -+/usr/openwin/share/include' -+ -+if test "$ac_x_includes" = no; then -+ # Guess where to find include files, by looking for Xlib.h. -+ # First, try using that file with no special directory specified. -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+_ACEOF -+if ac_fn_c_try_cpp "$LINENO"; then : -+ # We can compile using X headers with no special include directory. -+ac_x_includes= - else +-else - { { $as_echo "$as_me:$LINENO: error: *** libXext not found. Check 'config.log' for more details." >&5 -$as_echo "$as_me: error: *** libXext not found. Check 'config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -+ for ac_dir in $ac_x_header_dirs; do -+ if test -r "$ac_dir/X11/Xlib.h"; then -+ ac_x_includes=$ac_dir -+ break -+ fi -+done - fi -+rm -f conftest.err conftest.$ac_ext -+fi # $ac_x_includes = no +-fi ++if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:$LINENO: checking for XRenderQueryExtension" >&5 -$as_echo_n "checking for XRenderQueryExtension... " >&6; } -if test "${ac_cv_func_XRenderQueryExtension+set}" = set; then - $as_echo_n "(cached) " >&6 --else + else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+if test "$ac_x_libraries" = no; then -+ # Check for the libraries. -+ # See if we find them without any special options. -+ # Don't add to $LIBS permanently. -+ ac_save_LIBS=$LIBS -+ LIBS="-lX11 $LIBS" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -/* Define XRenderQueryExtension to an innocuous variant, in case declares XRenderQueryExtension. - For example, HP-UX 11i declares gettimeofday. */ -#define XRenderQueryExtension innocuous_XRenderQueryExtension @@ -23699,13 +23857,22 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -#endif - -#undef XRenderQueryExtension -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 ++$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } ++if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ldnet $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -30181,200 +23178,100 @@ + #ifdef __cplusplus + extern "C" + #endif -char XRenderQueryExtension (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named @@ -23714,12 +23881,12 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -choke me -#endif - -+#include ++char dnet_ntoa (); int main () { -return XRenderQueryExtension (); -+XrmInitialize () ++return dnet_ntoa (); ; return 0; } @@ -23747,79 +23914,39 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - }; then - ac_cv_func_XRenderQueryExtension=yes +if ac_fn_c_try_link "$LINENO"; then : -+ LIBS=$ac_save_LIBS -+# We can link X programs with no special library path. -+ac_x_libraries= ++ ac_cv_lib_dnet_dnet_ntoa=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ LIBS=$ac_save_LIBS -+for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` -+do -+ # Don't even attempt the hair of trying to link an X program! -+ for ac_extension in a so sl dylib la dll; do -+ if test -r "$ac_dir/libX11.$ac_extension"; then -+ ac_x_libraries=$ac_dir -+ break 2 -+ fi -+ done -+done -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+fi # $ac_x_libraries = no - +- - ac_cv_func_XRenderQueryExtension=no -+case $ac_x_includes,$ac_x_libraries in #( -+ no,* | *,no | *\'*) -+ # Didn't find X, or a directory has "'" in its name. -+ ac_cv_have_x="have_x=no";; #( -+ *) -+ # Record where we found X for the cache. -+ ac_cv_have_x="have_x=yes\ -+ ac_x_includes='$ac_x_includes'\ -+ ac_x_libraries='$ac_x_libraries'" -+esac ++ ac_cv_lib_dnet_dnet_ntoa=no fi -+;; #( -+ *) have_x=yes;; -+ esac -+ eval "$ac_cv_have_x" -+fi # $with_x != no - +- -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext --fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XRenderQueryExtension" >&5 -$as_echo "$ac_cv_func_XRenderQueryExtension" >&6; } -if test "x$ac_cv_func_XRenderQueryExtension" = x""yes; then - : -+if test "$have_x" != yes; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5 -+$as_echo "$have_x" >&6; } -+ no_x=yes - else +-else - { { $as_echo "$as_me:$LINENO: error: *** libXrender not found. Check 'config.log' for more details." >&5 -$as_echo "$as_me: error: *** libXrender not found. Check 'config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -+ # If each of the values was on the command line, it overrides each guess. -+ test "x$x_includes" = xNONE && x_includes=$ac_x_includes -+ test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries -+ # Update the cache value to reflect the command line values. -+ ac_cv_have_x="have_x=yes\ -+ ac_x_includes='$x_includes'\ -+ ac_x_libraries='$x_libraries'" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5 -+$as_echo "libraries $x_libraries, headers $x_includes" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 ++$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } ++if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then : ++ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi -+if test "$no_x" = yes; then -+ # Not all programs may use this symbol, but it does not hurt to define it. - +- - # Check for xReply -+$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h - +- - { $as_echo "$as_me:$LINENO: checking if is needed for xReply" >&5 -$as_echo_n "checking if is needed for xReply... " >&6; } - cat >conftest.$ac_ext <<_ACEOF @@ -23827,35 +23954,16 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= -+else -+ if test -n "$x_includes"; then -+ X_CFLAGS="$X_CFLAGS -I$x_includes" -+ fi -+ -+ # It would also be nice to do this for all -L options, not just this one. -+ if test -n "$x_libraries"; then -+ X_LIBS="$X_LIBS -L$x_libraries" -+ # For Solaris; some versions of Sun CC require a space after -R and -+ # others require no space. Words are not sufficient . . . . -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5 -+$as_echo_n "checking whether -R must be followed by a space... " >&6; } -+ ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" -+ ac_xsave_c_werror_flag=$ac_c_werror_flag -+ ac_c_werror_flag=yes -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -#include -+ - int - main () - { +-int +-main () +-{ -xReply *rep; -+ - ; - return 0; - } - _ACEOF +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -23875,10 +23983,12 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -+if ac_fn_c_try_link "$LINENO"; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } -+ X_LIBS="$X_LIBS -R$x_libraries" +-$as_echo "no" >&6; } ++ if test $ac_cv_lib_dnet_dnet_ntoa = no; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 ++$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } ++if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then : ++ $as_echo_n "(cached) " >&6 else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 @@ -23888,17 +23998,25 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ LIBS="$ac_xsave_LIBS -R $x_libraries" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ldnet_stub $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include + ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char dnet_ntoa (); int main () { -xReply *rep; -+ ++return dnet_ntoa (); ; return 0; } @@ -23922,15 +24040,14 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -+if ac_fn_c_try_link "$LINENO"; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } +-$as_echo "yes" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define NEED_XIPROTO_H_FOR_XREPLY 1 -_ACEOF - -+ X_LIBS="$X_LIBS -R $x_libraries" ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_dnet_stub_dnet_ntoa=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 @@ -23940,53 +24057,41 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - { { $as_echo "$as_me:$LINENO: error: xReply type unavailable. X11 is too old" >&5 -$as_echo "$as_me: error: xReply type unavailable. X11 is too old" >&2;} - { (exit 1); exit 1; }; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5 -+$as_echo "neither works" >&6; } ++ ac_cv_lib_dnet_stub_dnet_ntoa=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 ++$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } ++if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then : ++ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ ac_c_werror_flag=$ac_xsave_c_werror_flag -+ LIBS=$ac_xsave_LIBS -+ fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - # Check for XConvertCase, XInternAtoms (X11R6 specific) -+ # Check for system-dependent libraries X programs must link with. -+ # Do this before checking for the system-independent R6 libraries -+ # (-lICE), since we may need -lsocket or whatever for X linking. ++ fi ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ LIBS="$ac_xsave_LIBS" -+ if test "$ISC" = yes; then -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" -+ else -+ # Martyn Johnson says this is needed for Ultrix, if the X -+ # libraries were built with DECnet support. And Karl Berry says -+ # the Alpha needs dnet_stub (dnet does not exist). -+ ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ ++ # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, ++ # to get the SysV transport functions. ++ # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4) ++ # needs -lnsl. ++ # The nsl library prevents programs from opening the X display ++ # on Irix 5.2, according to T.E. Dickey. ++ # The functions gethostbyname, getservbyname, and inet_addr are ++ # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. ++ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" ++if test "x$ac_cv_func_gethostbyname" = x""yes; then : -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char XOpenDisplay (); -+int -+main () -+{ -+return XOpenDisplay (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : ++fi -for ac_func in XConvertCase XInternAtoms -do @@ -23994,10 +24099,10 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 -+$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } -+if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then : ++ if test $ac_cv_func_gethostbyname = no; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 ++$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } ++if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF @@ -24006,7 +24111,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldnet $LIBS" ++LIBS="-lnsl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. @@ -24028,7 +24133,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -30370,103 +23127,40 @@ +@@ -30382,103 +23279,40 @@ #ifdef __cplusplus extern "C" #endif @@ -24040,12 +24145,12 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -choke me -#endif - -+char dnet_ntoa (); ++char gethostbyname (); int main () { -return $ac_func (); -+return dnet_ntoa (); ++return gethostbyname (); ; return 0; } @@ -24073,13 +24178,13 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - }; then - eval "$as_ac_var=yes" +if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_dnet_dnet_ntoa=yes ++ ac_cv_lib_nsl_gethostbyname=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -+ ac_cv_lib_dnet_dnet_ntoa=no ++ ac_cv_lib_nsl_gethostbyname=no fi - -rm -rf conftest.dSYM @@ -24100,10 +24205,10 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -+$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } -+if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then : -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 ++$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } ++if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then : ++ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi -done - @@ -24117,10 +24222,10 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - { $as_echo "$as_me:$LINENO: checking for XAddConnectionWatch" >&5 -$as_echo_n "checking for XAddConnectionWatch... " >&6; } -if test "${ac_cv_func_XAddConnectionWatch+set}" = set; then -+ if test $ac_cv_lib_dnet_dnet_ntoa = no; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 -+$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } -+if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then : ++ if test $ac_cv_lib_nsl_gethostbyname = no; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 ++$as_echo_n "checking for gethostbyname in -lbsd... " >&6; } ++if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF @@ -24129,7 +24234,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldnet_stub $LIBS" ++LIBS="-lbsd $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Define XAddConnectionWatch to an innocuous variant, in case declares XAddConnectionWatch. @@ -24151,7 +24256,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -30474,116 +23168,59 @@ +@@ -30486,116 +23320,104 @@ #ifdef __cplusplus extern "C" #endif @@ -24163,12 +24268,12 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -choke me -#endif - -+char dnet_ntoa (); ++char gethostbyname (); int main () { -return XAddConnectionWatch (); -+return dnet_ntoa (); ++return gethostbyname (); ; return 0; } @@ -24196,13 +24301,13 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - }; then - ac_cv_func_XAddConnectionWatch=yes +if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_dnet_stub_dnet_ntoa=yes ++ ac_cv_lib_bsd_gethostbyname=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_XAddConnectionWatch=no -+ ac_cv_lib_dnet_stub_dnet_ntoa=no ++ ac_cv_lib_bsd_gethostbyname=no fi - -rm -rf conftest.dSYM @@ -24216,49 +24321,89 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -$as_echo "$ac_cv_func_XAddConnectionWatch" >&6; } -if test "x$ac_cv_func_XAddConnectionWatch" = x""yes; then - have_x11r6=true -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -+$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } -+if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then : -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 ++$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } ++if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then : ++ X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" fi -- ++ fi ++ fi + - if $have_x11r6; then -- ++ # lieder@skyler.mavd.honeywell.com says without -lsocket, ++ # socket/setsockopt and other routines are undefined under SCO ODT ++ # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary ++ # on later versions), says Simon Leinen: it contains gethostby* ++ # variants that don't use the name server (or something). -lsocket ++ # must be given before -lnsl if both are needed. We assume that ++ # if connect needs -lnsl, so does gethostbyname. ++ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect" ++if test "x$ac_cv_func_connect" = x""yes; then : + -cat >>confdefs.h <<\_ACEOF -#define HAVE_X11R6 1 -_ACEOF -- ++fi + - fi - if $have_x11r6; then - HAVE_X11R6_TRUE= - HAVE_X11R6_FALSE='#' --else ++ if test $ac_cv_func_connect = no; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 ++$as_echo_n "checking for connect in -lsocket... " >&6; } ++if test "${ac_cv_lib_socket_connect+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lsocket $X_EXTRA_LIBS $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char connect (); ++int ++main () ++{ ++return connect (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_socket_connect=yes + else - HAVE_X11R6_TRUE='#' - HAVE_X11R6_FALSE= -+ fi - fi ++ ac_cv_lib_socket_connect=no ++fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext -+ LIBS="$ac_xsave_LIBS" ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 ++$as_echo "$ac_cv_lib_socket_connect" >&6; } ++if test "x$ac_cv_lib_socket_connect" = x""yes; then : ++ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" + fi -+ # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, -+ # to get the SysV transport functions. -+ # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4) -+ # needs -lnsl. -+ # The nsl library prevents programs from opening the X display -+ # on Irix 5.2, according to T.E. Dickey. -+ # The functions gethostbyname, getservbyname, and inet_addr are -+ # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. -+ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" -+if test "x$ac_cv_func_gethostbyname" = x""yes; then : ++ fi - # Check for XKB support. - - if test "x$enable_xkb" = "xyes"; then - { $as_echo "$as_me:$LINENO: WARNING: XKB support explicitly enabled" >&5 -$as_echo "$as_me: WARNING: XKB support explicitly enabled" >&2;} -- ++ # Guillermo Gomez says -lposix is necessary on A/UX. ++ ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove" ++if test "x$ac_cv_func_remove" = x""yes; then : + -cat >>confdefs.h <<\_ACEOF -#define HAVE_XKB 1 -_ACEOF @@ -24268,10 +24413,10 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - { $as_echo "$as_me:$LINENO: checking for XkbQueryExtension" >&5 -$as_echo_n "checking for XkbQueryExtension... " >&6; } -if test "${ac_cv_func_XkbQueryExtension+set}" = set; then -+ if test $ac_cv_func_gethostbyname = no; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 -+$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } -+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then : ++ if test $ac_cv_func_remove = no; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 ++$as_echo_n "checking for remove in -lposix... " >&6; } ++if test "${ac_cv_lib_posix_remove+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF @@ -24280,7 +24425,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS -+LIBS="-lnsl $LIBS" ++LIBS="-lposix $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Define XkbQueryExtension to an innocuous variant, in case declares XkbQueryExtension. @@ -24302,7 +24447,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -30591,99 +23228,40 @@ +@@ -30603,99 +23425,48 @@ #ifdef __cplusplus extern "C" #endif @@ -24314,12 +24459,12 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -choke me -#endif - -+char gethostbyname (); ++char remove (); int main () { -return XkbQueryExtension (); -+return gethostbyname (); ++return remove (); ; return 0; } @@ -24347,13 +24492,13 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - }; then - ac_cv_func_XkbQueryExtension=yes +if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_nsl_gethostbyname=yes ++ ac_cv_lib_posix_remove=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_XkbQueryExtension=no -+ ac_cv_lib_nsl_gethostbyname=no ++ ac_cv_lib_posix_remove=no fi - -rm -rf conftest.dSYM @@ -24371,26 +24516,32 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -#define HAVE_XKB 1 -_ACEOF - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 -+$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } -+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then : -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 ++$as_echo "$ac_cv_lib_posix_remove" >&6; } ++if test "x$ac_cv_lib_posix_remove" = x""yes; then : ++ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" fi - else - { $as_echo "$as_me:$LINENO: WARNING: XKB support explicitly disabled" >&5 -$as_echo "$as_me: WARNING: XKB support explicitly disabled" >&2;} - fi -- ++ fi + - # Check for shaped window extension -- ++ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. ++ ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat" ++if test "x$ac_cv_func_shmat" = x""yes; then : ++ ++fi + - { $as_echo "$as_me:$LINENO: checking for XShapeCombineMask" >&5 -$as_echo_n "checking for XShapeCombineMask... " >&6; } -if test "${ac_cv_func_XShapeCombineMask+set}" = set; then -+ if test $ac_cv_lib_nsl_gethostbyname = no; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 -+$as_echo_n "checking for gethostbyname in -lbsd... " >&6; } -+if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then : ++ if test $ac_cv_func_shmat = no; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 ++$as_echo_n "checking for shmat in -lipc... " >&6; } ++if test "${ac_cv_lib_ipc_shmat+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF @@ -24399,7 +24550,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS -+LIBS="-lbsd $LIBS" ++LIBS="-lipc $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Define XShapeCombineMask to an innocuous variant, in case declares XShapeCombineMask. @@ -24421,7 +24572,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -30691,97 +23269,55 @@ +@@ -30703,97 +23474,51 @@ #ifdef __cplusplus extern "C" #endif @@ -24433,12 +24584,12 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -choke me -#endif - -+char gethostbyname (); ++char shmat (); int main () { -return XShapeCombineMask (); -+return gethostbyname (); ++return shmat (); ; return 0; } @@ -24466,13 +24617,13 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - }; then - ac_cv_func_XShapeCombineMask=yes +if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_bsd_gethostbyname=yes ++ ac_cv_lib_ipc_shmat=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_XShapeCombineMask=no -+ ac_cv_lib_bsd_gethostbyname=no ++ ac_cv_lib_ipc_shmat=no fi - -rm -rf conftest.dSYM @@ -24490,37 +24641,34 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - { { $as_echo "$as_me:$LINENO: error: Shape extension not found, check your development headers" >&5 -$as_echo "$as_me: error: Shape extension not found, check your development headers" >&2;} - { (exit 1); exit 1; }; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 -+$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } -+if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then : -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 ++$as_echo "$ac_cv_lib_ipc_shmat" >&6; } ++if test "x$ac_cv_lib_ipc_shmat" = x""yes; then : ++ X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" fi -+ fi + fi ++ fi - # X SYNC check - gtk_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $x_cflags" -+ # lieder@skyler.mavd.honeywell.com says without -lsocket, -+ # socket/setsockopt and other routines are undefined under SCO ODT -+ # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary -+ # on later versions), says Simon Leinen: it contains gethostby* -+ # variants that don't use the name server (or something). -lsocket -+ # must be given before -lnsl if both are needed. We assume that -+ # if connect needs -lnsl, so does gethostbyname. -+ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect" -+if test "x$ac_cv_func_connect" = x""yes; then : -+ -+fi - +- - { $as_echo "$as_me:$LINENO: checking for XSyncQueryExtension" >&5 -$as_echo_n "checking for XSyncQueryExtension... " >&6; } -if test "${ac_cv_func_XSyncQueryExtension+set}" = set; then -+ if test $ac_cv_func_connect = no; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 -+$as_echo_n "checking for connect in -lsocket... " >&6; } -+if test "${ac_cv_lib_socket_connect+set}" = set; then : ++ # Check for libraries that X11R6 Xt/Xaw programs need. ++ ac_save_LDFLAGS=$LDFLAGS ++ test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" ++ # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to ++ # check for ICE first), but we must link in the order -lSM -lICE or ++ # we get undefined symbols. So assume we have SM if we have ICE. ++ # These have to be linked with before -lX11, unlike the other ++ # libraries we check for below, so use a different variable. ++ # John Interrante, Karl Berry ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 ++$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } ++if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF @@ -24529,7 +24677,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS -+LIBS="-lsocket $X_EXTRA_LIBS $LIBS" ++LIBS="-lICE $X_EXTRA_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Define XSyncQueryExtension to an innocuous variant, in case declares XSyncQueryExtension. @@ -24551,7 +24699,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -30789,150 +23325,97 @@ +@@ -30801,224 +23526,238 @@ #ifdef __cplusplus extern "C" #endif @@ -24563,12 +24711,12 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -choke me -#endif - -+char connect (); ++char IceConnectionNumber (); int main () { -return XSyncQueryExtension (); -+return connect (); ++return IceConnectionNumber (); ; return 0; } @@ -24596,33 +24744,66 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - }; then - ac_cv_func_XSyncQueryExtension=yes +if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_socket_connect=yes ++ ac_cv_lib_ICE_IceConnectionNumber=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_func_XSyncQueryExtension=no -+ ac_cv_lib_socket_connect=no ++ ac_cv_lib_ICE_IceConnectionNumber=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 -+$as_echo "$ac_cv_lib_socket_connect" >&6; } -+if test "x$ac_cv_lib_socket_connect" = x""yes; then : -+ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 ++$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } ++if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then : ++ X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" ++fi ++ ++ LDFLAGS=$ac_save_LDFLAGS ++ ++fi ++ ++ if test x$no_x = xyes ; then ++ as_fn_error "X development libraries not found" "$LINENO" 5 ++ fi ++ ++ x_cflags="$X_CFLAGS" ++ x_libs_for_checks="$X_LIBS -lXext -lXrender -lX11 $X_EXTRA_LIBS" ++ ++ GDK_PIXBUF_XLIB_EXTRA_CFLAGS="$x_cflags" ++ GDK_PIXBUF_XLIB_EXTRA_LIBS="$X_LIBS -lX11 $X_EXTRA_LIBS" ++ GTK_DEP_LIBS_FOR_X="$X_LIBS -lXrender -lX11 $X_EXTRA_LIBS" ++ fi ++ ++ # Extra libraries found during checks (-lXinerama, etc), not from pkg-config. ++ x_extra_libs= ++ ++ gtk_save_cppflags="$CPPFLAGS" ++ CPPFLAGS="$CPPFLAGS $X_CFLAGS" ++ ++ gtk_save_LIBS=$LIBS ++ LIBS="$x_libs_for_checks $LIBS" + +- ac_cv_func_XSyncQueryExtension=no ++ # Sanity check for the X11 and Xext libraries. While everything we need from ++ # Xext is optional, the chances a system has *none* of these things is so ++ # small that we just unconditionally require it. ++ ac_fn_c_check_func "$LINENO" "XOpenDisplay" "ac_cv_func_XOpenDisplay" ++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 fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -+ fi -+ -+ # Guillermo Gomez says -lposix is necessary on A/UX. -+ ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove" -+if test "x$ac_cv_func_remove" = x""yes; then : -+ ++ 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 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XSyncQueryExtension" >&5 -$as_echo "$ac_cv_func_XSyncQueryExtension" >&6; } @@ -24630,36 +24811,35 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - { $as_echo "$as_me:$LINENO: checking for X11/extensions/sync.h" >&5 -$as_echo_n "checking for X11/extensions/sync.h... " >&6; } -if test "${ac_cv_header_X11_extensions_sync_h+set}" = set; then +- $as_echo_n "(cached) " >&6 + -+ if test $ac_cv_func_remove = no; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 -+$as_echo_n "checking for remove in -lposix... " >&6; } -+if test "${ac_cv_lib_posix_remove+set}" = set; then : - $as_echo_n "(cached) " >&6 ++ ac_fn_c_check_func "$LINENO" "XRenderQueryExtension" "ac_cv_func_XRenderQueryExtension" ++if test "x$ac_cv_func_XRenderQueryExtension" = x""yes; then : ++ : else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lposix $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -#include ++ as_fn_error "*** libXrender not found. Check 'config.log' for more details." "$LINENO" 5 ++fi ++ -#include -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char remove (); ++ # Check for xReply ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if is needed for xReply" >&5 ++$as_echo_n "checking if is needed for xReply... " >&6; } ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include +int +main () +{ -+return remove (); ++xReply *rep; + ; + return 0; +} @@ -24683,93 +24863,129 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_header_X11_extensions_sync_h=yes -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_posix_remove=yes ++if ac_fn_c_try_compile "$LINENO"; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include ++#include ++int ++main () ++{ ++xReply *rep; ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ ++$as_echo "#define NEED_XIPROTO_H_FOR_XREPLY 1" >>confdefs.h + - ac_cv_header_X11_extensions_sync_h=no --fi ++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 + fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_cv_lib_posix_remove=no + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_sync_h" >&5 -$as_echo "$ac_cv_header_X11_extensions_sync_h" >&6; } -if test "x$ac_cv_header_X11_extensions_sync_h" = x""yes; then -- ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + -cat >>confdefs.h <<\_ACEOF -#define HAVE_XSYNC 1 --_ACEOF -- ++ # Check for XConvertCase, XInternAtoms (X11R6 specific) ++ ++ for ac_func in XConvertCase XInternAtoms ++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" ++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 + -else - : -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS fi -- -- -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 -+$as_echo "$ac_cv_lib_posix_remove" >&6; } -+if test "x$ac_cv_lib_posix_remove" = x""yes; then : -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" ++done ++ + ++ # Generic X11R6 check needed for XIM support; we could ++ # probably use this to replace the above, but we'll ++ # leave the separate checks for XConvertCase and XInternAtoms ++ # for clarity + ++ have_x11r6=false ++ ac_fn_c_check_func "$LINENO" "XAddConnectionWatch" "ac_cv_func_XAddConnectionWatch" ++if test "x$ac_cv_func_XAddConnectionWatch" = x""yes; then : ++ have_x11r6=true fi -+ fi - CFLAGS="$gtk_save_CFLAGS" -+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. -+ ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat" -+if test "x$ac_cv_func_shmat" = x""yes; then : ++ if $have_x11r6; then - # Xshm checks -+fi ++$as_echo "#define HAVE_X11R6 1" >>confdefs.h - if test "x$enable_shm" = "xyes"; then - # Check for the XShm extension, normally in Xext - { $as_echo "$as_me:$LINENO: checking for XShmAttach" >&5 -$as_echo_n "checking for XShmAttach... " >&6; } -if test "${ac_cv_func_XShmAttach+set}" = set; then -+ if test $ac_cv_func_shmat = no; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 -+$as_echo_n "checking for shmat in -lipc... " >&6; } -+if test "${ac_cv_lib_ipc_shmat+set}" = set; then : - $as_echo_n "(cached) " >&6 +- $as_echo_n "(cached) " >&6 ++ fi ++ if $have_x11r6; then ++ HAVE_X11R6_TRUE= ++ HAVE_X11R6_FALSE='#' else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lipc $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -/* Define XShmAttach to an innocuous variant, in case declares XShmAttach. - For example, HP-UX 11i declares gettimeofday. */ -#define XShmAttach innocuous_XShmAttach -- ++ HAVE_X11R6_TRUE='#' ++ HAVE_X11R6_FALSE= ++fi + -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char XShmAttach (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -- + -#ifdef __STDC__ -# include -#else -# include -#endif -- --#undef XShmAttach ++ # Check for XKB support. - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -@@ -30940,73 +23423,50 @@ - #ifdef __cplusplus - extern "C" - #endif +-#undef XShmAttach ++ if test "x$enable_xkb" = "xyes"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: XKB support explicitly enabled" >&5 ++$as_echo "$as_me: WARNING: XKB support explicitly enabled" >&2;} + +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif -char XShmAttach (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named @@ -24777,17 +24993,16 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -#if defined __stub_XShmAttach || defined __stub___XShmAttach -choke me -#endif -- -+char shmat (); - int - main () - { ++$as_echo "#define HAVE_XKB 1" >>confdefs.h + +-int +-main () +-{ -return XShmAttach (); -+return shmat (); - ; - return 0; - } - _ACEOF +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -24810,79 +25025,88 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_XShmAttach=yes -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_ipc_shmat=yes ++ elif test "x$enable_xkb" = "xmaybe"; then ++ ac_fn_c_check_func "$LINENO" "XkbQueryExtension" "ac_cv_func_XkbQueryExtension" ++if test "x$ac_cv_func_XkbQueryExtension" = x""yes; then : ++ ++$as_echo "#define HAVE_XKB 1" >>confdefs.h ++ ++fi ++ ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: XKB support explicitly disabled" >&5 ++$as_echo "$as_me: WARNING: XKB support explicitly disabled" >&2;} ++ fi ++ ++ # Check for shaped window extension ++ ++ ac_fn_c_check_func "$LINENO" "XShapeCombineMask" "ac_cv_func_XShapeCombineMask" ++if test "x$ac_cv_func_XShapeCombineMask" = x""yes; then : ++ : else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_func_XShmAttach=no -+ ac_cv_lib_ipc_shmat=no ++ as_fn_error "Shape extension not found, check your development headers" "$LINENO" 5 +fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS ++ ++ ++ # X SYNC check ++ gtk_save_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS $x_cflags" + +- ac_cv_func_XShmAttach=no ++ ac_fn_c_check_func "$LINENO" "XSyncQueryExtension" "ac_cv_func_XSyncQueryExtension" ++if test "x$ac_cv_func_XSyncQueryExtension" = x""yes; then : ++ ac_fn_c_check_header_compile "$LINENO" "X11/extensions/sync.h" "ac_cv_header_X11_extensions_sync_h" "#include ++" ++if test "x$ac_cv_header_X11_extensions_sync_h" = x""yes; then : ++ ++$as_echo "#define HAVE_XSYNC 1" >>confdefs.h ++ ++else ++ : fi -- + -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 -+$as_echo "$ac_cv_lib_ipc_shmat" >&6; } -+if test "x$ac_cv_lib_ipc_shmat" = x""yes; then : -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" ++ fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XShmAttach" >&5 -$as_echo "$ac_cv_func_XShmAttach" >&6; } -if test "x$ac_cv_func_XShmAttach" = x""yes; then -- : --else -- # On AIX, it is in XextSam instead ++ ++ ++ CFLAGS="$gtk_save_CFLAGS" ++ ++ # Xshm checks ++ ++ if test "x$enable_shm" = "xyes"; then ++ # Check for the XShm extension, normally in Xext ++ ac_fn_c_check_func "$LINENO" "XShmAttach" "ac_cv_func_XShmAttach" ++if test "x$ac_cv_func_XShmAttach" = x""yes; then : + : + else + # On AIX, it is in XextSam instead - { $as_echo "$as_me:$LINENO: checking for XShmAttach in -lXextSam" >&5 --$as_echo_n "checking for XShmAttach in -lXextSam... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShmAttach in -lXextSam" >&5 + $as_echo_n "checking for XShmAttach in -lXextSam... " >&6; } -if test "${ac_cv_lib_XextSam_XShmAttach+set}" = set; then -+ -+ fi -+ fi -+ -+ # Check for libraries that X11R6 Xt/Xaw programs need. -+ ac_save_LDFLAGS=$LDFLAGS -+ test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" -+ # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to -+ # check for ICE first), but we must link in the order -lSM -lICE or -+ # we get undefined symbols. So assume we have SM if we have ICE. -+ # These have to be linked with before -lX11, unlike the other -+ # libraries we check for below, so use a different variable. -+ # John Interrante, Karl Berry -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 -+$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } -+if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then : ++if test "${ac_cv_lib_XextSam_XShmAttach+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS --LIBS="-lXextSam $LIBS" + LIBS="-lXextSam $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+LIBS="-lICE $X_EXTRA_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -31015,345 +23475,294 @@ - #ifdef __cplusplus - extern "C" - #endif --char XShmAttach (); -+char IceConnectionNumber (); - int - main () - { --return XShmAttach (); -+return IceConnectionNumber (); - ; +@@ -31036,336 +23775,45 @@ return 0; } _ACEOF @@ -24907,15 +25131,14 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -- ac_cv_lib_XextSam_XShmAttach=yes +if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_ICE_IceConnectionNumber=yes + ac_cv_lib_XextSam_XShmAttach=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_XextSam_XShmAttach=no -+ ac_cv_lib_ICE_IceConnectionNumber=no ++ ac_cv_lib_XextSam_XShmAttach=no fi - -rm -rf conftest.dSYM @@ -24926,35 +25149,21 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_XextSam_XShmAttach" >&5 --$as_echo "$ac_cv_lib_XextSam_XShmAttach" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_XextSam_XShmAttach" >&5 + $as_echo "$ac_cv_lib_XextSam_XShmAttach" >&6; } -if test "x$ac_cv_lib_XextSam_XShmAttach" = x""yes; then -- case "$x_extra_libs " in -- *-lXextSam[\ \ ]*) ;; ++if test "x$ac_cv_lib_XextSam_XShmAttach" = x""yes; then : + case "$x_extra_libs " in + *-lXextSam[\ \ ]*) ;; - *) x_extra_libs="-lXextSam $x_extra_libs" ;; - esac - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -+$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } -+if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then : -+ X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" - fi - -+ LDFLAGS=$ac_save_LDFLAGS -+ - fi - -+ if test x$no_x = xyes ; then -+ as_fn_error "X development libraries not found" "$LINENO" 5 -+ fi -+ -+ x_cflags="$X_CFLAGS" -+ x_libs_for_checks="$X_LIBS -lXext -lXrender -lX11 $X_EXTRA_LIBS" -+ -+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS="$x_cflags" -+ GDK_PIXBUF_XLIB_EXTRA_LIBS="$X_LIBS -lX11 $X_EXTRA_LIBS" -+ GTK_DEP_LIBS_FOR_X="$X_LIBS -lXrender -lX11 $X_EXTRA_LIBS" - fi - +-fi +- +-fi +- +- fi +- - if test "x$enable_shm" = "xyes"; then - # Check for shared memory - if test "${ac_cv_header_sys_ipc_h+set}" = set; then @@ -24965,22 +25174,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5 -$as_echo "$ac_cv_header_sys_ipc_h" >&6; } -+ # Extra libraries found during checks (-lXinerama, etc), not from pkg-config. -+ x_extra_libs= -+ -+ gtk_save_cppflags="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $X_CFLAGS" -+ -+ gtk_save_LIBS=$LIBS -+ LIBS="$x_libs_for_checks $LIBS" -+ -+ # Sanity check for the X11 and Xext libraries. While everything we need from -+ # Xext is optional, the chances a system has *none* of these things is so -+ # small that we just unconditionally require it. -+ ac_fn_c_check_func "$LINENO" "XOpenDisplay" "ac_cv_func_XOpenDisplay" -+if test "x$ac_cv_func_XOpenDisplay" = x""yes; then : -+ : - else +-else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking sys/ipc.h usability" >&5 -$as_echo_n "checking sys/ipc.h usability... " >&6; } @@ -25012,69 +25206,28 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -+ 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 +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ as_fn_error "*** libXext not found. Check 'config.log' for more details." "$LINENO" 5 -+fi - +- - ac_header_compiler=no -+ 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 - fi - +-fi +- -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - +- -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking sys/ipc.h presence" >&5 -$as_echo_n "checking sys/ipc.h presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -+ # Check for xReply -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if is needed for xReply" >&5 -+$as_echo_n "checking if is needed for xReply... " >&6; } -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main () -+{ -+xReply *rep; -+ ; -+ return 0; -+} - _ACEOF +-_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -#include -+#include -+#include -+int -+main () -+{ -+xReply *rep; -+ ; -+ return 0; -+} - _ACEOF +-_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -25093,43 +25246,17 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - test ! -s conftest.err - }; then - ac_header_preproc=yes -+if ac_fn_c_try_compile "$LINENO"; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } -+ -+$as_echo "#define NEED_XIPROTO_H_FOR_XREPLY 1" >>confdefs.h -+ - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ { $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 -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+ # Check for XConvertCase, XInternAtoms (X11R6 specific) -+ -+ for ac_func in XConvertCase XInternAtoms -+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" -+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 - +- - ac_header_preproc=no - fi -+done - +-fi +- -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - +- -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) @@ -25164,108 +25291,33 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -$as_echo_n "checking for sys/ipc.h... " >&6; } -if test "${ac_cv_header_sys_ipc_h+set}" = set; then - $as_echo_n "(cached) " >&6 -+ # Generic X11R6 check needed for XIM support; we could -+ # probably use this to replace the above, but we'll -+ # leave the separate checks for XConvertCase and XInternAtoms -+ # for clarity -+ -+ have_x11r6=false -+ ac_fn_c_check_func "$LINENO" "XAddConnectionWatch" "ac_cv_func_XAddConnectionWatch" -+if test "x$ac_cv_func_XAddConnectionWatch" = x""yes; then : -+ have_x11r6=true -+fi -+ -+ -+ if $have_x11r6; then -+ -+$as_echo "#define HAVE_X11R6 1" >>confdefs.h -+ -+ fi -+ if $have_x11r6; then -+ HAVE_X11R6_TRUE= -+ HAVE_X11R6_FALSE='#' - else +-else - ac_cv_header_sys_ipc_h=$ac_header_preproc -+ HAVE_X11R6_TRUE='#' -+ HAVE_X11R6_FALSE= - fi +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5 -$as_echo "$ac_cv_header_sys_ipc_h" >&6; } -+ -+ -+ # Check for XKB support. -+ -+ if test "x$enable_xkb" = "xyes"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: XKB support explicitly enabled" >&5 -+$as_echo "$as_me: WARNING: XKB support explicitly enabled" >&2;} -+ -+$as_echo "#define HAVE_XKB 1" >>confdefs.h -+ -+ elif test "x$enable_xkb" = "xmaybe"; then -+ ac_fn_c_check_func "$LINENO" "XkbQueryExtension" "ac_cv_func_XkbQueryExtension" -+if test "x$ac_cv_func_XkbQueryExtension" = x""yes; then : -+ -+$as_echo "#define HAVE_XKB 1" >>confdefs.h - - fi +- +-fi -if test "x$ac_cv_header_sys_ipc_h" = x""yes; then - +- -cat >>confdefs.h <<\_ACEOF -#define HAVE_IPC_H 1 -_ACEOF -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: XKB support explicitly disabled" >&5 -+$as_echo "$as_me: WARNING: XKB support explicitly disabled" >&2;} -+ fi -+ -+ # Check for shaped window extension - -+ ac_fn_c_check_func "$LINENO" "XShapeCombineMask" "ac_cv_func_XShapeCombineMask" -+if test "x$ac_cv_func_XShapeCombineMask" = x""yes; then : -+ : - else +- +-else - no_sys_ipc=yes -+ as_fn_error "Shape extension not found, check your development headers" "$LINENO" 5 - fi - - +-fi +- +- - if test "${ac_cv_header_sys_shm_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for sys/shm.h" >&5 -$as_echo_n "checking for sys/shm.h... " >&6; } -if test "${ac_cv_header_sys_shm_h+set}" = set; then - $as_echo_n "(cached) " >&6 -+ # X SYNC check -+ gtk_save_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS $x_cflags" -+ -+ ac_fn_c_check_func "$LINENO" "XSyncQueryExtension" "ac_cv_func_XSyncQueryExtension" -+if test "x$ac_cv_func_XSyncQueryExtension" = x""yes; then : -+ ac_fn_c_check_header_compile "$LINENO" "X11/extensions/sync.h" "ac_cv_header_X11_extensions_sync_h" "#include -+" -+if test "x$ac_cv_header_X11_extensions_sync_h" = x""yes; then : -+ -+$as_echo "#define HAVE_XSYNC 1" >>confdefs.h -+ -+else -+ : - fi +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_shm_h" >&5 -$as_echo "$ac_cv_header_sys_shm_h" >&6; } -+ -+ -+fi -+ -+ -+ CFLAGS="$gtk_save_CFLAGS" -+ -+ # Xshm checks -+ -+ if test "x$enable_shm" = "xyes"; then -+ # Check for the XShm extension, normally in Xext -+ ac_fn_c_check_func "$LINENO" "XShmAttach" "ac_cv_func_XShmAttach" -+if test "x$ac_cv_func_XShmAttach" = x""yes; then : -+ : - else +-else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking sys/shm.h usability" >&5 -$as_echo_n "checking sys/shm.h usability... " >&6; } @@ -25274,34 +25326,10 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ # On AIX, it is in XextSam instead -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShmAttach in -lXextSam" >&5 -+$as_echo_n "checking for XShmAttach in -lXextSam... " >&6; } -+if test "${ac_cv_lib_XextSam_XShmAttach+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lXextSam $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -$ac_includes_default -#include -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char XShmAttach (); -+int -+main () -+{ -+return XShmAttach (); -+ ; -+ return 0; -+} - _ACEOF +-_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -25321,33 +25349,17 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_XextSam_XShmAttach=yes - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ ac_cv_lib_XextSam_XShmAttach=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_XextSam_XShmAttach" >&5 -+$as_echo "$ac_cv_lib_XextSam_XShmAttach" >&6; } -+if test "x$ac_cv_lib_XextSam_XShmAttach" = x""yes; then : -+ case "$x_extra_libs " in -+ *-lXextSam[\ \ ]*) ;; -+ *) x_extra_libs="-lXextSam $x_extra_libs" ;; -+ esac - +- - ac_header_compiler=no - fi - +-fi +- -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } -+fi - +- -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking sys/shm.h presence" >&5 -$as_echo_n "checking sys/shm.h presence... " >&6; } @@ -25380,18 +25392,24 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ fi ++ *) x_extra_libs="-lXextSam $x_extra_libs" ;; ++ esac - ac_header_preproc=no --fi -+ if test "x$enable_shm" = "xyes"; then -+ # Check for shared memory -+ ac_fn_c_check_header_mongrel "$LINENO" "sys/ipc.h" "ac_cv_header_sys_ipc_h" "$ac_includes_default" -+if test "x$ac_cv_header_sys_ipc_h" = x""yes; then : + fi -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } ++fi ++ ++ fi ++ ++ if test "x$enable_shm" = "xyes"; then ++ # Check for shared memory ++ ac_fn_c_check_header_mongrel "$LINENO" "sys/ipc.h" "ac_cv_header_sys_ipc_h" "$ac_includes_default" ++if test "x$ac_cv_header_sys_ipc_h" = x""yes; then : ++ +$as_echo "#define HAVE_IPC_H 1" >>confdefs.h -# So? What about this header? @@ -25448,7 +25466,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure else no_sys_shm=yes -@@ -31363,18 +23772,14 @@ +@@ -31375,18 +23823,14 @@ # Check for the X shared memory extension header file have_xshm=no @@ -25469,7 +25487,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ #include -@@ -31393,42 +23798,17 @@ +@@ -31405,42 +23849,17 @@ return 0; } _ACEOF @@ -25515,7 +25533,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure fi fi -@@ -31439,7 +23819,7 @@ +@@ -31451,7 +23870,7 @@ CPPFLAGS="$CPPFLAGS $x_cflags" # Check for XFree @@ -25524,7 +25542,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "checking for Xinerama support on XFree86... " >&6; } have_xfree_xinerama=false -@@ -31447,18 +23827,14 @@ +@@ -31459,18 +23878,14 @@ have_xfree_xinerama=true X_PACKAGES="$X_PACKAGES xinerama" else @@ -25546,7 +25564,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -31476,89 +23852,21 @@ +@@ -31488,89 +23903,21 @@ return 0; } _ACEOF @@ -25645,7 +25663,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure case "$x_extra_libs " in *-lXinerama[\ \ ]*) ;; *) x_extra_libs="-lXinerama $x_extra_libs" ;; -@@ -31576,160 +23884,29 @@ +@@ -31588,160 +23935,29 @@ if $have_xfree_xinerama ; then @@ -25816,7 +25834,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure have_solaris_xinerama=true else : -@@ -31741,19 +23918,15 @@ +@@ -31753,19 +23969,15 @@ if $have_solaris_xinerama ; then @@ -25840,7 +25858,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi ;; -@@ -31767,9 +23940,7 @@ +@@ -31779,9 +23991,7 @@ if test "x$with_xinput" = "xxfree" || test "x$with_xinput" = "xyes"; then @@ -25851,7 +25869,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure if $PKG_CONFIG --exists xi ; then -@@ -31783,9 +23954,7 @@ +@@ -31795,9 +24005,7 @@ fi else @@ -25862,7 +25880,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure fi -@@ -31801,9 +23970,7 @@ +@@ -31813,9 +24021,7 @@ # Check for the RANDR extension if $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then @@ -25873,7 +25891,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure X_PACKAGES="$X_PACKAGES xrandr" -@@ -31813,9 +23980,7 @@ +@@ -31825,9 +24031,7 @@ if $PKG_CONFIG --exists xcursor ; then @@ -25884,7 +25902,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure X_PACKAGES="$X_PACKAGES xcursor" -@@ -31825,9 +23990,7 @@ +@@ -31837,9 +24041,7 @@ if $PKG_CONFIG --exists xfixes ; then @@ -25895,7 +25913,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure X_PACKAGES="$X_PACKAGES xfixes" -@@ -31838,9 +24001,7 @@ +@@ -31850,9 +24052,7 @@ if $PKG_CONFIG --exists xcomposite ; then @@ -25906,7 +25924,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure X_PACKAGES="$X_PACKAGES xcomposite" -@@ -31851,9 +24012,7 @@ +@@ -31863,9 +24063,7 @@ if $PKG_CONFIG --exists xdamage ; then @@ -25917,7 +25935,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure X_PACKAGES="$X_PACKAGES xdamage" -@@ -31959,45 +24118,49 @@ +@@ -31971,45 +24169,49 @@ if test "x$gdktarget" = "xdirectfb"; then DIRECTFB_REQUIRED_VERSION=1.0.0 @@ -25987,7 +26005,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure fi -@@ -32010,25 +24173,14 @@ +@@ -32022,25 +24224,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then @@ -26016,7 +26034,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $DIRECTFB_PKG_ERRORS -@@ -32038,22 +24190,11 @@ +@@ -32050,22 +24241,11 @@ 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. @@ -26042,7 +26060,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -@@ -32062,12 +24203,11 @@ +@@ -32074,12 +24254,11 @@ See the pkg-config man page for more details. To get pkg-config, see . @@ -26057,7 +26075,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "yes" >&6; } : fi -@@ -32099,24 +24239,19 @@ +@@ -32111,24 +24290,19 @@ PANGO_PACKAGES="pango pangocairo" fi @@ -26086,7 +26104,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure fi CFLAGS="$CFLAGS $PANGO_CFLAGS" -@@ -32126,11 +24261,7 @@ +@@ -32138,11 +24312,7 @@ else gtk_save_LIBS="$LIBS" LIBS="$PANGO_LIBS $LIBS" @@ -26099,14 +26117,10 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -32144,64 +24275,37 @@ - main () - { - return pango_context_new (); -- ; -- return 0; --} --_ACEOF +@@ -32160,60 +24330,33 @@ + return 0; + } + _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -26128,10 +26142,6 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -+ ; -+ return 0; -+} -+_ACEOF +if ac_fn_c_try_link "$LINENO"; then : : else @@ -26179,7 +26189,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure fi -@@ -32211,29 +24315,25 @@ +@@ -32223,29 +24366,25 @@ @@ -26214,7 +26224,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure fi if $PKG_CONFIG --uninstalled $ATK_PACKAGES; then -@@ -32241,11 +24341,7 @@ +@@ -32253,11 +24392,7 @@ else gtk_save_LIBS="$LIBS" LIBS="$ATK_LIBS $LIBS" @@ -26227,7 +26237,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -32263,44 +24359,15 @@ +@@ -32275,44 +24410,15 @@ return 0; } _ACEOF @@ -26277,7 +26287,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure LIBS="$gtk_save_LIBS" fi -@@ -32323,7 +24390,7 @@ +@@ -32335,7 +24441,7 @@ CAIRO_PREFIX="`pkg-config --variable=prefix cairo`" if test $enable_explicit_deps != yes ; then @@ -26286,7 +26296,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure fi -@@ -32351,17 +24418,13 @@ +@@ -32363,17 +24469,13 @@ ######################## old_LIBS="$LIBS" @@ -26307,10 +26317,11 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -32386,69 +24449,38 @@ +@@ -32397,70 +24499,39 @@ + else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi +- fi - rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -26332,6 +26343,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then ++ fi + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_gethostent=$ac_res -else @@ -26388,7 +26400,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -32473,69 +24505,38 @@ +@@ -32485,69 +24556,38 @@ ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi @@ -26469,7 +26481,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -32560,161 +24561,37 @@ +@@ -32572,161 +24612,37 @@ ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi @@ -26642,7 +26654,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure struct_sockaddr_un_sun_len=true else struct_sockaddr_un_suin_len=false -@@ -32742,7 +24619,7 @@ +@@ -32754,7 +24670,7 @@ ################################################################ # Check whether --enable-cups was given. @@ -26651,7 +26663,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure enableval=$enable_cups; else enable_cups=auto -@@ -32761,9 +24638,9 @@ +@@ -32773,9 +24689,9 @@ else # Extract the first word of "cups-config", so it can be a program name with args. set dummy cups-config; ac_word=$2 @@ -26663,7 +26675,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else case $CUPS_CONFIG in -@@ -32776,14 +24653,14 @@ +@@ -32788,14 +24704,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -26681,7 +26693,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure IFS=$as_save_IFS test -z "$ac_cv_path_CUPS_CONFIG" && ac_cv_path_CUPS_CONFIG="no" -@@ -32792,193 +24669,54 @@ +@@ -32804,10 +24720,10 @@ fi CUPS_CONFIG=$ac_cv_path_CUPS_CONFIG if test -n "$CUPS_CONFIG"; then @@ -26690,51 +26702,41 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$CUPS_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } --fi -- -- -- if test "x$CUPS_CONFIG" = "xno"; then -- if test "x$enable_cups" = "xauto"; then -- if false; then -- HAVE_CUPS_TRUE= -- HAVE_CUPS_FALSE='#' --else -- HAVE_CUPS_TRUE='#' -- HAVE_CUPS_FALSE= --fi -- -- else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -32823,13 +24739,9 @@ + fi + + else - { { $as_echo "$as_me:$LINENO: error: --*** cups not found. ++ as_fn_error " + *** cups not found. -" >&5 -$as_echo "$as_me: error: -*** cups not found. -" >&2;} - { (exit 1); exit 1; }; } -- fi -- else -- CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed 's/-O0-9*//' | sed 's/-m^\t*//g'` -- CUPS_LIBS=`$CUPS_CONFIG --libs` -- -- CUPS_API_VERSION=`$CUPS_CONFIG --api-version` -- CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $1}'` -- CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'` -- -- if test $CUPS_API_MAJOR -gt 1 -o \ -- $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then -- ++" "$LINENO" 5 + fi + else + CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed 's/-O0-9*//' | sed 's/-m^\t*//g'` +@@ -32842,9 +24754,7 @@ + if test $CUPS_API_MAJOR -gt 1 -o \ + $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then + -cat >>confdefs.h <<\_ACEOF -#define HAVE_CUPS_API_1_2 1 -_ACEOF -- -- fi -- -- -- -- -- -- ++$as_echo "#define HAVE_CUPS_API_1_2 1" >>confdefs.h + + fi + +@@ -32853,144 +24763,11 @@ + + + - if test "${ac_cv_header_cups_cups_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for cups/cups.h" >&5 -$as_echo_n "checking for cups/cups.h... " >&6; } @@ -26862,53 +26864,15 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure - $as_echo_n "(cached) " >&6 -else - ac_cv_header_cups_cups_h=$ac_header_preproc -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 -$as_echo "$ac_cv_header_cups_cups_h" >&6; } - -+ -+ if test "x$CUPS_CONFIG" = "xno"; then -+ if test "x$enable_cups" = "xauto"; then -+ if false; then -+ HAVE_CUPS_TRUE= -+ HAVE_CUPS_FALSE='#' -+else -+ HAVE_CUPS_TRUE='#' -+ HAVE_CUPS_FALSE= - fi --if test "x$ac_cv_header_cups_cups_h" = x""yes; then -- : -+ -+ else -+ as_fn_error " -+*** cups not found. -+" "$LINENO" 5 -+ fi -+ else -+ CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed 's/-O0-9*//' | sed 's/-m^\t*//g'` -+ CUPS_LIBS=`$CUPS_CONFIG --libs` -+ -+ CUPS_API_VERSION=`$CUPS_CONFIG --api-version` -+ CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $1}'` -+ CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'` -+ -+ if test $CUPS_API_MAJOR -gt 1 -o \ -+ $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then -+ -+$as_echo "#define HAVE_CUPS_API_1_2 1" >>confdefs.h -+ -+ fi -+ -+ -+ -+ -+ -+ + ac_fn_c_check_header_mongrel "$LINENO" "cups/cups.h" "ac_cv_header_cups_cups_h" "$ac_includes_default" +if test "x$ac_cv_header_cups_cups_h" = x""yes; then : -+ + +-fi +-if test "x$ac_cv_header_cups_cups_h" = x""yes; then +- : else - { { $as_echo "$as_me:$LINENO: error: *** Sorry, cups-config present but cups/cups.h missing." >&5 -$as_echo "$as_me: error: *** Sorry, cups-config present but cups/cups.h missing." >&2;} @@ -26917,7 +26881,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure fi -@@ -32994,11 +24732,7 @@ +@@ -33006,11 +24783,7 @@ gtk_save_cflags="$CFLAGS" CFLAGS="$CUPS_CFLAGS" @@ -26930,7 +26894,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ #include int -@@ -33009,36 +24743,11 @@ +@@ -33021,36 +24794,11 @@ return 0; } _ACEOF @@ -26969,7 +26933,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS="$gtk_save_cflags" -@@ -33046,102 +24755,12 @@ +@@ -33058,102 +24806,12 @@ gtk_save_libs="$LIBS" LIBS="$CUPS_LIBS" @@ -27077,7 +27041,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure _ACEOF fi -@@ -33155,7 +24774,7 @@ +@@ -33167,7 +24825,7 @@ # # Check whether --enable-papi was given. @@ -27086,7 +27050,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure enableval=$enable_papi; else enable_papi=auto -@@ -33172,20 +24791,16 @@ +@@ -33184,20 +24842,16 @@ fi else @@ -27111,7 +27075,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -33203,43 +24818,18 @@ +@@ -33215,43 +24869,18 @@ return 0; } _ACEOF @@ -27161,7 +27125,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure have_papi=yes else have_papi=no -@@ -33247,9 +24837,7 @@ +@@ -33259,9 +24888,7 @@ if test $have_papi = yes; then @@ -27172,7 +27136,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure fi if test $have_papi = yes; then -@@ -33261,317 +24849,43 @@ +@@ -33273,13 +24900,9 @@ fi if test "x$enable_papi" = "xyes" -a "x$have_papi" = "xno"; then @@ -27188,18 +27152,10 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure fi fi - if test "x$have_papi" = "xyes" -a "x$CUPS_CONFIG" != "xno"; then -- HAVE_PAPI_CUPS_TRUE= -- HAVE_PAPI_CUPS_FALSE='#' --else -- HAVE_PAPI_CUPS_TRUE='#' -- HAVE_PAPI_CUPS_FALSE= --fi -- -- --gtk_save_cppflags="$CPPFLAGS" --CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS $GDK_DEP_CFLAGS" -- +@@ -33295,295 +24918,25 @@ + gtk_save_cppflags="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS $GDK_DEP_CFLAGS" + -if test "${ac_cv_header_cairo_pdf_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for cairo-pdf.h" >&5 -$as_echo_n "checking for cairo-pdf.h... " >&6; } @@ -27330,23 +27286,27 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cairo_pdf_h" >&5 -$as_echo "$ac_cv_header_cairo_pdf_h" >&6; } -- ++ac_fn_c_check_header_mongrel "$LINENO" "cairo-pdf.h" "ac_cv_header_cairo_pdf_h" "$ac_includes_default" ++if test "x$ac_cv_header_cairo_pdf_h" = x""yes; then : + -fi -if test "x$ac_cv_header_cairo_pdf_h" = x""yes; then - : --else + else - { { $as_echo "$as_me:$LINENO: error: --*** Can't find cairo-pdf.h. You must build Cairo with the pdf ++ as_fn_error " + *** Can't find cairo-pdf.h. You must build Cairo with the pdf -*** backend enabled." >&5 -$as_echo "$as_me: error: -*** Can't find cairo-pdf.h. You must build Cairo with the pdf -*** backend enabled." >&2;} - { (exit 1); exit 1; }; } --fi -- -- -- --if test "$os_win32" != "yes"; then ++*** backend enabled." "$LINENO" 5 + fi + + + + if test "$os_win32" != "yes"; then - if test "${ac_cv_header_cairo_ps_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for cairo-ps.h" >&5 -$as_echo_n "checking for cairo-ps.h... " >&6; } @@ -27432,17 +27392,14 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -+ HAVE_PAPI_CUPS_TRUE= -+ HAVE_PAPI_CUPS_FALSE='#' -+else -+ HAVE_PAPI_CUPS_TRUE='#' -+ HAVE_PAPI_CUPS_FALSE= - fi +-fi ++ ac_fn_c_check_header_mongrel "$LINENO" "cairo-ps.h" "ac_cv_header_cairo_ps_h" "$ac_includes_default" ++if test "x$ac_cv_header_cairo_ps_h" = x""yes; then : -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - +- -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) @@ -27477,30 +27434,15 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -$as_echo_n "checking for cairo-ps.h... " >&6; } -if test "${ac_cv_header_cairo_ps_h+set}" = set; then - $as_echo_n "(cached) " >&6 -+gtk_save_cppflags="$CPPFLAGS" -+CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS $GDK_DEP_CFLAGS" -+ -+ac_fn_c_check_header_mongrel "$LINENO" "cairo-pdf.h" "ac_cv_header_cairo_pdf_h" "$ac_includes_default" -+if test "x$ac_cv_header_cairo_pdf_h" = x""yes; then : -+ - else +-else - ac_cv_header_cairo_ps_h=$ac_header_preproc -+ as_fn_error " -+*** Can't find cairo-pdf.h. You must build Cairo with the pdf -+*** backend enabled." "$LINENO" 5 - fi +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cairo_ps_h" >&5 -$as_echo "$ac_cv_header_cairo_ps_h" >&6; } - +- -fi -if test "x$ac_cv_header_cairo_ps_h" = x""yes; then - : -+ -+ -+if test "$os_win32" != "yes"; then -+ ac_fn_c_check_header_mongrel "$LINENO" "cairo-ps.h" "ac_cv_header_cairo_ps_h" "$ac_includes_default" -+if test "x$ac_cv_header_cairo_ps_h" = x""yes; then : -+ else - { { $as_echo "$as_me:$LINENO: error: + as_fn_error " @@ -27514,7 +27456,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure fi -@@ -33581,7 +24895,7 @@ +@@ -33593,7 +24946,7 @@ # Check whether --enable-test-print-backend was given. @@ -27523,16 +27465,145 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure enableval=$enable_test_print_backend; else enable_test_print_backend=no -@@ -33627,7 +24941,7 @@ +@@ -33638,136 +24991,8 @@ + +- # Extract the first word of "gtkdoc-check", so it can be a program name with args. +-set dummy gtkdoc-check; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- case $GTKDOC_CHECK in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +- ;; +-esac +-fi +-GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK +-if test -n "$GTKDOC_CHECK"; then +- { $as_echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5 +-$as_echo "$GTKDOC_CHECK" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- for ac_prog in gtkdoc-rebase +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- case $GTKDOC_REBASE in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_GTKDOC_REBASE="$GTKDOC_REBASE" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +- ;; +-esac +-fi +-GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE +-if test -n "$GTKDOC_REBASE"; then +- { $as_echo "$as_me:$LINENO: result: $GTKDOC_REBASE" >&5 +-$as_echo "$GTKDOC_REBASE" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- test -n "$GTKDOC_REBASE" && break +-done +-test -n "$GTKDOC_REBASE" || GTKDOC_REBASE="true" +- +- # Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args. +-set dummy gtkdoc-mkpdf; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- case $GTKDOC_MKPDF in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_GTKDOC_MKPDF="$GTKDOC_MKPDF" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +- ;; +-esac +-fi +-GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF +-if test -n "$GTKDOC_MKPDF"; then +- { $as_echo "$as_me:$LINENO: result: $GTKDOC_MKPDF" >&5 +-$as_echo "$GTKDOC_MKPDF" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- +- # Check whether --with-html-dir was given. -if test "${with_html_dir+set}" = set; then +if test "${with_html_dir+set}" = set; then : withval=$with_html_dir; else with_html_dir='${datadir}/gtk-doc/html' -@@ -33637,7 +24951,7 @@ +@@ -33777,7 +25002,7 @@ # Check whether --enable-gtk-doc was given. @@ -27541,7 +27612,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure enableval=$enable_gtk_doc; else enable_gtk_doc=no -@@ -33646,31 +24960,29 @@ +@@ -33786,42 +25011,66 @@ if test x$enable_gtk_doc = xyes; then if test -n "$PKG_CONFIG" && \ @@ -27555,64 +27626,119 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure + test $ac_status = 0; }; then : else -- { { $as_echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.11 installed to build gtk-doc" >&5 --$as_echo "$as_me: error: You need to have gtk-doc >= 1.11 installed to build gtk-doc" >&2;} +- { { $as_echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.11 installed to build $PACKAGE_NAME" >&5 +-$as_echo "$as_me: error: You need to have gtk-doc >= 1.11 installed to build $PACKAGE_NAME" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "You need to have gtk-doc >= 1.11 installed to build gtk-doc" "$LINENO" 5 fi fi - { $as_echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 - $as_echo_n "checking whether to build gtk-doc documentation... " >&6; } +-$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } - { $as_echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5 +-$as_echo "$enable_gtk_doc" >&6; } +- +- # Check whether --enable-gtk-doc-html was given. +-if test "${enable_gtk_doc_html+set}" = set; then +- enableval=$enable_gtk_doc_html; +-else +- enable_gtk_doc_html=yes ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 ++$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 - $as_echo "$enable_gtk_doc" >&6; } - - for ac_prog in gtkdoc-check - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo "$enable_gtk_doc" >&6; } ++ ++ for ac_prog in gtkdoc-check ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then ++$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then : - $as_echo_n "(cached) " >&6 - else - case $GTKDOC_CHECK in -@@ -33683,14 +24995,14 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do ++ $as_echo_n "(cached) " >&6 ++else ++ case $GTKDOC_CHECK in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done ++ break 2 ++ fi ++done + done - IFS=$as_save_IFS - - ;; -@@ -33698,10 +25010,10 @@ ++IFS=$as_save_IFS ++ ++ ;; ++esac fi - GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK - if test -n "$GTKDOC_CHECK"; then -- { $as_echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5 +- +- # Check whether --enable-gtk-doc-pdf was given. +-if test "${enable_gtk_doc_pdf+set}" = set; then +- enableval=$enable_gtk_doc_pdf; ++GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK ++if test -n "$GTKDOC_CHECK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 - $as_echo "$GTKDOC_CHECK" >&6; } ++$as_echo "$GTKDOC_CHECK" >&6; } else -- { $as_echo "$as_me:$LINENO: result: no" >&5 +- enable_gtk_doc_pdf=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } ++$as_echo "no" >&6; } fi -@@ -33730,9 +25042,9 @@ + +- if test -z "$GTKDOC_MKPDF"; then +- enable_gtk_doc_pdf=no +- fi ++ test -n "$GTKDOC_CHECK" && break ++done + + + if test x$enable_gtk_doc = xyes; then +@@ -33832,22 +25081,6 @@ + ENABLE_GTK_DOC_FALSE= + fi + +- if test x$enable_gtk_doc_html = xyes; then +- GTK_DOC_BUILD_HTML_TRUE= +- GTK_DOC_BUILD_HTML_FALSE='#' +-else +- GTK_DOC_BUILD_HTML_TRUE='#' +- GTK_DOC_BUILD_HTML_FALSE= +-fi +- +- if test x$enable_gtk_doc_pdf = xyes; then +- GTK_DOC_BUILD_PDF_TRUE= +- GTK_DOC_BUILD_PDF_FALSE='#' +-else +- GTK_DOC_BUILD_PDF_TRUE='#' +- GTK_DOC_BUILD_PDF_FALSE= +-fi +- + if test -n "$LIBTOOL"; then + GTK_DOC_USE_LIBTOOL_TRUE= + GTK_DOC_USE_LIBTOOL_FALSE='#' +@@ -33856,21 +25089,13 @@ + GTK_DOC_USE_LIBTOOL_FALSE= + fi + +- if test -n "$GTKDOC_REBASE"; then +- GTK_DOC_USE_REBASE_TRUE= +- GTK_DOC_USE_REBASE_FALSE='#' +-else +- GTK_DOC_USE_REBASE_TRUE='#' +- GTK_DOC_USE_REBASE_FALSE= +-fi +- + # Extract the first word of "db2html", so it can be a program name with args. set dummy db2html; ac_word=$2 @@ -27624,7 +27750,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else if test -n "$DB2HTML"; then -@@ -33743,14 +25055,14 @@ +@@ -33881,14 +25106,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -27642,7 +27768,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure IFS=$as_save_IFS test -z "$ac_cv_prog_DB2HTML" && ac_cv_prog_DB2HTML="false" -@@ -33758,10 +25070,10 @@ +@@ -33896,10 +25121,10 @@ fi DB2HTML=$ac_cv_prog_DB2HTML if test -n "$DB2HTML"; then @@ -27655,7 +27781,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -33776,7 +25088,7 @@ +@@ -33914,7 +25139,7 @@ # Check whether --enable-man was given. @@ -27664,7 +27790,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure enableval=$enable_man; enable_man=yes else enable_man=no -@@ -33786,9 +25098,9 @@ +@@ -33924,9 +25149,9 @@ if test "${enable_man}" != no; then # Extract the first word of "xsltproc", so it can be a program name with args. set dummy xsltproc; ac_word=$2 @@ -27676,7 +27802,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else case $XSLTPROC in -@@ -33801,14 +25113,14 @@ +@@ -33939,14 +25164,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -27694,7 +27820,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure IFS=$as_save_IFS ;; -@@ -33816,10 +25128,10 @@ +@@ -33954,10 +25179,10 @@ fi XSLTPROC=$ac_cv_path_XSLTPROC if test -n "$XSLTPROC"; then @@ -27707,7 +27833,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -33832,7 +25144,7 @@ +@@ -33970,7 +25195,7 @@ # check for the presence of the XML catalog # Check whether --with-xml-catalog was given. @@ -27716,7 +27842,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure withval=$with_xml_catalog; else with_xml_catalog=/etc/xml/catalog -@@ -33841,23 +25153,23 @@ +@@ -33979,23 +25204,23 @@ jh_found_xmlcatalog=true XML_CATALOG_FILE="$with_xml_catalog" @@ -27745,7 +27871,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo_n "(cached) " >&6 else case $XMLCATALOG in -@@ -33870,14 +25182,14 @@ +@@ -34008,14 +25233,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -27763,7 +27889,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure IFS=$as_save_IFS test -z "$ac_cv_path_XMLCATALOG" && ac_cv_path_XMLCATALOG="no" -@@ -33886,10 +25198,10 @@ +@@ -34024,10 +25249,10 @@ fi XMLCATALOG=$ac_cv_path_XMLCATALOG if test -n "$XMLCATALOG"; then @@ -27776,7 +27902,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "no" >&6; } fi -@@ -33905,35 +25217,35 @@ +@@ -34043,35 +25268,35 @@ fi @@ -27824,7 +27950,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "not found" >&6; } enable_man=no fi -@@ -33987,13 +25299,13 @@ +@@ -34125,13 +25350,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( @@ -27840,7 +27966,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure esac ;; esac done -@@ -34001,8 +25313,8 @@ +@@ -34139,8 +25364,8 @@ (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) @@ -27851,7 +27977,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -@@ -34025,11 +25337,11 @@ +@@ -34163,11 +25388,11 @@ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then test "x$cache_file" != "x/dev/null" && @@ -27865,7 +27991,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi -@@ -34049,8 +25361,8 @@ +@@ -34187,8 +25412,8 @@ ac_i=`$as_echo "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. @@ -27876,7 +28002,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure done LIBOBJS=$ac_libobjs -@@ -34066,559 +25378,330 @@ +@@ -34204,580 +25429,330 @@ fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then @@ -28555,6 +28681,20 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -$as_echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } +-fi +-if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_BUILD_HTML\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"GTK_DOC_BUILD_HTML\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_BUILD_PDF\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"GTK_DOC_BUILD_PDF\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } + as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -28564,6 +28704,13 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -$as_echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } +-fi +-if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_REBASE\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"GTK_DOC_USE_REBASE\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } + as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -28599,7 +28746,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. -@@ -34628,17 +25711,18 @@ +@@ -34787,17 +25762,18 @@ debug=false ac_cs_recheck=false ac_cs_silent=false @@ -28625,7 +28772,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -@@ -34646,23 +25730,15 @@ +@@ -34805,23 +25781,15 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else @@ -28654,7 +28801,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure as_nl=' ' export as_nl -@@ -34670,7 +25746,13 @@ +@@ -34829,7 +25797,13 @@ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo @@ -28669,7 +28816,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure as_echo='printf %s\n' as_echo_n='printf %s' else -@@ -34681,7 +25763,7 @@ +@@ -34840,7 +25814,7 @@ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; @@ -28678,7 +28825,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -@@ -34704,13 +25786,6 @@ +@@ -34863,13 +25837,6 @@ } fi @@ -28692,7 +28839,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure # IFS # We need space, tab and new line, in precisely that order. Quoting is -@@ -34720,15 +25795,15 @@ +@@ -34879,15 +25846,15 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. @@ -28711,7 +28858,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure IFS=$as_save_IFS ;; -@@ -34740,12 +25815,16 @@ +@@ -34899,12 +25866,16 @@ fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 @@ -28732,7 +28879,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure done PS1='$ ' PS2='> ' -@@ -34757,7 +25836,89 @@ +@@ -34916,7 +25887,89 @@ LANGUAGE=C export LANGUAGE @@ -28823,7 +28970,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr -@@ -34771,8 +25932,12 @@ +@@ -34930,8 +25983,12 @@ as_basename=false fi @@ -28837,7 +28984,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ -@@ -34792,76 +25957,25 @@ +@@ -34951,76 +26008,25 @@ } s/.*/./; q'` @@ -28925,7 +29072,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then -@@ -34890,8 +26004,56 @@ +@@ -35049,8 +26055,56 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -28983,7 +29130,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure else test -d ./-p && rmdir ./-p as_mkdir_p=false -@@ -34910,10 +26072,10 @@ +@@ -35069,10 +26123,10 @@ if test -d "$1"; then test -d "$1/."; else @@ -28996,7 +29143,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure ???[sx]*):;;*)false;;esac;fi '\'' sh ' -@@ -34928,13 +26090,19 @@ +@@ -35087,13 +26141,19 @@ exec 6>&1 @@ -29012,13 +29159,13 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" - This file was extended by gtk+ $as_me 2.17.11, which was + This file was extended by gtk+ $as_me 2.18.4, which was -generated by GNU Autoconf 2.63. Invocation command line was -+generated by GNU Autoconf 2.64. Invocation command line was ++generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS -@@ -34966,10 +26134,11 @@ +@@ -35125,13 +26185,15 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ @@ -29033,7 +29180,11 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit -@@ -34991,16 +26160,16 @@ ++ --config print configuration, then exit + -q, --quiet, --silent + do not print progress messages + -d, --debug don't remove temporary files +@@ -35150,16 +26212,17 @@ Configuration commands: $config_commands @@ -29042,18 +29193,29 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ - gtk+ config.status 2.17.11 + gtk+ config.status 2.18.4 -configured by $0, generated by GNU Autoconf 2.63, -+configured by $0, generated by GNU Autoconf 2.64, - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" ++configured by $0, generated by GNU Autoconf 2.65, ++ with options \\"\$ac_cs_config\\" -Copyright (C) 2008 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." -@@ -35043,20 +26212,19 @@ +@@ -35195,6 +26258,8 @@ + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + $as_echo "$ac_cs_version"; exit ;; ++ --config | --confi | --conf | --con | --co | --c ) ++ $as_echo "$ac_cs_config"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) +@@ -35202,20 +26267,19 @@ case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac @@ -29078,7 +29240,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -@@ -35064,11 +26232,10 @@ +@@ -35223,11 +26287,10 @@ ac_cs_silent=: ;; # This is an error. @@ -29093,7 +29255,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure ac_need_defaults=false ;; esac -@@ -35583,9 +26750,7 @@ +@@ -35742,9 +26805,7 @@ "contrib/gdk-pixbuf-xlib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/gdk-pixbuf-xlib/Makefile" ;; "contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc") CONFIG_FILES="$CONFIG_FILES contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc" ;; @@ -29104,7 +29266,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure esac done -@@ -35612,7 +26777,7 @@ +@@ -35771,7 +26832,7 @@ trap 'exit_status=$? { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ' 0 @@ -29113,7 +29275,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure } # Create a (secure) tmp directory for tmp files. -@@ -35623,11 +26788,7 @@ +@@ -35782,11 +26843,7 @@ { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") @@ -29126,7 +29288,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. -@@ -35635,10 +26796,16 @@ +@@ -35794,10 +26851,16 @@ if test -n "$CONFIG_FILES"; then @@ -29145,7 +29307,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure else ac_cs_awk_cr=$ac_cr fi -@@ -35652,24 +26819,18 @@ +@@ -35811,24 +26874,18 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || @@ -29173,7 +29335,25 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi -@@ -35758,9 +26919,7 @@ +@@ -35850,7 +26907,7 @@ + t delim + :nl + h +-s/\(.\{148\}\).*/\1/ ++s/\(.\{148\}\)..*/\1/ + t more1 + s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ + p +@@ -35864,7 +26921,7 @@ + t nl + :delim + h +-s/\(.\{148\}\).*/\1/ ++s/\(.\{148\}\)..*/\1/ + t more2 + s/["\\]/\\&/g; s/^/"/; s/$/"/ + p +@@ -35917,9 +26974,7 @@ else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ @@ -29184,7 +29364,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure _ACEOF # VPATH may cause trouble with some makes, so we remove $(srcdir), -@@ -35801,9 +26960,7 @@ +@@ -35960,9 +27015,7 @@ if test -z "$ac_t"; then break elif $ac_last_try; then @@ -29195,7 +29375,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi -@@ -35888,9 +27045,7 @@ +@@ -36047,9 +27100,7 @@ _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 @@ -29206,7 +29386,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure fi # test -n "$CONFIG_HEADERS" -@@ -35903,9 +27058,7 @@ +@@ -36062,9 +27113,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; @@ -29217,7 +29397,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac -@@ -35933,12 +27086,10 @@ +@@ -36092,12 +27141,10 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || @@ -29232,7 +29412,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure done # Let's still pretend it is `configure' which instantiates (i.e., don't -@@ -35949,7 +27100,7 @@ +@@ -36108,7 +27155,7 @@ `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" @@ -29241,7 +29421,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. -@@ -35962,9 +27113,7 @@ +@@ -36121,9 +27168,7 @@ case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ @@ -29252,7 +29432,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure esac ;; esac -@@ -35992,47 +27141,7 @@ +@@ -36151,47 +27196,7 @@ q } s/.*/./; q'` @@ -29301,7 +29481,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure ac_builddir=. case "$ac_dir" in -@@ -36089,7 +27198,6 @@ +@@ -36248,7 +27253,6 @@ # If the template does not know about datarootdir, expand it. # FIXME: This hack should be removed a few years after 2.60. ac_datarootdir_hack=; ac_datarootdir_seen= @@ -29309,7 +29489,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure ac_sed_dataroot=' /datarootdir/ { p -@@ -36099,12 +27207,11 @@ +@@ -36258,12 +27262,11 @@ /@docdir@/p /@infodir@/p /@localedir@/p @@ -29324,7 +29504,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -@@ -36114,7 +27221,7 @@ +@@ -36273,7 +27276,7 @@ s&@infodir@&$infodir&g s&@localedir@&$localedir&g s&@mandir@&$mandir&g @@ -29333,7 +29513,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure esac _ACEOF -@@ -36143,14 +27250,12 @@ +@@ -36302,14 +27305,12 @@ $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ @@ -29350,7 +29530,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure 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;} -@@ -36160,9 +27265,7 @@ +@@ -36319,9 +27320,7 @@ -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ @@ -29361,7 +29541,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure ;; :H) # -@@ -36173,25 +27276,19 @@ +@@ -36332,25 +27331,19 @@ $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" } >"$tmp/config.h" \ @@ -29391,7 +29571,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" -@@ -36229,7 +27326,7 @@ +@@ -36388,7 +27381,7 @@ s/.*/./; q'`/stamp-h$_am_stamp_count ;; @@ -29400,7 +29580,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: executing $ac_file commands" >&6;} ;; esac -@@ -36324,47 +27421,7 @@ +@@ -36483,47 +27476,7 @@ q } s/.*/./; q'` @@ -29449,7 +29629,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done -@@ -37227,7 +28284,7 @@ +@@ -37386,7 +28339,7 @@ if cmp -s $outfile gdk/gdkconfig.h; then @@ -29458,7 +29638,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: gdk/gdkconfig.h is unchanged" >&6;} rm -f $outfile else -@@ -37239,15 +28296,12 @@ +@@ -37398,15 +28351,12 @@ done # for ac_tag @@ -29476,7 +29656,7 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure # configure is writing to config.log, and then calls config.status. -@@ -37268,10 +28322,10 @@ +@@ -37427,10 +28377,10 @@ 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. @@ -29489,9 +29669,9 @@ diff -Naur gtk+2.0-2.17.11.old/configure gtk+2.0-2.17.11/configure $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi -diff -Naur gtk+2.0-2.17.11.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.17.11/contrib/gdk-pixbuf-xlib/Makefile.in ---- gtk+2.0-2.17.11.old/contrib/gdk-pixbuf-xlib/Makefile.in 2009-09-05 04:54:19.000000000 +0200 -+++ gtk+2.0-2.17.11/contrib/gdk-pixbuf-xlib/Makefile.in 2009-09-05 07:25:20.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.18.4/contrib/gdk-pixbuf-xlib/Makefile.in +--- gtk+2.0-2.18.4.old/contrib/gdk-pixbuf-xlib/Makefile.in 2009-12-01 05:08:43.000000000 +0100 ++++ gtk+2.0-2.18.4/contrib/gdk-pixbuf-xlib/Makefile.in 2009-12-01 13:03:30.324290233 +0100 @@ -48,7 +48,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -29509,7 +29689,16 @@ diff -Naur gtk+2.0-2.17.11.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.17. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -272,6 +273,7 @@ +@@ -209,8 +210,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -274,6 +273,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -29517,9 +29706,9 @@ diff -Naur gtk+2.0-2.17.11.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.17. PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/contrib/Makefile.in gtk+2.0-2.17.11/contrib/Makefile.in ---- gtk+2.0-2.17.11.old/contrib/Makefile.in 2009-09-05 04:54:19.000000000 +0200 -+++ gtk+2.0-2.17.11/contrib/Makefile.in 2009-09-05 07:25:20.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/contrib/Makefile.in gtk+2.0-2.18.4/contrib/Makefile.in +--- gtk+2.0-2.18.4.old/contrib/Makefile.in 2009-12-01 05:08:42.000000000 +0100 ++++ gtk+2.0-2.18.4/contrib/Makefile.in 2009-12-01 13:03:30.220289792 +0100 @@ -44,7 +44,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -29537,7 +29726,16 @@ diff -Naur gtk+2.0-2.17.11.old/contrib/Makefile.in gtk+2.0-2.17.11/contrib/Makef GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -245,6 +246,7 @@ +@@ -182,8 +183,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -247,6 +246,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -29545,9 +29743,9 @@ diff -Naur gtk+2.0-2.17.11.old/contrib/Makefile.in gtk+2.0-2.17.11/contrib/Makef PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/demos/gtk-demo/Makefile.in gtk+2.0-2.17.11/demos/gtk-demo/Makefile.in ---- gtk+2.0-2.17.11.old/demos/gtk-demo/Makefile.in 2009-09-05 04:54:20.000000000 +0200 -+++ gtk+2.0-2.17.11/demos/gtk-demo/Makefile.in 2009-09-05 07:25:21.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/demos/gtk-demo/Makefile.in gtk+2.0-2.18.4/demos/gtk-demo/Makefile.in +--- gtk+2.0-2.18.4.old/demos/gtk-demo/Makefile.in 2009-12-01 05:08:43.000000000 +0100 ++++ gtk+2.0-2.18.4/demos/gtk-demo/Makefile.in 2009-12-01 13:03:30.536290618 +0100 @@ -46,7 +46,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -29565,7 +29763,16 @@ diff -Naur gtk+2.0-2.17.11.old/demos/gtk-demo/Makefile.in gtk+2.0-2.17.11/demos/ GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -276,6 +277,7 @@ +@@ -213,8 +214,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -278,6 +277,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -29573,9 +29780,9 @@ diff -Naur gtk+2.0-2.17.11.old/demos/gtk-demo/Makefile.in gtk+2.0-2.17.11/demos/ PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/demos/Makefile.in gtk+2.0-2.17.11/demos/Makefile.in ---- gtk+2.0-2.17.11.old/demos/Makefile.in 2009-09-05 04:54:20.000000000 +0200 -+++ gtk+2.0-2.17.11/demos/Makefile.in 2009-09-05 07:25:20.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/demos/Makefile.in gtk+2.0-2.18.4/demos/Makefile.in +--- gtk+2.0-2.18.4.old/demos/Makefile.in 2009-12-01 05:08:43.000000000 +0100 ++++ gtk+2.0-2.18.4/demos/Makefile.in 2009-12-01 13:03:30.428291169 +0100 @@ -50,7 +50,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -29593,7 +29800,16 @@ diff -Naur gtk+2.0-2.17.11.old/demos/Makefile.in gtk+2.0-2.17.11/demos/Makefile. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -295,6 +296,7 @@ +@@ -232,8 +233,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -297,6 +296,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -29601,9 +29817,9 @@ diff -Naur gtk+2.0-2.17.11.old/demos/Makefile.in gtk+2.0-2.17.11/demos/Makefile. PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/docs/faq/Makefile.in gtk+2.0-2.17.11/docs/faq/Makefile.in ---- gtk+2.0-2.17.11.old/docs/faq/Makefile.in 2009-09-05 04:54:20.000000000 +0200 -+++ gtk+2.0-2.17.11/docs/faq/Makefile.in 2009-09-05 07:25:21.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/docs/faq/Makefile.in gtk+2.0-2.18.4/docs/faq/Makefile.in +--- gtk+2.0-2.18.4.old/docs/faq/Makefile.in 2009-12-01 05:08:43.000000000 +0100 ++++ gtk+2.0-2.18.4/docs/faq/Makefile.in 2009-12-01 13:03:30.688289560 +0100 @@ -43,7 +43,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -29621,7 +29837,16 @@ diff -Naur gtk+2.0-2.17.11.old/docs/faq/Makefile.in gtk+2.0-2.17.11/docs/faq/Mak GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -204,6 +205,7 @@ +@@ -141,8 +142,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -206,6 +205,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -29629,9 +29854,9 @@ diff -Naur gtk+2.0-2.17.11.old/docs/faq/Makefile.in gtk+2.0-2.17.11/docs/faq/Mak PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/docs/Makefile.in gtk+2.0-2.17.11/docs/Makefile.in ---- gtk+2.0-2.17.11.old/docs/Makefile.in 2009-09-05 04:54:20.000000000 +0200 -+++ gtk+2.0-2.17.11/docs/Makefile.in 2009-09-05 07:25:21.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/docs/Makefile.in gtk+2.0-2.18.4/docs/Makefile.in +--- gtk+2.0-2.18.4.old/docs/Makefile.in 2009-12-01 05:08:43.000000000 +0100 ++++ gtk+2.0-2.18.4/docs/Makefile.in 2009-12-01 13:03:30.612289429 +0100 @@ -43,7 +43,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -29649,7 +29874,16 @@ diff -Naur gtk+2.0-2.17.11.old/docs/Makefile.in gtk+2.0-2.17.11/docs/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -244,6 +245,7 @@ +@@ -181,8 +182,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -246,6 +245,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -29657,9 +29891,9 @@ diff -Naur gtk+2.0-2.17.11.old/docs/Makefile.in gtk+2.0-2.17.11/docs/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/docs/reference/gdk/Makefile.in gtk+2.0-2.17.11/docs/reference/gdk/Makefile.in ---- gtk+2.0-2.17.11.old/docs/reference/gdk/Makefile.in 2009-09-05 04:54:20.000000000 +0200 -+++ gtk+2.0-2.17.11/docs/reference/gdk/Makefile.in 2009-09-05 07:25:21.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/docs/reference/gdk/Makefile.in gtk+2.0-2.18.4/docs/reference/gdk/Makefile.in +--- gtk+2.0-2.18.4.old/docs/reference/gdk/Makefile.in 2009-12-01 05:08:44.000000000 +0100 ++++ gtk+2.0-2.18.4/docs/reference/gdk/Makefile.in 2009-12-01 13:03:30.960289614 +0100 @@ -50,7 +50,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -29677,7 +29911,16 @@ diff -Naur gtk+2.0-2.17.11.old/docs/reference/gdk/Makefile.in gtk+2.0-2.17.11/do GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -211,6 +212,7 @@ +@@ -148,8 +149,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -213,6 +212,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -29685,9 +29928,206 @@ diff -Naur gtk+2.0-2.17.11.old/docs/reference/gdk/Makefile.in gtk+2.0-2.17.11/do PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.17.11/docs/reference/gdk-pixbuf/Makefile.in ---- gtk+2.0-2.17.11.old/docs/reference/gdk-pixbuf/Makefile.in 2009-09-05 04:54:20.000000000 +0200 -+++ gtk+2.0-2.17.11/docs/reference/gdk-pixbuf/Makefile.in 2009-09-05 07:25:21.000000000 +0200 +@@ -480,10 +480,10 @@ + --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo + + @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +-@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = ++@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) ++@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = sh -c + @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute + + # We set GPATH here; this gives us semantics for GNU make +@@ -494,9 +494,7 @@ + GPATH = $(srcdir) + TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) + DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ +- pdf-build.stamp \ +- $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \ +- $(srcdir)/pdf.stamp ++ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp + + SCANOBJ_FILES = \ + $(DOC_MODULE).args \ +@@ -511,10 +509,6 @@ + $(DOC_MODULE)-unused.txt + + CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) +-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = +-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp +-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = +-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp + all: all-am + + .SUFFIXES: +@@ -764,10 +758,10 @@ + # run make test as part of make check + check-local: test + +-@ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) ++@ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp + @ENABLE_GTK_DOC_FALSE@all-local: + +-docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) ++docs: html-build.stamp + + $(REPORT_FILES): sgml-build.stamp + +@@ -776,9 +770,9 @@ + scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) + @echo 'gtk-doc: Scanning header files' + @-chmod -R u+w $(srcdir) +- @cd $(srcdir) && \ ++ cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) +- @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ ++ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + else \ + cd $(srcdir) ; \ +@@ -786,7 +780,7 @@ + test -f $$i || touch $$i ; \ + done \ + fi +- @touch scan-build.stamp ++ touch scan-build.stamp + + $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp + @true +@@ -796,23 +790,23 @@ + tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt + @echo 'gtk-doc: Rebuilding template files' + @-chmod -R u+w $(srcdir) +- @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) +- @touch tmpl-build.stamp ++ cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) ++ touch tmpl-build.stamp + + tmpl.stamp: tmpl-build.stamp + @true + +-$(srcdir)/tmpl/*.sgml: ++tmpl/*.sgml: + @true + + #### xml #### + +-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) ++sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) + @echo 'gtk-doc: Building XML' + @-chmod -R u+w $(srcdir) +- @cd $(srcdir) && \ ++ cd $(srcdir) && \ + gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) +- @touch sgml-build.stamp ++ touch sgml-build.stamp + + sgml.stamp: sgml-build.stamp + @true +@@ -822,37 +816,18 @@ + html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + @echo 'gtk-doc: Building HTML' + @-chmod -R u+w $(srcdir) +- @rm -rf $(srcdir)/html +- @mkdir $(srcdir)/html +- @mkhtml_options=""; \ ++ rm -rf $(srcdir)/html ++ mkdir $(srcdir)/html ++ mkhtml_options=""; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ + if test "$(?)" = "0"; then \ + mkhtml_options=--path="$(srcdir)"; \ +- fi; \ +- cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) +- @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) ++ fi ++ cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) ++ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @echo 'gtk-doc: Fixing cross-references' +- @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) +- @touch html-build.stamp +- +-#### pdf #### +- +-pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +- @echo 'gtk-doc: Building PDF' +- @-chmod -R u+w $(srcdir) +- @rm -rf $(srcdir)/$(DOC_MODULE).pdf +- @mkpdf_imgdirs=""; \ +- if test "x$(HTML_IMAGES)" != "x"; then \ +- for img in $(HTML_IMAGES); do \ +- part=`dirname $$img`; \ +- echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \ +- if test $$? != 0; then \ +- mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \ +- fi; \ +- done; \ +- fi; \ +- cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) +- @touch pdf-build.stamp ++ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) ++ touch html-build.stamp + + ############## + +@@ -862,14 +837,14 @@ + + distclean-local: + cd $(srcdir) && \ +- rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \ ++ rm -rf xml $(REPORT_FILES) \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + + maintainer-clean-local: clean + cd $(srcdir) && rm -rf xml html + + install-data-local: +- @installfiles=`echo $(srcdir)/html/*`; \ ++ installfiles=`echo $(srcdir)/html/*`; \ + if test "$$installfiles" = '$(srcdir)/html/*'; \ + then echo '-- Nothing to install' ; \ + else \ +@@ -889,11 +864,12 @@ + mv -f $${installdir}/$(DOC_MODULE).devhelp \ + $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ + fi; \ +- $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ ++ ! which gtkdoc-rebase >/dev/null 2>&1 || \ ++ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \ + fi + + uninstall-local: +- @if test -n "$(DOC_MODULE_VERSION)"; then \ ++ if test -n "$(DOC_MODULE_VERSION)"; then \ + installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ + else \ + installdir="$(DESTDIR)$(TARGET_DIR)"; \ +@@ -910,14 +886,16 @@ + + dist-hook: dist-check-gtkdoc dist-hook-local + mkdir $(distdir)/tmpl ++ mkdir $(distdir)/xml + mkdir $(distdir)/html + -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl ++ -cp $(srcdir)/xml/*.xml $(distdir)/xml + cp $(srcdir)/html/* $(distdir)/html +- -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) +- $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html ++ ! which gtkdoc-rebase >/dev/null 2>&1 || \ ++ gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + + .PHONY : dist-hook-local docs + +diff -Naur gtk+2.0-2.18.4.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.18.4/docs/reference/gdk-pixbuf/Makefile.in +--- gtk+2.0-2.18.4.old/docs/reference/gdk-pixbuf/Makefile.in 2009-12-01 05:08:43.000000000 +0100 ++++ gtk+2.0-2.18.4/docs/reference/gdk-pixbuf/Makefile.in 2009-12-01 13:03:30.864289185 +0100 @@ -50,7 +50,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -29705,7 +30145,16 @@ diff -Naur gtk+2.0-2.17.11.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.1 GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -236,6 +237,7 @@ +@@ -173,8 +174,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -238,6 +237,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -29713,9 +30162,206 @@ diff -Naur gtk+2.0-2.17.11.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.1 PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/docs/reference/gtk/Makefile.in gtk+2.0-2.17.11/docs/reference/gtk/Makefile.in ---- gtk+2.0-2.17.11.old/docs/reference/gtk/Makefile.in 2009-09-05 04:54:20.000000000 +0200 -+++ gtk+2.0-2.17.11/docs/reference/gtk/Makefile.in 2009-09-05 07:25:21.000000000 +0200 +@@ -423,10 +423,10 @@ + --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib + + @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +-@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = ++@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) ++@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = sh -c + @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute + + # We set GPATH here; this gives us semantics for GNU make +@@ -437,9 +437,7 @@ + GPATH = $(srcdir) + TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) + DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ +- pdf-build.stamp \ +- $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \ +- $(srcdir)/pdf.stamp ++ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp + + SCANOBJ_FILES = \ + $(DOC_MODULE).args \ +@@ -454,10 +452,6 @@ + $(DOC_MODULE)-unused.txt + + CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) +-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = +-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp +-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = +-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp + + ######################################################################## + @ENABLE_MAN_TRUE@man_MANS = gdk-pixbuf-csource.1 gdk-pixbuf-query-loaders.1 +@@ -767,10 +761,10 @@ + # run make test as part of make check + check-local: test + +-@ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) ++@ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp + @ENABLE_GTK_DOC_FALSE@all-local: + +-docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) ++docs: html-build.stamp + + $(REPORT_FILES): sgml-build.stamp + +@@ -779,9 +773,9 @@ + scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) + @echo 'gtk-doc: Scanning header files' + @-chmod -R u+w $(srcdir) +- @cd $(srcdir) && \ ++ cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) +- @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ ++ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + else \ + cd $(srcdir) ; \ +@@ -789,7 +783,7 @@ + test -f $$i || touch $$i ; \ + done \ + fi +- @touch scan-build.stamp ++ touch scan-build.stamp + + $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp + @true +@@ -799,23 +793,23 @@ + tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt + @echo 'gtk-doc: Rebuilding template files' + @-chmod -R u+w $(srcdir) +- @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) +- @touch tmpl-build.stamp ++ cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) ++ touch tmpl-build.stamp + + tmpl.stamp: tmpl-build.stamp + @true + +-$(srcdir)/tmpl/*.sgml: ++tmpl/*.sgml: + @true + + #### xml #### + +-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) ++sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) + @echo 'gtk-doc: Building XML' + @-chmod -R u+w $(srcdir) +- @cd $(srcdir) && \ ++ cd $(srcdir) && \ + gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) +- @touch sgml-build.stamp ++ touch sgml-build.stamp + + sgml.stamp: sgml-build.stamp + @true +@@ -825,37 +819,18 @@ + html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + @echo 'gtk-doc: Building HTML' + @-chmod -R u+w $(srcdir) +- @rm -rf $(srcdir)/html +- @mkdir $(srcdir)/html +- @mkhtml_options=""; \ ++ rm -rf $(srcdir)/html ++ mkdir $(srcdir)/html ++ mkhtml_options=""; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ + if test "$(?)" = "0"; then \ + mkhtml_options=--path="$(srcdir)"; \ +- fi; \ +- cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) +- @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) ++ fi ++ cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) ++ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @echo 'gtk-doc: Fixing cross-references' +- @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) +- @touch html-build.stamp +- +-#### pdf #### +- +-pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +- @echo 'gtk-doc: Building PDF' +- @-chmod -R u+w $(srcdir) +- @rm -rf $(srcdir)/$(DOC_MODULE).pdf +- @mkpdf_imgdirs=""; \ +- if test "x$(HTML_IMAGES)" != "x"; then \ +- for img in $(HTML_IMAGES); do \ +- part=`dirname $$img`; \ +- echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \ +- if test $$? != 0; then \ +- mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \ +- fi; \ +- done; \ +- fi; \ +- cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) +- @touch pdf-build.stamp ++ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) ++ touch html-build.stamp + + ############## + +@@ -865,14 +840,14 @@ + + distclean-local: + cd $(srcdir) && \ +- rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \ ++ rm -rf xml $(REPORT_FILES) \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + + maintainer-clean-local: clean + cd $(srcdir) && rm -rf xml html + + install-data-local: +- @installfiles=`echo $(srcdir)/html/*`; \ ++ installfiles=`echo $(srcdir)/html/*`; \ + if test "$$installfiles" = '$(srcdir)/html/*'; \ + then echo '-- Nothing to install' ; \ + else \ +@@ -892,11 +867,12 @@ + mv -f $${installdir}/$(DOC_MODULE).devhelp \ + $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ + fi; \ +- $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ ++ ! which gtkdoc-rebase >/dev/null 2>&1 || \ ++ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \ + fi + + uninstall-local: +- @if test -n "$(DOC_MODULE_VERSION)"; then \ ++ if test -n "$(DOC_MODULE_VERSION)"; then \ + installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ + else \ + installdir="$(DESTDIR)$(TARGET_DIR)"; \ +@@ -913,14 +889,16 @@ + + dist-hook: dist-check-gtkdoc dist-hook-local + mkdir $(distdir)/tmpl ++ mkdir $(distdir)/xml + mkdir $(distdir)/html + -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl ++ -cp $(srcdir)/xml/*.xml $(distdir)/xml + cp $(srcdir)/html/* $(distdir)/html +- -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) +- $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html ++ ! which gtkdoc-rebase >/dev/null 2>&1 || \ ++ gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + + .PHONY : dist-hook-local docs + +diff -Naur gtk+2.0-2.18.4.old/docs/reference/gtk/Makefile.in gtk+2.0-2.18.4/docs/reference/gtk/Makefile.in +--- gtk+2.0-2.18.4.old/docs/reference/gtk/Makefile.in 2009-12-01 05:08:44.000000000 +0100 ++++ gtk+2.0-2.18.4/docs/reference/gtk/Makefile.in 2009-12-01 13:03:31.084290006 +0100 @@ -50,7 +50,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -29733,7 +30379,16 @@ diff -Naur gtk+2.0-2.17.11.old/docs/reference/gtk/Makefile.in gtk+2.0-2.17.11/do GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -236,6 +237,7 @@ +@@ -173,8 +174,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -238,6 +237,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -29741,9 +30396,206 @@ diff -Naur gtk+2.0-2.17.11.old/docs/reference/gtk/Makefile.in gtk+2.0-2.17.11/do PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2.17.11/docs/reference/libgail-util/Makefile.in ---- gtk+2.0-2.17.11.old/docs/reference/libgail-util/Makefile.in 2009-09-05 04:54:21.000000000 +0200 -+++ gtk+2.0-2.17.11/docs/reference/libgail-util/Makefile.in 2009-09-05 07:25:22.000000000 +0200 +@@ -713,10 +713,10 @@ + --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo + + @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +-@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = ++@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) ++@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = sh -c + @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute + + # We set GPATH here; this gives us semantics for GNU make +@@ -727,9 +727,7 @@ + GPATH = $(srcdir) + TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) + DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ +- pdf-build.stamp \ +- $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \ +- $(srcdir)/pdf.stamp ++ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp + + SCANOBJ_FILES = \ + $(DOC_MODULE).args \ +@@ -744,10 +742,6 @@ + $(DOC_MODULE)-unused.txt + + CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) +-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = +-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp +-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = +-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp + + ######################################################################## + @ENABLE_MAN_TRUE@man_MANS = gtk-query-immodules-2.0.1 gtk-update-icon-cache.1 gtk-builder-convert.1 +@@ -1057,10 +1051,10 @@ + # run make test as part of make check + check-local: test + +-@ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) ++@ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp + @ENABLE_GTK_DOC_FALSE@all-local: + +-docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) ++docs: html-build.stamp + + $(REPORT_FILES): sgml-build.stamp + +@@ -1069,9 +1063,9 @@ + scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) + @echo 'gtk-doc: Scanning header files' + @-chmod -R u+w $(srcdir) +- @cd $(srcdir) && \ ++ cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) +- @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ ++ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + else \ + cd $(srcdir) ; \ +@@ -1079,7 +1073,7 @@ + test -f $$i || touch $$i ; \ + done \ + fi +- @touch scan-build.stamp ++ touch scan-build.stamp + + $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp + @true +@@ -1089,23 +1083,23 @@ + tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt + @echo 'gtk-doc: Rebuilding template files' + @-chmod -R u+w $(srcdir) +- @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) +- @touch tmpl-build.stamp ++ cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) ++ touch tmpl-build.stamp + + tmpl.stamp: tmpl-build.stamp + @true + +-$(srcdir)/tmpl/*.sgml: ++tmpl/*.sgml: + @true + + #### xml #### + +-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) ++sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) + @echo 'gtk-doc: Building XML' + @-chmod -R u+w $(srcdir) +- @cd $(srcdir) && \ ++ cd $(srcdir) && \ + gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) +- @touch sgml-build.stamp ++ touch sgml-build.stamp + + sgml.stamp: sgml-build.stamp + @true +@@ -1115,37 +1109,18 @@ + html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + @echo 'gtk-doc: Building HTML' + @-chmod -R u+w $(srcdir) +- @rm -rf $(srcdir)/html +- @mkdir $(srcdir)/html +- @mkhtml_options=""; \ ++ rm -rf $(srcdir)/html ++ mkdir $(srcdir)/html ++ mkhtml_options=""; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ + if test "$(?)" = "0"; then \ + mkhtml_options=--path="$(srcdir)"; \ +- fi; \ +- cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) +- @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) ++ fi ++ cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) ++ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @echo 'gtk-doc: Fixing cross-references' +- @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) +- @touch html-build.stamp +- +-#### pdf #### +- +-pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +- @echo 'gtk-doc: Building PDF' +- @-chmod -R u+w $(srcdir) +- @rm -rf $(srcdir)/$(DOC_MODULE).pdf +- @mkpdf_imgdirs=""; \ +- if test "x$(HTML_IMAGES)" != "x"; then \ +- for img in $(HTML_IMAGES); do \ +- part=`dirname $$img`; \ +- echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \ +- if test $$? != 0; then \ +- mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \ +- fi; \ +- done; \ +- fi; \ +- cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) +- @touch pdf-build.stamp ++ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) ++ touch html-build.stamp + + ############## + +@@ -1155,14 +1130,14 @@ + + distclean-local: + cd $(srcdir) && \ +- rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \ ++ rm -rf xml $(REPORT_FILES) \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + + maintainer-clean-local: clean + cd $(srcdir) && rm -rf xml html + + install-data-local: +- @installfiles=`echo $(srcdir)/html/*`; \ ++ installfiles=`echo $(srcdir)/html/*`; \ + if test "$$installfiles" = '$(srcdir)/html/*'; \ + then echo '-- Nothing to install' ; \ + else \ +@@ -1182,11 +1157,12 @@ + mv -f $${installdir}/$(DOC_MODULE).devhelp \ + $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ + fi; \ +- $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ ++ ! which gtkdoc-rebase >/dev/null 2>&1 || \ ++ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \ + fi + + uninstall-local: +- @if test -n "$(DOC_MODULE_VERSION)"; then \ ++ if test -n "$(DOC_MODULE_VERSION)"; then \ + installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ + else \ + installdir="$(DESTDIR)$(TARGET_DIR)"; \ +@@ -1203,14 +1179,16 @@ + + dist-hook: dist-check-gtkdoc dist-hook-local + mkdir $(distdir)/tmpl ++ mkdir $(distdir)/xml + mkdir $(distdir)/html + -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl ++ -cp $(srcdir)/xml/*.xml $(distdir)/xml + cp $(srcdir)/html/* $(distdir)/html +- -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) +- $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html ++ ! which gtkdoc-rebase >/dev/null 2>&1 || \ ++ gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + + .PHONY : dist-hook-local docs + +diff -Naur gtk+2.0-2.18.4.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2.18.4/docs/reference/libgail-util/Makefile.in +--- gtk+2.0-2.18.4.old/docs/reference/libgail-util/Makefile.in 2009-12-01 05:08:44.000000000 +0100 ++++ gtk+2.0-2.18.4/docs/reference/libgail-util/Makefile.in 2009-12-01 13:03:31.176289476 +0100 @@ -49,7 +49,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -29761,7 +30613,16 @@ diff -Naur gtk+2.0-2.17.11.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2 GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -210,6 +211,7 @@ +@@ -147,8 +148,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -212,6 +211,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -29769,9 +30630,206 @@ diff -Naur gtk+2.0-2.17.11.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2 PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/docs/reference/Makefile.in gtk+2.0-2.17.11/docs/reference/Makefile.in ---- gtk+2.0-2.17.11.old/docs/reference/Makefile.in 2009-09-05 04:54:20.000000000 +0200 -+++ gtk+2.0-2.17.11/docs/reference/Makefile.in 2009-09-05 07:25:21.000000000 +0200 +@@ -360,10 +360,10 @@ + content_files = + HTML_IMAGES = + @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +-@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = ++@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) ++@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = sh -c + @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute + + # We set GPATH here; this gives us semantics for GNU make +@@ -374,9 +374,7 @@ + GPATH = $(srcdir) + TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) + DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ +- pdf-build.stamp \ +- $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \ +- $(srcdir)/pdf.stamp ++ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp + + SCANOBJ_FILES = \ + $(DOC_MODULE).args \ +@@ -391,10 +389,6 @@ + $(DOC_MODULE)-unused.txt + + CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) +-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = +-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp +-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = +-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp + all: all-am + + .SUFFIXES: +@@ -642,10 +636,10 @@ + # run make test as part of make check + check-local: test + +-@ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) ++@ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp + @ENABLE_GTK_DOC_FALSE@all-local: + +-docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) ++docs: html-build.stamp + + $(REPORT_FILES): sgml-build.stamp + +@@ -654,9 +648,9 @@ + scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) + @echo 'gtk-doc: Scanning header files' + @-chmod -R u+w $(srcdir) +- @cd $(srcdir) && \ ++ cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) +- @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ ++ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + else \ + cd $(srcdir) ; \ +@@ -664,7 +658,7 @@ + test -f $$i || touch $$i ; \ + done \ + fi +- @touch scan-build.stamp ++ touch scan-build.stamp + + $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp + @true +@@ -674,23 +668,23 @@ + tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt + @echo 'gtk-doc: Rebuilding template files' + @-chmod -R u+w $(srcdir) +- @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) +- @touch tmpl-build.stamp ++ cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) ++ touch tmpl-build.stamp + + tmpl.stamp: tmpl-build.stamp + @true + +-$(srcdir)/tmpl/*.sgml: ++tmpl/*.sgml: + @true + + #### xml #### + +-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) ++sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) + @echo 'gtk-doc: Building XML' + @-chmod -R u+w $(srcdir) +- @cd $(srcdir) && \ ++ cd $(srcdir) && \ + gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) +- @touch sgml-build.stamp ++ touch sgml-build.stamp + + sgml.stamp: sgml-build.stamp + @true +@@ -700,37 +694,18 @@ + html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + @echo 'gtk-doc: Building HTML' + @-chmod -R u+w $(srcdir) +- @rm -rf $(srcdir)/html +- @mkdir $(srcdir)/html +- @mkhtml_options=""; \ ++ rm -rf $(srcdir)/html ++ mkdir $(srcdir)/html ++ mkhtml_options=""; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ + if test "$(?)" = "0"; then \ + mkhtml_options=--path="$(srcdir)"; \ +- fi; \ +- cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) +- @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) ++ fi ++ cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) ++ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @echo 'gtk-doc: Fixing cross-references' +- @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) +- @touch html-build.stamp +- +-#### pdf #### +- +-pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +- @echo 'gtk-doc: Building PDF' +- @-chmod -R u+w $(srcdir) +- @rm -rf $(srcdir)/$(DOC_MODULE).pdf +- @mkpdf_imgdirs=""; \ +- if test "x$(HTML_IMAGES)" != "x"; then \ +- for img in $(HTML_IMAGES); do \ +- part=`dirname $$img`; \ +- echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \ +- if test $$? != 0; then \ +- mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \ +- fi; \ +- done; \ +- fi; \ +- cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) +- @touch pdf-build.stamp ++ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) ++ touch html-build.stamp + + ############## + +@@ -740,14 +715,14 @@ + + distclean-local: + cd $(srcdir) && \ +- rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \ ++ rm -rf xml $(REPORT_FILES) \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + + maintainer-clean-local: clean + cd $(srcdir) && rm -rf xml html + + install-data-local: +- @installfiles=`echo $(srcdir)/html/*`; \ ++ installfiles=`echo $(srcdir)/html/*`; \ + if test "$$installfiles" = '$(srcdir)/html/*'; \ + then echo '-- Nothing to install' ; \ + else \ +@@ -767,11 +742,12 @@ + mv -f $${installdir}/$(DOC_MODULE).devhelp \ + $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ + fi; \ +- $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ ++ ! which gtkdoc-rebase >/dev/null 2>&1 || \ ++ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \ + fi + + uninstall-local: +- @if test -n "$(DOC_MODULE_VERSION)"; then \ ++ if test -n "$(DOC_MODULE_VERSION)"; then \ + installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ + else \ + installdir="$(DESTDIR)$(TARGET_DIR)"; \ +@@ -788,14 +764,16 @@ + + dist-hook: dist-check-gtkdoc dist-hook-local + mkdir $(distdir)/tmpl ++ mkdir $(distdir)/xml + mkdir $(distdir)/html + -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl ++ -cp $(srcdir)/xml/*.xml $(distdir)/xml + cp $(srcdir)/html/* $(distdir)/html +- -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) +- $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html ++ ! which gtkdoc-rebase >/dev/null 2>&1 || \ ++ gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + + .PHONY : dist-hook-local docs + +diff -Naur gtk+2.0-2.18.4.old/docs/reference/Makefile.in gtk+2.0-2.18.4/docs/reference/Makefile.in +--- gtk+2.0-2.18.4.old/docs/reference/Makefile.in 2009-12-01 05:08:43.000000000 +0100 ++++ gtk+2.0-2.18.4/docs/reference/Makefile.in 2009-12-01 13:03:30.768289524 +0100 @@ -43,7 +43,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -29789,7 +30847,16 @@ diff -Naur gtk+2.0-2.17.11.old/docs/reference/Makefile.in gtk+2.0-2.17.11/docs/r GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -244,6 +245,7 @@ +@@ -181,8 +182,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -246,6 +245,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -29797,9 +30864,9 @@ diff -Naur gtk+2.0-2.17.11.old/docs/reference/Makefile.in gtk+2.0-2.17.11/docs/r PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/docs/tools/Makefile.in gtk+2.0-2.17.11/docs/tools/Makefile.in ---- gtk+2.0-2.17.11.old/docs/tools/Makefile.in 2009-09-05 04:54:21.000000000 +0200 -+++ gtk+2.0-2.17.11/docs/tools/Makefile.in 2009-09-05 07:25:22.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/docs/tools/Makefile.in gtk+2.0-2.18.4/docs/tools/Makefile.in +--- gtk+2.0-2.18.4.old/docs/tools/Makefile.in 2009-12-01 05:08:44.000000000 +0100 ++++ gtk+2.0-2.18.4/docs/tools/Makefile.in 2009-12-01 13:03:31.272289335 +0100 @@ -45,7 +45,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -29817,7 +30884,16 @@ diff -Naur gtk+2.0-2.17.11.old/docs/tools/Makefile.in gtk+2.0-2.17.11/docs/tools GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -239,6 +240,7 @@ +@@ -176,8 +177,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -241,6 +240,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -29825,9 +30901,9 @@ diff -Naur gtk+2.0-2.17.11.old/docs/tools/Makefile.in gtk+2.0-2.17.11/docs/tools PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/docs/tutorial/Makefile.in gtk+2.0-2.17.11/docs/tutorial/Makefile.in ---- gtk+2.0-2.17.11.old/docs/tutorial/Makefile.in 2009-09-05 04:54:21.000000000 +0200 -+++ gtk+2.0-2.17.11/docs/tutorial/Makefile.in 2009-09-05 07:25:22.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/docs/tutorial/Makefile.in gtk+2.0-2.18.4/docs/tutorial/Makefile.in +--- gtk+2.0-2.18.4.old/docs/tutorial/Makefile.in 2009-12-01 05:08:44.000000000 +0100 ++++ gtk+2.0-2.18.4/docs/tutorial/Makefile.in 2009-12-01 13:03:31.360290164 +0100 @@ -43,7 +43,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -29845,7 +30921,16 @@ diff -Naur gtk+2.0-2.17.11.old/docs/tutorial/Makefile.in gtk+2.0-2.17.11/docs/tu GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -204,6 +205,7 @@ +@@ -141,8 +142,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -206,6 +205,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -29853,9 +30938,9 @@ diff -Naur gtk+2.0-2.17.11.old/docs/tutorial/Makefile.in gtk+2.0-2.17.11/docs/tu PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/gdk/directfb/Makefile.in gtk+2.0-2.17.11/gdk/directfb/Makefile.in ---- gtk+2.0-2.17.11.old/gdk/directfb/Makefile.in 2009-09-05 04:54:22.000000000 +0200 -+++ gtk+2.0-2.17.11/gdk/directfb/Makefile.in 2009-09-05 07:25:23.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/gdk/directfb/Makefile.in gtk+2.0-2.18.4/gdk/directfb/Makefile.in +--- gtk+2.0-2.18.4.old/gdk/directfb/Makefile.in 2009-12-01 05:08:45.000000000 +0100 ++++ gtk+2.0-2.18.4/gdk/directfb/Makefile.in 2009-12-01 13:03:32.032291621 +0100 @@ -45,7 +45,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -29873,7 +30958,16 @@ diff -Naur gtk+2.0-2.17.11.old/gdk/directfb/Makefile.in gtk+2.0-2.17.11/gdk/dire GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -268,6 +269,7 @@ +@@ -205,8 +206,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -270,6 +269,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -29881,9 +30975,9 @@ diff -Naur gtk+2.0-2.17.11.old/gdk/directfb/Makefile.in gtk+2.0-2.17.11/gdk/dire PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/gdk/Makefile.in gtk+2.0-2.17.11/gdk/Makefile.in ---- gtk+2.0-2.17.11.old/gdk/Makefile.in 2009-09-05 04:54:22.000000000 +0200 -+++ gtk+2.0-2.17.11/gdk/Makefile.in 2009-09-05 07:25:22.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/gdk/Makefile.in gtk+2.0-2.18.4/gdk/Makefile.in +--- gtk+2.0-2.18.4.old/gdk/Makefile.in 2009-12-01 05:08:45.000000000 +0100 ++++ gtk+2.0-2.18.4/gdk/Makefile.in 2009-12-01 13:03:31.928289354 +0100 @@ -46,7 +46,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -29901,7 +30995,16 @@ diff -Naur gtk+2.0-2.17.11.old/gdk/Makefile.in gtk+2.0-2.17.11/gdk/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -390,6 +391,7 @@ +@@ -327,8 +328,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -392,6 +391,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -29909,9 +31012,9 @@ diff -Naur gtk+2.0-2.17.11.old/gdk/Makefile.in gtk+2.0-2.17.11/gdk/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/gdk/quartz/Makefile.in gtk+2.0-2.17.11/gdk/quartz/Makefile.in ---- gtk+2.0-2.17.11.old/gdk/quartz/Makefile.in 2009-09-05 04:54:22.000000000 +0200 -+++ gtk+2.0-2.17.11/gdk/quartz/Makefile.in 2009-09-05 07:25:23.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/gdk/quartz/Makefile.in gtk+2.0-2.18.4/gdk/quartz/Makefile.in +--- gtk+2.0-2.18.4.old/gdk/quartz/Makefile.in 2009-12-01 05:08:45.000000000 +0100 ++++ gtk+2.0-2.18.4/gdk/quartz/Makefile.in 2009-12-01 13:03:32.136289691 +0100 @@ -45,7 +45,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -29929,7 +31032,16 @@ diff -Naur gtk+2.0-2.17.11.old/gdk/quartz/Makefile.in gtk+2.0-2.17.11/gdk/quartz GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -267,6 +268,7 @@ +@@ -204,8 +205,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -269,6 +268,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -29937,9 +31049,9 @@ diff -Naur gtk+2.0-2.17.11.old/gdk/quartz/Makefile.in gtk+2.0-2.17.11/gdk/quartz PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/gdk/tests/Makefile.in gtk+2.0-2.17.11/gdk/tests/Makefile.in ---- gtk+2.0-2.17.11.old/gdk/tests/Makefile.in 2009-09-05 04:54:22.000000000 +0200 -+++ gtk+2.0-2.17.11/gdk/tests/Makefile.in 2009-09-05 07:25:23.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/gdk/tests/Makefile.in gtk+2.0-2.18.4/gdk/tests/Makefile.in +--- gtk+2.0-2.18.4.old/gdk/tests/Makefile.in 2009-12-01 05:08:45.000000000 +0100 ++++ gtk+2.0-2.18.4/gdk/tests/Makefile.in 2009-12-01 13:03:32.216291330 +0100 @@ -45,7 +45,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -29957,7 +31069,16 @@ diff -Naur gtk+2.0-2.17.11.old/gdk/tests/Makefile.in gtk+2.0-2.17.11/gdk/tests/M GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -209,6 +210,7 @@ +@@ -146,8 +147,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -211,6 +210,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -29965,9 +31086,9 @@ diff -Naur gtk+2.0-2.17.11.old/gdk/tests/Makefile.in gtk+2.0-2.17.11/gdk/tests/M PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/gdk/win32/Makefile.in gtk+2.0-2.17.11/gdk/win32/Makefile.in ---- gtk+2.0-2.17.11.old/gdk/win32/Makefile.in 2009-09-05 04:54:22.000000000 +0200 -+++ gtk+2.0-2.17.11/gdk/win32/Makefile.in 2009-09-05 07:25:23.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/gdk/win32/Makefile.in gtk+2.0-2.18.4/gdk/win32/Makefile.in +--- gtk+2.0-2.18.4.old/gdk/win32/Makefile.in 2009-12-01 05:08:45.000000000 +0100 ++++ gtk+2.0-2.18.4/gdk/win32/Makefile.in 2009-12-01 13:03:32.332289460 +0100 @@ -45,7 +45,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -29985,7 +31106,16 @@ diff -Naur gtk+2.0-2.17.11.old/gdk/win32/Makefile.in gtk+2.0-2.17.11/gdk/win32/M GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -305,6 +306,7 @@ +@@ -242,8 +243,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -307,6 +306,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -29993,9 +31123,9 @@ diff -Naur gtk+2.0-2.17.11.old/gdk/win32/Makefile.in gtk+2.0-2.17.11/gdk/win32/M PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/gdk/win32/rc/Makefile.in gtk+2.0-2.17.11/gdk/win32/rc/Makefile.in ---- gtk+2.0-2.17.11.old/gdk/win32/rc/Makefile.in 2009-09-05 04:54:22.000000000 +0200 -+++ gtk+2.0-2.17.11/gdk/win32/rc/Makefile.in 2009-09-05 07:25:23.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/gdk/win32/rc/Makefile.in gtk+2.0-2.18.4/gdk/win32/rc/Makefile.in +--- gtk+2.0-2.18.4.old/gdk/win32/rc/Makefile.in 2009-12-01 05:08:45.000000000 +0100 ++++ gtk+2.0-2.18.4/gdk/win32/rc/Makefile.in 2009-12-01 13:03:32.408290995 +0100 @@ -44,7 +44,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -30013,7 +31143,16 @@ diff -Naur gtk+2.0-2.17.11.old/gdk/win32/rc/Makefile.in gtk+2.0-2.17.11/gdk/win3 GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -206,6 +207,7 @@ +@@ -143,8 +144,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -208,6 +207,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -30021,9 +31160,9 @@ diff -Naur gtk+2.0-2.17.11.old/gdk/win32/rc/Makefile.in gtk+2.0-2.17.11/gdk/win3 PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/gdk/x11/Makefile.in gtk+2.0-2.17.11/gdk/x11/Makefile.in ---- gtk+2.0-2.17.11.old/gdk/x11/Makefile.in 2009-09-05 04:54:22.000000000 +0200 -+++ gtk+2.0-2.17.11/gdk/x11/Makefile.in 2009-09-05 07:25:24.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/gdk/x11/Makefile.in gtk+2.0-2.18.4/gdk/x11/Makefile.in +--- gtk+2.0-2.18.4.old/gdk/x11/Makefile.in 2009-12-01 05:08:45.000000000 +0100 ++++ gtk+2.0-2.18.4/gdk/x11/Makefile.in 2009-12-01 13:03:32.520291185 +0100 @@ -50,7 +50,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -30041,7 +31180,16 @@ diff -Naur gtk+2.0-2.17.11.old/gdk/x11/Makefile.in gtk+2.0-2.17.11/gdk/x11/Makef GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -297,6 +298,7 @@ +@@ -234,8 +235,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -299,6 +298,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -30049,9 +31197,9 @@ diff -Naur gtk+2.0-2.17.11.old/gdk/x11/Makefile.in gtk+2.0-2.17.11/gdk/x11/Makef PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/gdk-pixbuf/Makefile.in gtk+2.0-2.17.11/gdk-pixbuf/Makefile.in ---- gtk+2.0-2.17.11.old/gdk-pixbuf/Makefile.in 2009-09-05 04:54:21.000000000 +0200 -+++ gtk+2.0-2.17.11/gdk-pixbuf/Makefile.in 2009-09-05 07:25:22.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/gdk-pixbuf/Makefile.in gtk+2.0-2.18.4/gdk-pixbuf/Makefile.in +--- gtk+2.0-2.18.4.old/gdk-pixbuf/Makefile.in 2009-12-01 05:08:44.000000000 +0100 ++++ gtk+2.0-2.18.4/gdk-pixbuf/Makefile.in 2009-12-01 13:03:31.648289566 +0100 @@ -52,7 +52,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -30069,7 +31217,16 @@ diff -Naur gtk+2.0-2.17.11.old/gdk-pixbuf/Makefile.in gtk+2.0-2.17.11/gdk-pixbuf GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -827,6 +828,7 @@ +@@ -764,8 +765,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -829,6 +828,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -30077,7 +31234,7 @@ diff -Naur gtk+2.0-2.17.11.old/gdk-pixbuf/Makefile.in gtk+2.0-2.17.11/gdk-pixbuf PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -@@ -959,6 +961,7 @@ +@@ -961,6 +961,7 @@ libgdk_pixbuf-2.0.la loaderdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loaders @@ -30085,7 +31242,7 @@ diff -Naur gtk+2.0-2.17.11.old/gdk-pixbuf/Makefile.in gtk+2.0-2.17.11/gdk-pixbuf module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS) # -@@ -1318,7 +1321,7 @@ +@@ -1320,7 +1321,7 @@ $(GDK_PIXBUF_DEP_CFLAGS) \ -DGDK_PIXBUF_ENABLE_BACKEND @@ -30094,9 +31251,9 @@ diff -Naur gtk+2.0-2.17.11.old/gdk-pixbuf/Makefile.in gtk+2.0-2.17.11/gdk-pixbuf LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS) test_gdk_pixbuf_LDADD = $(LDADDS) gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c -diff -Naur gtk+2.0-2.17.11.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.17.11/gdk-pixbuf/pixops/Makefile.in ---- gtk+2.0-2.17.11.old/gdk-pixbuf/pixops/Makefile.in 2009-09-05 04:54:21.000000000 +0200 -+++ gtk+2.0-2.17.11/gdk-pixbuf/pixops/Makefile.in 2009-09-05 07:25:22.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.18.4/gdk-pixbuf/pixops/Makefile.in +--- gtk+2.0-2.18.4.old/gdk-pixbuf/pixops/Makefile.in 2009-12-01 05:08:44.000000000 +0100 ++++ gtk+2.0-2.18.4/gdk-pixbuf/pixops/Makefile.in 2009-12-01 13:03:31.776289285 +0100 @@ -46,7 +46,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -30114,7 +31271,16 @@ diff -Naur gtk+2.0-2.17.11.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.17.11/gdk GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -257,6 +258,7 @@ +@@ -194,8 +195,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -259,6 +258,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -30122,10 +31288,10 @@ diff -Naur gtk+2.0-2.17.11.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.17.11/gdk PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/gtk/Makefile.in gtk+2.0-2.17.11/gtk/Makefile.in ---- gtk+2.0-2.17.11.old/gtk/Makefile.in 2009-09-05 04:54:23.000000000 +0200 -+++ gtk+2.0-2.17.11/gtk/Makefile.in 2009-09-05 07:25:25.000000000 +0200 -@@ -76,7 +76,7 @@ +diff -Naur gtk+2.0-2.18.4.old/gtk/Makefile.in gtk+2.0-2.18.4/gtk/Makefile.in +--- gtk+2.0-2.18.4.old/gtk/Makefile.in 2009-12-01 05:08:46.000000000 +0100 ++++ gtk+2.0-2.18.4/gtk/Makefile.in 2009-12-01 13:03:32.860289675 +0100 +@@ -79,7 +79,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -30134,7 +31300,7 @@ diff -Naur gtk+2.0-2.17.11.old/gtk/Makefile.in gtk+2.0-2.17.11/gtk/Makefile.in CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = makefile.msc gtkversion.h gtk-win32.rc CONFIG_CLEAN_VPATH_FILES = -@@ -724,6 +724,7 @@ +@@ -727,6 +727,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -30142,7 +31308,16 @@ diff -Naur gtk+2.0-2.17.11.old/gtk/Makefile.in gtk+2.0-2.17.11/gtk/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -799,6 +800,7 @@ +@@ -739,8 +740,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -804,6 +803,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -30150,7 +31325,7 @@ diff -Naur gtk+2.0-2.17.11.old/gtk/Makefile.in gtk+2.0-2.17.11/gtk/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -@@ -952,6 +954,8 @@ +@@ -957,6 +957,8 @@ -I$(top_srcdir)/gdk \ -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \ -DGDK_DISABLE_DEPRECATED \ @@ -30159,7 +31334,7 @@ diff -Naur gtk+2.0-2.17.11.old/gtk/Makefile.in gtk+2.0-2.17.11/gtk/Makefile.in -DGTK_DISABLE_DEPRECATED \ -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \ -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ -@@ -1063,17 +1067,21 @@ +@@ -1068,17 +1070,21 @@ # Installed header files without compatibility guarantees # that are not included in gtk/gtk.h gtk_semi_private_h_sources = \ @@ -30189,9 +31364,9 @@ diff -Naur gtk+2.0-2.17.11.old/gtk/Makefile.in gtk+2.0-2.17.11/gtk/Makefile.in gtkmnemonichash.h gtkmountoperationprivate.h gtkpathbar.h \ gtkplugprivate.h gtkprintoperation-private.h gtkprintutils.h \ gtkrbtree.h gtkrecentchooserdefault.h \ -diff -Naur gtk+2.0-2.17.11.old/gtk/tests/Makefile.in gtk+2.0-2.17.11/gtk/tests/Makefile.in ---- gtk+2.0-2.17.11.old/gtk/tests/Makefile.in 2009-09-05 04:54:23.000000000 +0200 -+++ gtk+2.0-2.17.11/gtk/tests/Makefile.in 2009-09-05 07:25:25.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/gtk/tests/Makefile.in gtk+2.0-2.18.4/gtk/tests/Makefile.in +--- gtk+2.0-2.18.4.old/gtk/tests/Makefile.in 2009-12-01 05:08:46.000000000 +0100 ++++ gtk+2.0-2.18.4/gtk/tests/Makefile.in 2009-12-01 13:03:32.984291392 +0100 @@ -46,7 +46,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -30201,7 +31376,7 @@ diff -Naur gtk+2.0-2.17.11.old/gtk/tests/Makefile.in gtk+2.0-2.17.11/gtk/tests/M CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -@@ -207,6 +207,7 @@ +@@ -216,6 +216,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -30209,7 +31384,16 @@ diff -Naur gtk+2.0-2.17.11.old/gtk/tests/Makefile.in gtk+2.0-2.17.11/gtk/tests/M GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -282,6 +283,7 @@ +@@ -228,8 +229,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -293,6 +292,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -30217,9 +31401,9 @@ diff -Naur gtk+2.0-2.17.11.old/gtk/tests/Makefile.in gtk+2.0-2.17.11/gtk/tests/M PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/gtk/theme-bits/Makefile.in gtk+2.0-2.17.11/gtk/theme-bits/Makefile.in ---- gtk+2.0-2.17.11.old/gtk/theme-bits/Makefile.in 2009-09-05 04:54:23.000000000 +0200 -+++ gtk+2.0-2.17.11/gtk/theme-bits/Makefile.in 2009-09-05 07:25:25.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/gtk/theme-bits/Makefile.in gtk+2.0-2.18.4/gtk/theme-bits/Makefile.in +--- gtk+2.0-2.18.4.old/gtk/theme-bits/Makefile.in 2009-12-01 05:08:46.000000000 +0100 ++++ gtk+2.0-2.18.4/gtk/theme-bits/Makefile.in 2009-12-01 13:03:33.096288997 +0100 @@ -45,7 +45,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -30237,7 +31421,16 @@ diff -Naur gtk+2.0-2.17.11.old/gtk/theme-bits/Makefile.in gtk+2.0-2.17.11/gtk/th GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -235,6 +236,7 @@ +@@ -172,8 +173,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -237,6 +236,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -30245,9 +31438,214 @@ diff -Naur gtk+2.0-2.17.11.old/gtk/theme-bits/Makefile.in gtk+2.0-2.17.11/gtk/th PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/ltmain.sh gtk+2.0-2.17.11/ltmain.sh ---- gtk+2.0-2.17.11.old/ltmain.sh 2009-07-27 00:39:21.000000000 +0200 -+++ gtk+2.0-2.17.11/ltmain.sh 2009-09-05 07:25:10.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/gtk-doc.make gtk+2.0-2.18.4/gtk-doc.make +--- gtk+2.0-2.18.4.old/gtk-doc.make 2009-11-30 05:33:42.000000000 +0100 ++++ gtk+2.0-2.18.4/gtk-doc.make 2009-12-01 13:03:24.383319469 +0100 +@@ -5,13 +5,13 @@ + #################################### + + if GTK_DOC_USE_LIBTOOL +-GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) ++GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) + GTKDOC_RUN = $(LIBTOOL) --mode=execute + else + GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +-GTKDOC_RUN = ++GTKDOC_RUN = sh -c + endif + + # We set GPATH here; this gives us semantics for GNU make +@@ -31,9 +31,7 @@ + $(DOC_MODULE)-overrides.txt + + DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ +- pdf-build.stamp \ +- $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \ +- $(srcdir)/pdf.stamp ++ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp + + SCANOBJ_FILES = \ + $(DOC_MODULE).args \ +@@ -50,23 +48,12 @@ + CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) + + if ENABLE_GTK_DOC +-if GTK_DOC_BUILD_HTML +-HTML_BUILD_STAMP=html-build.stamp +-else +-HTML_BUILD_STAMP= +-endif +-if GTK_DOC_BUILD_PDF +-PDF_BUILD_STAMP=pdf-build.stamp +-else +-PDF_BUILD_STAMP= +-endif +- +-all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) ++all-local: html-build.stamp + else + all-local: + endif + +-docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) ++docs: html-build.stamp + + $(REPORT_FILES): sgml-build.stamp + +@@ -75,9 +62,9 @@ + scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) + @echo 'gtk-doc: Scanning header files' + @-chmod -R u+w $(srcdir) +- @cd $(srcdir) && \ ++ cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) +- @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ ++ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + else \ + cd $(srcdir) ; \ +@@ -85,7 +72,7 @@ + test -f $$i || touch $$i ; \ + done \ + fi +- @touch scan-build.stamp ++ touch scan-build.stamp + + $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp + @true +@@ -95,23 +82,24 @@ + tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt + @echo 'gtk-doc: Rebuilding template files' + @-chmod -R u+w $(srcdir) +- @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) +- @touch tmpl-build.stamp ++ cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) ++ touch tmpl-build.stamp + + tmpl.stamp: tmpl-build.stamp + @true + +-$(srcdir)/tmpl/*.sgml: ++tmpl/*.sgml: + @true + ++ + #### xml #### + +-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) ++sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) + @echo 'gtk-doc: Building XML' + @-chmod -R u+w $(srcdir) +- @cd $(srcdir) && \ ++ cd $(srcdir) && \ + gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) +- @touch sgml-build.stamp ++ touch sgml-build.stamp + + sgml.stamp: sgml-build.stamp + @true +@@ -121,37 +109,18 @@ + html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + @echo 'gtk-doc: Building HTML' + @-chmod -R u+w $(srcdir) +- @rm -rf $(srcdir)/html +- @mkdir $(srcdir)/html +- @mkhtml_options=""; \ ++ rm -rf $(srcdir)/html ++ mkdir $(srcdir)/html ++ mkhtml_options=""; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ + if test "$(?)" = "0"; then \ + mkhtml_options=--path="$(srcdir)"; \ +- fi; \ +- cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) +- @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) ++ fi ++ cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) ++ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @echo 'gtk-doc: Fixing cross-references' +- @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) +- @touch html-build.stamp +- +-#### pdf #### +- +-pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +- @echo 'gtk-doc: Building PDF' +- @-chmod -R u+w $(srcdir) +- @rm -rf $(srcdir)/$(DOC_MODULE).pdf +- @mkpdf_imgdirs=""; \ +- if test "x$(HTML_IMAGES)" != "x"; then \ +- for img in $(HTML_IMAGES); do \ +- part=`dirname $$img`; \ +- echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \ +- if test $$? != 0; then \ +- mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \ +- fi; \ +- done; \ +- fi; \ +- cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) +- @touch pdf-build.stamp ++ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) ++ touch html-build.stamp + + ############## + +@@ -161,14 +130,14 @@ + + distclean-local: + cd $(srcdir) && \ +- rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \ ++ rm -rf xml $(REPORT_FILES) \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + + maintainer-clean-local: clean + cd $(srcdir) && rm -rf xml html + + install-data-local: +- @installfiles=`echo $(srcdir)/html/*`; \ ++ installfiles=`echo $(srcdir)/html/*`; \ + if test "$$installfiles" = '$(srcdir)/html/*'; \ + then echo '-- Nothing to install' ; \ + else \ +@@ -188,11 +157,12 @@ + mv -f $${installdir}/$(DOC_MODULE).devhelp \ + $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ + fi; \ +- $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ ++ ! which gtkdoc-rebase >/dev/null 2>&1 || \ ++ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \ + fi + + uninstall-local: +- @if test -n "$(DOC_MODULE_VERSION)"; then \ ++ if test -n "$(DOC_MODULE_VERSION)"; then \ + installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ + else \ + installdir="$(DESTDIR)$(TARGET_DIR)"; \ +@@ -212,13 +182,15 @@ + + dist-hook: dist-check-gtkdoc dist-hook-local + mkdir $(distdir)/tmpl ++ mkdir $(distdir)/xml + mkdir $(distdir)/html + -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl ++ -cp $(srcdir)/xml/*.xml $(distdir)/xml + cp $(srcdir)/html/* $(distdir)/html +- -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) +- $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html ++ ! which gtkdoc-rebase >/dev/null 2>&1 || \ ++ gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + + .PHONY : dist-hook-local docs +diff -Naur gtk+2.0-2.18.4.old/ltmain.sh gtk+2.0-2.18.4/ltmain.sh +--- gtk+2.0-2.18.4.old/ltmain.sh 2009-10-19 14:18:27.000000000 +0200 ++++ gtk+2.0-2.18.4/ltmain.sh 2009-12-01 13:03:23.884291336 +0100 @@ -65,7 +65,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS @@ -30326,9 +31724,9 @@ diff -Naur gtk+2.0-2.17.11.old/ltmain.sh gtk+2.0-2.17.11/ltmain.sh esac ;; no) -diff -Naur gtk+2.0-2.17.11.old/m4macros/Makefile.in gtk+2.0-2.17.11/m4macros/Makefile.in ---- gtk+2.0-2.17.11.old/m4macros/Makefile.in 2009-09-05 04:54:23.000000000 +0200 -+++ gtk+2.0-2.17.11/m4macros/Makefile.in 2009-09-05 07:25:26.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/m4macros/Makefile.in gtk+2.0-2.18.4/m4macros/Makefile.in +--- gtk+2.0-2.18.4.old/m4macros/Makefile.in 2009-12-01 05:08:46.000000000 +0100 ++++ gtk+2.0-2.18.4/m4macros/Makefile.in 2009-12-01 13:03:33.176291197 +0100 @@ -44,7 +44,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -30346,7 +31744,16 @@ diff -Naur gtk+2.0-2.17.11.old/m4macros/Makefile.in gtk+2.0-2.17.11/m4macros/Mak GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -228,6 +229,7 @@ +@@ -165,8 +166,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -230,6 +229,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -30354,9 +31761,9 @@ diff -Naur gtk+2.0-2.17.11.old/m4macros/Makefile.in gtk+2.0-2.17.11/m4macros/Mak PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/Makefile.in gtk+2.0-2.17.11/Makefile.in ---- gtk+2.0-2.17.11.old/Makefile.in 2009-09-05 04:54:26.000000000 +0200 -+++ gtk+2.0-2.17.11/Makefile.in 2009-09-05 07:25:31.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/Makefile.in gtk+2.0-2.18.4/Makefile.in +--- gtk+2.0-2.18.4.old/Makefile.in 2009-12-01 05:08:49.000000000 +0100 ++++ gtk+2.0-2.18.4/Makefile.in 2009-12-01 13:03:35.660290348 +0100 @@ -47,7 +47,7 @@ $(srcdir)/gtk+-unix-print-2.0.pc.in $(srcdir)/gtk-zip.sh.in \ $(top_srcdir)/Makefile.decl $(top_srcdir)/configure AUTHORS \ @@ -30393,7 +31800,16 @@ diff -Naur gtk+2.0-2.17.11.old/Makefile.in gtk+2.0-2.17.11/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -294,6 +296,7 @@ +@@ -231,8 +233,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -296,6 +296,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -30401,7 +31817,7 @@ diff -Naur gtk+2.0-2.17.11.old/Makefile.in gtk+2.0-2.17.11/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -@@ -464,7 +467,10 @@ +@@ -466,7 +467,10 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -30413,9 +31829,9 @@ diff -Naur gtk+2.0-2.17.11.old/Makefile.in gtk+2.0-2.17.11/Makefile.in SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros # require automake 1.4 -diff -Naur gtk+2.0-2.17.11.old/mkinstalldirs gtk+2.0-2.17.11/mkinstalldirs ---- gtk+2.0-2.17.11.old/mkinstalldirs 1970-01-01 01:00:00.000000000 +0100 -+++ gtk+2.0-2.17.11/mkinstalldirs 2009-09-05 07:25:31.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/mkinstalldirs gtk+2.0-2.18.4/mkinstalldirs +--- gtk+2.0-2.18.4.old/mkinstalldirs 1970-01-01 01:00:00.000000000 +0100 ++++ gtk+2.0-2.18.4/mkinstalldirs 2009-12-01 13:03:35.596318408 +0100 @@ -0,0 +1,162 @@ +#! /bin/sh +# mkinstalldirs --- make directory hierarchy @@ -30579,9 +31995,9 @@ diff -Naur gtk+2.0-2.17.11.old/mkinstalldirs gtk+2.0-2.17.11/mkinstalldirs +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: -diff -Naur gtk+2.0-2.17.11.old/modules/engines/Makefile.in gtk+2.0-2.17.11/modules/engines/Makefile.in ---- gtk+2.0-2.17.11.old/modules/engines/Makefile.in 2009-09-05 04:54:23.000000000 +0200 -+++ gtk+2.0-2.17.11/modules/engines/Makefile.in 2009-09-05 07:25:26.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/modules/engines/Makefile.in gtk+2.0-2.18.4/modules/engines/Makefile.in +--- gtk+2.0-2.18.4.old/modules/engines/Makefile.in 2009-12-01 05:08:46.000000000 +0100 ++++ gtk+2.0-2.18.4/modules/engines/Makefile.in 2009-12-01 13:03:33.336291133 +0100 @@ -43,7 +43,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -30599,7 +32015,16 @@ diff -Naur gtk+2.0-2.17.11.old/modules/engines/Makefile.in gtk+2.0-2.17.11/modul GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -244,6 +245,7 @@ +@@ -181,8 +182,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -246,6 +245,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -30607,9 +32032,9 @@ diff -Naur gtk+2.0-2.17.11.old/modules/engines/Makefile.in gtk+2.0-2.17.11/modul PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.17.11/modules/engines/ms-windows/Makefile.in ---- gtk+2.0-2.17.11.old/modules/engines/ms-windows/Makefile.in 2009-09-05 04:54:23.000000000 +0200 -+++ gtk+2.0-2.17.11/modules/engines/ms-windows/Makefile.in 2009-09-05 07:25:26.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.18.4/modules/engines/ms-windows/Makefile.in +--- gtk+2.0-2.18.4.old/modules/engines/ms-windows/Makefile.in 2009-12-01 05:08:46.000000000 +0100 ++++ gtk+2.0-2.18.4/modules/engines/ms-windows/Makefile.in 2009-12-01 13:03:33.436289511 +0100 @@ -44,7 +44,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -30627,7 +32052,16 @@ diff -Naur gtk+2.0-2.17.11.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -302,6 +303,7 @@ +@@ -239,8 +240,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -304,6 +303,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -30635,9 +32069,9 @@ diff -Naur gtk+2.0-2.17.11.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2. PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.17.11/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in ---- gtk+2.0-2.17.11.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2009-09-05 04:54:24.000000000 +0200 -+++ gtk+2.0-2.17.11/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2009-09-05 07:25:27.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.18.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in +--- gtk+2.0-2.18.4.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2009-12-01 05:08:47.000000000 +0100 ++++ gtk+2.0-2.18.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2009-12-01 13:03:33.596289671 +0100 @@ -44,7 +44,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -30655,7 +32089,16 @@ diff -Naur gtk+2.0-2.17.11.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -228,6 +229,7 @@ +@@ -165,8 +166,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -230,6 +229,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -30663,9 +32106,9 @@ diff -Naur gtk+2.0-2.17.11.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.17.11/modules/engines/ms-windows/Theme/Makefile.in ---- gtk+2.0-2.17.11.old/modules/engines/ms-windows/Theme/Makefile.in 2009-09-05 04:54:24.000000000 +0200 -+++ gtk+2.0-2.17.11/modules/engines/ms-windows/Theme/Makefile.in 2009-09-05 07:25:26.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.18.4/modules/engines/ms-windows/Theme/Makefile.in +--- gtk+2.0-2.18.4.old/modules/engines/ms-windows/Theme/Makefile.in 2009-12-01 05:08:47.000000000 +0100 ++++ gtk+2.0-2.18.4/modules/engines/ms-windows/Theme/Makefile.in 2009-12-01 13:03:33.516289559 +0100 @@ -43,7 +43,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -30683,7 +32126,16 @@ diff -Naur gtk+2.0-2.17.11.old/modules/engines/ms-windows/Theme/Makefile.in gtk+ GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -244,6 +245,7 @@ +@@ -181,8 +182,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -246,6 +245,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -30691,9 +32143,9 @@ diff -Naur gtk+2.0-2.17.11.old/modules/engines/ms-windows/Theme/Makefile.in gtk+ PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.17.11/modules/engines/pixbuf/Makefile.in ---- gtk+2.0-2.17.11.old/modules/engines/pixbuf/Makefile.in 2009-09-05 04:54:24.000000000 +0200 -+++ gtk+2.0-2.17.11/modules/engines/pixbuf/Makefile.in 2009-09-05 07:25:27.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.18.4/modules/engines/pixbuf/Makefile.in +--- gtk+2.0-2.18.4.old/modules/engines/pixbuf/Makefile.in 2009-12-01 05:08:47.000000000 +0100 ++++ gtk+2.0-2.18.4/modules/engines/pixbuf/Makefile.in 2009-12-01 13:03:33.696289576 +0100 @@ -44,7 +44,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -30711,7 +32163,16 @@ diff -Naur gtk+2.0-2.17.11.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.17.1 GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -265,6 +266,7 @@ +@@ -202,8 +203,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -267,6 +266,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -30719,9 +32180,9 @@ diff -Naur gtk+2.0-2.17.11.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.17.1 PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/modules/input/Makefile.in gtk+2.0-2.17.11/modules/input/Makefile.in ---- gtk+2.0-2.17.11.old/modules/input/Makefile.in 2009-09-05 04:54:24.000000000 +0200 -+++ gtk+2.0-2.17.11/modules/input/Makefile.in 2009-09-05 07:25:28.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/modules/input/Makefile.in gtk+2.0-2.18.4/modules/input/Makefile.in +--- gtk+2.0-2.18.4.old/modules/input/Makefile.in 2009-12-01 05:08:47.000000000 +0100 ++++ gtk+2.0-2.18.4/modules/input/Makefile.in 2009-12-01 13:03:33.900291674 +0100 @@ -45,7 +45,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -30739,7 +32200,16 @@ diff -Naur gtk+2.0-2.17.11.old/modules/input/Makefile.in gtk+2.0-2.17.11/modules GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -466,6 +467,7 @@ +@@ -403,8 +404,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -468,6 +467,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -30747,7 +32217,7 @@ diff -Naur gtk+2.0-2.17.11.old/modules/input/Makefile.in gtk+2.0-2.17.11/modules PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -@@ -702,7 +704,8 @@ +@@ -704,7 +704,8 @@ @INCLUDE_IM_MULTIPRESS_FALSE@MULTIPRESS_MODULE = im-multipress.la imconffiledir = $(sysconfdir)/gtk-2.0 dist_imconffile_DATA = im-multipress.conf @@ -30757,7 +32227,7 @@ diff -Naur gtk+2.0-2.17.11.old/modules/input/Makefile.in gtk+2.0-2.17.11/modules @CROSS_COMPILING_TRUE@RUN_QUERY_IMMODULES_TEST = false @BUILD_DYNAMIC_MODULES_TRUE@module_LTLIBRARIES = \ @BUILD_DYNAMIC_MODULES_TRUE@ $(AM_ET_MODULE) \ -@@ -1254,7 +1257,18 @@ +@@ -1256,7 +1257,18 @@ included-modules: $(noinst_LTLIBRARIES) gtk.immodules: Makefile.am $(module_LTLIBRARIES) @@ -30777,9 +32247,9 @@ diff -Naur gtk+2.0-2.17.11.old/modules/input/Makefile.in gtk+2.0-2.17.11/modules @CROSS_COMPILING_FALSE@all-local: gtk.immodules -diff -Naur gtk+2.0-2.17.11.old/modules/Makefile.in gtk+2.0-2.17.11/modules/Makefile.in ---- gtk+2.0-2.17.11.old/modules/Makefile.in 2009-09-05 04:54:23.000000000 +0200 -+++ gtk+2.0-2.17.11/modules/Makefile.in 2009-09-05 07:25:26.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/modules/Makefile.in gtk+2.0-2.18.4/modules/Makefile.in +--- gtk+2.0-2.18.4.old/modules/Makefile.in 2009-12-01 05:08:46.000000000 +0100 ++++ gtk+2.0-2.18.4/modules/Makefile.in 2009-12-01 13:03:33.256291440 +0100 @@ -44,7 +44,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -30797,7 +32267,16 @@ diff -Naur gtk+2.0-2.17.11.old/modules/Makefile.in gtk+2.0-2.17.11/modules/Makef GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -245,6 +246,7 @@ +@@ -182,8 +183,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -247,6 +246,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -30805,9 +32284,9 @@ diff -Naur gtk+2.0-2.17.11.old/modules/Makefile.in gtk+2.0-2.17.11/modules/Makef PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/modules/other/gail/libgail-util/Makefile.in gtk+2.0-2.17.11/modules/other/gail/libgail-util/Makefile.in ---- gtk+2.0-2.17.11.old/modules/other/gail/libgail-util/Makefile.in 2009-09-05 04:54:25.000000000 +0200 -+++ gtk+2.0-2.17.11/modules/other/gail/libgail-util/Makefile.in 2009-09-05 07:25:29.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/modules/other/gail/libgail-util/Makefile.in gtk+2.0-2.18.4/modules/other/gail/libgail-util/Makefile.in +--- gtk+2.0-2.18.4.old/modules/other/gail/libgail-util/Makefile.in 2009-12-01 05:08:48.000000000 +0100 ++++ gtk+2.0-2.18.4/modules/other/gail/libgail-util/Makefile.in 2009-12-01 13:03:34.416289315 +0100 @@ -46,7 +46,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -30825,7 +32304,16 @@ diff -Naur gtk+2.0-2.17.11.old/modules/other/gail/libgail-util/Makefile.in gtk+2 GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -269,6 +270,7 @@ +@@ -206,8 +207,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -271,6 +270,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -30833,9 +32321,9 @@ diff -Naur gtk+2.0-2.17.11.old/modules/other/gail/libgail-util/Makefile.in gtk+2 PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/modules/other/gail/Makefile.in gtk+2.0-2.17.11/modules/other/gail/Makefile.in ---- gtk+2.0-2.17.11.old/modules/other/gail/Makefile.in 2009-09-05 04:54:25.000000000 +0200 -+++ gtk+2.0-2.17.11/modules/other/gail/Makefile.in 2009-09-05 07:25:29.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/modules/other/gail/Makefile.in gtk+2.0-2.18.4/modules/other/gail/Makefile.in +--- gtk+2.0-2.18.4.old/modules/other/gail/Makefile.in 2009-12-01 05:08:47.000000000 +0100 ++++ gtk+2.0-2.18.4/modules/other/gail/Makefile.in 2009-12-01 13:03:34.304289617 +0100 @@ -45,7 +45,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -30853,7 +32341,16 @@ diff -Naur gtk+2.0-2.17.11.old/modules/other/gail/Makefile.in gtk+2.0-2.17.11/mo GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -336,6 +337,7 @@ +@@ -273,8 +274,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -338,6 +337,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -30861,9 +32358,9 @@ diff -Naur gtk+2.0-2.17.11.old/modules/other/gail/Makefile.in gtk+2.0-2.17.11/mo PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.17.11/modules/other/gail/tests/Makefile.in ---- gtk+2.0-2.17.11.old/modules/other/gail/tests/Makefile.in 2009-09-05 04:54:25.000000000 +0200 -+++ gtk+2.0-2.17.11/modules/other/gail/tests/Makefile.in 2009-09-05 07:25:29.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.18.4/modules/other/gail/tests/Makefile.in +--- gtk+2.0-2.18.4.old/modules/other/gail/tests/Makefile.in 2009-12-01 05:08:48.000000000 +0100 ++++ gtk+2.0-2.18.4/modules/other/gail/tests/Makefile.in 2009-12-01 13:03:34.580289520 +0100 @@ -44,7 +44,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -30881,7 +32378,16 @@ diff -Naur gtk+2.0-2.17.11.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.17 GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -408,6 +409,7 @@ +@@ -345,8 +346,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -410,6 +409,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -30889,9 +32395,9 @@ diff -Naur gtk+2.0-2.17.11.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.17 PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/modules/other/Makefile.in gtk+2.0-2.17.11/modules/other/Makefile.in ---- gtk+2.0-2.17.11.old/modules/other/Makefile.in 2009-09-05 04:54:24.000000000 +0200 -+++ gtk+2.0-2.17.11/modules/other/Makefile.in 2009-09-05 07:25:28.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/modules/other/Makefile.in gtk+2.0-2.18.4/modules/other/Makefile.in +--- gtk+2.0-2.18.4.old/modules/other/Makefile.in 2009-12-01 05:08:47.000000000 +0100 ++++ gtk+2.0-2.18.4/modules/other/Makefile.in 2009-12-01 13:03:33.992289409 +0100 @@ -43,7 +43,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -30909,7 +32415,16 @@ diff -Naur gtk+2.0-2.17.11.old/modules/other/Makefile.in gtk+2.0-2.17.11/modules GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -244,6 +245,7 @@ +@@ -181,8 +182,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -246,6 +245,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -30917,9 +32432,9 @@ diff -Naur gtk+2.0-2.17.11.old/modules/other/Makefile.in gtk+2.0-2.17.11/modules PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.17.11/modules/printbackends/cups/Makefile.in ---- gtk+2.0-2.17.11.old/modules/printbackends/cups/Makefile.in 2009-09-05 04:54:25.000000000 +0200 -+++ gtk+2.0-2.17.11/modules/printbackends/cups/Makefile.in 2009-09-05 07:25:29.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.18.4/modules/printbackends/cups/Makefile.in +--- gtk+2.0-2.18.4.old/modules/printbackends/cups/Makefile.in 2009-12-01 05:08:48.000000000 +0100 ++++ gtk+2.0-2.18.4/modules/printbackends/cups/Makefile.in 2009-12-01 13:03:34.768292129 +0100 @@ -45,7 +45,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -30937,7 +32452,16 @@ diff -Naur gtk+2.0-2.17.11.old/modules/printbackends/cups/Makefile.in gtk+2.0-2. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -268,6 +269,7 @@ +@@ -205,8 +206,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -270,6 +269,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -30945,9 +32469,9 @@ diff -Naur gtk+2.0-2.17.11.old/modules/printbackends/cups/Makefile.in gtk+2.0-2. PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/modules/printbackends/file/Makefile.in gtk+2.0-2.17.11/modules/printbackends/file/Makefile.in ---- gtk+2.0-2.17.11.old/modules/printbackends/file/Makefile.in 2009-09-05 04:54:25.000000000 +0200 -+++ gtk+2.0-2.17.11/modules/printbackends/file/Makefile.in 2009-09-05 07:25:30.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/modules/printbackends/file/Makefile.in gtk+2.0-2.18.4/modules/printbackends/file/Makefile.in +--- gtk+2.0-2.18.4.old/modules/printbackends/file/Makefile.in 2009-12-01 05:08:48.000000000 +0100 ++++ gtk+2.0-2.18.4/modules/printbackends/file/Makefile.in 2009-12-01 13:03:34.872290552 +0100 @@ -45,7 +45,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -30965,7 +32489,16 @@ diff -Naur gtk+2.0-2.17.11.old/modules/printbackends/file/Makefile.in gtk+2.0-2. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -267,6 +268,7 @@ +@@ -204,8 +205,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -269,6 +268,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -30973,9 +32506,9 @@ diff -Naur gtk+2.0-2.17.11.old/modules/printbackends/file/Makefile.in gtk+2.0-2. PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.17.11/modules/printbackends/lpr/Makefile.in ---- gtk+2.0-2.17.11.old/modules/printbackends/lpr/Makefile.in 2009-09-05 04:54:25.000000000 +0200 -+++ gtk+2.0-2.17.11/modules/printbackends/lpr/Makefile.in 2009-09-05 07:25:30.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.18.4/modules/printbackends/lpr/Makefile.in +--- gtk+2.0-2.18.4.old/modules/printbackends/lpr/Makefile.in 2009-12-01 05:08:48.000000000 +0100 ++++ gtk+2.0-2.18.4/modules/printbackends/lpr/Makefile.in 2009-12-01 13:03:34.976289326 +0100 @@ -45,7 +45,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -30993,7 +32526,16 @@ diff -Naur gtk+2.0-2.17.11.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.1 GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -265,6 +266,7 @@ +@@ -202,8 +203,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -267,6 +266,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -31001,9 +32543,9 @@ diff -Naur gtk+2.0-2.17.11.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.1 PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/modules/printbackends/Makefile.in gtk+2.0-2.17.11/modules/printbackends/Makefile.in ---- gtk+2.0-2.17.11.old/modules/printbackends/Makefile.in 2009-09-05 04:54:25.000000000 +0200 -+++ gtk+2.0-2.17.11/modules/printbackends/Makefile.in 2009-09-05 07:25:29.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/modules/printbackends/Makefile.in gtk+2.0-2.18.4/modules/printbackends/Makefile.in +--- gtk+2.0-2.18.4.old/modules/printbackends/Makefile.in 2009-12-01 05:08:48.000000000 +0100 ++++ gtk+2.0-2.18.4/modules/printbackends/Makefile.in 2009-12-01 13:03:34.664291346 +0100 @@ -46,7 +46,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -31021,7 +32563,16 @@ diff -Naur gtk+2.0-2.17.11.old/modules/printbackends/Makefile.in gtk+2.0-2.17.11 GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -246,6 +247,7 @@ +@@ -183,8 +184,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -248,6 +247,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -31029,9 +32580,9 @@ diff -Naur gtk+2.0-2.17.11.old/modules/printbackends/Makefile.in gtk+2.0-2.17.11 PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/modules/printbackends/papi/Makefile.in gtk+2.0-2.17.11/modules/printbackends/papi/Makefile.in ---- gtk+2.0-2.17.11.old/modules/printbackends/papi/Makefile.in 2009-09-05 04:54:26.000000000 +0200 -+++ gtk+2.0-2.17.11/modules/printbackends/papi/Makefile.in 2009-09-05 07:25:30.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/modules/printbackends/papi/Makefile.in gtk+2.0-2.18.4/modules/printbackends/papi/Makefile.in +--- gtk+2.0-2.18.4.old/modules/printbackends/papi/Makefile.in 2009-12-01 05:08:48.000000000 +0100 ++++ gtk+2.0-2.18.4/modules/printbackends/papi/Makefile.in 2009-12-01 13:03:35.072291363 +0100 @@ -43,7 +43,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -31049,7 +32600,16 @@ diff -Naur gtk+2.0-2.17.11.old/modules/printbackends/papi/Makefile.in gtk+2.0-2. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -265,6 +266,7 @@ +@@ -202,8 +203,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -267,6 +266,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -31057,9 +32617,9 @@ diff -Naur gtk+2.0-2.17.11.old/modules/printbackends/papi/Makefile.in gtk+2.0-2. PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/modules/printbackends/test/Makefile.in gtk+2.0-2.17.11/modules/printbackends/test/Makefile.in ---- gtk+2.0-2.17.11.old/modules/printbackends/test/Makefile.in 2009-09-05 04:54:26.000000000 +0200 -+++ gtk+2.0-2.17.11/modules/printbackends/test/Makefile.in 2009-09-05 07:25:30.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/modules/printbackends/test/Makefile.in gtk+2.0-2.18.4/modules/printbackends/test/Makefile.in +--- gtk+2.0-2.18.4.old/modules/printbackends/test/Makefile.in 2009-12-01 05:08:49.000000000 +0100 ++++ gtk+2.0-2.18.4/modules/printbackends/test/Makefile.in 2009-12-01 13:03:35.176289847 +0100 @@ -45,7 +45,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -31077,7 +32637,16 @@ diff -Naur gtk+2.0-2.17.11.old/modules/printbackends/test/Makefile.in gtk+2.0-2. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -266,6 +267,7 @@ +@@ -203,8 +204,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -268,6 +267,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -31085,9 +32654,9 @@ diff -Naur gtk+2.0-2.17.11.old/modules/printbackends/test/Makefile.in gtk+2.0-2. PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/perf/Makefile.in gtk+2.0-2.17.11/perf/Makefile.in ---- gtk+2.0-2.17.11.old/perf/Makefile.in 2009-09-05 04:54:26.000000000 +0200 -+++ gtk+2.0-2.17.11/perf/Makefile.in 2009-09-05 07:25:30.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/perf/Makefile.in gtk+2.0-2.18.4/perf/Makefile.in +--- gtk+2.0-2.18.4.old/perf/Makefile.in 2009-12-01 05:08:49.000000000 +0100 ++++ gtk+2.0-2.18.4/perf/Makefile.in 2009-12-01 13:03:35.276289470 +0100 @@ -45,7 +45,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -31105,7 +32674,16 @@ diff -Naur gtk+2.0-2.17.11.old/perf/Makefile.in gtk+2.0-2.17.11/perf/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -236,6 +237,7 @@ +@@ -173,8 +174,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -238,6 +237,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -31113,9 +32691,9 @@ diff -Naur gtk+2.0-2.17.11.old/perf/Makefile.in gtk+2.0-2.17.11/perf/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -diff -Naur gtk+2.0-2.17.11.old/po/Makefile.in.in gtk+2.0-2.17.11/po/Makefile.in.in ---- gtk+2.0-2.17.11.old/po/Makefile.in.in 2009-09-05 06:05:23.000000000 +0200 -+++ gtk+2.0-2.17.11/po/Makefile.in.in 2009-09-05 07:25:11.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/po/Makefile.in.in gtk+2.0-2.18.4/po/Makefile.in.in +--- gtk+2.0-2.18.4.old/po/Makefile.in.in 2009-10-09 07:00:46.000000000 +0200 ++++ gtk+2.0-2.18.4/po/Makefile.in.in 2009-12-01 13:03:24.331293835 +0100 @@ -25,22 +25,23 @@ prefix = @prefix@ @@ -31186,19 +32764,21 @@ diff -Naur gtk+2.0-2.17.11.old/po/Makefile.in.in gtk+2.0-2.17.11/po/Makefile.in. --files-from=$(srcdir)/POTFILES.in \ && test ! -f $(GETTEXT_PACKAGE).po \ || ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \ -@@ -125,7 +127,11 @@ +@@ -125,8 +127,12 @@ install-data: install-data-@USE_NLS@ install-data-no: all install-data-yes: all - $(mkdir_p) $(DESTDIR)$(datadir); \ +- catalogs='$(CATALOGS)'; \ + if test -r "$(MKINSTALLDIRS)"; then \ + $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ + else \ + $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \ + fi - @catalogs='$(CATALOGS)'; \ ++ @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ + case "$$cat" in \ @@ -135,7 +141,11 @@ esac; \ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ @@ -31225,9 +32805,9 @@ diff -Naur gtk+2.0-2.17.11.old/po/Makefile.in.in gtk+2.0-2.17.11/po/Makefile.in. $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ else \ -diff -Naur gtk+2.0-2.17.11.old/tests/Makefile.in gtk+2.0-2.17.11/tests/Makefile.in ---- gtk+2.0-2.17.11.old/tests/Makefile.in 2009-09-05 04:54:26.000000000 +0200 -+++ gtk+2.0-2.17.11/tests/Makefile.in 2009-09-05 07:25:31.000000000 +0200 +diff -Naur gtk+2.0-2.18.4.old/tests/Makefile.in gtk+2.0-2.18.4/tests/Makefile.in +--- gtk+2.0-2.18.4.old/tests/Makefile.in 2009-12-01 05:08:49.000000000 +0100 ++++ gtk+2.0-2.18.4/tests/Makefile.in 2009-12-01 13:03:35.532290410 +0100 @@ -79,7 +79,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -31237,7 +32817,7 @@ diff -Naur gtk+2.0-2.17.11.old/tests/Makefile.in gtk+2.0-2.17.11/tests/Makefile. CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -@@ -427,6 +427,7 @@ +@@ -423,6 +423,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -31245,7 +32825,16 @@ diff -Naur gtk+2.0-2.17.11.old/tests/Makefile.in gtk+2.0-2.17.11/tests/Makefile. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -502,6 +503,7 @@ +@@ -435,8 +436,6 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTKDOC_MKPDF = @GTKDOC_MKPDF@ +-GTKDOC_REBASE = @GTKDOC_REBASE@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -500,6 +499,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ diff --git a/debian/patches/series b/debian/patches/series index 57c76633b0..a9a18099a2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,7 +2,6 @@ 002_static-linking-dont-build-perf.patch 003_gdk.pc_privates.patch 004_gtk+-ximian-gtk2-filesel-navbutton-5.patch -005_gdk_directfb_window_new.patch 009_gtk-export-filechooser.patch 010_gdkpixbuf_-lm.patch 015_default-fallback-icon-theme.patch diff --git a/debian/rules b/debian/rules index e4571ebc65..de96288093 100644 --- a/debian/rules +++ b/debian/rules @@ -53,7 +53,7 @@ DEBVERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p') VERSION := $(shell echo $(DEBVERSION) | sed -e 's/-[^-]*$$//') APIVER := 2.0 SONAME := 0 -SHVER := 2.17.11 +SHVER := 2.18.0 # earliest version that this release has backwards binary compatibility for GTK_BINARY_VERSION := 2.10.0