diff --git a/debian/changelog b/debian/changelog index c387598a30..de4bcbaf39 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,22 @@ +gtk+2.0 (2.19.1-1) experimental; urgency=low + + * New upstream development release: + + debian/rules: + - Include check-dist.mk to prevent accidental uploads to unstable. + + debian/control.in: + - Update ATK build dependency. + + debian/rules, + debian/libgtk-directfb-2.0-0.symbols, + debian/libgtk2.0-0.symbols: + - Update SHVER to 2.19.1 for the new API and add new symbols. + + debian/patches/009_gtk-export-filechooser.patch, + debian/patches/021_loader-files-d.patch: + - Updated to apply cleanly again. + + debian/patches/070_mandatory-relibtoolize.patch: + - Regenerated for the new version. + + -- Sebastian Dröge Tue, 01 Dec 2009 15:28:10 +0100 + gtk+2.0 (2.18.4-1) unstable; urgency=low * New upstream bugfix release: diff --git a/debian/control b/debian/control index fa2f05e63f..87015f0f36 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.22), autotools-dev, libglib2.0-dev (>= 2.21.3), libpango1.0-dev (>= 1.20), - libatk1.0-dev (>= 1.13.0), + libatk1.0-dev (>= 1.29.2), libx11-dev (>= 2:1.0.0-6), libxext-dev (>= 1:1.0.1-2), libxi-dev (>= 1:1.0.1-4), diff --git a/debian/control.in b/debian/control.in index 77b3887240..87c7a67d09 100644 --- a/debian/control.in +++ b/debian/control.in @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.22), autotools-dev, libglib2.0-dev (>= 2.21.3), libpango1.0-dev (>= 1.20), - libatk1.0-dev (>= 1.13.0), + libatk1.0-dev (>= 1.29.2), libx11-dev (>= 2:1.0.0-6), libxext-dev (>= 1:1.0.1-2), libxi-dev (>= 1:1.0.1-4), diff --git a/debian/libgtk-directfb-2.0-0.symbols b/debian/libgtk-directfb-2.0-0.symbols index 74a1ee1e92..c150d44498 100644 --- a/debian/libgtk-directfb-2.0-0.symbols +++ b/debian/libgtk-directfb-2.0-0.symbols @@ -802,6 +802,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_action_disconnect_proxy@Base 2.8.0 gtk_action_get_accel_closure@Base 2.8.0 gtk_action_get_accel_path@Base 2.8.0 + gtk_action_get_always_show_image@Base 2.19.1 gtk_action_get_gicon@Base 2.16.0 gtk_action_get_icon_name@Base 2.16.0 gtk_action_get_is_important@Base 2.16.0 @@ -842,6 +843,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_action_new@Base 2.8.0 gtk_action_set_accel_group@Base 2.8.0 gtk_action_set_accel_path@Base 2.8.0 + gtk_action_set_always_show_image@Base 2.19.1 gtk_action_set_gicon@Base 2.16.0 gtk_action_set_icon_name@Base 2.16.0 gtk_action_set_is_important@Base 2.16.0 @@ -1079,6 +1081,8 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# 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_spinner_get_type@Base 2.19.1 + gtk_cell_renderer_spinner_new@Base 2.19.1 gtk_cell_renderer_start_editing@Base 2.8.0 gtk_cell_renderer_state_get_type@Base 2.8.0 gtk_cell_renderer_stop_editing@Base 2.8.0 @@ -1447,6 +1451,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_dialog_get_has_separator@Base 2.8.0 gtk_dialog_get_response_for_widget@Base 2.8.0 gtk_dialog_get_type@Base 2.8.0 + gtk_dialog_get_widget_for_response@Base 2.19.1 gtk_dialog_new@Base 2.8.0 gtk_dialog_new_with_buttons@Base 2.8.0 gtk_dialog_response@Base 2.8.0 @@ -2399,6 +2404,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_movement_step_get_type@Base 2.8.0 gtk_notebook_append_page@Base 2.8.0 gtk_notebook_append_page_menu@Base 2.8.0 + gtk_notebook_get_action_widget@Base 2.19.1 gtk_notebook_get_current_page@Base 2.8.0 gtk_notebook_get_group@Base 2.12.0 gtk_notebook_get_group_id@Base 2.10.0 @@ -2428,6 +2434,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_notebook_query_tab_label_packing@Base 2.8.0 gtk_notebook_remove_page@Base 2.8.0 gtk_notebook_reorder_child@Base 2.8.0 + gtk_notebook_set_action_widget@Base 2.19.1 gtk_notebook_set_current_page@Base 2.8.0 gtk_notebook_set_group@Base 2.12.0 gtk_notebook_set_group_id@Base 2.10.0 @@ -2541,6 +2548,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_paint_shadow@Base 2.8.0 gtk_paint_shadow_gap@Base 2.8.0 gtk_paint_slider@Base 2.8.0 + gtk_paint_spinner@Base 2.19.1 gtk_paint_string@Base 2.8.0 gtk_paint_tab@Base 2.8.0 gtk_paint_vline@Base 2.8.0 @@ -3252,6 +3260,10 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_spin_button_update@Base 2.8.0 gtk_spin_button_update_policy_get_type@Base 2.8.0 gtk_spin_type_get_type@Base 2.8.0 + gtk_spinner_get_type@Base 2.19.1 + gtk_spinner_new@Base 2.19.1 + gtk_spinner_start@Base 2.19.1 + gtk_spinner_stop@Base 2.19.1 gtk_state_type_get_type@Base 2.8.0 gtk_status_icon_get_blinking@Base 2.10.0 gtk_status_icon_get_geometry@Base 2.10.0 @@ -3292,6 +3304,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_status_icon_set_visible@Base 2.10.0 gtk_statusbar_get_context_id@Base 2.8.0 gtk_statusbar_get_has_resize_grip@Base 2.8.0 + gtk_statusbar_get_message_area@Base 2.19.1 gtk_statusbar_get_type@Base 2.8.0 gtk_statusbar_new@Base 2.8.0 gtk_statusbar_pop@Base 2.8.0 @@ -3757,6 +3770,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_tool_button_set_label_widget@Base 2.8.0 gtk_tool_button_set_stock_id@Base 2.8.0 gtk_tool_button_set_use_underline@Base 2.8.0 + gtk_tool_item_get_ellipsize_mode@Base 2.19.1 gtk_tool_item_get_expand@Base 2.8.0 gtk_tool_item_get_homogeneous@Base 2.8.0 gtk_tool_item_get_icon_size@Base 2.8.0 @@ -3764,11 +3778,32 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_tool_item_get_orientation@Base 2.8.0 gtk_tool_item_get_proxy_menu_item@Base 2.8.0 gtk_tool_item_get_relief_style@Base 2.8.0 + gtk_tool_item_get_text_alignment@Base 2.19.1 + gtk_tool_item_get_text_orientation@Base 2.19.1 + gtk_tool_item_get_text_size_group@Base 2.19.1 gtk_tool_item_get_toolbar_style@Base 2.8.0 gtk_tool_item_get_type@Base 2.8.0 gtk_tool_item_get_use_drag_window@Base 2.8.0 gtk_tool_item_get_visible_horizontal@Base 2.8.0 gtk_tool_item_get_visible_vertical@Base 2.8.0 + gtk_tool_item_group_get_collapsed@Base 2.19.1 + gtk_tool_item_group_get_drop_item@Base 2.19.1 + gtk_tool_item_group_get_ellipsize@Base 2.19.1 + gtk_tool_item_group_get_header_relief@Base 2.19.1 + gtk_tool_item_group_get_item_position@Base 2.19.1 + gtk_tool_item_group_get_label@Base 2.19.1 + gtk_tool_item_group_get_label_widget@Base 2.19.1 + gtk_tool_item_group_get_n_items@Base 2.19.1 + gtk_tool_item_group_get_nth_item@Base 2.19.1 + gtk_tool_item_group_get_type@Base 2.19.1 + gtk_tool_item_group_insert@Base 2.19.1 + gtk_tool_item_group_new@Base 2.19.1 + gtk_tool_item_group_set_collapsed@Base 2.19.1 + gtk_tool_item_group_set_ellipsize@Base 2.19.1 + gtk_tool_item_group_set_header_relief@Base 2.19.1 + gtk_tool_item_group_set_item_position@Base 2.19.1 + gtk_tool_item_group_set_label@Base 2.19.1 + gtk_tool_item_group_set_label_widget@Base 2.19.1 gtk_tool_item_new@Base 2.8.0 gtk_tool_item_rebuild_menu@Base 2.8.0 gtk_tool_item_retrieve_proxy_menu_item@Base 2.8.0 @@ -3783,10 +3818,38 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_tool_item_set_visible_horizontal@Base 2.8.0 gtk_tool_item_set_visible_vertical@Base 2.8.0 gtk_tool_item_toolbar_reconfigured@Base 2.14.0 + gtk_tool_palette_add_drag_dest@Base 2.19.1 + gtk_tool_palette_drag_targets_get_type@Base 2.19.1 + gtk_tool_palette_get_drag_item@Base 2.19.1 + gtk_tool_palette_get_drag_target_group@Base 2.19.1 + gtk_tool_palette_get_drag_target_item@Base 2.19.1 + gtk_tool_palette_get_drop_group@Base 2.19.1 + gtk_tool_palette_get_drop_item@Base 2.19.1 + gtk_tool_palette_get_exclusive@Base 2.19.1 + gtk_tool_palette_get_expand@Base 2.19.1 + gtk_tool_palette_get_group_position@Base 2.19.1 + gtk_tool_palette_get_hadjustment@Base 2.19.1 + gtk_tool_palette_get_icon_size@Base 2.19.1 + gtk_tool_palette_get_style@Base 2.19.1 + gtk_tool_palette_get_type@Base 2.19.1 + gtk_tool_palette_get_vadjustment@Base 2.19.1 + gtk_tool_palette_new@Base 2.19.1 + gtk_tool_palette_set_drag_source@Base 2.19.1 + gtk_tool_palette_set_exclusive@Base 2.19.1 + gtk_tool_palette_set_expand@Base 2.19.1 + gtk_tool_palette_set_group_position@Base 2.19.1 + gtk_tool_palette_set_icon_size@Base 2.19.1 + gtk_tool_palette_set_style@Base 2.19.1 + gtk_tool_palette_unset_icon_size@Base 2.19.1 + gtk_tool_palette_unset_style@Base 2.19.1 + gtk_tool_shell_get_ellipsize_mode@Base 2.19.1 gtk_tool_shell_get_icon_size@Base 2.14.0 gtk_tool_shell_get_orientation@Base 2.14.0 gtk_tool_shell_get_relief_style@Base 2.14.0 gtk_tool_shell_get_style@Base 2.14.0 + gtk_tool_shell_get_text_alignment@Base 2.19.1 + gtk_tool_shell_get_text_orientation@Base 2.19.1 + gtk_tool_shell_get_text_size_group@Base 2.19.1 gtk_tool_shell_get_type@Base 2.14.0 gtk_tool_shell_rebuild_menu@Base 2.14.0 gtk_toolbar_append_element@Base 2.8.0 @@ -3830,6 +3893,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_tooltip_get_type@Base 2.12.0 gtk_tooltip_set_custom@Base 2.12.0 gtk_tooltip_set_icon@Base 2.12.0 + gtk_tooltip_set_icon_from_gicon@Base 2.19.1 gtk_tooltip_set_icon_from_icon_name@Base 2.14.0 gtk_tooltip_set_icon_from_stock@Base 2.12.0 gtk_tooltip_set_markup@Base 2.12.0 @@ -4207,6 +4271,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_vbutton_box_new@Base 2.8.0 gtk_vbutton_box_set_layout_default@Base 2.8.0 gtk_vbutton_box_set_spacing_default@Base 2.8.0 + gtk_viewport_get_bin_window@Base 2.19.1 gtk_viewport_get_hadjustment@Base 2.8.0 gtk_viewport_get_shadow_type@Base 2.8.0 gtk_viewport_get_type@Base 2.8.0 @@ -4443,6 +4508,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER# gtk_window_get_type@Base 2.8.0 gtk_window_get_type_hint@Base 2.8.0 gtk_window_get_urgency_hint@Base 2.8.0 + gtk_window_get_window_type@Base 2.19.1 gtk_window_group_add_window@Base 2.8.0 gtk_window_group_get_type@Base 2.8.0 gtk_window_group_list_windows@Base 2.14.0 diff --git a/debian/libgtk2.0-0.symbols b/debian/libgtk2.0-0.symbols index 9e98cf1d96..69d0b4c2e2 100644 --- a/debian/libgtk2.0-0.symbols +++ b/debian/libgtk2.0-0.symbols @@ -949,6 +949,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_action_disconnect_proxy@Base 2.8.0 gtk_action_get_accel_closure@Base 2.8.0 gtk_action_get_accel_path@Base 2.8.0 + gtk_action_get_always_show_image@Base 2.19.1 gtk_action_get_gicon@Base 2.16.0 gtk_action_get_icon_name@Base 2.16.0 gtk_action_get_is_important@Base 2.16.0 @@ -989,6 +990,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_action_new@Base 2.8.0 gtk_action_set_accel_group@Base 2.8.0 gtk_action_set_accel_path@Base 2.8.0 + gtk_action_set_always_show_image@Base 2.19.1 gtk_action_set_gicon@Base 2.16.0 gtk_action_set_icon_name@Base 2.16.0 gtk_action_set_is_important@Base 2.16.0 @@ -1226,6 +1228,8 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# 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_spinner_get_type@Base 2.19.1 + gtk_cell_renderer_spinner_new@Base 2.19.1 gtk_cell_renderer_start_editing@Base 2.8.0 gtk_cell_renderer_state_get_type@Base 2.8.0 gtk_cell_renderer_stop_editing@Base 2.8.0 @@ -1594,6 +1598,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_dialog_get_has_separator@Base 2.8.0 gtk_dialog_get_response_for_widget@Base 2.8.0 gtk_dialog_get_type@Base 2.8.0 + gtk_dialog_get_widget_for_response@Base 2.19.1 gtk_dialog_new@Base 2.8.0 gtk_dialog_new_with_buttons@Base 2.8.0 gtk_dialog_response@Base 2.8.0 @@ -2546,6 +2551,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_movement_step_get_type@Base 2.8.0 gtk_notebook_append_page@Base 2.8.0 gtk_notebook_append_page_menu@Base 2.8.0 + gtk_notebook_get_action_widget@Base 2.19.1 gtk_notebook_get_current_page@Base 2.8.0 gtk_notebook_get_group@Base 2.12.0 gtk_notebook_get_group_id@Base 2.10.0 @@ -2575,6 +2581,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_notebook_query_tab_label_packing@Base 2.8.0 gtk_notebook_remove_page@Base 2.8.0 gtk_notebook_reorder_child@Base 2.8.0 + gtk_notebook_set_action_widget@Base 2.19.1 gtk_notebook_set_current_page@Base 2.8.0 gtk_notebook_set_group@Base 2.12.0 gtk_notebook_set_group_id@Base 2.10.0 @@ -2688,6 +2695,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_paint_shadow@Base 2.8.0 gtk_paint_shadow_gap@Base 2.8.0 gtk_paint_slider@Base 2.8.0 + gtk_paint_spinner@Base 2.19.1 gtk_paint_string@Base 2.8.0 gtk_paint_tab@Base 2.8.0 gtk_paint_vline@Base 2.8.0 @@ -3399,6 +3407,10 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_spin_button_update@Base 2.8.0 gtk_spin_button_update_policy_get_type@Base 2.8.0 gtk_spin_type_get_type@Base 2.8.0 + gtk_spinner_get_type@Base 2.19.1 + gtk_spinner_new@Base 2.19.1 + gtk_spinner_start@Base 2.19.1 + gtk_spinner_stop@Base 2.19.1 gtk_state_type_get_type@Base 2.8.0 gtk_status_icon_get_blinking@Base 2.10.0 gtk_status_icon_get_geometry@Base 2.10.0 @@ -3439,6 +3451,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_status_icon_set_visible@Base 2.10.0 gtk_statusbar_get_context_id@Base 2.8.0 gtk_statusbar_get_has_resize_grip@Base 2.8.0 + gtk_statusbar_get_message_area@Base 2.19.1 gtk_statusbar_get_type@Base 2.8.0 gtk_statusbar_new@Base 2.8.0 gtk_statusbar_pop@Base 2.8.0 @@ -3904,6 +3917,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_tool_button_set_label_widget@Base 2.8.0 gtk_tool_button_set_stock_id@Base 2.8.0 gtk_tool_button_set_use_underline@Base 2.8.0 + gtk_tool_item_get_ellipsize_mode@Base 2.19.1 gtk_tool_item_get_expand@Base 2.8.0 gtk_tool_item_get_homogeneous@Base 2.8.0 gtk_tool_item_get_icon_size@Base 2.8.0 @@ -3911,11 +3925,32 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_tool_item_get_orientation@Base 2.8.0 gtk_tool_item_get_proxy_menu_item@Base 2.8.0 gtk_tool_item_get_relief_style@Base 2.8.0 + gtk_tool_item_get_text_alignment@Base 2.19.1 + gtk_tool_item_get_text_orientation@Base 2.19.1 + gtk_tool_item_get_text_size_group@Base 2.19.1 gtk_tool_item_get_toolbar_style@Base 2.8.0 gtk_tool_item_get_type@Base 2.8.0 gtk_tool_item_get_use_drag_window@Base 2.8.0 gtk_tool_item_get_visible_horizontal@Base 2.8.0 gtk_tool_item_get_visible_vertical@Base 2.8.0 + gtk_tool_item_group_get_collapsed@Base 2.19.1 + gtk_tool_item_group_get_drop_item@Base 2.19.1 + gtk_tool_item_group_get_ellipsize@Base 2.19.1 + gtk_tool_item_group_get_header_relief@Base 2.19.1 + gtk_tool_item_group_get_item_position@Base 2.19.1 + gtk_tool_item_group_get_label@Base 2.19.1 + gtk_tool_item_group_get_label_widget@Base 2.19.1 + gtk_tool_item_group_get_n_items@Base 2.19.1 + gtk_tool_item_group_get_nth_item@Base 2.19.1 + gtk_tool_item_group_get_type@Base 2.19.1 + gtk_tool_item_group_insert@Base 2.19.1 + gtk_tool_item_group_new@Base 2.19.1 + gtk_tool_item_group_set_collapsed@Base 2.19.1 + gtk_tool_item_group_set_ellipsize@Base 2.19.1 + gtk_tool_item_group_set_header_relief@Base 2.19.1 + gtk_tool_item_group_set_item_position@Base 2.19.1 + gtk_tool_item_group_set_label@Base 2.19.1 + gtk_tool_item_group_set_label_widget@Base 2.19.1 gtk_tool_item_new@Base 2.8.0 gtk_tool_item_rebuild_menu@Base 2.8.0 gtk_tool_item_retrieve_proxy_menu_item@Base 2.8.0 @@ -3930,10 +3965,38 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_tool_item_set_visible_horizontal@Base 2.8.0 gtk_tool_item_set_visible_vertical@Base 2.8.0 gtk_tool_item_toolbar_reconfigured@Base 2.14.0 + gtk_tool_palette_add_drag_dest@Base 2.19.1 + gtk_tool_palette_drag_targets_get_type@Base 2.19.1 + gtk_tool_palette_get_drag_item@Base 2.19.1 + gtk_tool_palette_get_drag_target_group@Base 2.19.1 + gtk_tool_palette_get_drag_target_item@Base 2.19.1 + gtk_tool_palette_get_drop_group@Base 2.19.1 + gtk_tool_palette_get_drop_item@Base 2.19.1 + gtk_tool_palette_get_exclusive@Base 2.19.1 + gtk_tool_palette_get_expand@Base 2.19.1 + gtk_tool_palette_get_group_position@Base 2.19.1 + gtk_tool_palette_get_hadjustment@Base 2.19.1 + gtk_tool_palette_get_icon_size@Base 2.19.1 + gtk_tool_palette_get_style@Base 2.19.1 + gtk_tool_palette_get_type@Base 2.19.1 + gtk_tool_palette_get_vadjustment@Base 2.19.1 + gtk_tool_palette_new@Base 2.19.1 + gtk_tool_palette_set_drag_source@Base 2.19.1 + gtk_tool_palette_set_exclusive@Base 2.19.1 + gtk_tool_palette_set_expand@Base 2.19.1 + gtk_tool_palette_set_group_position@Base 2.19.1 + gtk_tool_palette_set_icon_size@Base 2.19.1 + gtk_tool_palette_set_style@Base 2.19.1 + gtk_tool_palette_unset_icon_size@Base 2.19.1 + gtk_tool_palette_unset_style@Base 2.19.1 + gtk_tool_shell_get_ellipsize_mode@Base 2.19.1 gtk_tool_shell_get_icon_size@Base 2.14.0 gtk_tool_shell_get_orientation@Base 2.14.0 gtk_tool_shell_get_relief_style@Base 2.14.0 gtk_tool_shell_get_style@Base 2.14.0 + gtk_tool_shell_get_text_alignment@Base 2.19.1 + gtk_tool_shell_get_text_orientation@Base 2.19.1 + gtk_tool_shell_get_text_size_group@Base 2.19.1 gtk_tool_shell_get_type@Base 2.14.0 gtk_tool_shell_rebuild_menu@Base 2.14.0 gtk_toolbar_append_element@Base 2.8.0 @@ -3977,6 +4040,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_tooltip_get_type@Base 2.12.0 gtk_tooltip_set_custom@Base 2.12.0 gtk_tooltip_set_icon@Base 2.12.0 + gtk_tooltip_set_icon_from_gicon@Base 2.19.1 gtk_tooltip_set_icon_from_icon_name@Base 2.14.0 gtk_tooltip_set_icon_from_stock@Base 2.12.0 gtk_tooltip_set_markup@Base 2.12.0 @@ -4355,6 +4419,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_vbutton_box_new@Base 2.8.0 gtk_vbutton_box_set_layout_default@Base 2.8.0 gtk_vbutton_box_set_spacing_default@Base 2.8.0 + gtk_viewport_get_bin_window@Base 2.19.1 gtk_viewport_get_hadjustment@Base 2.8.0 gtk_viewport_get_shadow_type@Base 2.8.0 gtk_viewport_get_type@Base 2.8.0 @@ -4591,6 +4656,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER# gtk_window_get_type@Base 2.8.0 gtk_window_get_type_hint@Base 2.8.0 gtk_window_get_urgency_hint@Base 2.8.0 + gtk_window_get_window_type@Base 2.19.1 gtk_window_group_add_window@Base 2.8.0 gtk_window_group_get_type@Base 2.8.0 gtk_window_group_list_windows@Base 2.14.0 diff --git a/debian/patches/009_gtk-export-filechooser.patch b/debian/patches/009_gtk-export-filechooser.patch index 1b44a45bde..2085bdadf9 100644 --- a/debian/patches/009_gtk-export-filechooser.patch +++ b/debian/patches/009_gtk-export-filechooser.patch @@ -178,8 +178,8 @@ +#error "GtkFileSystemModel is not supported API for general use" +#endif + - #include "gtkfilesystem.h" - #include + #include + #include --- a/gtk/gtkquery.h +++ b/gtk/gtkquery.h diff --git a/debian/patches/021_loader-files-d.patch b/debian/patches/021_loader-files-d.patch index 6b0770af1b..8dcd5fab44 100644 --- a/debian/patches/021_loader-files-d.patch +++ b/debian/patches/021_loader-files-d.patch @@ -29,7 +29,7 @@ #ifndef GDK_PIXBUF_USE_GIO_MIME static gint format_check (GdkPixbufModule *module, guchar *buffer, int size) -@@ -316,115 +319,93 @@ +@@ -316,118 +319,93 @@ gdk_pixbuf_load_module_unlocked (GdkPixbufModule *image_module, GError **error); @@ -188,6 +188,9 @@ -#ifdef INCLUDE_jasper - load_one_builtin_module (jasper); -#endif +-#ifdef INCLUDE_qtif +- load_one_builtin_module (qtif); +-#endif -#ifdef INCLUDE_gdiplus - /* We don't bother having the GDI+ loaders individually selectable - * for building in or not. @@ -221,7 +224,7 @@ while (!have_error && g_io_channel_read_line (channel, &line_buf, NULL, &term, NULL) == G_IO_STATUS_NORMAL) { const char *p; -@@ -562,8 +543,156 @@ +@@ -562,8 +543,159 @@ g_free (line_buf); } g_string_free (tmp_buf, TRUE); @@ -300,6 +303,9 @@ +#ifdef INCLUDE_jasper + load_one_builtin_module (jasper); +#endif ++#ifdef INCLUDE_qtif ++ load_one_builtin_module (qtif); ++#endif +#ifdef INCLUDE_gdiplus + /* We don't bother having the GDI+ loaders individually selectable + * for building in or not. diff --git a/debian/patches/070_mandatory-relibtoolize.patch b/debian/patches/070_mandatory-relibtoolize.patch index b7145600cc..06518195d2 100644 --- a/debian/patches/070_mandatory-relibtoolize.patch +++ b/debian/patches/070_mandatory-relibtoolize.patch @@ -1,6 +1,6 @@ -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 +diff -Naur gtk+2.0-2.19.1.old/aclocal.m4 gtk+2.0-2.19.1/aclocal.m4 +--- gtk+2.0-2.19.1.old/aclocal.m4 2009-11-30 22:17:25.000000000 +0100 ++++ gtk+2.0-2.19.1/aclocal.m4 2009-12-01 16:03:29.707292349 +0100 @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], @@ -206,9 +206,9 @@ diff -Naur gtk+2.0-2.18.4.old/aclocal.m4 gtk+2.0-2.18.4/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.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 +diff -Naur gtk+2.0-2.19.1.old/config.h.in gtk+2.0-2.19.1/config.h.in +--- gtk+2.0-2.19.1.old/config.h.in 2009-11-30 22:17:28.000000000 +0100 ++++ gtk+2.0-2.19.1/config.h.in 2009-12-01 16:03:31.820294705 +0100 @@ -126,6 +126,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STRING_H @@ -229,14 +229,14 @@ diff -Naur gtk+2.0-2.18.4.old/config.h.in gtk+2.0-2.18.4/config.h.in /* Define to the version of this package. */ #undef PACKAGE_VERSION -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 +diff -Naur gtk+2.0-2.19.1.old/configure gtk+2.0-2.19.1/configure +--- gtk+2.0-2.19.1.old/configure 2009-11-30 22:17:39.000000000 +0100 ++++ gtk+2.0-2.19.1/configure 2009-12-01 16:03:31.444292874 +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.18.4. -+# Generated by GNU Autoconf 2.65 for gtk+ 2.18.4. +-# Generated by GNU Autoconf 2.63 for gtk+ 2.19.1. ++# Generated by GNU Autoconf 2.65 for gtk+ 2.19.1. # # Report bugs to . # @@ -1042,8 +1042,8 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure # Identity of this package. PACKAGE_NAME='gtk+' @@ -748,6 +705,7 @@ - PACKAGE_VERSION='2.18.4' - PACKAGE_STRING='gtk+ 2.18.4' + PACKAGE_VERSION='2.19.1' + PACKAGE_STRING='gtk+ 2.19.1' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B' +PACKAGE_URL='' @@ -1087,7 +1087,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure GDK_PACKAGES USE_DIRECTFB_FALSE USE_DIRECTFB_TRUE -@@ -1052,6 +1004,8 @@ +@@ -1054,6 +1006,8 @@ CXXFLAGS ac_ct_CXX CXX @@ -1096,7 +1096,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE -@@ -1149,6 +1103,7 @@ +@@ -1151,6 +1105,7 @@ program_transform_name prefix exec_prefix @@ -1104,7 +1104,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure PACKAGE_BUGREPORT PACKAGE_STRING PACKAGE_VERSION -@@ -1193,8 +1148,6 @@ +@@ -1195,8 +1150,6 @@ enable_test_print_backend with_html_dir enable_gtk_doc @@ -1113,7 +1113,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure enable_man with_xml_catalog ' -@@ -1329,8 +1282,7 @@ +@@ -1331,8 +1284,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 && @@ -1123,7 +1123,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in -@@ -1356,8 +1308,7 @@ +@@ -1358,8 +1310,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 && @@ -1133,7 +1133,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in -@@ -1561,8 +1512,7 @@ +@@ -1563,8 +1514,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 && @@ -1143,7 +1143,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in -@@ -1578,8 +1528,7 @@ +@@ -1580,8 +1530,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 && @@ -1153,7 +1153,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in -@@ -1609,17 +1558,17 @@ +@@ -1611,17 +1560,17 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; @@ -1177,7 +1177,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure eval $ac_envvar=\$ac_optarg export $ac_envvar ;; -@@ -1636,15 +1585,13 @@ +@@ -1638,15 +1587,13 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` @@ -1195,7 +1195,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi -@@ -1667,8 +1614,7 @@ +@@ -1669,8 +1616,7 @@ [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac @@ -1205,7 +1205,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure done # There might be people who depend on the old broken behavior: `$host' -@@ -1698,11 +1644,9 @@ +@@ -1700,11 +1646,9 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || @@ -1219,7 +1219,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure # Find the source files, if location was not specified. -@@ -1741,13 +1685,11 @@ +@@ -1743,13 +1687,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." @@ -1235,7 +1235,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then -@@ -1890,9 +1832,7 @@ +@@ -1892,9 +1834,7 @@ --enable-test-print-backend build test print backend @@ -1246,7 +1246,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure --enable-man regenerate man pages from Docbook [default=no] Optional Packages: -@@ -1922,7 +1862,7 @@ +@@ -1924,7 +1864,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 @@ -1255,10 +1255,10 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure you have headers in a nonstandard directory CXX C++ compiler command CXXFLAGS C++ compiler flags -@@ -2012,464 +1952,973 @@ +@@ -2014,464 +1954,973 @@ if $ac_init_version; then cat <<\_ACEOF - gtk+ configure 2.18.4 + gtk+ configure 2.19.1 -generated by GNU Autoconf 2.63 +generated by GNU Autoconf 2.65 @@ -1274,7 +1274,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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.18.4, which was +-It was created by gtk+ $as_me 2.19.1, which was -generated by GNU Autoconf 2.63. Invocation command line was +## ------------------------ ## +## Autoconf initialization. ## @@ -2110,7 +2110,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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.18.4, which was ++It was created by gtk+ $as_me 2.19.1, which was +generated by GNU Autoconf 2.65. Invocation command line was + $ $0 $@ @@ -2607,7 +2607,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. -@@ -2498,7 +2947,7 @@ +@@ -2500,7 +2949,7 @@ ;; esac @@ -2616,7 +2616,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir -@@ -2514,7 +2963,7 @@ +@@ -2516,7 +2965,7 @@ INSTALL=$ac_install_sh fi fi @@ -2625,7 +2625,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. -@@ -2525,7 +2974,7 @@ +@@ -2527,7 +2976,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' @@ -2634,7 +2634,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "checking whether build environment is sane... " >&6; } # Just in case sleep 1 -@@ -2536,15 +2985,11 @@ +@@ -2538,15 +2987,11 @@ ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) @@ -2652,7 +2652,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure esac # Do `set' in a subshell so we don't clobber the current shell's -@@ -2566,11 +3011,8 @@ +@@ -2568,11 +3013,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". @@ -2666,7 +2666,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure fi test "$2" = conftest.file -@@ -2579,13 +3021,10 @@ +@@ -2581,13 +3023,10 @@ # Ok. : else @@ -2683,7 +2683,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "yes" >&6; } test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" -@@ -2613,7 +3052,7 @@ +@@ -2615,7 +3054,7 @@ am_missing_run="$MISSING --run " else am_missing_run= @@ -2692,7 +2692,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -@@ -2634,9 +3073,9 @@ +@@ -2636,9 +3075,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 @@ -2704,7 +2704,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then -@@ -2647,24 +3086,24 @@ +@@ -2649,24 +3088,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2734,7 +2734,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -2674,9 +3113,9 @@ +@@ -2676,9 +3115,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 @@ -2746,7 +2746,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then -@@ -2687,24 +3126,24 @@ +@@ -2689,24 +3128,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2776,7 +2776,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -2713,7 +3152,7 @@ +@@ -2715,7 +3154,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -2785,7 +2785,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -2726,10 +3165,10 @@ +@@ -2728,10 +3167,10 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" @@ -2798,7 +2798,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -@@ -2737,7 +3176,7 @@ +@@ -2739,7 +3178,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2807,7 +2807,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 #( -@@ -2749,11 +3188,12 @@ +@@ -2751,11 +3190,12 @@ esac done done @@ -2821,7 +2821,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure if test "${ac_cv_path_mkdir+set}" = set; then MKDIR_P="$ac_cv_path_mkdir -p" else -@@ -2761,11 +3201,10 @@ +@@ -2763,11 +3203,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. @@ -2834,7 +2834,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$MKDIR_P" >&6; } mkdir_p="$MKDIR_P" -@@ -2778,9 +3217,9 @@ +@@ -2780,9 +3219,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 @@ -2846,7 +2846,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then -@@ -2791,24 +3230,24 @@ +@@ -2793,24 +3232,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2876,7 +2876,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -2816,11 +3255,11 @@ +@@ -2818,11 +3257,11 @@ test -n "$AWK" && break done @@ -2890,7 +2890,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF -@@ -2838,11 +3277,11 @@ +@@ -2840,11 +3279,11 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then @@ -2904,7 +2904,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi -@@ -2862,9 +3301,7 @@ +@@ -2864,9 +3303,7 @@ am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then @@ -2915,7 +2915,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure fi fi -@@ -2918,7 +3355,7 @@ +@@ -2920,7 +3357,7 @@ # by either passing --enable-silent-rules to configure or passing V=0 # to make # Check whether --enable-silent-rules was given. @@ -2924,7 +2924,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure enableval=$enable_silent_rules; fi -@@ -3007,35 +3444,27 @@ +@@ -3009,35 +3446,27 @@ # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || @@ -2967,7 +2967,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' -@@ -3051,28 +3480,24 @@ +@@ -3053,28 +3482,24 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac @@ -3001,7 +3001,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' -@@ -3090,7 +3515,7 @@ +@@ -3092,7 +3517,7 @@ MATH_LIB=-lm @@ -3010,7 +3010,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "checking for native Win32... " >&6; } LIB_EXE_MACHINE_FLAG=X86 case "$host" in -@@ -3108,7 +3533,7 @@ +@@ -3110,7 +3535,7 @@ os_win32=no ;; esac @@ -3019,7 +3019,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$os_win32" >&6; } -@@ -3127,9 +3552,9 @@ +@@ -3129,9 +3554,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 @@ -3031,7 +3031,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -3140,24 +3565,24 @@ +@@ -3142,24 +3567,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -3061,7 +3061,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -3167,9 +3592,9 @@ +@@ -3169,9 +3594,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 @@ -3073,7 +3073,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then -@@ -3180,24 +3605,24 @@ +@@ -3182,24 +3607,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -3103,7 +3103,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -3206,7 +3631,7 @@ +@@ -3208,7 +3633,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -3112,7 +3112,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -3220,9 +3645,9 @@ +@@ -3222,9 +3647,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 @@ -3124,7 +3124,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -3233,24 +3658,24 @@ +@@ -3235,24 +3660,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -3154,7 +3154,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -3260,9 +3685,9 @@ +@@ -3262,9 +3687,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 @@ -3166,7 +3166,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -3274,18 +3699,18 @@ +@@ -3276,18 +3701,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -3188,7 +3188,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure IFS=$as_save_IFS if test $ac_prog_rejected = yes; then -@@ -3304,10 +3729,10 @@ +@@ -3306,10 +3731,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -3201,7 +3201,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -3319,9 +3744,9 @@ +@@ -3321,9 +3746,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 @@ -3213,7 +3213,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -3332,24 +3757,24 @@ +@@ -3334,24 +3759,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -3243,7 +3243,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -3363,9 +3788,9 @@ +@@ -3365,9 +3790,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 @@ -3255,7 +3255,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then -@@ -3376,24 +3801,24 @@ +@@ -3378,24 +3803,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -3285,7 +3285,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -3406,7 +3831,7 @@ +@@ -3408,7 +3833,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -3294,7 +3294,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -3417,57 +3842,37 @@ +@@ -3419,57 +3844,37 @@ fi @@ -3372,7 +3372,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ int -@@ -3483,8 +3888,8 @@ +@@ -3485,8 +3890,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. @@ -3383,7 +3383,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: -@@ -3500,17 +3905,17 @@ +@@ -3502,17 +3907,17 @@ done rm -f $ac_rmfiles @@ -3406,7 +3406,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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, -@@ -3527,7 +3932,7 @@ +@@ -3529,7 +3934,7 @@ # certainly right. break;; *.* ) @@ -3415,7 +3415,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi -@@ -3546,84 +3951,42 @@ +@@ -3548,84 +3953,42 @@ else ac_file='' fi @@ -3521,7 +3521,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 -@@ -3638,32 +4001,83 @@ +@@ -3640,32 +4003,83 @@ esac done else @@ -3621,7 +3621,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ int -@@ -3675,17 +4089,17 @@ +@@ -3677,17 +4091,17 @@ } _ACEOF rm -f conftest.o conftest.obj @@ -3644,7 +3644,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in -@@ -3698,31 +4112,23 @@ +@@ -3700,31 +4114,23 @@ $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -3683,7 +3683,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ int -@@ -3736,37 +4142,16 @@ +@@ -3738,37 +4144,16 @@ return 0; } _ACEOF @@ -3724,7 +3724,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes -@@ -3775,20 +4160,16 @@ +@@ -3777,20 +4162,16 @@ fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS @@ -3748,7 +3748,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ int -@@ -3799,35 +4180,11 @@ +@@ -3801,35 +4182,11 @@ return 0; } _ACEOF @@ -3787,7 +3787,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ int -@@ -3838,36 +4195,12 @@ +@@ -3840,36 +4197,12 @@ return 0; } _ACEOF @@ -3828,7 +3828,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ int -@@ -3878,42 +4211,17 @@ +@@ -3880,42 +4213,17 @@ return 0; } _ACEOF @@ -3873,7 +3873,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS -@@ -3930,18 +4238,14 @@ +@@ -3932,18 +4240,14 @@ CFLAGS= fi fi @@ -3895,7 +3895,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ #include #include -@@ -3998,32 +4302,9 @@ +@@ -4000,32 +4304,9 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" @@ -3929,7 +3929,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done -@@ -4034,17 +4315,19 @@ +@@ -4036,17 +4317,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) @@ -3952,7 +3952,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure ac_ext=c ac_cpp='$CPP $CPPFLAGS' -@@ -4063,7 +4346,7 @@ +@@ -4065,7 +4348,7 @@ .PHONY: am__doit END # If we don't find an include directive, just comment out the code. @@ -3961,7 +3961,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= -@@ -4091,12 +4374,12 @@ +@@ -4093,12 +4376,12 @@ fi @@ -3976,7 +3976,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure enableval=$enable_dependency_tracking; fi -@@ -4116,9 +4399,9 @@ +@@ -4118,9 +4401,9 @@ depcc="$CC" am_compiler_list= @@ -3988,7 +3988,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -@@ -4226,7 +4509,7 @@ +@@ -4228,7 +4511,7 @@ fi fi @@ -3997,7 +3997,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type -@@ -4242,7 +4525,7 @@ +@@ -4244,7 +4527,7 @@ # Check whether --enable-static was given. @@ -4006,7 +4006,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; -@@ -4272,15 +4555,23 @@ +@@ -4274,15 +4557,23 @@ @@ -4032,7 +4032,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$CXX"; then -@@ -4291,24 +4582,24 @@ +@@ -4293,24 +4584,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4062,7 +4062,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -4322,9 +4613,9 @@ +@@ -4324,9 +4615,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 @@ -4074,7 +4074,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CXX"; then -@@ -4335,24 +4626,24 @@ +@@ -4337,24 +4628,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4104,7 +4104,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -4365,7 +4656,7 @@ +@@ -4367,7 +4658,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -4113,7 +4113,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -4395,9 +4686,9 @@ +@@ -4397,9 +4688,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 @@ -4125,7 +4125,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$CXX"; then -@@ -4408,24 +4699,24 @@ +@@ -4410,24 +4701,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4155,7 +4155,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -4439,9 +4730,9 @@ +@@ -4441,9 +4732,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 @@ -4167,7 +4167,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CXX"; then -@@ -4452,24 +4743,24 @@ +@@ -4454,24 +4745,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4197,7 +4197,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -4482,7 +4773,7 @@ +@@ -4484,7 +4775,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -4206,7 +4206,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -4493,53 +4784,36 @@ +@@ -4495,53 +4786,36 @@ fi fi # Provide some information about the compiler. @@ -4279,7 +4279,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ int -@@ -4553,37 +4827,16 @@ +@@ -4555,37 +4829,16 @@ return 0; } _ACEOF @@ -4320,7 +4320,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$ac_cv_cxx_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GXX=yes -@@ -4592,20 +4845,16 @@ +@@ -4594,20 +4847,16 @@ fi ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS @@ -4344,7 +4344,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ int -@@ -4616,35 +4865,11 @@ +@@ -4618,35 +4867,11 @@ return 0; } _ACEOF @@ -4383,7 +4383,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ int -@@ -4655,36 +4880,12 @@ +@@ -4657,36 +4882,12 @@ return 0; } _ACEOF @@ -4424,7 +4424,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ int -@@ -4695,42 +4896,17 @@ +@@ -4697,42 +4898,17 @@ return 0; } _ACEOF @@ -4469,7 +4469,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$ac_cv_prog_cxx_g" >&6; } if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS -@@ -4755,9 +4931,9 @@ +@@ -4757,9 +4933,9 @@ depcc="$CXX" am_compiler_list= @@ -4481,7 +4481,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -@@ -4865,7 +5041,7 @@ +@@ -4867,7 +5043,7 @@ fi fi @@ -4490,7 +4490,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type -@@ -4881,11 +5057,7 @@ +@@ -4883,11 +5059,7 @@ @@ -4503,7 +4503,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ int -@@ -4896,32 +5068,11 @@ +@@ -4898,32 +5070,11 @@ return 0; } _ACEOF @@ -4539,7 +4539,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "$CXX" != ""; then HAVE_CXX_TRUE= -@@ -4934,11 +5085,7 @@ +@@ -4936,11 +5087,7 @@ gtk_save_cxxflags="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -x objective-c++" @@ -4552,7 +4552,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ @interface Foo @end int -@@ -4949,32 +5096,11 @@ +@@ -4951,32 +5098,11 @@ return 0; } _ACEOF @@ -4587,7 +4587,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "$OBJC" = "yes"; then HAVE_OBJC_TRUE= -@@ -4994,12 +5120,12 @@ +@@ -4996,12 +5122,12 @@ if test "$os_win32" = "yes"; then if test x$enable_static = xyes -o x$enable_static = x; then @@ -4602,7 +4602,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: WARNING: Enabling shared library build, must build as DLL on Windows." >&2;} fi enable_shared=yes -@@ -5012,9 +5138,9 @@ +@@ -5014,9 +5140,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 @@ -4614,7 +4614,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$AS"; then -@@ -5025,24 +5151,24 @@ +@@ -5027,24 +5153,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4644,7 +4644,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -5052,9 +5178,9 @@ +@@ -5054,9 +5180,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 @@ -4656,7 +4656,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AS"; then -@@ -5065,24 +5191,24 @@ +@@ -5067,24 +5193,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4686,7 +4686,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -5091,7 +5217,7 @@ +@@ -5093,7 +5219,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -4695,7 +4695,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -5104,9 +5230,9 @@ +@@ -5106,9 +5232,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 @@ -4707,7 +4707,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$DLLTOOL"; then -@@ -5117,24 +5243,24 @@ +@@ -5119,24 +5245,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4737,7 +4737,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -5144,9 +5270,9 @@ +@@ -5146,9 +5272,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 @@ -4749,7 +4749,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DLLTOOL"; then -@@ -5157,24 +5283,24 @@ +@@ -5159,24 +5285,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4779,7 +4779,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -5183,7 +5309,7 @@ +@@ -5185,7 +5311,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -4788,7 +4788,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -5196,9 +5322,9 @@ +@@ -5198,9 +5324,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 @@ -4800,7 +4800,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$OBJDUMP"; then -@@ -5209,24 +5335,24 @@ +@@ -5211,24 +5337,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4830,7 +4830,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -5236,9 +5362,9 @@ +@@ -5238,9 +5364,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 @@ -4842,7 +4842,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OBJDUMP"; then -@@ -5249,24 +5375,24 @@ +@@ -5251,24 +5377,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4872,7 +4872,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -5275,7 +5401,7 @@ +@@ -5277,7 +5403,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -4881,7 +4881,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -5310,7 +5436,7 @@ +@@ -5312,7 +5438,7 @@ case `pwd` in *\ * | *\ *) @@ -4890,7 +4890,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; esac -@@ -5333,9 +5459,9 @@ +@@ -5335,9 +5461,9 @@ ltmain="$ac_aux_dir/ltmain.sh" @@ -4902,7 +4902,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ -@@ -5343,7 +5469,7 @@ +@@ -5345,7 +5471,7 @@ ac_script="$ac_script$as_nl$ac_script" done echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed @@ -4911,7 +4911,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure if test -z "$SED"; then ac_path_SED_found=false # Loop through the user's path and test for each of PROGNAME-LIST -@@ -5352,7 +5478,7 @@ +@@ -5354,7 +5480,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4920,7 +4920,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 -@@ -5372,7 +5498,7 @@ +@@ -5374,7 +5500,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 @@ -4929,7 +4929,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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" -@@ -5387,19 +5513,17 @@ +@@ -5389,19 +5515,17 @@ $ac_path_SED_found && break 3 done done @@ -4952,7 +4952,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$ac_cv_path_SED" >&6; } SED="$ac_cv_path_SED" rm -f conftest.sed -@@ -5417,9 +5541,9 @@ +@@ -5419,9 +5543,9 @@ @@ -4964,7 +4964,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then -@@ -5430,7 +5554,7 @@ +@@ -5432,7 +5556,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4973,7 +4973,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 -@@ -5450,7 +5574,7 @@ +@@ -5452,7 +5576,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 @@ -4982,7 +4982,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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" -@@ -5465,26 +5589,24 @@ +@@ -5467,26 +5591,24 @@ $ac_path_GREP_found && break 3 done done @@ -5014,7 +5014,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 -@@ -5498,7 +5620,7 @@ +@@ -5500,7 +5622,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5023,7 +5023,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 -@@ -5518,7 +5640,7 @@ +@@ -5520,7 +5642,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 @@ -5032,7 +5032,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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" -@@ -5533,12 +5655,10 @@ +@@ -5535,12 +5657,10 @@ $ac_path_EGREP_found && break 3 done done @@ -5047,7 +5047,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure fi else ac_cv_path_EGREP=$EGREP -@@ -5546,14 +5666,14 @@ +@@ -5548,14 +5668,14 @@ fi fi @@ -5065,7 +5065,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 -@@ -5567,7 +5687,7 @@ +@@ -5569,7 +5689,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5074,7 +5074,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 -@@ -5587,7 +5707,7 @@ +@@ -5589,7 +5709,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 @@ -5083,7 +5083,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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" -@@ -5602,12 +5722,10 @@ +@@ -5604,12 +5724,10 @@ $ac_path_FGREP_found && break 3 done done @@ -5098,7 +5098,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure fi else ac_cv_path_FGREP=$FGREP -@@ -5615,7 +5733,7 @@ +@@ -5617,7 +5735,7 @@ fi fi @@ -5107,7 +5107,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$ac_cv_path_FGREP" >&6; } FGREP="$ac_cv_path_FGREP" -@@ -5641,7 +5759,7 @@ +@@ -5643,7 +5761,7 @@ # Check whether --with-gnu-ld was given. @@ -5116,7 +5116,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no -@@ -5650,7 +5768,7 @@ +@@ -5652,7 +5770,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. @@ -5125,7 +5125,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) -@@ -5680,13 +5798,13 @@ +@@ -5682,13 +5800,13 @@ ;; esac elif test "$with_gnu_ld" = yes; then @@ -5142,7 +5142,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -z "$LD"; then -@@ -5717,18 +5835,16 @@ +@@ -5719,18 +5837,16 @@ LD="$lt_cv_path_LD" if test -n "$LD"; then @@ -5166,7 +5166,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. -@@ -5741,7 +5857,7 @@ +@@ -5743,7 +5859,7 @@ ;; esac fi @@ -5175,7 +5175,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld -@@ -5753,9 +5869,9 @@ +@@ -5755,9 +5871,9 @@ @@ -5187,7 +5187,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$NM"; then -@@ -5802,7 +5918,7 @@ +@@ -5804,7 +5920,7 @@ : ${lt_cv_path_NM=no} fi fi @@ -5196,7 +5196,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$lt_cv_path_NM" >&6; } if test "$lt_cv_path_NM" != "no"; then NM="$lt_cv_path_NM" -@@ -5813,9 +5929,9 @@ +@@ -5815,9 +5931,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 @@ -5208,7 +5208,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$DUMPBIN"; then -@@ -5826,24 +5942,24 @@ +@@ -5828,24 +5944,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5238,7 +5238,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -5857,9 +5973,9 @@ +@@ -5859,9 +5975,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 @@ -5250,7 +5250,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DUMPBIN"; then -@@ -5870,24 +5986,24 @@ +@@ -5872,24 +5988,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5280,7 +5280,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -5900,7 +6016,7 @@ +@@ -5902,7 +6018,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -5289,7 +5289,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -5920,44 +6036,44 @@ +@@ -5922,44 +6038,44 @@ @@ -5302,16 +5302,16 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext -- (eval echo "\"\$as_me:5930: $ac_compile\"" >&5) -+ (eval echo "\"\$as_me:6046: $ac_compile\"" >&5) +- (eval echo "\"\$as_me:5932: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:6048: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 -- (eval echo "\"\$as_me:5933: $NM \\\"conftest.$ac_objext\\\"\"" >&5) -+ (eval echo "\"\$as_me:6049: $NM \\\"conftest.$ac_objext\\\"\"" >&5) +- (eval echo "\"\$as_me:5935: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:6051: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 -- (eval echo "\"\$as_me:5936: output\"" >&5) -+ (eval echo "\"\$as_me:6052: output\"" >&5) +- (eval echo "\"\$as_me:5938: output\"" >&5) ++ (eval echo "\"\$as_me:6054: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5345,7 +5345,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else i=0 -@@ -6075,10 +6191,10 @@ +@@ -6077,10 +6193,10 @@ fi if test -n $lt_cv_sys_max_cmd_len ; then @@ -5358,7 +5358,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "none" >&6; } fi max_cmd_len=$lt_cv_sys_max_cmd_len -@@ -6092,7 +6208,7 @@ +@@ -6094,7 +6210,7 @@ : ${MV="mv -f"} : ${RM="rm -f"} @@ -5367,7 +5367,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } # Try some XSI features xsi_shell=no -@@ -6102,17 +6218,17 @@ +@@ -6104,17 +6220,17 @@ && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes @@ -5388,7 +5388,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$lt_shell_append" >&6; } -@@ -6147,14 +6263,14 @@ +@@ -6149,14 +6265,14 @@ @@ -5406,7 +5406,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$lt_cv_ld_reload_flag" >&6; } reload_flag=$lt_cv_ld_reload_flag case $reload_flag in -@@ -6183,9 +6299,9 @@ +@@ -6185,9 +6301,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 @@ -5418,7 +5418,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$OBJDUMP"; then -@@ -6196,24 +6312,24 @@ +@@ -6198,24 +6314,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5448,7 +5448,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -6223,9 +6339,9 @@ +@@ -6225,9 +6341,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 @@ -5460,7 +5460,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OBJDUMP"; then -@@ -6236,24 +6352,24 @@ +@@ -6238,24 +6354,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5490,7 +5490,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -6262,7 +6378,7 @@ +@@ -6264,7 +6380,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -5499,7 +5499,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -6279,9 +6395,9 @@ +@@ -6281,9 +6397,9 @@ @@ -5511,7 +5511,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else lt_cv_file_magic_cmd='$MAGIC_CMD' -@@ -6400,7 +6516,7 @@ +@@ -6402,7 +6518,7 @@ lt_cv_deplibs_check_method=pass_all ;; @@ -5520,7 +5520,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 -@@ -6475,7 +6591,7 @@ +@@ -6477,7 +6593,7 @@ esac fi @@ -5529,7 +5529,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 -@@ -6495,9 +6611,9 @@ +@@ -6497,9 +6613,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 @@ -5541,7 +5541,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$AR"; then -@@ -6508,24 +6624,24 @@ +@@ -6510,24 +6626,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5571,7 +5571,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -6535,9 +6651,9 @@ +@@ -6537,9 +6653,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 @@ -5583,7 +5583,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AR"; then -@@ -6548,24 +6664,24 @@ +@@ -6550,24 +6666,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5613,7 +5613,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -6574,7 +6690,7 @@ +@@ -6576,7 +6692,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -5622,7 +5622,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -6600,9 +6716,9 @@ +@@ -6602,9 +6718,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 @@ -5634,7 +5634,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then -@@ -6613,24 +6729,24 @@ +@@ -6615,24 +6731,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5664,7 +5664,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -6640,9 +6756,9 @@ +@@ -6642,9 +6758,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 @@ -5676,7 +5676,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then -@@ -6653,24 +6769,24 @@ +@@ -6655,24 +6771,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5706,7 +5706,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -6679,7 +6795,7 @@ +@@ -6681,7 +6797,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -5715,7 +5715,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -6699,9 +6815,9 @@ +@@ -6701,9 +6817,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 @@ -5727,7 +5727,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then -@@ -6712,24 +6828,24 @@ +@@ -6714,24 +6830,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5757,7 +5757,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -6739,9 +6855,9 @@ +@@ -6741,9 +6857,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 @@ -5769,7 +5769,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then -@@ -6752,24 +6868,24 @@ +@@ -6754,24 +6870,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5799,7 +5799,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -6778,7 +6894,7 @@ +@@ -6780,7 +6896,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -5808,7 +5808,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -6856,9 +6972,9 @@ +@@ -6858,9 +6974,9 @@ # Check for command to grab the raw symbol name followed by C symbol from nm. @@ -5820,7 +5820,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else -@@ -6974,18 +7090,18 @@ +@@ -6976,18 +7092,18 @@ int main(){nm_test_var='a';nm_test_func();return(0);} _LT_EOF @@ -5845,7 +5845,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" -@@ -7038,11 +7154,11 @@ +@@ -7040,11 +7156,11 @@ lt_save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" @@ -5860,7 +5860,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure pipe_works=yes fi LIBS="$lt_save_LIBS" -@@ -7076,10 +7192,10 @@ +@@ -7078,10 +7194,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 @@ -5873,7 +5873,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "ok" >&6; } fi -@@ -7106,7 +7222,7 @@ +@@ -7108,7 +7224,7 @@ # Check whether --enable-libtool-lock was given. @@ -5882,7 +5882,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure enableval=$enable_libtool_lock; fi -@@ -7118,11 +7234,11 @@ +@@ -7120,11 +7236,11 @@ ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -5897,13 +5897,13 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE="32" -@@ -7136,12 +7252,12 @@ +@@ -7138,12 +7254,12 @@ ;; *-*-irix6*) # Find out which ABI we are using. -- echo '#line 7139 "configure"' > conftest.$ac_ext +- echo '#line 7141 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ echo '#line 7255 "configure"' > conftest.$ac_ext ++ echo '#line 7257 "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5914,7 +5914,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) -@@ -7175,11 +7291,11 @@ +@@ -7177,11 +7293,11 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -5929,7 +5929,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure case `/usr/bin/file conftest.o` in *32-bit*) case $host in -@@ -7228,9 +7344,9 @@ +@@ -7230,9 +7346,9 @@ # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" @@ -5941,7 +5941,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else ac_ext=c -@@ -7239,11 +7355,7 @@ +@@ -7241,11 +7357,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -5954,7 +5954,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ int -@@ -7254,38 +7366,13 @@ +@@ -7256,38 +7368,13 @@ return 0; } _ACEOF @@ -5997,7 +5997,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -7293,7 +7380,7 @@ +@@ -7295,7 +7382,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi @@ -6006,7 +6006,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 -@@ -7303,11 +7390,11 @@ +@@ -7305,11 +7392,11 @@ sparc*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -6021,7 +6021,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in -@@ -7333,9 +7420,9 @@ +@@ -7335,9 +7422,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 @@ -6033,7 +6033,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$DSYMUTIL"; then -@@ -7346,24 +7433,24 @@ +@@ -7348,24 +7435,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6063,7 +6063,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -7373,9 +7460,9 @@ +@@ -7375,9 +7462,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 @@ -6075,7 +6075,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DSYMUTIL"; then -@@ -7386,24 +7473,24 @@ +@@ -7388,24 +7475,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6105,7 +6105,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -7412,7 +7499,7 @@ +@@ -7414,7 +7501,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -6114,7 +6114,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -7425,9 +7512,9 @@ +@@ -7427,9 +7514,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 @@ -6126,7 +6126,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$NMEDIT"; then -@@ -7438,24 +7525,24 @@ +@@ -7440,24 +7527,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6156,7 +6156,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -7465,9 +7552,9 @@ +@@ -7467,9 +7554,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 @@ -6168,7 +6168,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_NMEDIT"; then -@@ -7478,24 +7565,24 @@ +@@ -7480,24 +7567,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6198,7 +6198,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -7504,7 +7591,7 @@ +@@ -7506,7 +7593,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -6207,7 +6207,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -7517,9 +7604,9 @@ +@@ -7519,9 +7606,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 @@ -6219,7 +6219,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$LIPO"; then -@@ -7530,24 +7617,24 @@ +@@ -7532,24 +7619,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6249,7 +6249,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -7557,9 +7644,9 @@ +@@ -7559,9 +7646,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 @@ -6261,7 +6261,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_LIPO"; then -@@ -7570,24 +7657,24 @@ +@@ -7572,24 +7659,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6291,7 +6291,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -7596,7 +7683,7 @@ +@@ -7598,7 +7685,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -6300,7 +6300,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -7609,9 +7696,9 @@ +@@ -7611,9 +7698,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 @@ -6312,7 +6312,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$OTOOL"; then -@@ -7622,24 +7709,24 @@ +@@ -7624,24 +7711,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6342,7 +6342,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -7649,9 +7736,9 @@ +@@ -7651,9 +7738,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 @@ -6354,7 +6354,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL"; then -@@ -7662,24 +7749,24 @@ +@@ -7664,24 +7751,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6384,7 +6384,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -7688,7 +7775,7 @@ +@@ -7690,7 +7777,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -6393,7 +6393,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -7701,9 +7788,9 @@ +@@ -7703,9 +7790,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 @@ -6405,7 +6405,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$OTOOL64"; then -@@ -7714,24 +7801,24 @@ +@@ -7716,24 +7803,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6435,7 +6435,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -7741,9 +7828,9 @@ +@@ -7743,9 +7830,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 @@ -6447,7 +6447,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL64"; then -@@ -7754,24 +7841,24 @@ +@@ -7756,24 +7843,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6477,7 +6477,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -7780,7 +7867,7 @@ +@@ -7782,7 +7869,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -6486,7 +6486,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -7816,9 +7903,9 @@ +@@ -7818,9 +7905,9 @@ @@ -6498,7 +6498,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no -@@ -7843,22 +7930,18 @@ +@@ -7845,22 +7932,18 @@ rm -f conftest.* fi fi @@ -6525,7 +6525,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ int -@@ -7869,42 +7952,17 @@ +@@ -7871,42 +7954,17 @@ return 0; } _ACEOF @@ -6573,7 +6573,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } case $host_os in rhapsody* | darwin1.[012]) -@@ -7946,14 +8004,14 @@ +@@ -7948,14 +8006,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 @@ -6590,7 +6590,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded -@@ -7968,11 +8026,7 @@ +@@ -7970,11 +8028,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. @@ -6603,7 +6603,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ #ifdef __STDC__ # include -@@ -7981,78 +8035,34 @@ +@@ -7983,78 +8037,34 @@ #endif Syntax error _ACEOF @@ -6687,7 +6687,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure break fi -@@ -8064,7 +8074,7 @@ +@@ -8066,7 +8076,7 @@ else ac_cv_prog_CPP=$CPP fi @@ -6696,7 +6696,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes -@@ -8075,11 +8085,7 @@ +@@ -8077,11 +8087,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. @@ -6709,7 +6709,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ #ifdef __STDC__ # include -@@ -8088,87 +8094,40 @@ +@@ -8090,87 +8096,40 @@ #endif Syntax error _ACEOF @@ -6806,7 +6806,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure fi ac_ext=c -@@ -8178,16 +8137,12 @@ +@@ -8180,16 +8139,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -6826,7 +6826,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ #include #include -@@ -8202,48 +8157,23 @@ +@@ -8204,48 +8159,23 @@ return 0; } _ACEOF @@ -6880,7 +6880,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure else ac_cv_header_stdc=no fi -@@ -8253,18 +8183,14 @@ +@@ -8255,18 +8185,14 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. @@ -6902,7 +6902,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure else ac_cv_header_stdc=no fi -@@ -8274,14 +8200,10 @@ +@@ -8276,14 +8202,10 @@ if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. @@ -6919,7 +6919,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ #include #include -@@ -8308,118 +8230,34 @@ +@@ -8310,118 +8232,34 @@ return 0; } _ACEOF @@ -7051,7 +7051,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -8429,62 +8267,13 @@ +@@ -8431,62 +8269,13 @@ done @@ -7119,7 +7119,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure _ACEOF fi -@@ -8507,9 +8296,9 @@ +@@ -8509,9 +8298,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 @@ -7131,7 +7131,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$CXX"; then -@@ -8520,24 +8309,24 @@ +@@ -8522,24 +8311,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -7161,7 +7161,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -8551,9 +8340,9 @@ +@@ -8553,9 +8342,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 @@ -7173,7 +7173,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CXX"; then -@@ -8564,24 +8353,24 @@ +@@ -8566,24 +8355,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -7203,7 +7203,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -8594,7 +8383,7 @@ +@@ -8596,7 +8385,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -7212,7 +7212,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -8605,53 +8394,36 @@ +@@ -8607,53 +8396,36 @@ fi fi # Provide some information about the compiler. @@ -7285,7 +7285,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ int -@@ -8665,37 +8437,16 @@ +@@ -8667,37 +8439,16 @@ return 0; } _ACEOF @@ -7326,7 +7326,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$ac_cv_cxx_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GXX=yes -@@ -8704,20 +8455,16 @@ +@@ -8706,20 +8457,16 @@ fi ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS @@ -7350,7 +7350,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ int -@@ -8728,35 +8475,11 @@ +@@ -8730,35 +8477,11 @@ return 0; } _ACEOF @@ -7389,7 +7389,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ int -@@ -8767,36 +8490,12 @@ +@@ -8769,36 +8492,12 @@ return 0; } _ACEOF @@ -7430,7 +7430,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ int -@@ -8807,42 +8506,17 @@ +@@ -8809,42 +8508,17 @@ return 0; } _ACEOF @@ -7475,7 +7475,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$ac_cv_prog_cxx_g" >&6; } if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS -@@ -8867,9 +8541,9 @@ +@@ -8869,9 +8543,9 @@ depcc="$CXX" am_compiler_list= @@ -7487,7 +7487,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -@@ -8977,7 +8651,7 @@ +@@ -8979,7 +8653,7 @@ fi fi @@ -7496,7 +7496,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type -@@ -9000,10 +8674,10 @@ +@@ -9002,10 +8676,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 @@ -7509,7 +7509,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else # Double quotes because CXXCPP needs to be expanded -@@ -9018,11 +8692,7 @@ +@@ -9020,11 +8694,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. @@ -7522,7 +7522,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ #ifdef __STDC__ # include -@@ -9031,78 +8701,34 @@ +@@ -9033,78 +8703,34 @@ #endif Syntax error _ACEOF @@ -7606,7 +7606,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure break fi -@@ -9114,7 +8740,7 @@ +@@ -9116,7 +8742,7 @@ else ac_cv_prog_CXXCPP=$CXXCPP fi @@ -7615,7 +7615,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$CXXCPP" >&6; } ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes -@@ -9125,11 +8751,7 @@ +@@ -9127,11 +8753,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. @@ -7628,7 +7628,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ #ifdef __STDC__ # include -@@ -9138,81 +8760,37 @@ +@@ -9140,81 +8762,37 @@ #endif Syntax error _ACEOF @@ -7717,7 +7717,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} _lt_caught_CXX_error=yes; } fi -@@ -9239,7 +8817,7 @@ +@@ -9241,7 +8819,7 @@ # Check whether --enable-shared was given. @@ -7726,7 +7726,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; -@@ -9272,7 +8850,7 @@ +@@ -9274,7 +8852,7 @@ # Check whether --with-pic was given. @@ -7735,7 +7735,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure withval=$with_pic; pic_mode="$withval" else pic_mode=default -@@ -9288,7 +8866,7 @@ +@@ -9290,7 +8868,7 @@ # Check whether --enable-fast-install was given. @@ -7744,7 +7744,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; -@@ -9369,9 +8947,9 @@ +@@ -9371,9 +8949,9 @@ setopt NO_GLOB_SUBST fi @@ -7756,7 +7756,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else rm -f .libs 2>/dev/null -@@ -9384,7 +8962,7 @@ +@@ -9386,7 +8964,7 @@ fi rmdir .libs 2>/dev/null fi @@ -7765,7 +7765,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir -@@ -9477,9 +9055,9 @@ +@@ -9479,9 +9057,9 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then @@ -7777,7 +7777,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in -@@ -9530,10 +9108,10 @@ +@@ -9532,10 +9110,10 @@ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then @@ -7790,7 +7790,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -9543,9 +9121,9 @@ +@@ -9545,9 +9123,9 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then @@ -7802,7 +7802,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in -@@ -9596,10 +9174,10 @@ +@@ -9598,10 +9176,10 @@ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then @@ -7815,7 +7815,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -9676,9 +9254,9 @@ +@@ -9678,9 +9256,9 @@ if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag=' -fno-builtin' @@ -7827,21 +7827,21 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_rtti_exceptions=no -@@ -9694,11 +9272,11 @@ +@@ -9696,11 +9274,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:9697: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9275: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:9699: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9277: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 -- echo "$as_me:9701: \$? = $ac_status" >&5 -+ echo "$as_me:9279: \$? = $ac_status" >&5 +- echo "$as_me:9703: \$? = $ac_status" >&5 ++ echo "$as_me:9281: \$? = $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. -@@ -9711,7 +9289,7 @@ +@@ -9713,7 +9291,7 @@ $RM conftest* fi @@ -7850,7 +7850,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then -@@ -9731,7 +9309,7 @@ +@@ -9733,7 +9311,7 @@ lt_prog_compiler_pic= lt_prog_compiler_static= @@ -7859,7 +7859,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "checking for $compiler option to produce PIC... " >&6; } if test "$GCC" = yes; then -@@ -10003,7 +9581,7 @@ +@@ -10005,7 +9583,7 @@ lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -7868,7 +7868,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$lt_prog_compiler_pic" >&6; } -@@ -10015,9 +9593,9 @@ +@@ -10017,9 +9595,9 @@ # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then @@ -7880,21 +7880,21 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works=no -@@ -10033,11 +9611,11 @@ +@@ -10035,11 +9613,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:10036: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9614: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:10038: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9616: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 -- echo "$as_me:10040: \$? = $ac_status" >&5 -+ echo "$as_me:9618: \$? = $ac_status" >&5 +- echo "$as_me:10042: \$? = $ac_status" >&5 ++ echo "$as_me:9620: \$? = $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. -@@ -10050,7 +9628,7 @@ +@@ -10052,7 +9630,7 @@ $RM conftest* fi @@ -7903,7 +7903,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } if test x"$lt_cv_prog_compiler_pic_works" = xyes; then -@@ -10074,9 +9652,9 @@ +@@ -10076,9 +9654,9 @@ # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" @@ -7915,7 +7915,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no -@@ -10102,7 +9680,7 @@ +@@ -10104,7 +9682,7 @@ LDFLAGS="$save_LDFLAGS" fi @@ -7924,7 +7924,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$lt_cv_prog_compiler_static_works" >&6; } if test x"$lt_cv_prog_compiler_static_works" = xyes; then -@@ -10117,9 +9695,9 @@ +@@ -10119,9 +9697,9 @@ @@ -7936,21 +7936,21 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no -@@ -10138,11 +9716,11 @@ +@@ -10140,11 +9718,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:10141: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9719: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:10143: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9721: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 -- echo "$as_me:10145: \$? = $ac_status" >&5 -+ echo "$as_me:9723: \$? = $ac_status" >&5 +- echo "$as_me:10147: \$? = $ac_status" >&5 ++ echo "$as_me:9725: \$? = $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 -@@ -10164,7 +9742,7 @@ +@@ -10166,7 +9744,7 @@ $RM conftest* fi @@ -7959,7 +7959,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$lt_cv_prog_compiler_c_o" >&6; } -@@ -10172,9 +9750,9 @@ +@@ -10174,9 +9752,9 @@ @@ -7971,21 +7971,21 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no -@@ -10193,11 +9771,11 @@ +@@ -10195,11 +9773,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:10196: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9774: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:10198: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9776: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 -- echo "$as_me:10200: \$? = $ac_status" >&5 -+ echo "$as_me:9778: \$? = $ac_status" >&5 +- echo "$as_me:10202: \$? = $ac_status" >&5 ++ echo "$as_me:9780: \$? = $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 -@@ -10219,7 +9797,7 @@ +@@ -10221,7 +9799,7 @@ $RM conftest* fi @@ -7994,7 +7994,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$lt_cv_prog_compiler_c_o" >&6; } -@@ -10228,7 +9806,7 @@ +@@ -10230,7 +9808,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 @@ -8003,7 +8003,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes $RM conftest* -@@ -10236,10 +9814,10 @@ +@@ -10238,10 +9816,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 @@ -8016,7 +8016,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi -@@ -10252,7 +9830,7 @@ +@@ -10254,7 +9832,7 @@ @@ -8025,7 +8025,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } runpath_var= -@@ -10312,6 +9890,9 @@ +@@ -10314,6 +9892,9 @@ openbsd*) with_gnu_ld=no ;; @@ -8035,7 +8035,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure esac ld_shlibs=yes -@@ -10494,7 +10075,7 @@ +@@ -10496,7 +10077,7 @@ fi ;; @@ -8044,7 +8044,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= -@@ -10669,6 +10250,7 @@ +@@ -10671,6 +10252,7 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi @@ -8052,7 +8052,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure else # not using gcc if test "$host_cpu" = ia64; then -@@ -10694,11 +10276,7 @@ +@@ -10696,11 +10278,7 @@ allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -8065,7 +8065,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ int -@@ -10709,27 +10287,7 @@ +@@ -10711,27 +10289,7 @@ return 0; } _ACEOF @@ -8094,7 +8094,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -10743,16 +10301,9 @@ +@@ -10745,16 +10303,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 @@ -8113,7 +8113,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" -@@ -10765,11 +10316,7 @@ +@@ -10767,11 +10318,7 @@ else # Determine the default libpath from the value encoded in an # empty executable. @@ -8126,7 +8126,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ int -@@ -10780,27 +10327,7 @@ +@@ -10782,27 +10329,7 @@ return 0; } _ACEOF @@ -8155,7 +8155,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -10814,16 +10341,9 @@ +@@ -10816,16 +10343,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 @@ -8174,7 +8174,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" -@@ -11035,42 +10555,16 @@ +@@ -11037,42 +10557,16 @@ # implicitly export all symbols. save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" @@ -8222,7 +8222,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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' -@@ -11083,7 +10577,7 @@ +@@ -11085,7 +10579,7 @@ link_all_deplibs=yes ;; @@ -8231,7 +8231,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else -@@ -11326,7 +10820,7 @@ +@@ -11328,7 +10822,7 @@ fi fi @@ -8240,7 +8240,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$ld_shlibs" >&6; } test "$ld_shlibs" = no && can_build_shared=no -@@ -11363,16 +10857,16 @@ +@@ -11365,16 +10859,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. @@ -8261,7 +8261,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure soname=conftest lib=conftest libobjs=conftest.$ac_objext -@@ -11386,11 +10880,11 @@ +@@ -11388,11 +10882,11 @@ libname=conftest lt_save_allow_undefined_flag=$allow_undefined_flag allow_undefined_flag= @@ -8276,7 +8276,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure then archive_cmds_need_lc=no else -@@ -11401,7 +10895,7 @@ +@@ -11403,7 +10897,7 @@ cat conftest.err 1>&5 fi $RM conftest* @@ -8285,7 +8285,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$archive_cmds_need_lc" >&6; } ;; esac -@@ -11565,7 +11059,7 @@ +@@ -11567,7 +11061,7 @@ @@ -8294,7 +8294,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "checking dynamic linker characteristics... " >&6; } if test "$GCC" = yes; then -@@ -11987,11 +11481,7 @@ +@@ -11989,11 +11483,7 @@ save_libdir=$libdir eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" @@ -8307,7 +8307,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ int -@@ -12002,41 +11492,13 @@ +@@ -12004,41 +11494,13 @@ return 0; } _ACEOF @@ -8353,7 +8353,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure LDFLAGS=$save_LDFLAGS libdir=$save_libdir -@@ -12045,13 +11507,10 @@ +@@ -12047,13 +11509,10 @@ # before this can be enabled. hardcode_into_libs=yes @@ -8368,7 +8368,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -12063,6 +11522,18 @@ +@@ -12065,6 +11524,18 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -8387,7 +8387,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure netbsd*) version_type=sunos need_lib_prefix=no -@@ -12251,7 +11722,7 @@ +@@ -12253,7 +11724,7 @@ dynamic_linker=no ;; esac @@ -8396,7 +8396,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no -@@ -12353,7 +11824,7 @@ +@@ -12355,7 +11826,7 @@ @@ -8405,7 +8405,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || -@@ -12378,7 +11849,7 @@ +@@ -12380,7 +11851,7 @@ # directories. hardcode_action=unsupported fi @@ -8414,7 +8414,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$hardcode_action" >&6; } if test "$hardcode_action" = relink || -@@ -12423,18 +11894,14 @@ +@@ -12425,18 +11896,14 @@ darwin*) # if libdl is installed we need to link against it @@ -8436,7 +8436,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -12452,43 +11919,18 @@ +@@ -12454,43 +11921,18 @@ return 0; } _ACEOF @@ -8486,7 +8486,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else -@@ -12501,33 +11943,19 @@ +@@ -12503,33 +11945,19 @@ ;; *) @@ -8530,7 +8530,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -12536,13 +11964,6 @@ +@@ -12538,13 +11966,6 @@ extern "C" #endif char shl_load (); @@ -8544,7 +8544,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure int main () { -@@ -12551,56 +11972,32 @@ +@@ -12553,56 +11974,32 @@ return 0; } _ACEOF @@ -8620,7 +8620,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -12609,222 +12006,37 @@ +@@ -12611,222 +12008,37 @@ #ifdef __cplusplus extern "C" #endif @@ -8855,7 +8855,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -12842,57 +12054,28 @@ +@@ -12844,57 +12056,28 @@ return 0; } _ACEOF @@ -8922,7 +8922,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -12910,43 +12093,18 @@ +@@ -12912,43 +12095,18 @@ return 0; } _ACEOF @@ -8972,7 +8972,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi -@@ -12985,9 +12143,9 @@ +@@ -12987,9 +12145,9 @@ save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" @@ -8984,16 +8984,16 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : -@@ -12996,7 +12154,7 @@ +@@ -12998,7 +12156,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 12999 "configure" -+#line 12157 "configure" +-#line 13001 "configure" ++#line 12159 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -13055,11 +12213,11 @@ +@@ -13057,11 +12215,11 @@ return status; } _LT_EOF @@ -9008,7 +9008,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in -@@ -13076,14 +12234,14 @@ +@@ -13078,14 +12236,14 @@ fi @@ -9026,16 +9026,16 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : -@@ -13092,7 +12250,7 @@ +@@ -13094,7 +12252,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 13095 "configure" -+#line 12253 "configure" +-#line 13097 "configure" ++#line 12255 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -13151,11 +12309,11 @@ +@@ -13153,11 +12311,11 @@ return status; } _LT_EOF @@ -9050,7 +9050,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in -@@ -13172,7 +12330,7 @@ +@@ -13174,7 +12332,7 @@ fi @@ -9059,7 +9059,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$lt_cv_dlopen_self_static" >&6; } fi -@@ -13211,12 +12369,12 @@ +@@ -13213,12 +12371,12 @@ striplib= old_striplib= @@ -9074,7 +9074,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "yes" >&6; } else # FIXME - insert some real tests, host_os isn't really good enough -@@ -13225,15 +12383,15 @@ +@@ -13227,15 +12385,15 @@ if test -n "$STRIP" ; then striplib="$STRIP -x" old_striplib="$STRIP -S" @@ -9093,7 +9093,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } ;; esac -@@ -13251,12 +12409,12 @@ +@@ -13253,12 +12411,12 @@ # Report which library types will actually be built @@ -9109,7 +9109,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "checking whether to build shared libraries... " >&6; } test "$can_build_shared" = "no" && enable_shared=no -@@ -13277,14 +12435,14 @@ +@@ -13279,14 +12437,14 @@ fi ;; esac @@ -9127,7 +9127,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$enable_static" >&6; } -@@ -13425,7 +12583,7 @@ +@@ -13427,7 +12585,7 @@ # Check whether --with-gnu-ld was given. @@ -9136,7 +9136,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no -@@ -13434,7 +12592,7 @@ +@@ -13436,7 +12594,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. @@ -9145,7 +9145,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) -@@ -13464,13 +12622,13 @@ +@@ -13466,13 +12624,13 @@ ;; esac elif test "$with_gnu_ld" = yes; then @@ -9162,7 +9162,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -z "$LD"; then -@@ -13501,18 +12659,16 @@ +@@ -13503,18 +12661,16 @@ LD="$lt_cv_path_LD" if test -n "$LD"; then @@ -9186,7 +9186,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. -@@ -13525,7 +12681,7 @@ +@@ -13527,7 +12683,7 @@ ;; esac fi @@ -9195,7 +9195,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld -@@ -13580,7 +12736,7 @@ +@@ -13582,7 +12738,7 @@ fi # PORTME: fill in a description of your system's C++ link characteristics @@ -9204,7 +9204,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } ld_shlibs_CXX=yes case $host_os in -@@ -13681,11 +12837,7 @@ +@@ -13683,11 +12839,7 @@ allow_undefined_flag_CXX='-berok' # Determine the default libpath from the value encoded in an empty # executable. @@ -9217,7 +9217,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ int -@@ -13696,27 +12848,7 @@ +@@ -13698,27 +12850,7 @@ return 0; } _ACEOF @@ -9246,7 +9246,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -13730,16 +12862,9 @@ +@@ -13732,16 +12864,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 @@ -9265,7 +9265,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" -@@ -13753,11 +12878,7 @@ +@@ -13755,11 +12880,7 @@ else # Determine the default libpath from the value encoded in an # empty executable. @@ -9278,7 +9278,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ int -@@ -13768,27 +12889,7 @@ +@@ -13770,27 +12891,7 @@ return 0; } _ACEOF @@ -9307,7 +9307,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -13802,16 +12903,9 @@ +@@ -13804,16 +12905,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 @@ -9326,7 +9326,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" -@@ -14555,7 +13649,7 @@ +@@ -14557,7 +13651,7 @@ ;; esac @@ -9335,7 +9335,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$ld_shlibs_CXX" >&6; } test "$ld_shlibs_CXX" = no && can_build_shared=no -@@ -14583,11 +13677,11 @@ +@@ -14585,11 +13679,11 @@ }; _LT_EOF @@ -9350,7 +9350,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure # Parse the compiler output and extract the necessary # objects, libraries and library flags. -@@ -14768,7 +13862,7 @@ +@@ -14770,7 +13864,7 @@ lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX= @@ -9359,7 +9359,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "checking for $compiler option to produce PIC... " >&6; } # C++ specific cases for pic, static, wl, etc. -@@ -14988,7 +14082,7 @@ +@@ -14990,7 +14084,7 @@ ;; esac ;; @@ -9368,7 +9368,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise -@@ -15085,7 +14179,7 @@ +@@ -15087,7 +14181,7 @@ lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" ;; esac @@ -9377,7 +9377,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$lt_prog_compiler_pic_CXX" >&6; } -@@ -15094,9 +14188,9 @@ +@@ -15096,9 +14190,9 @@ # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_CXX"; then @@ -9389,21 +9389,21 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works_CXX=no -@@ -15112,11 +14206,11 @@ +@@ -15114,11 +14208,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:15115: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:14209: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:15117: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14211: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 -- echo "$as_me:15119: \$? = $ac_status" >&5 -+ echo "$as_me:14213: \$? = $ac_status" >&5 +- echo "$as_me:15121: \$? = $ac_status" >&5 ++ echo "$as_me:14215: \$? = $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. -@@ -15129,7 +14223,7 @@ +@@ -15131,7 +14225,7 @@ $RM conftest* fi @@ -9412,7 +9412,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then -@@ -15150,9 +14244,9 @@ +@@ -15152,9 +14246,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\" @@ -9424,7 +9424,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works_CXX=no -@@ -15178,7 +14272,7 @@ +@@ -15180,7 +14274,7 @@ LDFLAGS="$save_LDFLAGS" fi @@ -9433,7 +9433,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then -@@ -15190,9 +14284,9 @@ +@@ -15192,9 +14286,9 @@ @@ -9445,21 +9445,21 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o_CXX=no -@@ -15211,11 +14305,11 @@ +@@ -15213,11 +14307,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:15214: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:14308: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:15216: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14310: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 -- echo "$as_me:15218: \$? = $ac_status" >&5 -+ echo "$as_me:14312: \$? = $ac_status" >&5 +- echo "$as_me:15220: \$? = $ac_status" >&5 ++ echo "$as_me:14314: \$? = $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 -@@ -15237,14 +14331,14 @@ +@@ -15239,14 +14333,14 @@ $RM conftest* fi @@ -9477,21 +9477,21 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o_CXX=no -@@ -15263,11 +14357,11 @@ +@@ -15265,11 +14359,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:15266: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:14360: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:15268: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14362: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 -- echo "$as_me:15270: \$? = $ac_status" >&5 -+ echo "$as_me:14364: \$? = $ac_status" >&5 +- echo "$as_me:15272: \$? = $ac_status" >&5 ++ echo "$as_me:14366: \$? = $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 -@@ -15289,7 +14383,7 @@ +@@ -15291,7 +14385,7 @@ $RM conftest* fi @@ -9500,7 +9500,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } -@@ -15298,7 +14392,7 @@ +@@ -15300,7 +14394,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 @@ -9509,7 +9509,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes $RM conftest* -@@ -15306,10 +14400,10 @@ +@@ -15308,10 +14402,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 @@ -9522,7 +9522,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi -@@ -15319,7 +14413,7 @@ +@@ -15321,7 +14415,7 @@ @@ -9531,7 +9531,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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' -@@ -15339,13 +14433,16 @@ +@@ -15341,13 +14435,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' ;; @@ -9549,7 +9549,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$ld_shlibs_CXX" >&6; } test "$ld_shlibs_CXX" = no && can_build_shared=no -@@ -15373,16 +14470,16 @@ +@@ -15375,16 +14472,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. @@ -9570,7 +9570,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure soname=conftest lib=conftest libobjs=conftest.$ac_objext -@@ -15396,11 +14493,11 @@ +@@ -15398,11 +14495,11 @@ libname=conftest lt_save_allow_undefined_flag=$allow_undefined_flag_CXX allow_undefined_flag_CXX= @@ -9585,7 +9585,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure then archive_cmds_need_lc_CXX=no else -@@ -15411,7 +14508,7 @@ +@@ -15413,7 +14510,7 @@ cat conftest.err 1>&5 fi $RM conftest* @@ -9594,7 +9594,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$archive_cmds_need_lc_CXX" >&6; } ;; esac -@@ -15482,7 +14579,7 @@ +@@ -15484,7 +14581,7 @@ @@ -9603,7 +9603,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "checking dynamic linker characteristics... " >&6; } library_names_spec= -@@ -15852,11 +14949,7 @@ +@@ -15854,11 +14951,7 @@ save_libdir=$libdir eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" @@ -9616,7 +9616,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ int -@@ -15867,41 +14960,13 @@ +@@ -15869,41 +14962,13 @@ return 0; } _ACEOF @@ -9662,7 +9662,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure LDFLAGS=$save_LDFLAGS libdir=$save_libdir -@@ -15910,13 +14975,10 @@ +@@ -15912,13 +14977,10 @@ # before this can be enabled. hardcode_into_libs=yes @@ -9677,7 +9677,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -15928,6 +14990,18 @@ +@@ -15930,6 +14992,18 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -9696,7 +9696,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure netbsd*) version_type=sunos need_lib_prefix=no -@@ -16116,7 +15190,7 @@ +@@ -16118,7 +15192,7 @@ dynamic_linker=no ;; esac @@ -9705,7 +9705,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no -@@ -16167,7 +15241,7 @@ +@@ -16169,7 +15243,7 @@ @@ -9714,7 +9714,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action_CXX= if test -n "$hardcode_libdir_flag_spec_CXX" || -@@ -16192,7 +15266,7 @@ +@@ -16194,7 +15268,7 @@ # directories. hardcode_action_CXX=unsupported fi @@ -9723,7 +9723,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$hardcode_action_CXX" >&6; } if test "$hardcode_action_CXX" = relink || -@@ -16251,7 +15325,7 @@ +@@ -16253,7 +15327,7 @@ : ${CONFIG_LT=./config.lt} @@ -9732,7 +9732,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: creating $CONFIG_LT" >&6;} cat >"$CONFIG_LT" <<_LTEOF #! $SHELL -@@ -16263,13 +15337,13 @@ +@@ -16265,13 +15339,13 @@ _LTEOF cat >>"$CONFIG_LT" <<\_LTEOF @@ -9750,7 +9750,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -@@ -16277,23 +15351,15 @@ +@@ -16279,23 +15353,15 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else @@ -9779,7 +9779,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure as_nl=' ' export as_nl -@@ -16301,7 +15367,13 @@ +@@ -16303,7 +15369,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 @@ -9794,7 +9794,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure as_echo='printf %s\n' as_echo_n='printf %s' else -@@ -16312,7 +15384,7 @@ +@@ -16314,7 +15386,7 @@ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; @@ -9803,7 +9803,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -@@ -16335,13 +15407,6 @@ +@@ -16337,13 +15409,6 @@ } fi @@ -9817,7 +9817,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure # IFS # We need space, tab and new line, in precisely that order. Quoting is -@@ -16351,15 +15416,15 @@ +@@ -16353,15 +15418,15 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. @@ -9836,7 +9836,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure IFS=$as_save_IFS ;; -@@ -16371,12 +15436,16 @@ +@@ -16373,12 +15438,16 @@ fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 @@ -9857,7 +9857,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure done PS1='$ ' PS2='> ' -@@ -16388,7 +15457,90 @@ +@@ -16390,7 +15459,90 @@ LANGUAGE=C export LANGUAGE @@ -9949,7 +9949,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr -@@ -16402,8 +15554,12 @@ +@@ -16404,8 +15556,12 @@ as_basename=false fi @@ -9963,7 +9963,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ -@@ -16423,77 +15579,25 @@ +@@ -16425,77 +15581,25 @@ } s/.*/./; q'` @@ -10052,7 +10052,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then -@@ -16522,8 +15626,56 @@ +@@ -16524,8 +15628,56 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -10110,7 +10110,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure else test -d ./-p && rmdir ./-p as_mkdir_p=false -@@ -16542,10 +15694,10 @@ +@@ -16544,10 +15696,10 @@ if test -d "$1"; then test -d "$1/."; else @@ -10123,16 +10123,16 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure ???[sx]*):;;*)false;;esac;fi '\'' sh ' -@@ -16585,7 +15737,7 @@ +@@ -16587,7 +15739,7 @@ lt_cl_version="\ - gtk+ config.lt 2.18.4 + gtk+ config.lt 2.19.1 -configured by $0, generated by GNU Autoconf 2.63. +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 -@@ -16603,17 +15755,11 @@ +@@ -16605,17 +15757,11 @@ --quiet | --q* | --silent | --s* | -q ) lt_cl_silent=: ;; @@ -10155,7 +10155,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure esac shift done -@@ -16979,7 +16125,7 @@ +@@ -16981,7 +16127,7 @@ _LTEOF cat >>"$CONFIG_LT" <<\_LTEOF @@ -10164,7 +10164,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: creating $ofile" >&6;} -@@ -17789,7 +16935,7 @@ +@@ -17791,7 +16937,7 @@ _LT_EOF @@ -10173,7 +10173,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure _LTEOF chmod +x "$CONFIG_LT" -@@ -17804,22 +16950,22 @@ +@@ -17806,22 +16952,22 @@ exec 5>/dev/null $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false exec 5>>config.log @@ -10200,7 +10200,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else ac_cv_sys_largefile_CC=no -@@ -17828,11 +16974,7 @@ +@@ -17830,11 +16976,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. @@ -10213,7 +10213,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ #include /* Check that off_t can represent 2**63 - 1 correctly. -@@ -17851,60 +16993,14 @@ +@@ -17853,60 +16995,14 @@ return 0; } _ACEOF @@ -10276,7 +10276,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure rm -f core conftest.err conftest.$ac_objext break done -@@ -17912,23 +17008,19 @@ +@@ -17914,23 +17010,19 @@ rm -f conftest.$ac_ext fi fi @@ -10304,7 +10304,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ #include /* Check that off_t can represent 2**63 - 1 correctly. -@@ -17947,38 +17039,11 @@ +@@ -17949,38 +17041,11 @@ return 0; } _ACEOF @@ -10345,7 +10345,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ #define _FILE_OFFSET_BITS 64 #include -@@ -17998,38 +17063,15 @@ +@@ -18000,38 +17065,15 @@ return 0; } _ACEOF @@ -10386,7 +10386,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$ac_cv_sys_file_offset_bits" >&6; } case $ac_cv_sys_file_offset_bits in #( no | unknown) ;; -@@ -18041,17 +17083,13 @@ +@@ -18043,17 +17085,13 @@ esac rm -rf conftest* if test $ac_cv_sys_file_offset_bits = unknown; then @@ -10407,7 +10407,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ #include /* Check that off_t can represent 2**63 - 1 correctly. -@@ -18070,38 +17108,11 @@ +@@ -18072,38 +17110,11 @@ return 0; } _ACEOF @@ -10448,7 +10448,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ #define _LARGE_FILES 1 #include -@@ -18121,38 +17132,15 @@ +@@ -18123,38 +17134,15 @@ return 0; } _ACEOF @@ -10489,7 +10489,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$ac_cv_sys_large_files" >&6; } case $ac_cv_sys_large_files in #( no | unknown) ;; -@@ -18176,9 +17164,9 @@ +@@ -18178,9 +17166,9 @@ depcc="$CCAS" am_compiler_list= @@ -10501,7 +10501,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -@@ -18284,7 +17272,7 @@ +@@ -18286,7 +17274,7 @@ fi fi @@ -10510,7 +10510,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; } CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type -@@ -18301,9 +17289,9 @@ +@@ -18303,9 +17291,9 @@ # Extract the first word of "nm", so it can be a program name with args. set dummy nm; ac_word=$2 @@ -10522,7 +10522,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else case $NM in -@@ -18316,14 +17304,14 @@ +@@ -18318,14 +17306,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -10540,7 +10540,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure IFS=$as_save_IFS test -z "$ac_cv_path_NM" && ac_cv_path_NM="nm" -@@ -18332,26 +17320,26 @@ +@@ -18334,26 +17322,26 @@ fi NM=$ac_cv_path_NM if test -n "$NM"; then @@ -10572,7 +10572,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$USE_MAINTAINER_MODE" >&6; } if test $USE_MAINTAINER_MODE = yes; then MAINTAINER_MODE_TRUE= -@@ -18365,7 +17353,7 @@ +@@ -18367,7 +17355,7 @@ @@ -10581,7 +10581,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "checking for some Win32 platform... " >&6; } case "$host" in *-*-mingw*|*-*-cygwin*) -@@ -18375,7 +17363,7 @@ +@@ -18377,7 +17365,7 @@ platform_win32=no ;; esac @@ -10590,7 +10590,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$platform_win32" >&6; } if test "$platform_win32" = "yes"; then PLATFORM_WIN32_TRUE= -@@ -18415,9 +17403,9 @@ +@@ -18417,9 +17405,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 @@ -10602,7 +10602,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$WINDRES"; then -@@ -18428,24 +17416,24 @@ +@@ -18430,24 +17418,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -10632,7 +10632,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -18455,9 +17443,9 @@ +@@ -18457,9 +17445,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 @@ -10644,7 +10644,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_WINDRES"; then -@@ -18468,24 +17456,24 @@ +@@ -18470,24 +17458,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -10674,7 +10674,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -18494,7 +17482,7 @@ +@@ -18496,7 +17484,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -10683,7 +10683,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -18505,15 +17493,13 @@ +@@ -18507,15 +17495,13 @@ fi if test "$WINDRES" = no; then @@ -10702,7 +10702,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$ms_librarian"; then -@@ -18524,14 +17510,14 @@ +@@ -18526,14 +17512,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -10720,7 +10720,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure IFS=$as_save_IFS test -z "$ac_cv_prog_ms_librarian" && ac_cv_prog_ms_librarian="no" -@@ -18539,10 +17525,10 @@ +@@ -18541,10 +17527,10 @@ fi ms_librarian=$ac_cv_prog_ms_librarian if test -n "$ms_librarian"; then @@ -10733,7 +10733,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -18560,42 +17546,42 @@ +@@ -18562,42 +17548,42 @@ # Check whether --enable-debug was given. @@ -10741,7 +10741,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure +if test "${enable_debug+set}" = set; then : enableval=$enable_debug; else - enable_debug=minimum + enable_debug=yes fi # Check whether --enable-shm was given. @@ -10782,7 +10782,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure enableval=$enable_visibility; else enable_visibility=yes -@@ -18604,7 +17590,7 @@ +@@ -18606,7 +17592,7 @@ # Check whether --with-xinput was given. @@ -10791,7 +10791,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure withval=$with_xinput; fi -@@ -18617,7 +17603,7 @@ +@@ -18619,7 +17605,7 @@ # Check whether --with-gdktarget was given. @@ -10800,7 +10800,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure withval=$with_gdktarget; gdktarget=$with_gdktarget fi -@@ -18625,9 +17611,7 @@ +@@ -18627,9 +17613,7 @@ case $gdktarget in x11|win32|quartz|directfb) ;; @@ -10811,7 +10811,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure esac gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la -@@ -18661,7 +17645,7 @@ +@@ -18663,7 +17647,7 @@ # Build time sanity check... @@ -10820,7 +10820,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "checking whether build environment is sane... " >&6; } # Just in case sleep 1 -@@ -18672,15 +17656,11 @@ +@@ -18674,15 +17658,11 @@ ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) @@ -10838,7 +10838,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure esac # Do `set' in a subshell so we don't clobber the current shell's -@@ -18702,11 +17682,8 @@ +@@ -18704,11 +17684,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". @@ -10852,7 +10852,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure fi test "$2" = conftest.file -@@ -18715,27 +17692,20 @@ +@@ -18717,27 +17694,20 @@ # Ok. : else @@ -10886,7 +10886,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -18760,54 +17730,27 @@ +@@ -18762,54 +17732,27 @@ ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi @@ -10949,7 +10949,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi -@@ -18820,9 +17763,9 @@ +@@ -18822,9 +17765,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 @@ -10961,7 +10961,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -18833,24 +17776,24 @@ +@@ -18835,24 +17778,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -10991,7 +10991,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -18860,9 +17803,9 @@ +@@ -18862,9 +17805,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 @@ -11003,7 +11003,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then -@@ -18873,24 +17816,24 @@ +@@ -18875,24 +17818,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -11033,7 +11033,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -18899,7 +17842,7 @@ +@@ -18901,7 +17844,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -11042,7 +11042,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -18913,9 +17856,9 @@ +@@ -18915,9 +17858,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 @@ -11054,7 +11054,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -18926,24 +17869,24 @@ +@@ -18928,24 +17871,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -11084,7 +11084,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -18953,9 +17896,9 @@ +@@ -18955,9 +17898,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 @@ -11096,7 +11096,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -18967,18 +17910,18 @@ +@@ -18969,18 +17912,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -11118,7 +11118,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure IFS=$as_save_IFS if test $ac_prog_rejected = yes; then -@@ -18997,10 +17940,10 @@ +@@ -18999,10 +17942,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -11131,7 +11131,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -19012,9 +17955,9 @@ +@@ -19014,9 +17957,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 @@ -11143,7 +11143,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -19025,24 +17968,24 @@ +@@ -19027,24 +17970,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -11173,7 +11173,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -19056,9 +17999,9 @@ +@@ -19058,9 +18001,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 @@ -11185,7 +11185,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then -@@ -19069,24 +18012,24 @@ +@@ -19071,24 +18014,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -11215,7 +11215,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -19099,7 +18042,7 @@ +@@ -19101,7 +18044,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -11224,7 +11224,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -19110,62 +18053,42 @@ +@@ -19112,62 +18055,42 @@ fi @@ -11309,7 +11309,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ int -@@ -19179,37 +18102,16 @@ +@@ -19181,37 +18104,16 @@ return 0; } _ACEOF @@ -11350,7 +11350,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes -@@ -19218,20 +18120,16 @@ +@@ -19220,20 +18122,16 @@ fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS @@ -11374,7 +11374,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ int -@@ -19242,35 +18140,11 @@ +@@ -19244,35 +18142,11 @@ return 0; } _ACEOF @@ -11413,7 +11413,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ int -@@ -19281,36 +18155,12 @@ +@@ -19283,36 +18157,12 @@ return 0; } _ACEOF @@ -11454,7 +11454,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ int -@@ -19321,42 +18171,17 @@ +@@ -19323,42 +18173,17 @@ return 0; } _ACEOF @@ -11499,7 +11499,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS -@@ -19373,18 +18198,14 @@ +@@ -19375,18 +18200,14 @@ CFLAGS= fi fi @@ -11521,7 +11521,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ #include #include -@@ -19441,32 +18262,9 @@ +@@ -19443,32 +18264,9 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" @@ -11555,7 +11555,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done -@@ -19477,17 +18275,19 @@ +@@ -19479,17 +18277,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) @@ -11578,7 +11578,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure ac_ext=c ac_cpp='$CPP $CPPFLAGS' -@@ -19497,9 +18297,9 @@ +@@ -19499,9 +18299,9 @@ depcc="$CC" am_compiler_list= @@ -11590,7 +11590,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -@@ -19607,7 +18407,7 @@ +@@ -19609,7 +18409,7 @@ fi fi @@ -11599,7 +11599,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type -@@ -19626,22 +18426,18 @@ +@@ -19628,22 +18428,18 @@ am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc if test "x$CC" != xcc; then @@ -11626,7 +11626,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ int -@@ -19657,63 +18453,63 @@ +@@ -19659,63 +18455,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.* @@ -11715,7 +11715,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure then # cc works too. : -@@ -19730,15 +18526,13 @@ +@@ -19732,15 +18528,13 @@ fi if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then @@ -11734,7 +11734,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure fi -@@ -19757,104 +18551,12 @@ +@@ -19759,104 +18553,12 @@ fi @@ -11841,7 +11841,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF -@@ -19872,11 +18574,11 @@ +@@ -19874,11 +18576,11 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then @@ -11855,7 +11855,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi -@@ -19910,7 +18612,7 @@ +@@ -19912,7 +18614,7 @@ if test x"$os_win32" = xyes; then if test x"$GCC" = xyes; then msnative_struct='' @@ -11864,7 +11864,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "checking how to get MSVC-compatible struct packing... " >&6; } if test -z "$ac_cv_prog_CC"; then our_gcc="$CC" -@@ -19930,13 +18632,13 @@ +@@ -19932,13 +18634,13 @@ ;; esac if test x"$msnative_struct" = x ; then @@ -11881,7 +11881,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "${msnative_struct}" >&6; } fi fi -@@ -19957,9 +18659,9 @@ +@@ -19959,9 +18661,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 @@ -11893,7 +11893,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in -@@ -19972,14 +18674,14 @@ +@@ -19974,14 +18676,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -11911,7 +11911,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure IFS=$as_save_IFS ;; -@@ -19987,10 +18689,10 @@ +@@ -19989,10 +18691,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then @@ -11924,7 +11924,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -20000,9 +18702,9 @@ +@@ -20002,9 +18704,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 @@ -11936,7 +11936,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in -@@ -20015,14 +18717,14 @@ +@@ -20017,14 +18719,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -11954,7 +11954,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure IFS=$as_save_IFS ;; -@@ -20030,10 +18732,10 @@ +@@ -20032,10 +18734,10 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then @@ -11967,7 +11967,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -20042,7 +18744,7 @@ +@@ -20044,7 +18746,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -11976,7 +11976,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -20055,13 +18757,13 @@ +@@ -20057,13 +18759,13 @@ fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.9.0 @@ -11993,7 +11993,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } PKG_CONFIG="" fi -@@ -20069,40 +18771,44 @@ +@@ -20071,40 +18773,44 @@ fi pkg_failed=no @@ -12005,20 +12005,20 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.21.3 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\"") >&5 +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.21.3 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$BASE_DEPENDENCIES_CFLAGS"; then + pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.21.3 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.21.3 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.21.3 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.21.3 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6") 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 - pkg_cv_BASE_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.21.3 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6" 2>/dev/null` + pkg_cv_BASE_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.21.3 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6" 2>/dev/null` else pkg_failed=yes fi @@ -12032,20 +12032,20 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.21.3 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\"") >&5 +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.21.3 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$BASE_DEPENDENCIES_LIBS"; then + pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS" + else + if test -n "$PKG_CONFIG" && \ -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.21.3 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.21.3 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.21.3 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.21.3 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6") 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 - pkg_cv_BASE_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.21.3 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6" 2>/dev/null` + pkg_cv_BASE_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.21.3 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6" 2>/dev/null` else pkg_failed=yes fi @@ -12057,20 +12057,20 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure fi -@@ -20115,25 +18821,14 @@ +@@ -20117,25 +18823,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then -- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.21.3 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6" 2>&1` -+ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.21.3 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6"` +- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.21.3 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6" 2>&1` ++ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.21.3 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6"` else -- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.21.3 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6" 2>&1` -+ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.21.3 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6"` +- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.21.3 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6" 2>&1` ++ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.21.3 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6"` fi # Put the nasty error message in config.log where it belongs echo "$BASE_DEPENDENCIES_PKG_ERRORS" >&5 -- { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.21.3 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6) were not met: +- { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.21.3 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6) were not met: - -$BASE_DEPENDENCIES_PKG_ERRORS - @@ -12081,12 +12081,12 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 --$as_echo "$as_me: error: Package requirements (glib-2.0 >= 2.21.3 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6) were not met: -+ as_fn_error "Package requirements (glib-2.0 >= 2.21.3 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6) were not met: +-$as_echo "$as_me: error: Package requirements (glib-2.0 >= 2.21.3 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6) were not met: ++ as_fn_error "Package requirements (glib-2.0 >= 2.21.3 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6) were not met: $BASE_DEPENDENCIES_PKG_ERRORS -@@ -20143,22 +18838,11 @@ +@@ -20145,22 +18840,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. @@ -12112,7 +12112,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -@@ -20167,12 +18851,11 @@ +@@ -20169,12 +18853,11 @@ See the pkg-config man page for more details. To get pkg-config, see . @@ -12127,7 +12127,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "yes" >&6; } : fi -@@ -20189,40 +18872,44 @@ +@@ -20191,40 +18874,44 @@ fi pkg_failed=no @@ -12191,7 +12191,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure fi -@@ -20235,25 +18922,14 @@ +@@ -20237,25 +18924,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then @@ -12220,7 +12220,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $CAIRO_BACKEND_PKG_ERRORS -@@ -20263,22 +18939,11 @@ +@@ -20265,22 +18941,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. @@ -12246,7 +12246,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -@@ -20287,12 +18952,11 @@ +@@ -20289,12 +18954,11 @@ See the pkg-config man page for more details. To get pkg-config, see . @@ -12261,7 +12261,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "yes" >&6; } : fi -@@ -20309,14 +18973,14 @@ +@@ -20311,14 +18975,14 @@ # Check whether --enable-explicit-deps was given. @@ -12278,7 +12278,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "checking Whether to write dependencies into .pc files... " >&6; } case $enable_explicit_deps in auto) -@@ -20330,12 +18994,10 @@ +@@ -20332,12 +18996,10 @@ ;; yes|no) ;; @@ -12293,7 +12293,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$enable_explicit_deps" >&6; } if test $enable_explicit_deps = no; then -@@ -20354,9 +19016,9 @@ +@@ -20356,9 +19018,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 @@ -12305,7 +12305,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else case $PERL in -@@ -20369,14 +19031,14 @@ +@@ -20371,14 +19033,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -12323,7 +12323,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure IFS=$as_save_IFS ;; -@@ -20384,10 +19046,10 @@ +@@ -20386,10 +19048,10 @@ fi PERL=$ac_cv_path_PERL if test -n "$PERL"; then @@ -12336,7 +12336,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -20399,9 +19061,9 @@ +@@ -20401,9 +19063,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 @@ -12348,7 +12348,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$INDENT"; then -@@ -20412,24 +19074,24 @@ +@@ -20414,24 +19076,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -12378,7 +12378,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -20443,283 +19105,67 @@ +@@ -20445,283 +19107,67 @@ fi @@ -12698,7 +12698,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ #include int -@@ -20733,56 +19179,25 @@ +@@ -20735,56 +19181,25 @@ return 0; } _ACEOF @@ -12763,7 +12763,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ #include int -@@ -20796,56 +19211,25 @@ +@@ -20798,56 +19213,25 @@ return 0; } _ACEOF @@ -12828,7 +12828,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ #include int -@@ -20859,56 +19243,25 @@ +@@ -20861,56 +19245,25 @@ return 0; } _ACEOF @@ -12893,7 +12893,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ #include int -@@ -20922,424 +19275,92 @@ +@@ -20924,424 +19277,92 @@ return 0; } _ACEOF @@ -13367,7 +13367,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ #include -@@ -21352,54 +19373,25 @@ +@@ -21354,54 +19375,25 @@ return 0; } _ACEOF @@ -13430,7 +13430,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ #include -@@ -21412,141 +19404,26 @@ +@@ -21414,141 +19406,26 @@ return 0; } _ACEOF @@ -13582,7 +13582,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure _ACEOF fi -@@ -21561,18 +19438,14 @@ +@@ -21563,18 +19440,14 @@ || test "$gt_cv_func_ngettext_libc" != "yes" \ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then @@ -13604,7 +13604,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -21590,55 +19463,26 @@ +@@ -21592,55 +19465,26 @@ return 0; } _ACEOF @@ -13669,7 +13669,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -21656,55 +19500,26 @@ +@@ -21658,55 +19502,26 @@ return 0; } _ACEOF @@ -13734,7 +13734,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -21722,43 +19537,18 @@ +@@ -21724,43 +19539,18 @@ return 0; } _ACEOF @@ -13784,7 +13784,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure gt_cv_func_dgettext_libintl=yes fi -@@ -21768,22 +19558,18 @@ +@@ -21770,22 +19560,18 @@ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then @@ -13812,7 +13812,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -21801,55 +19587,26 @@ +@@ -21803,55 +19589,26 @@ return 0; } _ACEOF @@ -13877,7 +13877,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -21867,43 +19624,18 @@ +@@ -21869,43 +19626,18 @@ return 0; } _ACEOF @@ -13927,7 +13927,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure gt_cv_func_dgettext_libintl=yes libintl_extra_libs=-liconv else -@@ -21925,102 +19657,12 @@ +@@ -21927,102 +19659,12 @@ glib_save_LIBS="$LIBS" LIBS="$LIBS -lintl $libintl_extra_libs" unset ac_cv_func_bind_textdomain_codeset @@ -14035,7 +14035,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure _ACEOF fi -@@ -22050,15 +19692,13 @@ +@@ -22052,15 +19694,13 @@ if test "$gt_cv_have_gettext" = "yes"; then @@ -14054,7 +14054,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else case "$MSGFMT" in -@@ -22083,118 +19723,28 @@ +@@ -22085,118 +19725,28 @@ fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != "no"; then @@ -14181,7 +14181,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "checking if msgfmt accepts -c... " >&6; } cat >conftest.foo <<_ACEOF -@@ -22209,14 +19759,14 @@ +@@ -22211,14 +19761,14 @@ "Content-Transfer-Encoding: 8bit\n" _ACEOF @@ -14201,7 +14201,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } echo "$as_me: failed input was:" >&5 sed 's/^/| /' conftest.foo >&5 -@@ -22224,9 +19774,9 @@ +@@ -22226,9 +19776,9 @@ # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 @@ -14213,7 +14213,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else case $GMSGFMT in -@@ -22239,14 +19789,14 @@ +@@ -22241,14 +19791,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -14231,7 +14231,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure IFS=$as_save_IFS test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" -@@ -22255,19 +19805,19 @@ +@@ -22257,19 +19807,19 @@ fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then @@ -14255,7 +14255,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else case "$XGETTEXT" in -@@ -22292,18 +19842,14 @@ +@@ -22294,18 +19844,14 @@ fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then @@ -14277,7 +14277,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ int -@@ -22315,121 +19861,14 @@ +@@ -22317,121 +19863,14 @@ return 0; } _ACEOF @@ -14403,7 +14403,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure CATOBJEXT=.gmo DATADIRNAME=share else -@@ -22444,10 +19883,8 @@ +@@ -22446,10 +19885,8 @@ ;; esac fi @@ -14416,7 +14416,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure LIBS="$glib_save_LIBS" INSTOBJEXT=.mo else -@@ -22461,9 +19898,7 @@ +@@ -22463,9 +19900,7 @@ if test "$gt_cv_have_gettext" = "yes" ; then @@ -14427,7 +14427,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure fi -@@ -22471,7 +19906,7 @@ +@@ -22473,7 +19908,7 @@ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then : ; else @@ -14436,7 +14436,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } XGETTEXT=":" fi -@@ -22504,7 +19939,7 @@ +@@ -22506,7 +19941,7 @@ if test "x$ALL_LINGUAS" = "x"; then LINGUAS= else @@ -14445,7 +14445,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "checking for catalogs to be installed... " >&6; } NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do -@@ -22529,7 +19964,7 @@ +@@ -22531,7 +19966,7 @@ fi done LINGUAS=$NEW_LINGUAS @@ -14454,7 +14454,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$LINGUAS" >&6; } fi -@@ -22600,129 +20035,67 @@ +@@ -22602,129 +20037,67 @@ @@ -14604,7 +14604,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } ;; esac -@@ -22730,27 +20103,23 @@ +@@ -22732,27 +20105,23 @@ # # see bug 162979 # @@ -14637,7 +14637,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ #include int -@@ -22761,37 +20130,13 @@ +@@ -22763,37 +20132,13 @@ return 0; } _ACEOF @@ -14679,7 +14679,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ #include int -@@ -22802,40 +20147,18 @@ +@@ -22804,40 +20149,18 @@ return 0; } _ACEOF @@ -14724,7 +14724,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # -@@ -22845,7 +20168,7 @@ +@@ -22847,7 +20170,7 @@ GLIB_PACKAGES="gobject-2.0 gmodule-no-export-2.0" # Check whether --enable-glibtest was given. @@ -14733,7 +14733,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure enableval=$enable_glibtest; else enable_glibtest=yes -@@ -22880,9 +20203,9 @@ +@@ -22882,9 +20205,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 @@ -14745,7 +14745,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in -@@ -22895,14 +20218,14 @@ +@@ -22897,14 +20220,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -14763,7 +14763,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure IFS=$as_save_IFS ;; -@@ -22910,10 +20233,10 @@ +@@ -22912,10 +20235,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then @@ -14776,7 +14776,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -22923,9 +20246,9 @@ +@@ -22925,9 +20248,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 @@ -14788,7 +14788,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in -@@ -22938,14 +20261,14 @@ +@@ -22940,14 +20263,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -14806,7 +14806,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure IFS=$as_save_IFS ;; -@@ -22953,10 +20276,10 @@ +@@ -22955,10 +20278,10 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then @@ -14819,7 +14819,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -22965,7 +20288,7 @@ +@@ -22967,7 +20290,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -14828,7 +14828,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -22978,13 +20301,13 @@ +@@ -22980,13 +20303,13 @@ fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.16 @@ -14845,7 +14845,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } PKG_CONFIG="" fi -@@ -22999,7 +20322,7 @@ +@@ -23001,7 +20324,7 @@ fi min_glib_version=2.21.3 @@ -14854,7 +14854,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "checking for GLIB - version >= $min_glib_version... " >&6; } if test x$PKG_CONFIG != xno ; then -@@ -23035,14 +20358,10 @@ +@@ -23037,14 +20360,10 @@ CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$GLIB_LIBS $LIBS" rm -f conf.glibtest @@ -14871,7 +14871,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* end confdefs.h. */ #include -@@ -23054,9 +20373,8 @@ +@@ -23056,9 +20375,8 @@ { int major, minor, micro; char *tmp_version; @@ -14882,7 +14882,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* HP/UX 9 (%@#!) writes to sscanf strings */ tmp_version = g_strdup("$min_glib_version"); -@@ -23118,52 +20436,25 @@ +@@ -23120,5893 +20438,1048 @@ } _ACEOF @@ -14913,52 +14913,56 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $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 -+if ac_fn_c_try_run "$LINENO"; then : - +- -( exit $ac_status ) -no_glib=yes -+else -+ no_glib=yes - fi +-fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext - fi - +-fi - - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_glib" = x ; then +- +- CFLAGS="$ac_save_CFLAGS" +- LIBS="$ac_save_LIBS" +- fi +- fi +- if test "x$no_glib" = x ; then - { $as_echo "$as_me:$LINENO: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5 - $as_echo "yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; } - : - else +-$as_echo "yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; } +- : +- else - { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - if test "$PKG_CONFIG" = "no" ; then - echo "*** A new enough version of pkg-config was not found." -@@ -23177,11 +20468,7 @@ - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" +-$as_echo "no" >&6; } +- if test "$PKG_CONFIG" = "no" ; then +- echo "*** A new enough version of pkg-config was not found." +- echo "*** See http://www.freedesktop.org/software/pkgconfig/" +- else +- if test -f conf.glibtest ; then +- : +- else +- echo "*** Could not run GLIB test program, checking why..." +- ac_save_CFLAGS="$CFLAGS" +- ac_save_LIBS="$LIBS" +- CFLAGS="$CFLAGS $GLIB_CFLAGS" +- LIBS="$LIBS $GLIB_LIBS" - 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 -@@ -23195,27 +20482,7 @@ - return 0; - } - _ACEOF +-/* end confdefs.h. */ +- +-#include +-#include +- +-int +-main () +-{ +- return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -14980,52 +14984,65 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -+if ac_fn_c_try_link "$LINENO"; then : - 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" -@@ -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 +- 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" +- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" +- echo "*** to the installed location Also, make sure you have run ldconfig if that" +- echo "*** is required on your system" +- echo "***" +- 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 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GLIB is incorrectly installed." - fi +- echo "*** exact error that occured. This usually means GLIB is incorrectly installed." +-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 - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi -@@ -23245,13 +20507,9 @@ - GLIB_GENMARSHAL="" - GOBJECT_QUERY="" - GLIB_MKENUMS="" +- CFLAGS="$ac_save_CFLAGS" +- LIBS="$ac_save_LIBS" +- fi +- fi +- GLIB_CFLAGS="" +- GLIB_LIBS="" +- GLIB_GENMARSHAL="" +- GOBJECT_QUERY="" +- GLIB_MKENUMS="" - { { $as_echo "$as_me:$LINENO: error: -+ as_fn_error " - *** GLIB 2.21.3 or better is required. The latest version of +-*** 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; }; } -+*** 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" +- fi - - for ac_func in bind_textdomain_codeset +- +- +- +- +- 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 -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -15035,44 +15052,27 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -+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 - 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. */ @@ -15086,69 +15086,15 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif -+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 () - { +- +-int +-main () +-{ -return $ac_func (); -+int flags = FTW_ACTIONRETVAL; - ; - return 0; - } - _ACEOF +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -15171,20 +15117,13 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=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 - - eval "$as_ac_var=no" -+ 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; } - +-fi +- -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext @@ -15199,19 +15138,13 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF -+$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 +- +-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` @@ -15219,17 +15152,13 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 -+# 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 +- $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; } @@ -15238,251 +15167,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> -+#include -+#include -+#include -+#include -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --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_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_header_compiler=yes -+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 -+ ac_cv_header_stdc=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 --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+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> -+#include -+ - _ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --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_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -- test ! -s conftest.err -- }; then -- ac_header_preproc=yes -+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 - --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: ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( cat <<\_ASBOX --## --------------------------------------------------------------------- ## --## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## --## --------------------------------------------------------------------- ## --_ASBOX -- ) | sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --{ $as_echo "$as_me:$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 -- eval "$as_ac_Header=\$ac_header_preproc" -+ 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; } -+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 -+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` --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { $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 - 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; } -+ -+ -+# 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; } --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. */ -$ac_includes_default -#include <$ac_header> -_ACEOF @@ -15508,65 +15193,14 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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; } @@ -15577,10 +15211,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -+ ; -+ return 0; -+} - _ACEOF +-_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -15599,28 +15230,17 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - test ! -s conftest.err - }; then - ac_header_preproc=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_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: ) @@ -15654,72 +15274,187 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 -+# 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 +- $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; } -+ 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 +- +-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 -+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 - +-_ACEOF +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_PWD_H 1 +-_ACEOF +- +-fi +- +-done +- +- +-for ac_header in sys/time.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $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 +-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 +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-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_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes +-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 +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-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_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- 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; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## --------------------------------------------------------------------- ## +-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +-## --------------------------------------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ $as_echo "$as_me:$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 +- 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 +-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_SYS_TIME_H 1 -+ -+ -+ -+ -+ 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 - - +-_ACEOF +- +-fi +- +-done +- +- -for ac_header in unistd.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -15768,45 +15503,23 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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. */ -+ -+ -+ -+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 +-_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_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. */ +-/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" @@ -15830,37 +15543,14 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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: ) @@ -15902,9 +15592,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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"'` @@ -15912,57 +15600,16 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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` @@ -16011,56 +15658,14 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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; } @@ -16071,23 +15676,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -+ /* 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 +-_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -16106,28 +15695,17 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - test ! -s conftest.err - }; then - ac_header_preproc=yes -+if ac_fn_c_try_run "$LINENO"; then : -+ ac_cv_func_mmap_fixed_mapped=yes - else +-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 -+{ $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 - +-fi +- -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: ) @@ -16164,99 +15742,48 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 -+ -+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 +- cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_MALLINFO 1 - _ACEOF - +-_ACEOF +- -cat >>confdefs.h <<\_ACEOF -#define HAVE_FTW_H 1 -+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 +-_ACEOF +- +-fi +- +-done +- - - 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 -+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. */ +-/* end confdefs.h. */ -#define _XOPEN_SOURCE 500 -#define _GNU_SOURCE -#include -+#include - int - main () - { +-int +-main () +-{ -int flags = FTW_ACTIONRETVAL; -+fd_set readMask, writeMask; - ; - return 0; - } - _ACEOF +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -16275,18 +15802,16 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 : - gtk_ok=yes - else +- gtk_ok=yes +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - gtk_ok=no -+ gtk_ok=no - fi +-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; } - @@ -16294,27 +15819,15 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -#define HAVE_GNU_FTW 1 -_ACEOF - -+ { $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:$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; } @@ -16331,15 +15844,11 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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; -} @@ -16366,14 +15875,10 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+ fi - fi - +-fi +- -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then @@ -16383,34 +15888,20 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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. */ -#include - -+#include - _ACEOF +-_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : -+if ac_fn_c_try_cpp "$LINENO"; then : -+ gdk_wchar_h=yes - else +-else - ac_cv_header_stdc=no -+ gdk_wchar_h=no - fi +-fi -rm -f conftest* -+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; } - +- +-fi +- -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 @@ -16418,58 +15909,31 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+# 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. */ +-/* end confdefs.h. */ -#include - -+#include - _ACEOF +-_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : -+if ac_fn_c_try_cpp "$LINENO"; then : -+ gdk_wctype_h=yes - else +-else - ac_cv_header_stdc=no -+ gdk_wctype_h=no - fi +-fi -rm -f conftest* -+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 : - +- +-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 +-else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ { $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. */ +-/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) @@ -16482,28 +15946,19 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - +- -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -+/* 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 +-main () +-{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; -+return iswalnum (); -+ ; - return 0; - } - _ACEOF +- return 0; +-} +-_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -16527,9 +15982,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_w_iswalnum=yes - else +-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 @@ -16539,19 +15992,11 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 -+ ac_cv_lib_w_iswalnum=no - 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 +-fi +-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 @@ -16559,10 +16004,10 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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; } @@ -16574,18 +16019,11 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+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. */ +-/* end confdefs.h. */ - -+#include - int - main () - { +-int +-main () +-{ -/* FIXME: Include the comments suggested by Paul. */ -#ifndef __cplusplus - /* Ultrix mips cc rejects this. */ @@ -16610,7 +16048,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - { /* SCO 3.2v4 cc rejects this. */ - char *t; - char const *s = 0 ? (char *) 0 : (char const *) 0; - +- - *t++ = 0; - if (s) return 0; - } @@ -16634,23 +16072,12 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - if (!foo) return 0; - } - return !cs[0] && !zero.x; -+#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 +-#endif +- +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -16670,37 +16097,26 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_c_const=yes -+if ac_fn_c_try_link "$LINENO"; then : -+ gdk_working_wctype=yes - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_c_const=no -+ gdk_working_wctype=no - fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS="$oLIBS" - +-fi +- -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 -+$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; } - - +- +-fi +- +- -# 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; } @@ -16712,11 +16128,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+# 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. */ +-/* end confdefs.h. */ -#include -#include - @@ -16727,8 +16139,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - ; - return 0; -} -+#include - _ACEOF +-_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -16748,50 +16159,25 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_type_signal=int -+if ac_fn_c_try_cpp "$LINENO"; then : -+ gtk_uxtheme_h=yes - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_signal=void -+ 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 +- -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 -+# 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 - +-_ACEOF +- +- +- +- -for ac_header in stdlib.h unistd.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -16800,7 +16186,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 @@ -16823,19 +16209,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -+done -+ -+ -+ -+################################################## -+# Checks for gdk-pixbuf -+################################################## -+ -+ -+use_la_modules=false -+case $host in -+ *-aix*) use_la_modules=true - esac +-esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 @@ -16852,18 +16226,14 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +- - ac_header_compiler=no -+if $use_la_modules ; then -+ -+$as_echo "#define USE_LA_MODULES 1" >>confdefs.h -+ - 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 $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } @@ -16896,19 +16266,14 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 -+# Check whether --enable-modules was given. -+if test "${enable_modules+set}" = set; then : -+ enableval=$enable_modules; - 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: ) @@ -16943,77 +16308,27 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 -+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 +-else - eval "$as_ac_Header=\$ac_header_preproc" -+ { $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 +-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; } - -+ -+ -+# Check whether --with-libpng was given. -+if test "${with_libpng+set}" = set; then : -+ withval=$with_libpng; - fi +- +-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 - -+ -+# Check whether --with-libjpeg was given. -+if test "${with_libjpeg+set}" = set; then : -+ withval=$with_libjpeg; - fi - +- +-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` @@ -17021,17 +16336,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 -+ -+# 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 +-else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF @@ -17041,47 +16346,26 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 -+ -+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 +- +-/* 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 $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named @@ -17090,16 +16374,14 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -choke me -#endif - -+char TIFFReadRGBAImageOriented (); - int - main () - { +-int +-main () +-{ -return $ac_func (); -+return TIFFReadRGBAImageOriented (); - ; - return 0; - } - _ACEOF +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -17122,23 +16404,17 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_tiff_TIFFReadRGBAImageOriented=yes - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -+ ac_cv_lib_tiff_TIFFReadRGBAImageOriented=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 -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 @@ -17150,40 +16426,23 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -+{ $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 +-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 -+ { $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 +-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="-ltiff -ljpeg -lz -lm $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -$ac_includes_default -/* malloc might have been renamed as rpl_malloc. */ -#undef malloc @@ -17204,7 +16463,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 @@ -17215,12 +16474,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - -#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H -char *malloc (); -+/* 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 +-#endif - -/* This mess was copied from the GNU getpagesize.h. */ -#ifndef HAVE_GETPAGESIZE @@ -17259,10 +16513,9 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - -#endif /* no HAVE_GETPAGESIZE */ - -+char TIFFWriteScanline (); - int - main () - { +-int +-main () +-{ - char *data, *data2, *data3; - int i, pagesize; - int fd; @@ -17314,11 +16567,9 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - if (*(data + i) != *(data3 + i)) - return 1; - close (fd); -+return TIFFWriteScanline (); -+ ; - return 0; - } - _ACEOF +- return 0; +-} +-_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -17342,26 +16593,20 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_mmap_fixed_mapped=yes -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_tiff_TIFFWriteScanline=yes - else +-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 -+ ac_cv_lib_tiff_TIFFWriteScanline=no - fi +-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 - - -+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_mmap_fixed_mapped" >&5 -$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; } -if test $ac_cv_func_mmap_fixed_mapped = yes; then @@ -17370,41 +16615,25 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -#define HAVE_MMAP 1 -_ACEOF - -+{ $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.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 -+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 +- $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="-ltiff34 -ljpeg -lz -lm $LIBS" -+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 @@ -17421,13 +16650,13 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 -@@ -24889,100 +21580,66 @@ - #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 $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named @@ -17436,16 +16665,14 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -choke me -#endif - -+char TIFFFlushData (); - int - main () - { +-int +-main () +-{ -return $ac_func (); -+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 @@ -17468,39 +16695,17 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -+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 -+ 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" -+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 +- -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 @@ -17511,42 +16716,25 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 -+ 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 +- $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="-ljpeg $LIBS" -+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 @@ -17563,13 +16751,13 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 -@@ -24990,314 +21647,136 @@ - #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 $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named @@ -17578,16 +16766,14 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -choke me -#endif - -+char jpeg_destroy_decompress (); - int - main () - { +-int +-main () +-{ -return $ac_func (); -+return jpeg_destroy_decompress (); - ; - return 0; - } - _ACEOF +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -17610,23 +16796,17 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -+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 - - eval "$as_ac_var=no" -+ ac_cv_lib_jpeg_jpeg_destroy_decompress=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 -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 @@ -17638,17 +16818,9 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -+{ $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 +-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 @@ -17659,25 +16831,14 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ 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. */ +-/* end confdefs.h. */ -#include - -+#include -+#undef PACKAGE -+#undef VERSION -+#undef HAVE_STDLIB_H -+#include - _ACEOF +-_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "uid_t" >/dev/null 2>&1; then - ac_cv_type_uid_t=yes -+if ac_fn_c_try_cpp "$LINENO"; then : -+ jpeg_ok=yes - else +-else - ac_cv_type_uid_t=no -fi -rm -f conftest* @@ -17696,8 +16857,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -#define gid_t int -_ACEOF - -+ jpeg_ok=no - fi +-fi - - -# Check if needs to be included for fd_set @@ -17708,38 +16868,16 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+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. */ +-/* 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 jpeg_simple_progression (); - int - main () - { +-int +-main () +-{ -fd_set readMask, writeMask; -+return jpeg_simple_progression (); - ; - return 0; - } - _ACEOF +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -17770,9 +16908,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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; } -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_jpeg_jpeg_simple_progression=yes - else +-else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF @@ -17805,8 +16941,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - fi -+ ac_cv_lib_jpeg_jpeg_simple_progression=no - fi +-fi - -# `widechar' tests for gdki18n.h -{ $as_echo "$as_me:$LINENO: checking for wchar.h" >&5 @@ -17842,14 +16977,8 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -sed 's/^/| /' conftest.$ac_ext >&5 - - gdk_wchar_h=no -+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 -f conftest.err conftest.$ac_ext -if test $gdk_wchar_h = yes; then - @@ -17860,8 +16989,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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; } @@ -17891,69 +17019,37 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 -+ { $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 -f conftest.err conftest.$ac_ext -if test $gdk_wctype_h = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_WCTYPE_H 1 -_ACEOF -+ 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 +- +-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 -+ 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 +- $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="-lpng -lz -lm $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -/* Define iswalnum to an innocuous variant, in case declares iswalnum. - For example, HP-UX 11i declares gettimeofday. */ -#define iswalnum innocuous_iswalnum @@ -17970,13 +17066,13 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 -@@ -25305,72 +21784,92 @@ - #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 iswalnum (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named @@ -17985,16 +17081,14 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -choke me -#endif - -+char png_read_info (); - int - main () - { +-int +-main () +-{ -return iswalnum (); -+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 @@ -18017,121 +17111,51 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_iswalnum=yes -+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_func_iswalnum=no -+ 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 - +-fi +- -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -+ -+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 +-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 - : -+ -+ 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 +-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 -+ 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="-lw $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. -@@ -25379,1212 +21878,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 iswalnum (); -+char jas_init (); - int - main () - { +-int +-main () +-{ -return iswalnum (); -+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 @@ -18154,37 +17178,27 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_w_iswalnum=yes -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_jasper_jas_init=yes - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_w_iswalnum=no -+ ac_cv_lib_jasper_jas_init=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_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:${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 - +-fi +- +- -oLIBS="$LIBS" -LIBS="$LIBS $GDK_WLIBS" -# The following is necessary for Linux libc-5.4.38 @@ -18213,12 +17227,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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; -} @@ -18248,33 +17257,27 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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= -+ if $dynworks; then -+ BUILD_DYNAMIC_MODULES_TRUE= -+ BUILD_DYNAMIC_MODULES_FALSE='#' -+else -+ BUILD_DYNAMIC_MODULES_TRUE='#' -+ BUILD_DYNAMIC_MODULES_FALSE= - fi +-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; } @@ -18307,42 +17310,23 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 - -+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 +- +-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` @@ -18351,21 +17335,12 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 -+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 +-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; } -+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 +-else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } @@ -18397,26 +17372,17 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -+ 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 +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -+ included_loaders="$with_included_loaders" - 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; } -+{ $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; } @@ -18449,25 +17415,14 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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: ) @@ -18509,32 +17464,20 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -+ # 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 +- +-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` @@ -18542,10 +17485,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 -+ if test x"$INCLUDE_png" = xyes; then -+ INCLUDE_PNG_TRUE= -+ INCLUDE_PNG_FALSE='#' - else +-else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF @@ -18560,23 +17500,13 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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. @@ -18623,28 +17553,17 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -+ if test x"$INCLUDE_wbmp" = xyes; then -+ INCLUDE_WBMP_TRUE= -+ INCLUDE_WBMP_FALSE='#' - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -+ INCLUDE_WBMP_TRUE='#' -+ INCLUDE_WBMP_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_gif" = xyes; then -+ INCLUDE_GIF_TRUE= -+ INCLUDE_GIF_FALSE='#' -+else -+ INCLUDE_GIF_TRUE='#' -+ INCLUDE_GIF_FALSE= - fi +-fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 @@ -18655,132 +17574,46 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -+ if test x"$INCLUDE_ico" = xyes; then -+ INCLUDE_ICO_TRUE= -+ INCLUDE_ICO_FALSE='#' -+else -+ INCLUDE_ICO_TRUE='#' -+ INCLUDE_ICO_FALSE= - fi +- +-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 -+ 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 - +- +-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; -+ 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 - +-fi +- +- -dynworks=false -deps= -if test x$enable_modules = xno; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -+# 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 +-else - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - { $as_echo "$as_me:$LINENO: checking whether dynamic modules work" >&5 @@ -18790,10 +17623,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 | \ @@ -18805,58 +17635,13 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 -+ #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 - +-_ACEOF +- - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - else @@ -18866,62 +17651,38 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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; -+else -+ gio_can_sniff=no - fi +-fi - - -# Check whether --with-libjpeg was given. -if test "${with_libjpeg+set}" = set; then - withval=$with_libjpeg; -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext - fi - +-fi +- - -# Check whether --with-libtiff was given. -if test "${with_libtiff+set}" = set; then - withval=$with_libtiff; -+ { $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; } -+ - +-fi +- +- -# Check whether --with-libjasper was given. -if test "${with_libjasper+set}" = set; then - withval=$with_libjasper; -+# Check whether --with-included_immodules was given. -+if test "${with_included_immodules+set}" = set; then : -+ withval=$with_included_immodules; - fi - - +-fi +- +- -# Check whether --enable-gdiplus was given. -if test "${enable_gdiplus+set}" = set; then - enableval=$enable_gdiplus; -+if $dynworks; then -+ : - else +-else - enable_gdiplus=no -+ ## 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 +- - - if test x$os_win32 = xyes && test x$enable_gdiplus != xno ; then - BUILD_GDIPLUS_LOADERS_TRUE= @@ -18929,15 +17690,8 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -else - BUILD_GDIPLUS_LOADERS_TRUE='#' - BUILD_GDIPLUS_LOADERS_FALSE= -+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 - +-fi +- - -if test x$os_win32 = xno || test x$enable_gdiplus = xno; then - if test x$with_libtiff != xno && test -z "$LIBTIFF"; then @@ -18945,11 +17699,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 -+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="-ltiff -lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF @@ -18958,9 +17708,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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. */ @@ -18998,52 +17746,18 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_tiff_TIFFReadRGBAImageOriented=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_tiff_TIFFReadRGBAImageOriented=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 -LIBS=$ac_check_lib_save_LIBS -+ -+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 +-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 @@ -19052,21 +17766,10 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -$as_echo_n "checking for tiffio.h... " >&6; } -if test "${ac_cv_header_tiffio_h+set}" = set; then - $as_echo_n "(cached) " >&6 -+ -+ 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 +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -$as_echo "$ac_cv_header_tiffio_h" >&6; } -+ -+ if test x"$INCLUDE_cyrillic_translit" = xyes; then -+ INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE= -+ INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE='#' - else +-else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking tiffio.h usability" >&5 -$as_echo_n "checking tiffio.h usability... " >&6; } @@ -19098,40 +17801,17 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -+ 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 +-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 -+ 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 - +-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; } @@ -19161,36 +17841,17 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - test ! -s conftest.err - }; then - ac_header_preproc=yes -+ if test x"$INCLUDE_multipress" = xyes; then -+ INCLUDE_IM_MULTIPRESS_TRUE= -+ INCLUDE_IM_MULTIPRESS_FALSE='#' - else +-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 -+ 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 +- -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: ) @@ -19225,47 +17886,27 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -$as_echo_n "checking for tiffio.h... " >&6; } -if test "${ac_cv_header_tiffio_h+set}" = set; then - $as_echo_n "(cached) " >&6 -+ if test x"$INCLUDE_ti_et" = xyes; then -+ INCLUDE_IM_TI_ET_TRUE= -+ INCLUDE_IM_TI_ET_FALSE='#' - else +-else - ac_cv_header_tiffio_h=$ac_header_preproc -+ INCLUDE_IM_TI_ET_TRUE='#' -+ INCLUDE_IM_TI_ET_FALSE= - fi +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -$as_echo "$ac_cv_header_tiffio_h" >&6; } - -+ 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 +- +-fi -if test "x$ac_cv_header_tiffio_h" = x""yes; then - TIFF='tiff'; LIBTIFF='-ltiff' -+ -+ if test x"$INCLUDE_xim" = xyes; then -+ INCLUDE_IM_XIM_TRUE= -+ INCLUDE_IM_XIM_FALSE='#' - else +-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;} -+ INCLUDE_IM_XIM_TRUE='#' -+ INCLUDE_IM_XIM_FALSE= - fi - - +-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 "$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 - ac_check_lib_save_LIBS=$LIBS -LIBS="-ltiff -ljpeg -lz -lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF @@ -19273,35 +17914,23 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -_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. */ - -/* 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" -+#include -+#include -+#ifndef WEXITSTATUS -+# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8) - #endif +-#endif -char TIFFWriteScanline (); -+#ifndef WIFEXITED -+# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) -+#endif -+ - int - main () - { +-int +-main () +-{ -return TIFFWriteScanline (); -+ 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 @@ -19324,23 +17953,13 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_tiff_TIFFWriteScanline=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_lib_tiff_TIFFWriteScanline=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 @@ -19486,18 +18105,15 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 "$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="-ltiff34 -ljpeg -lz -lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF @@ -19505,11 +18121,8 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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. */ @@ -19517,15 +18130,14 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -extern "C" -#endif -char TIFFFlushData (); - int - main () - { +-int +-main () +-{ -return TIFFFlushData (); -+return *(signal (0, 0)) (0) == 1; - ; - return 0; - } - _ACEOF +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -19548,9 +18160,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_tiff34_TIFFFlushData=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 - @@ -19561,8 +18171,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 -+ ac_cv_type_signal=void - fi +-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 @@ -19571,8 +18180,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -$as_echo_n "checking for tiffio.h... " >&6; } -if test "${ac_cv_header_tiffio_h+set}" = set; then - $as_echo_n "(cached) " >&6 -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -$as_echo "$ac_cv_header_tiffio_h" >&6; } -else @@ -19587,12 +18195,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -/* end confdefs.h. */ -$ac_includes_default -#include -+{ $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 +-_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -19615,14 +18218,14 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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; } @@ -19652,18 +18255,13 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - test ! -s conftest.err - }; then - ac_header_preproc=yes -+ if test "x$LIBTIFF" != x; then -+ HAVE_TIFF_TRUE= -+ HAVE_TIFF_FALSE='#' - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -+ HAVE_TIFF_TRUE='#' -+ HAVE_TIFF_FALSE= - 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; } @@ -19702,71 +18300,32 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -$as_echo_n "checking for tiffio.h... " >&6; } -if test "${ac_cv_header_tiffio_h+set}" = set; then - $as_echo_n "(cached) " >&6 -+ if test "x$LIBPNG" != x; then -+ HAVE_PNG_TRUE= -+ HAVE_PNG_FALSE='#' - else +-else - ac_cv_header_tiffio_h=$ac_header_preproc -+ HAVE_PNG_TRUE='#' -+ HAVE_PNG_FALSE= - fi +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -$as_echo "$ac_cv_header_tiffio_h" >&6; } - -+ if test "x$LIBJPEG" != x; then -+ HAVE_JPEG_TRUE= -+ HAVE_JPEG_FALSE='#' -+else -+ HAVE_JPEG_TRUE='#' -+ HAVE_JPEG_FALSE= - fi +- +-fi -if test "x$ac_cv_header_tiffio_h" = x""yes; then - TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz' -+ -+ if test "x$LIBJASPER" != x; then -+ HAVE_JASPER_TRUE= -+ HAVE_JASPER_FALSE='#' - else +-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;} -+ 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 +-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 -+# 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 +- +-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 @@ -19778,57 +18337,39 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -*** not work properly" >&2;} - { (exit 1); exit 1; }; } - 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 - +-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 "$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="-ljpeg $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 - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. -@@ -26593,116 +22543,50 @@ - #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 jpeg_destroy_decompress (); -+char mlib_ImageSetStruct (); - int - main () - { +-int +-main () +-{ -return jpeg_destroy_decompress (); -+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 @@ -19851,23 +18392,18 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_jpeg_jpeg_destroy_decompress=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_jpeg_jpeg_destroy_decompress=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_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 @@ -19876,14 +18412,8 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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;} -+{ $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 +- - if test "$jpeg_ok" = yes; then - { $as_echo "$as_me:$LINENO: checking for jpeglib.h" >&5 -$as_echo_n "checking for jpeglib.h... " >&6; } @@ -19920,12 +18450,10 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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; } @@ -19934,44 +18462,32 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 -+ 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="-ljpeg $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 - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. -@@ -26711,3376 +22595,554 @@ - #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 jpeg_simple_progression (); -+char mlib_VideoColorRGBint_to_BGRAint (); - int - main () - { +-int +-main () +-{ -return jpeg_simple_progression (); -+return mlib_VideoColorRGBint_to_BGRAint (); - ; - return 0; - } - _ACEOF +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -19994,23 +18510,18 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_jpeg_jpeg_simple_progression=yes -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=yes - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_jpeg_jpeg_simple_progression=no -+ ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=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_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 @@ -20019,24 +18530,18 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -#define HAVE_PROGRESSIVE_JPEG 1 -_ACEOF - -+{ $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 +-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;} -+ use_mlib25=no - fi - +-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 @@ -20049,8 +18554,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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; } @@ -20067,12 +18571,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 -+ fi -+fi -+ if test $use_mlib = yes; then -+ USE_MEDIALIB_TRUE= -+ USE_MEDIALIB_FALSE='#' - else +-else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpng -lz -lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF @@ -20081,10 +18580,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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. */ @@ -20122,18 +18618,13 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_png_png_read_info=yes -+ if test $use_mlib25 = yes; then -+ USE_MEDIALIB25_TRUE= -+ USE_MEDIALIB25_FALSE='#' - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_png_png_read_info=no -+ USE_MEDIALIB25_TRUE='#' -+ USE_MEDIALIB25_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 @@ -20168,39 +18659,11 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -+ -+# 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 +-esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 -+{ $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=$? +- ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 @@ -20213,21 +18676,14 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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; } @@ -20260,17 +18716,10 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 -+ { $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 - +-fi +- -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } @@ -20309,39 +18758,25 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -$as_echo_n "checking for png.h... " >&6; } -if test "${ac_cv_header_png_h+set}" = set; then - $as_echo_n "(cached) " >&6 -+ if test x$use_mmx_asm = xyes; then -+ USE_MMX_TRUE= -+ USE_MMX_FALSE='#' - else +-else - ac_cv_header_png_h=$ac_header_preproc -+ USE_MMX_TRUE='#' -+ USE_MMX_FALSE= - fi +-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 -+ -+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 +-fi +- +- +-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;} -+ CROSS_COMPILING_TRUE='#' -+ CROSS_COMPILING_FALSE= - fi - +-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; } @@ -20379,51 +18814,13 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - png_ok=yes -+ -+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 +-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 -+ 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 - +-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; } @@ -20453,18 +18850,13 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 -+ # 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 +- $as_echo_n "(cached) " >&6 +-else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ljasper -ljpeg $LIBS" -cat >conftest.$ac_ext <<_ACEOF @@ -20473,26 +18865,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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. */ @@ -20513,9 +18886,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -+ test -z "$ac_cv_path_GTK_UPDATE_ICON_CACHE" && ac_cv_path_GTK_UPDATE_ICON_CACHE="no" -+ ;; - esac +-esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 @@ -20532,20 +18903,13 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_jasper_jas_init=yes -+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 +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_jasper_jas_init=no -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - +-fi +- -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext @@ -20556,12 +18920,9 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -if test "x$ac_cv_lib_jasper_jas_init" = x""yes; then - LIBJASPER=-ljasper -fi - -+ if test x$GTK_UPDATE_ICON_CACHE = xno; then -+ REBUILD_PNGS=# - fi -+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 @@ -20571,30 +18932,12 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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='#' @@ -20602,53 +18945,21 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 @@ -20657,47 +18968,29 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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" +- +-all_loaders="ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm,qtif" -if test x$with_libjasper != xno; then - all_loaders="$all_loaders,jasper" -+# Check whether --with-x was given. -+if test "${with_x+set}" = set; then : -+ withval=$with_x; - fi +-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 -+ -+# $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 - 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" -+ 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 +-else - included_loaders="$with_included_loaders" -fi - @@ -20866,6 +19159,14 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - INCLUDE_JASPER_FALSE= -fi - +- if test x"$INCLUDE_qtif" = xyes; then +- INCLUDE_QTIF_TRUE= +- INCLUDE_QTIF_FALSE='#' +-else +- INCLUDE_QTIF_TRUE='#' +- INCLUDE_QTIF_FALSE= +-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 @@ -21055,14 +19356,16 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - INCLUDE_IM_AM_ET_TRUE='#' - INCLUDE_IM_AM_ET_FALSE= -fi -- ++if ac_fn_c_try_run "$LINENO"; then : + - if test x"$INCLUDE_cedilla" = xyes; then - INCLUDE_IM_CEDILLA_TRUE= - INCLUDE_IM_CEDILLA_FALSE='#' --else + else - INCLUDE_IM_CEDILLA_TRUE='#' - INCLUDE_IM_CEDILLA_FALSE= --fi ++ no_glib=yes + fi - - if test x"$INCLUDE_cyrillic_translit" = xyes; then - INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE= @@ -21070,8 +19373,10 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -else - INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE='#' - INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE= --fi -- ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext + fi + - if test x"$INCLUDE_ime" = xyes; then - INCLUDE_IM_IME_TRUE= - INCLUDE_IM_IME_FALSE='#' @@ -21079,7 +19384,32 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - INCLUDE_IM_IME_TRUE='#' - INCLUDE_IM_IME_FALSE= -fi -- ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ if test "x$no_glib" = x ; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5 ++$as_echo "yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; } ++ : ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ if test "$PKG_CONFIG" = "no" ; then ++ echo "*** A new enough version of pkg-config was not found." ++ echo "*** See http://www.freedesktop.org/software/pkgconfig/" ++ else ++ if test -f conf.glibtest ; then ++ : ++ else ++ echo "*** Could not run GLIB test program, checking why..." ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $GLIB_CFLAGS" ++ LIBS="$LIBS $GLIB_LIBS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ + - if test x"$INCLUDE_inuktitut" = xyes; then - INCLUDE_IM_INUKTITUT_TRUE= - INCLUDE_IM_INUKTITUT_FALSE='#' @@ -21087,15 +19417,52 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - INCLUDE_IM_INUKTITUT_TRUE='#' - INCLUDE_IM_INUKTITUT_FALSE= -fi -- ++#include ++#include + - if test x"$INCLUDE_ipa" = xyes; then - INCLUDE_IM_IPA_TRUE= - INCLUDE_IM_IPA_FALSE='#' --else ++int ++main () ++{ ++ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ 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" ++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" ++ echo "*** to the installed location Also, make sure you have run ldconfig if that" ++ echo "*** is required on your system" ++ echo "***" ++ 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 - INCLUDE_IM_IPA_TRUE='#' - INCLUDE_IM_IPA_FALSE= --fi -- ++ echo "*** The test program failed to compile or link. See the file config.log for the" ++ echo "*** exact error that occured. This usually means GLIB is incorrectly installed." + fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ GLIB_CFLAGS="" ++ GLIB_LIBS="" ++ GLIB_GENMARSHAL="" ++ 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 + - if test x"$INCLUDE_multipress" = xyes; then - INCLUDE_IM_MULTIPRESS_TRUE= - INCLUDE_IM_MULTIPRESS_FALSE='#' @@ -21103,7 +19470,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - INCLUDE_IM_MULTIPRESS_TRUE='#' - INCLUDE_IM_MULTIPRESS_FALSE= -fi -- + - if test x"$INCLUDE_thai" = xyes; then - INCLUDE_IM_THAI_TRUE= - INCLUDE_IM_THAI_FALSE='#' @@ -21111,7 +19478,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - INCLUDE_IM_THAI_TRUE='#' - INCLUDE_IM_THAI_FALSE= -fi -- + - if test x"$INCLUDE_ti_er" = xyes; then - INCLUDE_IM_TI_ER_TRUE= - INCLUDE_IM_TI_ER_FALSE='#' @@ -21119,7 +19486,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - 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='#' @@ -21127,7 +19494,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - 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='#' @@ -21135,16 +19502,24 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - INCLUDE_IM_VIQR_TRUE='#' - INCLUDE_IM_VIQR_FALSE= -fi -- ++ rm -f conf.glibtest + - 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 -- -- ++ ++# 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" + -{ $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 @@ -21164,7 +19539,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -#ifndef WIFEXITED -# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) -#endif -- + -int -main () -{ @@ -21174,7 +19549,15 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - ; - return 0; -} --_ACEOF ++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 -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -21197,23 +19580,34 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- + - ac_cv_header_sys_wait_h=no --fi -- + fi ++done + -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 -- ++LIBS=$gtk_save_LIBS + -cat >>confdefs.h <<\_ACEOF -#define HAVE_SYS_WAIT_H 1 --_ACEOF -- --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 + ++$as_echo "#define HAVE_PWD_H 1" >>confdefs.h ++ + fi + ++done + -{ $as_echo "$as_me:$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 @@ -21221,13 +19615,19 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ --_ACEOF ++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 -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -- + -int -main () -{ @@ -21258,20 +19658,29 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++$as_echo "#define HAVE_SYS_TIME_H 1" >>confdefs.h + - ac_cv_type_signal=void --fi -- + 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 "$ac_cv_type_signal" >&6; } -- ++done + -cat >>confdefs.h <<_ACEOF -#define RETSIGTYPE $ac_cv_type_signal --_ACEOF -- -- ++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 + - - if test "x$LIBTIFF" != x; then - HAVE_TIFF_TRUE= @@ -21279,33 +19688,76 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -else - HAVE_TIFF_TRUE='#' - HAVE_TIFF_FALSE= --fi -- + fi + - if test "x$LIBPNG" != x; then - HAVE_PNG_TRUE= - HAVE_PNG_FALSE='#' -else - HAVE_PNG_TRUE='#' - HAVE_PNG_FALSE= --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 + - if test "x$LIBJPEG" != x; then - HAVE_JPEG_TRUE= - HAVE_JPEG_FALSE='#' --else ++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 - HAVE_JPEG_TRUE='#' - HAVE_JPEG_FALSE= --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; } ++ ++$as_echo "#define HAVE_GNU_FTW 1" >>confdefs.h + - if test "x$LIBJASPER" != x; then - HAVE_JASPER_TRUE= - HAVE_JASPER_FALSE='#' --else + else - HAVE_JASPER_TRUE='#' - HAVE_JASPER_FALSE= --fi -- -- ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + ++saved_cflags="$CFLAGS" ++saved_ldflags="$LDFLAGS" + -if $dynworks ; then - STATIC_LIB_DEPS= - if echo "$included_loaders" | egrep '(^|,)tiff($|,)' > /dev/null; then @@ -21323,7 +19775,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -else - STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG $LIBJASPER" -fi -- + -# Checks to see whether we should include mediaLib -# support. -# @@ -21331,11 +19783,15 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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_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 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_systeminfo_h" >&5 -$as_echo "$ac_cv_header_sys_systeminfo_h" >&6; } --else + else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking sys/systeminfo.h usability" >&5 -$as_echo_n "checking sys/systeminfo.h usability... " >&6; } @@ -21344,10 +19800,23 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 --_ACEOF ++#include ++#include ++#include ++#include ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} + _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -21367,17 +19836,20 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 sys/systeminfo.h presence" >&5 -$as_echo_n "checking sys/systeminfo.h presence... " >&6; } @@ -21386,7 +19858,10 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" @@ -21413,11 +19888,15 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - - ac_header_preproc=no -fi -- ++#include + -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } -- ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "memchr" >/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: ) @@ -21452,31 +19931,49 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -$as_echo_n "checking for sys/systeminfo.h... " >&6; } -if test "${ac_cv_header_sys_systeminfo_h+set}" = set; then - $as_echo_n "(cached) " >&6 --else + else - ac_cv_header_sys_systeminfo_h=$ac_header_preproc --fi ++ ac_cv_header_stdc=no + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_systeminfo_h" >&5 -$as_echo "$ac_cv_header_sys_systeminfo_h" >&6; } -- --fi ++rm -f conftest* + + fi -if test "x$ac_cv_header_sys_systeminfo_h" = x""yes; then -- + -cat >>confdefs.h <<\_ACEOF -#define HAVE_SYS_SYSTEMINFO_H 1 --_ACEOF -- --fi -- ++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 ++ ac_cv_header_stdc=no + fi ++rm -f conftest* + - -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 ++ ++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 - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking sys/sysinfo.h usability" >&5 -$as_echo_n "checking sys/sysinfo.h usability... " >&6; } @@ -21485,10 +19982,35 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 --_ACEOF ++#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 -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -21511,14 +20033,25 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++if ac_fn_c_try_run "$LINENO"; then : + - ac_header_compiler=no --fi -- ++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 + -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 ++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 + -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking sys/sysinfo.h presence" >&5 -$as_echo_n "checking sys/sysinfo.h presence... " >&6; } @@ -21551,14 +20084,15 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++$as_echo "#define STDC_HEADERS 1" >>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: ) @@ -21592,23 +20126,96 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -{ $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 --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 - ac_cv_header_sys_sysinfo_h=$ac_header_preproc --fi ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++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; ++ ++ *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 ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_c_const=yes ++else ++ ac_cv_c_const=no + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysinfo_h" >&5 -$as_echo "$ac_cv_header_sys_sysinfo_h" >&6; } - --fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi -if test "x$ac_cv_header_sys_sysinfo_h" = x""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_SYSINFO_H 1 -_ACEOF -- --fi -- -- ++$as_echo "#define const /**/" >>confdefs.h + + fi + + - -{ $as_echo "$as_me:$LINENO: checking for mediaLib 2.3" >&5 -$as_echo_n "checking for mediaLib 2.3... " >&6; } @@ -21618,8 +20225,12 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -{ $as_echo "$as_me:$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 ++# 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 - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmlib $LIBS" -cat >conftest.$ac_ext <<_ACEOF @@ -21627,8 +20238,11 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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. */ @@ -21636,14 +20250,15 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -extern "C" -#endif -char mlib_ImageSetStruct (); --int --main () --{ + int + main () + { -return mlib_ImageSetStruct (); -- ; -- 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 @@ -21666,7 +20281,9 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_mlib_mlib_ImageSetStruct=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 - @@ -21677,23 +20294,29 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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_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 -- ++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; } + -if test $use_mlib = yes; then - -cat >>confdefs.h <<\_ACEOF -#define USE_MEDIALIB 1 --_ACEOF -- ++cat >>confdefs.h <<_ACEOF ++#define RETSIGTYPE $ac_cv_type_signal + _ACEOF + - MEDIA_LIB=-lmlib -- + - { $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 @@ -21711,7 +20334,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -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. */ @@ -21726,7 +20349,18 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - ; - return 0; -} --_ACEOF ++ ++ ++ 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 -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -21752,10 +20386,10 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- + - ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=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 @@ -21768,13 +20402,26 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -else - use_mlib25=no -fi -- ++done ++ ++ ++ ++ ++ ++ + - if test $use_mlib25 = yes; then -- + -cat >>confdefs.h <<\_ACEOF -#define USE_MEDIALIB25 1 --_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 + - fi -fi - if test $use_mlib = yes; then @@ -21783,17 +20430,46 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -else - USE_MEDIALIB_TRUE='#' - USE_MEDIALIB_FALSE= --fi -- + fi ++done + - if test $use_mlib25 = yes; then - USE_MEDIALIB25_TRUE= - USE_MEDIALIB25_FALSE='#' --else ++{ $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 - USE_MEDIALIB25_TRUE='#' - USE_MEDIALIB25_FALSE= -fi -- -- ++ 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. + -# 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.) @@ -21811,12 +20487,18 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -esac -{ $as_echo "$as_me:$LINENO: result: $use_x86_asm" >&5 -$as_echo "$use_x86_asm" >&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) */ + -use_mmx_asm=no -if test $use_x86_asm = yes; then - save_ac_ext=$ac_ext - ac_ext=S -- ++#include ++#include + - { $as_echo "$as_me:$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 @@ -21827,16 +20509,90 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - (exit $ac_status); }; then - use_mmx_asm=yes - fi -- ++#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H ++char *malloc (); ++#endif + - rm -rf conftest* -- ++/* 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 */ + - ac_ext=$save_ac_ext - if test $use_mmx_asm = yes; then -- ++#endif /* no HAVE_GETPAGESIZE */ ++ ++int ++main () ++{ ++ char *data, *data2, *data3; ++ const char *cdata2; ++ int i, pagesize; ++ int fd, fd2; ++ ++ 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 2; ++ if (write (fd, data, pagesize) != pagesize) ++ return 3; ++ close (fd); + -cat >>confdefs.h <<\_ACEOF -#define USE_MMX 1 -_ACEOF -- ++ /* 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; + - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - else @@ -21844,31 +20600,71 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -$as_echo "no" >&6; } - fi -fi -- ++ /* 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; + - if test x$use_mmx_asm = xyes; then - USE_MMX_TRUE= - USE_MMX_FALSE='#' --else ++ /* 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_fn_c_try_run "$LINENO"; then : ++ ac_cv_func_mmap_fixed_mapped=yes + else - USE_MMX_TRUE='#' - USE_MMX_FALSE= --fi -- ++ 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 + - -REBUILD_PNGS= -if test -z "$LIBPNG" && test x"$os_win32" = xno -o x$enable_gdiplus = xno; then - REBUILD_PNGS=# --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 + ++$as_echo "#define HAVE_MMAP 1" >>confdefs.h + - if test $cross_compiling = yes; then - CROSS_COMPILING_TRUE= - CROSS_COMPILING_FALSE='#' -else - CROSS_COMPILING_TRUE='#' - CROSS_COMPILING_FALSE= --fi -- -- + fi ++rm -f conftest.mmap conftest.txt + + -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 @@ -21896,7 +20692,14 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -done -done -IFS=$as_save_IFS -- ++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 + - test -z "$ac_cv_path_GDK_PIXBUF_CSOURCE" && ac_cv_path_GDK_PIXBUF_CSOURCE="no" - ;; -esac @@ -21908,9 +20711,17 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } --fi -- -- + 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 + - # 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 @@ -21935,9 +20746,10 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - break 2 - fi -done --done ++fi + done -IFS=$as_save_IFS -- + - test -z "$ac_cv_path_GTK_UPDATE_ICON_CACHE" && ac_cv_path_GTK_UPDATE_ICON_CACHE="no" - ;; -esac @@ -21946,17 +20758,31 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -if test -n "$GTK_UPDATE_ICON_CACHE"; then - { $as_echo "$as_me:$LINENO: result: $GTK_UPDATE_ICON_CACHE" >&5 -$as_echo "$GTK_UPDATE_ICON_CACHE" >&6; } --else ++{ $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 "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - -- ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include + - if test x$GTK_UPDATE_ICON_CACHE = xno; then - REBUILD_PNGS=# - fi --fi -- ++_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 ++rm -f conftest* + -if test ! -f $srcdir/gtk/gtkbuiltincache.h && - test "x$REBUILD_PNGS" = "x#" ; then - { { $as_echo "$as_me:$LINENO: error: @@ -21968,10 +20794,14 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 -- -- -- + 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 + + -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= @@ -22034,12 +20864,13 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - { $as_echo "$as_me:$LINENO: checking for X" >&5 -$as_echo_n "checking for X... " >&6; } - -- ++$as_echo "#define gid_t int" >>confdefs.h + -# Check whether --with-x was given. -if test "${with_x+set}" = set; then - withval=$with_x; --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. @@ -22091,8 +20922,35 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - fi - cd .. - rm -f -r conftest.dir --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. */ ++#include ++int ++main () ++{ ++fd_set readMask, writeMask; ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ gtk_ok=yes ++else ++ 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, found in sys/types.h" >&5 ++$as_echo "yes, found in sys/types.h" >&6; } ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include + -# 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=' @@ -22105,31 +20963,47 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -/usr/include/X11R6 -/usr/include/X11R5 -/usr/include/X11R4 -- ++_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* + -/usr/local/X11/include -/usr/local/X11R6/include -/usr/local/X11R5/include -/usr/local/X11R4/include -- ++ if test $gtk_ok = yes; then + -/usr/local/include/X11 -/usr/local/include/X11R6 -/usr/local/include/X11R5 -/usr/local/include/X11R4 -- ++$as_echo "#define HAVE_SYS_SELECT_H 1" >>confdefs.h + -/usr/X386/include -/usr/x386/include -/usr/XFree86/include/X11 -- ++ { $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 + -/usr/include -/usr/local/include -/usr/unsupported/include -/usr/athena/include -/usr/local/x11r5/include -/usr/lpp/Xamples/include -- ++$as_echo "#define NO_FD_SET 1" >>confdefs.h + -/usr/openwin/include -/usr/openwin/share/include' -- ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ fi ++fi + -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. @@ -22138,9 +21012,14 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -22160,21 +21039,44 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - }; then - # We can compile using X headers with no special include directory. -ac_x_includes= --else ++if ac_fn_c_try_cpp "$LINENO"; then : ++ gdk_wchar_h=yes + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++ gdk_wchar_h=no ++fi ++rm -f conftest.err conftest.$ac_ext ++if test $gdk_wchar_h = yes; then ++ ++$as_echo "#define HAVE_WCHAR_H 1" >>confdefs.h + - 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 ++{ $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 ++ gdk_wctype_h=no ++fi + rm -f conftest.err conftest.$ac_ext -fi # $ac_x_includes = no -- ++if test $gdk_wctype_h = yes; then + -if test "$ac_x_libraries" = no; then - # Check for the libraries. - # See if we find them without any special options. @@ -22183,19 +21085,94 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - LIBS="-lX11 $LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ --_ACEOF ++$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 : ++ ++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 ++LIBS="-lw $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 iswalnum (); ++int ++main () ++{ ++return iswalnum (); ++ ; ++ 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 : ++ ac_cv_lib_w_iswalnum=yes ++else ++ ac_cv_lib_w_iswalnum=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_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 ++ ++ ++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 () --{ ++#include + int + main () + { -XrmInitialize () -- ; -- 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 conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -22220,10 +21197,59 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - LIBS=$ac_save_LIBS -# We can link X programs with no special library path. -ac_x_libraries= --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 -- ++ 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 ++ ++$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; } ++ ++ ++# 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 ++if ac_fn_c_try_cpp "$LINENO"; then : ++ gtk_uxtheme_h=yes ++else ++ 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 ++{ $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 + - LIBS=$ac_save_LIBS -for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` -do @@ -22234,14 +21260,24 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - break 2 - fi - done --done --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 ++ + fi ++done + -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. @@ -22251,14 +21287,23 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - ac_cv_have_x="have_x=yes\ - ac_x_includes='$ac_x_includes'\ - ac_x_libraries='$ac_x_libraries'" --esac ++ ++################################################## ++# Checks for gdk-pixbuf ++################################################## ++ ++ ++use_la_modules=false ++case $host in ++ *-aix*) use_la_modules=true + esac -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; } @@ -22274,20 +21319,23 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 -$as_echo "libraries $x_libraries, headers $x_includes" >&6; } -fi -- ++if $use_la_modules ; then + -if test "$no_x" = yes; then - # Not all programs may use this symbol, but it does not hurt to define it. -- ++$as_echo "#define USE_LA_MODULES 1" >>confdefs.h + -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" - 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" @@ -22304,11 +21352,17 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -- ++{ $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; } + -int -main () -{ -- ++# Check whether --enable-modules was given. ++if test "${enable_modules+set}" = set; then : ++ enableval=$enable_modules; ++fi + - ; - return 0; -} @@ -22335,12 +21389,26 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_test_x conftest$ac_exeext - }; then - { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } ++ ++dynworks=false ++deps= ++if test x$enable_modules = xno; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } - X_LIBS="$X_LIBS -R$x_libraries" --else + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++ { $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 + - LIBS="$ac_xsave_LIBS -R $x_libraries" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ @@ -22348,11 +21416,23 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -- ++ 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 + -int -main () -{ -- ++ if $dynworks; then + - ; - return 0; -} @@ -22379,32 +21459,53 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_test_x conftest$ac_exeext - }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } ++$as_echo "#define USE_GMODULE 1" >>confdefs.h ++ ++ { $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 -- ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ fi ++fi + - { $as_echo "$as_me:$LINENO: result: neither works" >&5 -$as_echo "neither works" >&6; } --fi -- ++ ++ ++# Check whether --with-libpng was given. ++if test "${with_libpng+set}" = set; then : ++ withval=$with_libpng; + fi + -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext --fi -- ++ ++# Check whether --with-libjpeg was given. ++if test "${with_libjpeg+set}" = set; then : ++ withval=$with_libjpeg; + 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 - 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. -- ++# Check whether --with-libtiff was given. ++if test "${with_libtiff+set}" = set; then : ++ withval=$with_libtiff; ++fi + - if test "$ISC" = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" - else @@ -22418,7 +21519,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -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. */ @@ -22456,39 +21557,68 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_test_x conftest$ac_exeext - }; then - : --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 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++ enable_gdiplus=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 -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS ++ ++ 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 ++ ++ ++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="-ldnet $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="-ltiff -lm $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -29015,68 +21488,45 @@ + #ifdef __cplusplus + extern "C" + #endif -char dnet_ntoa (); --int --main () --{ ++char TIFFReadRGBAImageOriented (); + int + main () + { -return dnet_ntoa (); -- ; -- 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 @@ -22511,54 +21641,76 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_dnet_dnet_ntoa=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 - - ac_cv_lib_dnet_dnet_ntoa=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 --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_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 -- ++{ $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 + - 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 --else -- ac_check_lib_save_LIBS=$LIBS ++ ++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="-ldnet_stub $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="-ltiff -ljpeg -lz -lm $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -29085,98 +21535,46 @@ + #ifdef __cplusplus + extern "C" + #endif -char dnet_ntoa (); --int --main () --{ ++char TIFFWriteScanline (); + int + main () + { -return dnet_ntoa (); -- ; -- return 0; --} --_ACEOF ++return TIFFWriteScanline (); + ; + return 0; + } + _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -22581,18 +21733,23 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_dnet_stub_dnet_ntoa=yes --else ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_tiff_TIFFWriteScanline=yes + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dnet_stub_dnet_ntoa=no --fi ++ ac_cv_lib_tiff_TIFFWriteScanline=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_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 @@ -22600,13 +21757,22 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -fi - - fi --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 -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) @@ -22618,14 +21784,21 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5 -$as_echo_n "checking for gethostbyname... " >&6; } -if test "${ac_cv_func_gethostbyname+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 gethostbyname to an innocuous variant, in case declares gethostbyname. - For example, HP-UX 11i declares gettimeofday. */ -#define gethostbyname innocuous_gethostbyname @@ -22642,13 +21815,13 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -#endif - -#undef gethostbyname -- --/* 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 +@@ -29184,71 +21582,65 @@ + #ifdef __cplusplus + extern "C" + #endif -char gethostbyname (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named @@ -22657,14 +21830,16 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -choke me -#endif - --int --main () --{ ++char TIFFFlushData (); + int + main () + { -return gethostbyname (); -- ; -- 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 @@ -22687,50 +21862,92 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_gethostbyname=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 ++ + - ac_cv_func_gethostbyname=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 -{ $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; } -if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS ++fi ++ ++ fi ++ ++ 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 + ac_check_lib_save_LIBS=$LIBS -LIBS="-lnsl $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="-ljpeg $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -29257,68 +21649,63 @@ + #ifdef __cplusplus + extern "C" + #endif -char gethostbyname (); --int --main () --{ ++char jpeg_destroy_decompress (); + int + main () + { -return gethostbyname (); -- ; -- 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 @@ -22753,54 +21970,94 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_nsl_gethostbyname=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 - - ac_cv_lib_nsl_gethostbyname=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 --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_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 -- ++{ $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 + - 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 --else -- ac_check_lib_save_LIBS=$LIBS ++ 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 ++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="-lbsd $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="-ljpeg $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -29327,92 +21714,71 @@ + #ifdef __cplusplus + extern "C" + #endif -char gethostbyname (); --int --main () --{ ++char jpeg_simple_progression (); + int + main () + { -return gethostbyname (); -- ; -- return 0; --} --_ACEOF ++return jpeg_simple_progression (); + ; + return 0; + } + _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -22823,27 +22080,45 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_bsd_gethostbyname=yes --else ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_jpeg_jpeg_simple_progression=yes + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_bsd_gethostbyname=no --fi ++ ac_cv_lib_jpeg_jpeg_simple_progression=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_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 -- ++{ $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 : ++ ++$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 + ++ 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 + - # 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 @@ -22854,14 +22129,40 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - { $as_echo "$as_me:$LINENO: checking for connect" >&5 -$as_echo_n "checking for connect... " >&6; } -if test "${ac_cv_func_connect+set}" = set; then -- $as_echo_n "(cached) " >&6 --else ++ 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 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 connect to an innocuous variant, in case declares connect. - For example, HP-UX 11i declares gettimeofday. */ -#define connect innocuous_connect @@ -22878,13 +22179,13 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -#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. */ --#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 +@@ -29420,71 +21786,92 @@ + #ifdef __cplusplus + extern "C" + #endif -char connect (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named @@ -22893,14 +22194,16 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -choke me -#endif - --int --main () --{ ++char png_read_info (); + int + main () + { -return connect (); -- ; -- 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 @@ -22923,50 +22226,120 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_connect=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_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 + - ac_cv_func_connect=no --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 ++ ++ 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 + -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:$LINENO: result: $ac_cv_func_connect" >&5 -$as_echo "$ac_cv_func_connect" >&6; } -- ++ 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 $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 --else -- ac_check_lib_save_LIBS=$LIBS ++ 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="-lsocket $X_EXTRA_LIBS $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. +@@ -29493,898 +21880,672 @@ + #ifdef __cplusplus + extern "C" + #endif -char connect (); --int --main () --{ ++char jas_init (); + int + main () + { -return connect (); -- ; -- 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 @@ -22989,32 +22362,56 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_socket_connect=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_socket_connect=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_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 -- ++{ $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 -- ++ 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_n "(cached) " >&6 --else ++ 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 - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF @@ -23024,20 +22421,28 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -/* Define remove to an innocuous variant, in case declares remove. - For example, HP-UX 11i declares gettimeofday. */ -#define remove innocuous_remove -- ++ BUILD_DYNAMIC_MODULES_TRUE='#' ++ BUILD_DYNAMIC_MODULES_FALSE= ++fi + -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char remove (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -- + -#ifdef __STDC__ -# include -#else -# include -#endif -- ++# ++# 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; } + -#undef remove -- + -/* 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. */ @@ -23051,7 +22456,11 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -#if defined __stub_remove || defined __stub___remove -choke me -#endif -- ++# Check whether --with-included_loaders was given. ++if test "${with_included_loaders+set}" = set; then : ++ withval=$with_included_loaders; ++fi + -int -main () -{ @@ -23082,26 +22491,93 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_remove=yes --else ++ ++if $dynworks; then ++ : + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++ ## 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+ + - ac_cv_func_remove=no --fi -- ++all_loaders="ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm,qtif" ++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 + -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: $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 -{ $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_n "(cached) " >&6 --else ++IFS="$gtk_save_ifs" ++ ++ ++ ++ if test x"$INCLUDE_png" = xyes; then ++ INCLUDE_PNG_TRUE= ++ INCLUDE_PNG_FALSE='#' + else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lposix $LIBS" -cat >conftest.$ac_ext <<_ACEOF @@ -23110,7 +22586,10 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -- ++ INCLUDE_PNG_TRUE='#' ++ INCLUDE_PNG_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. */ @@ -23125,19 +22604,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - ; - 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 +-_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -23160,48 +22627,55 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_posix_remove=yes --else ++ if test x"$INCLUDE_bmp" = xyes; then ++ INCLUDE_BMP_TRUE= ++ INCLUDE_BMP_FALSE='#' + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++ INCLUDE_BMP_TRUE='#' ++ INCLUDE_BMP_FALSE= ++fi + - ac_cv_lib_posix_remove=no --fi -- ++ if test x"$INCLUDE_wbmp" = xyes; then ++ INCLUDE_WBMP_TRUE= ++ INCLUDE_WBMP_FALSE='#' ++else ++ 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 -LIBS=$ac_check_lib_save_LIBS --fi ++ if test x"$INCLUDE_gif" = xyes; then ++ INCLUDE_GIF_TRUE= ++ INCLUDE_GIF_FALSE='#' ++else ++ INCLUDE_GIF_TRUE='#' ++ INCLUDE_GIF_FALSE= + 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 (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 ++ ++ 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 - fi @@ -23211,7 +22685,10 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -$as_echo_n "checking for shmat... " >&6; } -if test "${ac_cv_func_shmat+set}" = set; then - $as_echo_n "(cached) " >&6 --else ++ if test x"$INCLUDE_jpeg" = xyes; then ++ INCLUDE_JPEG_TRUE= ++ INCLUDE_JPEG_FALSE='#' + else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF @@ -23226,32 +22703,31 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - which can conflict with char shmat (); 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 ++ INCLUDE_JPEG_TRUE='#' ++ INCLUDE_JPEG_FALSE= ++fi -#ifdef __STDC__ -# include -#else -# include -#endif -+/usr/include/X11 -+/usr/include/X11R7 -+/usr/include/X11R6 -+/usr/include/X11R5 -+/usr/include/X11R4 ++ if test x"$INCLUDE_pnm" = xyes; then ++ INCLUDE_PNM_TRUE= ++ INCLUDE_PNM_FALSE='#' ++else ++ INCLUDE_PNM_TRUE='#' ++ INCLUDE_PNM_FALSE= ++fi -#undef shmat -+/usr/local/X11/include -+/usr/local/X11R7/include -+/usr/local/X11R6/include -+/usr/local/X11R5/include -+/usr/local/X11R4/include ++ if test x"$INCLUDE_ras" = xyes; then ++ INCLUDE_RAS_TRUE= ++ INCLUDE_RAS_FALSE='#' ++else ++ INCLUDE_RAS_TRUE='#' ++ INCLUDE_RAS_FALSE= ++fi -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC @@ -23266,11 +22742,13 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 ++ if test x"$INCLUDE_tiff" = xyes; then ++ INCLUDE_TIFF_TRUE= ++ INCLUDE_TIFF_FALSE='#' ++else ++ INCLUDE_TIFF_TRUE='#' ++ INCLUDE_TIFF_FALSE= ++fi -int -main () @@ -23302,37 +22780,47 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_shmat=yes --else ++ if test x"$INCLUDE_xpm" = xyes; then ++ INCLUDE_XPM_TRUE= ++ INCLUDE_XPM_FALSE='#' + 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 ++ INCLUDE_XPM_TRUE='#' ++ INCLUDE_XPM_FALSE= ++fi - ac_cv_func_shmat=no --fi -+/usr/include -+/usr/local/include -+/usr/unsupported/include -+/usr/athena/include -+/usr/local/x11r5/include -+/usr/lpp/Xamples/include ++ if test x"$INCLUDE_xbm" = xyes; then ++ INCLUDE_XBM_TRUE= ++ INCLUDE_XBM_FALSE='#' ++else ++ INCLUDE_XBM_TRUE='#' ++ INCLUDE_XBM_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_tga" = xyes; then ++ INCLUDE_TGA_TRUE= ++ INCLUDE_TGA_FALSE='#' ++else ++ INCLUDE_TGA_TRUE='#' ++ INCLUDE_TGA_FALSE= + 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_n "(cached) " >&6 --else ++ if test x"$INCLUDE_pcx" = xyes; then ++ INCLUDE_PCX_TRUE= ++ INCLUDE_PCX_FALSE='#' + else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lipc $LIBS" -cat >conftest.$ac_ext <<_ACEOF @@ -23340,12 +22828,11 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+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. */ -- +-/* end confdefs.h. */ ++ INCLUDE_PCX_TRUE='#' ++ INCLUDE_PCX_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. */ @@ -23383,27 +22870,54 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_ipc_shmat=yes --else ++ if test x"$INCLUDE_icns" = xyes; then ++ INCLUDE_ICNS_TRUE= ++ INCLUDE_ICNS_FALSE='#' + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++ INCLUDE_ICNS_TRUE='#' ++ INCLUDE_ICNS_FALSE= ++fi + - ac_cv_lib_ipc_shmat=no --fi -- ++ if test x"$INCLUDE_jasper" = xyes; then ++ INCLUDE_JASPER_TRUE= ++ INCLUDE_JASPER_FALSE='#' ++else ++ INCLUDE_JASPER_TRUE='#' ++ INCLUDE_JASPER_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 ++ if test x"$INCLUDE_qtif" = xyes; then ++ INCLUDE_QTIF_TRUE= ++ INCLUDE_QTIF_FALSE='#' ++else ++ INCLUDE_QTIF_TRUE='#' ++ INCLUDE_QTIF_FALSE= + 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" --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 - fi -- + - # Check for libraries that X11R6 Xt/Xaw programs need. - ac_save_LDFLAGS=$LDFLAGS - test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" @@ -23417,29 +22931,28 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -$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 ++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 - ac_check_lib_save_LIBS=$LIBS -LIBS="-lICE $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -+#include - _ACEOF +-_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* 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 ++ 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 @@ -23448,23 +22961,41 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -extern "C" -#endif -char IceConnectionNumber (); -+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 () - { +-int +-main () +-{ -return IceConnectionNumber (); -+XrmInitialize () - ; - return 0; - } +- ; +- return 0; +-} ++ #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 -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" @@ -23488,31 +23019,13 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_ICE_IceConnectionNumber=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= - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_ICE_IceConnectionNumber=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 - +-fi +- -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext @@ -23522,39 +23035,18 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -$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" -+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 +-fi ++if ac_fn_c_try_run "$LINENO"; then : ++ gio_can_sniff=yes - LDFLAGS=$ac_save_LDFLAGS -- -+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 ++$as_echo "#define GDK_PIXBUF_USE_GIO_MIME 1" >>confdefs.h + +else -+ # 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; } ++ 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 - if test x$no_x = xyes ; then @@ -23562,45 +23054,37 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -$as_echo "$as_me: error: X development libraries not found" >&2;} - { (exit 1); exit 1; }; } - 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" -+$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h ++ { $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 - 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" -+ 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 +- 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; } - # Extra libraries found during checks (-lXinerama, etc), not from pkg-config. - x_extra_libs= -- + - gtk_save_cppflags="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $X_CFLAGS" -+ # 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. */ ++# Check whether --with-included_immodules was given. ++if test "${with_included_immodules+set}" = set; then : ++ withval=$with_included_immodules; ++fi - gtk_save_LIBS=$LIBS - LIBS="$x_libs_for_checks $LIBS" -+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 @@ -23609,23 +23093,15 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -$as_echo_n "checking for XOpenDisplay... " >&6; } -if test "${ac_cv_func_XOpenDisplay+set}" = set; then - $as_echo_n "(cached) " >&6 --else ++if $dynworks; then ++ : + else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -+ ; -+ return 0; -+} - _ACEOF +-_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+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. */ +-/* end confdefs.h. */ -/* Define XOpenDisplay to an innocuous variant, in case declares XOpenDisplay. - For example, HP-UX 11i declares gettimeofday. */ -#define XOpenDisplay innocuous_XOpenDisplay @@ -23642,7 +23118,12 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -#endif - -#undef XOpenDisplay -- ++ ## 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 + -/* 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. */ @@ -23656,16 +23137,23 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -#if defined __stub_XOpenDisplay || defined __stub___XOpenDisplay -choke me -#endif ++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 - 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 @@ -23688,39 +23176,38 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_XOpenDisplay=yes -+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" ++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 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_XOpenDisplay=no --fi -- ++ included_immodules="$with_included_immodules" + 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: neither works" >&5 -+$as_echo "neither works" >&6; } - fi +-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 - : --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:$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; }; } -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext ++ HAVE_INCLUDED_IMMMODULES_TRUE='#' ++ HAVE_INCLUDED_IMMMODULES_FALSE= 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; } @@ -23736,38 +23223,41 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -/* Define XextFindDisplay to an innocuous variant, in case declares XextFindDisplay. - For example, HP-UX 11i declares gettimeofday. */ -#define XextFindDisplay innocuous_XextFindDisplay -- + -/* 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. */ -- ++INCLUDED_IMMODULE_OBJ= ++INCLUDED_IMMODULE_DEFINE= + -#ifdef __STDC__ -# include -#else -# include -#endif -+ # 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. ++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 -#undef XextFindDisplay -+ 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. */ ++ 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" - /* 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 +-/* 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 XextFindDisplay (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named @@ -23775,17 +23265,15 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -#if defined __stub_XextFindDisplay || defined __stub___XextFindDisplay -choke me -#endif -- -+char XOpenDisplay (); - int - main () - { + +-int +-main () +-{ -return XextFindDisplay (); -+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 @@ -23811,10 +23299,16 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- + - ac_cv_func_XextFindDisplay=no --fi -- ++ 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 + -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext @@ -23823,17 +23317,24 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -$as_echo "$ac_cv_func_XextFindDisplay" >&6; } -if test "x$ac_cv_func_XextFindDisplay" = x""yes; then - : --else ++ if test x"$INCLUDE_cedilla" = xyes; then ++ INCLUDE_IM_CEDILLA_TRUE= ++ INCLUDE_IM_CEDILLA_FALSE='#' + 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; }; } --fi -+if ac_fn_c_try_link "$LINENO"; then : ++ INCLUDE_IM_CEDILLA_TRUE='#' ++ INCLUDE_IM_CEDILLA_FALSE= + fi - { $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 ++ if test x"$INCLUDE_cyrillic_translit" = xyes; then ++ INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE= ++ INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE='#' else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ @@ -23844,35 +23345,50 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -/* Define XRenderQueryExtension to an innocuous variant, in case declares XRenderQueryExtension. - For example, HP-UX 11i declares gettimeofday. */ -#define XRenderQueryExtension innocuous_XRenderQueryExtension -- ++ INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE='#' ++ INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE= ++fi + -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char XRenderQueryExtension (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -- ++ 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 + -#ifdef __STDC__ -# include -#else -# include -#endif -- --#undef XRenderQueryExtension -+ { $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 ++ if test x"$INCLUDE_inuktitut" = xyes; then ++ INCLUDE_IM_INUKTITUT_TRUE= ++ INCLUDE_IM_INUKTITUT_FALSE='#' +else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldnet $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* 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 -@@ -30181,200 +23178,100 @@ - #ifdef __cplusplus - extern "C" - #endif +-#undef XRenderQueryExtension ++ 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 + +-/* 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 XRenderQueryExtension (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named @@ -23880,17 +23396,22 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -#if defined __stub_XRenderQueryExtension || defined __stub___XRenderQueryExtension -choke me -#endif -- -+char dnet_ntoa (); - int - main () - { ++ 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 + +-int +-main () +-{ -return XRenderQueryExtension (); -+return dnet_ntoa (); - ; - return 0; - } - _ACEOF +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -23913,40 +23434,61 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_XRenderQueryExtension=yes -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_dnet_dnet_ntoa=yes ++ if test x"$INCLUDE_thai" = xyes; then ++ INCLUDE_IM_THAI_TRUE= ++ INCLUDE_IM_THAI_FALSE='#' else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++ INCLUDE_IM_THAI_TRUE='#' ++ INCLUDE_IM_THAI_FALSE= ++fi + - ac_cv_func_XRenderQueryExtension=no -+ ac_cv_lib_dnet_dnet_ntoa=no ++ 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 -- + -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 ++ 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 -{ $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 - : --else ++ ++ if test x"$INCLUDE_viqr" = xyes; then ++ INCLUDE_IM_VIQR_TRUE= ++ INCLUDE_IM_VIQR_FALSE='#' + 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; }; } -+{ $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" ++ 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 + - # Check for xReply -- + - { $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 @@ -23954,16 +23496,34 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++{ $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 ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ -#include --int --main () --{ ++#include ++#include ++#ifndef WEXITSTATUS ++# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8) ++#endif ++#ifndef WIFEXITED ++# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) ++#endif ++ + int + main () + { -xReply *rep; -- ; -- return 0; --} --_ACEOF ++ int s; ++ wait (&s); ++ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; + ; + return 0; + } + _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -23984,39 +23544,46 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$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 ++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_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 + - 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="-ldnet_stub $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h ++ ++fi ++ ++ ++{ $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 ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include ++#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 *(signal (0, 0)) (0) == 1; ; return 0; } @@ -24041,99 +23608,150 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } -- ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_type_signal=int ++else ++ 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 NEED_XIPROTO_H_FOR_XREPLY 1 --_ACEOF -- -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_dnet_stub_dnet_ntoa=yes ++cat >>confdefs.h <<_ACEOF ++#define RETSIGTYPE $ac_cv_type_signal + _ACEOF + ++ ++ ++ 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 -- ++ HAVE_TIFF_TRUE='#' ++ HAVE_TIFF_FALSE= ++fi + - { $as_echo "$as_me:$LINENO: result: unknown" >&5 -$as_echo "unknown" >&6; } - { { $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; }; } -+ 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" ++ if test "x$LIBPNG" != x; then ++ HAVE_PNG_TRUE= ++ HAVE_PNG_FALSE='#' ++else ++ HAVE_PNG_TRUE='#' ++ HAVE_PNG_FALSE= fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- ++ if test "x$LIBJPEG" != x; then ++ HAVE_JPEG_TRUE= ++ HAVE_JPEG_FALSE='#' ++else ++ HAVE_JPEG_TRUE='#' ++ HAVE_JPEG_FALSE= + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ if test "x$LIBJASPER" != x; then ++ HAVE_JASPER_TRUE= ++ HAVE_JASPER_FALSE='#' ++else ++ HAVE_JASPER_TRUE='#' ++ HAVE_JASPER_FALSE= ++fi + - # Check for XConvertCase, XInternAtoms (X11R6 specific) -+ fi -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ 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) -+ # 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 : ++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 ++ STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG $LIBJASPER" +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 : + -for ac_func in XConvertCase XInternAtoms -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 -+ 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 +- $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="-lnsl $LIBS" -+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 -- ++$as_echo "#define HAVE_SYS_SYSTEMINFO_H 1" >>confdefs.h ++ ++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 + -/* 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 -- + -#undef $ac_func ++{ $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="-lmlib $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 -@@ -30382,103 +23279,40 @@ +@@ -30392,569 +22553,606 @@ #ifdef __cplusplus extern "C" #endif @@ -24145,12 +23763,12 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -choke me -#endif - -+char gethostbyname (); ++char mlib_ImageSetStruct (); int main () { -return $ac_func (); -+return gethostbyname (); ++return mlib_ImageSetStruct (); ; return 0; } @@ -24178,13 +23796,13 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - }; then - eval "$as_ac_var=yes" +if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_nsl_gethostbyname=yes ++ ac_cv_lib_mlib_mlib_ImageSetStruct=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -+ ac_cv_lib_nsl_gethostbyname=no ++ ac_cv_lib_mlib_mlib_ImageSetStruct=no fi - -rm -rf conftest.dSYM @@ -24205,27 +23823,36 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 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_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 -done -- -- + ++if test $use_mlib = yes; then + - # 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 ++$as_echo "#define USE_MEDIALIB 1" >>confdefs.h - have_x11r6=false - { $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_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 : ++ 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 - cat >conftest.$ac_ext <<_ACEOF @@ -24234,7 +23861,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS -+LIBS="-lbsd $LIBS" ++LIBS="-lmlib $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Define XAddConnectionWatch to an innocuous variant, in case declares XAddConnectionWatch. @@ -24256,24 +23883,27 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -30486,116 +23320,104 @@ - #ifdef __cplusplus - extern "C" - #endif +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif -char XAddConnectionWatch (); -/* 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_XAddConnectionWatch || defined __stub___XAddConnectionWatch -choke me --#endif ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" + #endif - -+char gethostbyname (); ++char mlib_VideoColorRGBint_to_BGRAint (); int main () { -return XAddConnectionWatch (); -+return gethostbyname (); ++return mlib_VideoColorRGBint_to_BGRAint (); ; return 0; } @@ -24301,122 +23931,156 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - }; then - ac_cv_func_XAddConnectionWatch=yes +if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_bsd_gethostbyname=yes ++ 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_func_XAddConnectionWatch=no -+ ac_cv_lib_bsd_gethostbyname=no - fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext ++ ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=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_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 + 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 $use_mlib25 = yes; then ++ ++$as_echo "#define USE_MEDIALIB25 1" >>confdefs.h ++ ++ fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XAddConnectionWatch" >&5 -$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_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" ++ if test $use_mlib = yes; then ++ USE_MEDIALIB_TRUE= ++ USE_MEDIALIB_FALSE='#' ++else ++ USE_MEDIALIB_TRUE='#' ++ USE_MEDIALIB_FALSE= fi -+ fi -+ fi ++ if test $use_mlib25 = yes; then ++ USE_MEDIALIB25_TRUE= ++ USE_MEDIALIB25_FALSE='#' ++else ++ USE_MEDIALIB25_TRUE='#' ++ USE_MEDIALIB25_FALSE= ++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 ++# 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; } - fi - if $have_x11r6; then - HAVE_X11R6_TRUE= - HAVE_X11R6_FALSE='#' -+ 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. */ ++use_mmx_asm=no ++if test $use_x86_asm = yes; then ++ save_ac_ext=$ac_ext ++ ac_ext=S + -+/* 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 ++ { $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 ++ ++ rm -rf conftest* ++ ++ ac_ext=$save_ac_ext ++ if test $use_mmx_asm = yes; then ++ ++$as_echo "#define USE_MMX 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 ++ ++ if test x$use_mmx_asm = xyes; then ++ USE_MMX_TRUE= ++ USE_MMX_FALSE='#' else - HAVE_X11R6_TRUE='#' - HAVE_X11R6_FALSE= -+ ac_cv_lib_socket_connect=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" ++ USE_MMX_TRUE='#' ++ USE_MMX_FALSE= fi -+ fi - # Check for XKB support. -- ++REBUILD_PNGS= ++if test -z "$LIBPNG" && test x"$os_win32" = xno -o x$enable_gdiplus = xno; then ++ REBUILD_PNGS=# ++fi + - 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 ++ if test $cross_compiling = yes; then ++ CROSS_COMPILING_TRUE= ++ CROSS_COMPILING_FALSE='#' ++else ++ CROSS_COMPILING_TRUE='#' ++ CROSS_COMPILING_FALSE= +fi - elif test "x$enable_xkb" = "xmaybe"; then - { $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_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 : ++ ++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 - cat >conftest.$ac_ext <<_ACEOF @@ -24424,10 +24088,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -_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. */ -/* Define XkbQueryExtension to an innocuous variant, in case declares XkbQueryExtension. - For example, HP-UX 11i declares gettimeofday. */ -#define XkbQueryExtension innocuous_XkbQueryExtension @@ -24436,21 +24097,52 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - which can conflict with char XkbQueryExtension (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -- ++ 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 + -#ifdef __STDC__ -# include -#else -# include -#endif -- ++ 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 + -#undef XkbQueryExtension - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -@@ -30603,99 +23425,48 @@ - #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 XkbQueryExtension (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named @@ -24458,23 +24150,49 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -#if defined __stub_XkbQueryExtension || defined __stub___XkbQueryExtension -choke me -#endif -- -+char remove (); - int - main () - { ++ # 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 + +-int +-main () +-{ -return XkbQueryExtension (); -+return remove (); - ; - return 0; - } - _ACEOF +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -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 @@ -24491,91 +24209,214 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_XkbQueryExtension=yes -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_posix_remove=yes ++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 -- ++ { $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 + - ac_cv_func_XkbQueryExtension=no -+ ac_cv_lib_posix_remove=no ++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 -- + -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_XkbQueryExtension" >&5 -$as_echo "$ac_cv_func_XkbQueryExtension" >&6; } -if test "x$ac_cv_func_XkbQueryExtension" = x""yes; then -- + -cat >>confdefs.h <<\_ACEOF -#define HAVE_XKB 1 -_ACEOF -- -+{ $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 +-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 + ++ GDK_PIXBUF_XLIB_PACKAGES="x11" ++ GTK_PACKAGES_FOR_X="x11" + else - { $as_echo "$as_me:$LINENO: WARNING: XKB support explicitly disabled" >&5 -$as_echo "$as_me: WARNING: XKB support explicitly disabled" >&2;} - fi -+ fi ++ have_base_x_pc=false ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 ++$as_echo_n "checking for X... " >&6; } - # 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_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 : ++# Check whether --with-x was given. ++if test "${with_x+set}" = set; then : ++ withval=$with_x; ++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. ++ have_x=disabled ++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 - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ --_ACEOF ++ # 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 -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 XShapeCombineMask to an innocuous variant, in case declares XShapeCombineMask. - For example, HP-UX 11i declares gettimeofday. */ -#define XShapeCombineMask innocuous_XShapeCombineMask -- ++ 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 XShapeCombineMask (); 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 -- --#undef XShapeCombineMask ++/usr/include/X11 ++/usr/include/X11R7 ++/usr/include/X11R6 ++/usr/include/X11R5 ++/usr/include/X11R4 - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -@@ -30703,97 +23474,51 @@ - #ifdef __cplusplus - extern "C" - #endif +-#undef XShapeCombineMask ++/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 +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif -char XShapeCombineMask (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named @@ -24583,13 +24424,61 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -#if defined __stub_XShapeCombineMask || defined __stub___XShapeCombineMask -choke me -#endif -- -+char shmat (); ++/usr/local/include/X11 ++/usr/local/include/X11R7 ++/usr/local/include/X11R6 ++/usr/local/include/X11R5 ++/usr/local/include/X11R4 ++ ++/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 ++ ++/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 ++ 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 + ++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 XShapeCombineMask (); -+return shmat (); ++XrmInitialize () ; return 0; } @@ -24617,69 +24506,93 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - }; then - ac_cv_func_XShapeCombineMask=yes +if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_ipc_shmat=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_func_XShapeCombineMask=no -+ ac_cv_lib_ipc_shmat=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 ++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 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XShapeCombineMask" >&5 -$as_echo "$ac_cv_func_XShapeCombineMask" >&6; } -if test "x$ac_cv_func_XShapeCombineMask" = x""yes; then - : --else ++;; #( ++ *) have_x=yes;; ++ esac ++ eval "$ac_cv_have_x" ++fi # $with_x != no ++ ++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 - { { $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_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" ++ # 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 -+ fi -+ fi ++if test "$no_x" = yes; then ++ # Not all programs may use this symbol, but it does not hurt to define it. - # X SYNC check - gtk_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $x_cflags" -- ++$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h + - { $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 -+ # 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 +- $as_echo_n "(cached) " >&6 ++ X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= 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="-lICE $X_EXTRA_LIBS $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -/* Define XSyncQueryExtension to an innocuous variant, in case declares XSyncQueryExtension. - For example, HP-UX 11i declares gettimeofday. */ -#define XSyncQueryExtension innocuous_XSyncQueryExtension @@ -24696,13 +24609,13 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -#endif - -#undef XSyncQueryExtension - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -@@ -30801,224 +23526,238 @@ - #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 XSyncQueryExtension (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named @@ -24710,13 +24623,28 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -#if defined __stub_XSyncQueryExtension || defined __stub___XSyncQueryExtension -choke me -#endif -- -+char IceConnectionNumber (); ++ 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. */ + int main () { -return XSyncQueryExtension (); -+return IceConnectionNumber (); ++ ; return 0; } @@ -24743,68 +24671,17 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_XSyncQueryExtension=yes -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_ICE_IceConnectionNumber=yes - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ 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_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 - +-fi +- -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -+ 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 +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XSyncQueryExtension" >&5 -$as_echo "$ac_cv_func_XSyncQueryExtension" >&6; } -if test "x$ac_cv_func_XSyncQueryExtension" = x""yes; then @@ -24812,38 +24689,23 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -$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 -+ -+ ac_fn_c_check_func "$LINENO" "XRenderQueryExtension" "ac_cv_func_XRenderQueryExtension" -+if test "x$ac_cv_func_XRenderQueryExtension" = x""yes; then : -+ : ++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 - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++ LIBS="$ac_xsave_LIBS -R $x_libraries" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ -#include -+ as_fn_error "*** libXrender not found. Check 'config.log' for more details." "$LINENO" 5 -+fi -+ - +- -#include -+ # 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 -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -24863,129 +24725,101 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_header_X11_extensions_sync_h=yes -+if ac_fn_c_try_compile "$LINENO"; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&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 -+#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 -+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 - fi +- ac_cv_header_X11_extensions_sync_h=no +-fi + +-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 ++int ++main () ++{ -cat >>confdefs.h <<\_ACEOF -#define HAVE_XSYNC 1 -+ # 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 ++ ; ++ return 0; ++} _ACEOF - --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:${as_lineno-$LINENO}: result: neither works" >&5 ++$as_echo "neither works" >&6; } fi -+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 +- +- ++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 ++ # 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. - CFLAGS="$gtk_save_CFLAGS" -+ if $have_x11r6; then - +- - # Xshm checks -+$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 - $as_echo_n "(cached) " >&6 -+ fi -+ if $have_x11r6; then -+ HAVE_X11R6_TRUE= -+ HAVE_X11R6_FALSE='#' - else +-else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++ 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. */ -/* 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 -+ # Check for XKB support. - +- -#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 + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -30962,73 +23160,26 @@ + #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 @@ -24993,120 +24827,14 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -#if defined __stub_XShmAttach || defined __stub___XShmAttach -choke me -#endif -+$as_echo "#define HAVE_XKB 1" >>confdefs.h - --int --main () --{ +- ++char XOpenDisplay (); + int + main () + { -return XShmAttach (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (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:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_func_XShmAttach=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 -+ as_fn_error "Shape extension not found, check your development headers" "$LINENO" 5 -+fi -+ -+ -+ # 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 -+ - 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 -+ -+ -+ 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 "$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 -+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 >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. */ - - /* Override any GCC internal prototype to avoid an error. -@@ -31036,336 +23775,45 @@ ++return XOpenDisplay (); + ; return 0; } _ACEOF @@ -25131,14 +24859,90 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +- ac_cv_func_XShmAttach=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_XextSam_XShmAttach=yes + +- ac_cv_func_XShmAttach=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 +-{ $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 +- { $as_echo "$as_me:$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 "$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="-lXextSam $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++LIBS="-ldnet $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -31037,450 +23188,346 @@ + #ifdef __cplusplus + extern "C" + #endif +-char XShmAttach (); ++char dnet_ntoa (); + int + main () + { +-return XShmAttach (); ++return dnet_ntoa (); + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (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:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- 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_dnet_dnet_ntoa=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_XextSam_XShmAttach=no ++ ac_cv_lib_dnet_dnet_ntoa=no fi - -rm -rf conftest.dSYM @@ -25149,19 +24953,21 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_XextSam_XShmAttach" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_XextSam_XShmAttach" >&5 - $as_echo "$ac_cv_lib_XextSam_XShmAttach" >&6; } +-$as_echo "$ac_cv_lib_XextSam_XShmAttach" >&6; } -if test "x$ac_cv_lib_XextSam_XShmAttach" = x""yes; then -+if test "x$ac_cv_lib_XextSam_XShmAttach" = x""yes; then : - case "$x_extra_libs " in - *-lXextSam[\ \ ]*) ;; +- case "$x_extra_libs " in +- *-lXextSam[\ \ ]*) ;; - *) x_extra_libs="-lXextSam $x_extra_libs" ;; - esac - -fi - --fi -- ++{ $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 + - fi - - if test "x$enable_shm" = "xyes"; then @@ -25170,11 +24976,15 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - { $as_echo "$as_me:$LINENO: checking for sys/ipc.h" >&5 -$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 ++ 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 -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5 -$as_echo "$ac_cv_header_sys_ipc_h" >&6; } --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; } @@ -25183,7 +24993,10 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ldnet_stub $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF @@ -25216,7 +25029,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -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; } @@ -25227,7 +25040,21 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include --_ACEOF ++/* 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 () ++{ ++return dnet_ntoa (); ++ ; ++ return 0; ++} + _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -25246,13 +25073,25 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - test ! -s conftest.err - }; then - ac_header_preproc=yes --else ++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 - - ac_header_preproc=no --fi -- ++ ac_cv_lib_dnet_stub_dnet_ntoa=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_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 conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } @@ -25293,31 +25132,87 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - $as_echo_n "(cached) " >&6 -else - ac_cv_header_sys_ipc_h=$ac_header_preproc --fi ++ fi + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5 -$as_echo "$ac_cv_header_sys_ipc_h" >&6; } -- --fi ++rm -f core conftest.err conftest.$ac_objext \ ++ 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) ++ # 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 -if test "x$ac_cv_header_sys_ipc_h" = x""yes; then -- + -cat >>confdefs.h <<\_ACEOF -#define HAVE_IPC_H 1 -_ACEOF -- --else ++ 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 ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lnsl $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 gethostbyname (); ++int ++main () ++{ ++return gethostbyname (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_nsl_gethostbyname=yes + else - no_sys_ipc=yes --fi -- ++ ac_cv_lib_nsl_gethostbyname=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_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 + - - 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 ++ 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 -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_shm_h" >&5 -$as_echo "$ac_cv_header_sys_shm_h" >&6; } --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; } @@ -25326,10 +25221,28 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lbsd $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ -$ac_includes_default -#include --_ACEOF ++ ++/* 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 gethostbyname (); ++int ++main () ++{ ++return gethostbyname (); ++ ; ++ return 0; ++} + _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -25349,17 +25262,31 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes --else ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_bsd_gethostbyname=yes + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no --fi -- ++ ac_cv_lib_bsd_gethostbyname=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_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 + -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 ++ 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; } @@ -25392,8 +25319,15 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ *) x_extra_libs="-lXextSam $x_extra_libs" ;; -+ esac ++ # 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 : - ac_header_preproc=no fi @@ -25401,17 +25335,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -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? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) @@ -25445,49 +25369,112 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -{ $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 ++ 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_cv_header_sys_shm_h=$ac_header_preproc -+ no_sys_ipc=yes - 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 -if test "x$ac_cv_header_sys_shm_h" = x""yes; then ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lsocket $X_EXTRA_LIBS $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ -cat >>confdefs.h <<\_ACEOF -#define HAVE_SHM_H 1 --_ACEOF -+ ac_fn_c_check_header_mongrel "$LINENO" "sys/shm.h" "ac_cv_header_sys_shm_h" "$ac_includes_default" -+if test "x$ac_cv_header_sys_shm_h" = x""yes; then : -+ -+$as_echo "#define HAVE_SHM_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. */ ++#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 - no_sys_shm=yes -@@ -31375,18 +23823,14 @@ +- no_sys_shm=yes ++ ac_cv_lib_socket_connect=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" + fi - # Check for the X shared memory extension header file - have_xshm=no ++ 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 : + +- # Check for the X shared memory extension header file +- have_xshm=no - { $as_echo "$as_me:$LINENO: checking X11/extensions/XShm.h" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking X11/extensions/XShm.h" >&5 - $as_echo_n "checking X11/extensions/XShm.h... " >&6; } - if test "x$no_xext_lib" = "xyes"; then - : - else - gtk_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $x_cflags" +-$as_echo_n "checking X11/extensions/XShm.h... " >&6; } +- if test "x$no_xext_lib" = "xyes"; then +- : +- else +- gtk_save_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS $x_cflags" - 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. */ ++fi - #include -@@ -31405,42 +23849,17 @@ +-#include +-#include +-#include +-#include +-#include +-#include +-#include ++ 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 ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lposix $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 remove (); + int + main () + { +-XShmSegmentInfo *x_shm_info; ++return remove (); + ; return 0; } _ACEOF @@ -25509,62 +25496,140 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 : - have_xshm=yes --else +- have_xshm=yes ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_posix_remove=yes + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- -- ++ ac_cv_lib_posix_remove=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_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 + ++ fi ++ ++ # 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 -- - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS="$gtk_save_CFLAGS" - fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- CFLAGS="$gtk_save_CFLAGS" +- fi - { $as_echo "$as_me:$LINENO: result: $have_xshm" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_xshm" >&5 - $as_echo "$have_xshm" >&6; } - if test $have_xshm = yes ; then +-$as_echo "$have_xshm" >&6; } +- if test $have_xshm = yes ; 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 ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lipc $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ -cat >>confdefs.h <<\_ACEOF -#define HAVE_XSHM_H 1 --_ACEOF -+$as_echo "#define HAVE_XSHM_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. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char shmat (); ++int ++main () ++{ ++return shmat (); ++ ; ++ return 0; ++} + _ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_ipc_shmat=yes ++else ++ ac_cv_lib_ipc_shmat=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_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 -@@ -31451,7 +23870,7 @@ - CPPFLAGS="$CPPFLAGS $x_cflags" - - # Check for XFree +- +- if test "x$enable_xinerama" = "xyes"; then +- # Check for Xinerama extension (Solaris impl or Xfree impl) +- gtk_save_cppflags="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $x_cflags" +- +- # Check for XFree - { $as_echo "$as_me:$LINENO: checking for Xinerama support on XFree86" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Xinerama support on XFree86" >&5 - $as_echo_n "checking for Xinerama support on XFree86... " >&6; } - - have_xfree_xinerama=false -@@ -31459,18 +23878,14 @@ - have_xfree_xinerama=true - X_PACKAGES="$X_PACKAGES xinerama" - else +-$as_echo_n "checking for Xinerama support on XFree86... " >&6; } +- +- have_xfree_xinerama=false +- if $PKG_CONFIG --exists xinerama ; then +- have_xfree_xinerama=true +- X_PACKAGES="$X_PACKAGES xinerama" +- else - { $as_echo "$as_me:$LINENO: checking for XineramaQueryExtension in -lXinerama" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XineramaQueryExtension in -lXinerama" >&5 - $as_echo_n "checking for XineramaQueryExtension in -lXinerama... " >&6; } +-$as_echo_n "checking for XineramaQueryExtension in -lXinerama... " >&6; } -if test "${ac_cv_lib_Xinerama_XineramaQueryExtension+set}" = set; then -+if test "${ac_cv_lib_Xinerama_XineramaQueryExtension+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 ac_check_lib_save_LIBS=$LIBS - LIBS="-lXinerama $LIBS" +-LIBS="-lXinerama $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. -@@ -31488,89 +23903,21 @@ +@@ -31489,870 +23536,640 @@ + #ifdef __cplusplus + extern "C" + #endif +-char XineramaQueryExtension (); ++char IceConnectionNumber (); + int + main () + { +-return XineramaQueryExtension (); ++return IceConnectionNumber (); + ; return 0; } _ACEOF @@ -25589,14 +25654,15 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +- ac_cv_lib_Xinerama_XineramaQueryExtension=yes +if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_Xinerama_XineramaQueryExtension=yes ++ ac_cv_lib_ICE_IceConnectionNumber=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_Xinerama_XineramaQueryExtension=no -+ ac_cv_lib_Xinerama_XineramaQueryExtension=no ++ ac_cv_lib_ICE_IceConnectionNumber=no fi - -rm -rf conftest.dSYM @@ -25607,8 +25673,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaQueryExtension" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xinerama_XineramaQueryExtension" >&5 - $as_echo "$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6; } +-$as_echo "$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6; } -if test "x$ac_cv_lib_Xinerama_XineramaQueryExtension" = x""yes; then - { $as_echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5 -$as_echo_n "checking for X11/extensions/Xinerama.h... " >&6; } @@ -25656,49 +25721,75 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5 -$as_echo "$ac_cv_header_X11_extensions_Xinerama_h" >&6; } -if test "x$ac_cv_header_X11_extensions_Xinerama_h" = x""yes; then -+if test "x$ac_cv_lib_Xinerama_XineramaQueryExtension" = x""yes; then : -+ ac_fn_c_check_header_compile "$LINENO" "X11/extensions/Xinerama.h" "ac_cv_header_X11_extensions_Xinerama_h" "#include -+" -+if test "x$ac_cv_header_X11_extensions_Xinerama_h" = x""yes; then : - case "$x_extra_libs " in - *-lXinerama[\ \ ]*) ;; - *) x_extra_libs="-lXinerama $x_extra_libs" ;; -@@ -31588,160 +23935,29 @@ +- case "$x_extra_libs " in +- *-lXinerama[\ \ ]*) ;; +- *) x_extra_libs="-lXinerama $x_extra_libs" ;; +- esac +- +- have_xfree_xinerama=true +-else +- : ++{ $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 - if $have_xfree_xinerama ; then ++ LDFLAGS=$ac_save_LDFLAGS + fi + ++ if test x$no_x = xyes ; then ++ as_fn_error "X development libraries not found" "$LINENO" 5 + fi + +- if $have_xfree_xinerama ; then +- -cat >>confdefs.h <<\_ACEOF -#define HAVE_XFREE_XINERAMA 1 -_ACEOF -+$as_echo "#define HAVE_XFREE_XINERAMA 1" >>confdefs.h ++ 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 -cat >>confdefs.h <<\_ACEOF -#define HAVE_XINERAMA 1 -_ACEOF -+$as_echo "#define HAVE_XINERAMA 1" >>confdefs.h ++ # Extra libraries found during checks (-lXinerama, etc), not from pkg-config. ++ x_extra_libs= - { $as_echo "$as_me:$LINENO: result: yes" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - else +-$as_echo "yes" >&6; } +- else - { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } +-$as_echo "no" >&6; } ++ gtk_save_cppflags="$CPPFLAGS" ++ CPPFLAGS="$CPPFLAGS $X_CFLAGS" - case "$host" in - *-*-solaris*) - # Check for solaris +- case "$host" in +- *-*-solaris*) +- # Check for solaris - { $as_echo "$as_me:$LINENO: checking for Xinerama support on Solaris" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Xinerama support on Solaris" >&5 - $as_echo_n "checking for Xinerama support on Solaris... " >&6; } +-$as_echo_n "checking for Xinerama support on Solaris... " >&6; } ++ gtk_save_LIBS=$LIBS ++ LIBS="$x_libs_for_checks $LIBS" - have_solaris_xinerama=false +- have_solaris_xinerama=false - { $as_echo "$as_me:$LINENO: checking for XineramaGetInfo" >&5 -$as_echo_n "checking for XineramaGetInfo... " >&6; } -if test "${ac_cv_func_XineramaGetInfo+set}" = set; then - $as_echo_n "(cached) " >&6 --else ++ # 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 - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF @@ -25708,20 +25799,34 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -/* Define XineramaGetInfo to an innocuous variant, in case declares XineramaGetInfo. - For example, HP-UX 11i declares gettimeofday. */ -#define XineramaGetInfo innocuous_XineramaGetInfo -- ++ as_fn_error "*** libX11 not found. Check 'config.log' for more details." "$LINENO" 5 ++fi + -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char XineramaGetInfo (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -- ++ 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 + -#ifdef __STDC__ -# include -#else -# include -#endif -- ++ 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 + -#undef XineramaGetInfo -- + -/* 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. */ @@ -25735,15 +25840,22 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -#if defined __stub_XineramaGetInfo || defined __stub___XineramaGetInfo -choke me -#endif -- --int --main () --{ ++ # 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 XineramaGetInfo (); -- ; -- return 0; --} --_ACEOF ++xReply *rep; + ; + return 0; + } + _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -25784,17 +25896,30 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -$as_echo_n "checking for X11/extensions/xinerama.h... " >&6; } -if test "${ac_cv_header_X11_extensions_xinerama_h+set}" = set; then - $as_echo_n "(cached) " >&6 --else ++if ac_fn_c_try_compile "$LINENO"; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_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 --_ACEOF ++#include ++#include ++int ++main () ++{ ++xReply *rep; ++ ; ++ return 0; ++} + _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -25817,510 +25942,1120 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++if ac_fn_c_try_compile "$LINENO"; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } + - ac_cv_header_X11_extensions_xinerama_h=no -fi -- ++$as_echo "#define NEED_XIPROTO_H_FOR_XREPLY 1" >>confdefs.h + -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xinerama_h" >&5 -$as_echo "$ac_cv_header_X11_extensions_xinerama_h" >&6; } -if test "x$ac_cv_header_X11_extensions_xinerama_h" = x""yes; then -+ ac_fn_c_check_func "$LINENO" "XineramaGetInfo" "ac_cv_func_XineramaGetInfo" -+if test "x$ac_cv_func_XineramaGetInfo" = x""yes; then : -+ ac_fn_c_check_header_compile "$LINENO" "X11/extensions/xinerama.h" "ac_cv_header_X11_extensions_xinerama_h" "#include -+" -+if test "x$ac_cv_header_X11_extensions_xinerama_h" = x""yes; then : - have_solaris_xinerama=true +- have_solaris_xinerama=true else - : -@@ -31753,19 +23969,15 @@ +- : ++ { $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 - if $have_solaris_xinerama ; then ++ # Check for XConvertCase, XInternAtoms (X11R6 specific) +- if $have_solaris_xinerama ; then +- -cat >>confdefs.h <<\_ACEOF -#define HAVE_SOLARIS_XINERAMA 1 -_ACEOF -+$as_echo "#define HAVE_SOLARIS_XINERAMA 1" >>confdefs.h - - +- +- -cat >>confdefs.h <<\_ACEOF -#define HAVE_XINERAMA 1 -_ACEOF -+$as_echo "#define HAVE_XINERAMA 1" >>confdefs.h - +- - { $as_echo "$as_me:$LINENO: result: yes" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - else +-$as_echo "yes" >&6; } +- else - { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - ;; -@@ -31779,9 +23991,7 @@ - - if test "x$with_xinput" = "xxfree" || test "x$with_xinput" = "xyes"; then - +-$as_echo "no" >&6; } +- fi +- ;; +- *) +- ;; +- esac +- fi +- fi +- +- # set up things for XInput +- +- if test "x$with_xinput" = "xxfree" || test "x$with_xinput" = "xyes"; then +- -cat >>confdefs.h <<\_ACEOF -#define XINPUT_XFREE 1 --_ACEOF -+$as_echo "#define XINPUT_XFREE 1" >>confdefs.h ++ 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 ++fi ++done - if $PKG_CONFIG --exists xi ; then -@@ -31795,9 +24005,7 @@ - fi - else - +- if $PKG_CONFIG --exists xi ; then +- X_PACKAGES="$X_PACKAGES xi" +- else +- case "$x_extra_libs " in +- *-lXi[\ \ ]*) ;; +- *) x_extra_libs="-lXi $x_extra_libs" ;; +- esac +- +- fi +- else +- -cat >>confdefs.h <<\_ACEOF -#define XINPUT_NONE 1 -_ACEOF -+$as_echo "#define XINPUT_NONE 1" >>confdefs.h - fi +- fi ++ # 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 -@@ -31813,9 +24021,7 @@ - # Check for the RANDR extension - if $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then +- if test x$with_xinput = xxfree || test x$with_xinput = xyes; then +- XINPUT_XFREE_TRUE= +- XINPUT_XFREE_FALSE='#' +-else +- XINPUT_XFREE_TRUE='#' +- XINPUT_XFREE_FALSE= ++ 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 + +- # Check for the RANDR extension +- if $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then +- -cat >>confdefs.h <<\_ACEOF -#define HAVE_RANDR 1 -_ACEOF -+$as_echo "#define HAVE_RANDR 1" >>confdefs.h ++ if $have_x11r6; then ++$as_echo "#define HAVE_X11R6 1" >>confdefs.h - X_PACKAGES="$X_PACKAGES xrandr" -@@ -31825,9 +24031,7 @@ - - if $PKG_CONFIG --exists xcursor ; then +- X_PACKAGES="$X_PACKAGES xrandr" + fi ++ if $have_x11r6; then ++ HAVE_X11R6_TRUE= ++ HAVE_X11R6_FALSE='#' ++else ++ HAVE_X11R6_TRUE='#' ++ HAVE_X11R6_FALSE= ++fi +- # Checks for Xcursor library +- +- if $PKG_CONFIG --exists xcursor ; then +- -cat >>confdefs.h <<\_ACEOF -#define HAVE_XCURSOR 1 -_ACEOF -+$as_echo "#define HAVE_XCURSOR 1" >>confdefs.h ++ # Check for XKB support. - X_PACKAGES="$X_PACKAGES xcursor" -@@ -31837,9 +24041,7 @@ +- X_PACKAGES="$X_PACKAGES xcursor" +- fi ++ 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;} - if $PKG_CONFIG --exists xfixes ; then +- # Checks for XFixes extension ++$as_echo "#define HAVE_XKB 1" >>confdefs.h + +- if $PKG_CONFIG --exists xfixes ; then ++ 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 : -cat >>confdefs.h <<\_ACEOF -#define HAVE_XFIXES 1 -_ACEOF -+$as_echo "#define HAVE_XFIXES 1" >>confdefs.h ++$as_echo "#define HAVE_XKB 1" >>confdefs.h ++fi - X_PACKAGES="$X_PACKAGES xfixes" -@@ -31850,9 +24052,7 @@ +- X_PACKAGES="$X_PACKAGES xfixes" +- GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xfixes" ++ 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 - if $PKG_CONFIG --exists xcomposite ; then +- # Checks for Xcomposite extension ++ # Check for shaped window extension + +- if $PKG_CONFIG --exists xcomposite ; then ++ ac_fn_c_check_func "$LINENO" "XShapeCombineMask" "ac_cv_func_XShapeCombineMask" ++if test "x$ac_cv_func_XShapeCombineMask" = x""yes; then : ++ : ++else ++ as_fn_error "Shape extension not found, check your development headers" "$LINENO" 5 ++fi -cat >>confdefs.h <<\_ACEOF -#define HAVE_XCOMPOSITE 1 -_ACEOF -+$as_echo "#define HAVE_XCOMPOSITE 1" >>confdefs.h ++ # X SYNC check ++ gtk_save_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS $x_cflags" - X_PACKAGES="$X_PACKAGES xcomposite" -@@ -31863,9 +24063,7 @@ +- X_PACKAGES="$X_PACKAGES xcomposite" +- GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xcomposite" +- fi ++ 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 : - if $PKG_CONFIG --exists xdamage ; then +- # Checks for Xdamage extension ++$as_echo "#define HAVE_XSYNC 1" >>confdefs.h + +- if $PKG_CONFIG --exists xdamage ; then ++else ++ : ++fi -cat >>confdefs.h <<\_ACEOF -#define HAVE_XDAMAGE 1 -_ACEOF -+$as_echo "#define HAVE_XDAMAGE 1" >>confdefs.h ++fi - X_PACKAGES="$X_PACKAGES xdamage" -@@ -31971,45 +24169,49 @@ +- X_PACKAGES="$X_PACKAGES xdamage" +- GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xdamage" +- fi - if test "x$gdktarget" = "xdirectfb"; then - DIRECTFB_REQUIRED_VERSION=1.0.0 +- if $have_base_x_pc ; then +- GDK_EXTRA_LIBS="$x_extra_libs" +- else +- GDK_EXTRA_LIBS="$X_LIBS $x_extra_libs -lXext -lX11 $GDK_EXTRA_LIBS" +- fi ++ CFLAGS="$gtk_save_CFLAGS" + +- CPPFLAGS="$gtk_save_cppflags" +- LIBS="$gtk_save_libs" ++ # Xshm checks + +- if true; then +- USE_X11_TRUE= +- USE_X11_FALSE='#' ++ 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 +- USE_X11_TRUE='#' +- USE_X11_FALSE= +-fi +- ++ # 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 +- XPACKAGES= ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lXextSam $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ + +- if false; then +- XINPUT_XFREE_TRUE= +- XINPUT_XFREE_FALSE='#' ++/* 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 ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_XextSam_XShmAttach=yes + else +- XINPUT_XFREE_TRUE='#' +- XINPUT_XFREE_FALSE= ++ ac_cv_lib_XextSam_XShmAttach=no + fi +- +- if false; then +- USE_X11_TRUE= +- USE_X11_FALSE='#' +-else +- USE_X11_TRUE='#' +- USE_X11_FALSE= ++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 + +- if false; then +- HAVE_X11R6_TRUE= +- HAVE_X11R6_FALSE='#' +-else +- HAVE_X11R6_TRUE='#' +- HAVE_X11R6_FALSE= + fi + + fi + +-if test "x$gdktarget" = "xwin32"; then +- GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid" +- if true; then +- USE_WIN32_TRUE= +- USE_WIN32_FALSE='#' +-else +- USE_WIN32_TRUE='#' +- USE_WIN32_FALSE= +-fi ++ fi + +-else +- if false; then +- USE_WIN32_TRUE= +- USE_WIN32_FALSE='#' +-else +- USE_WIN32_TRUE='#' +- USE_WIN32_FALSE= +-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 ++$as_echo "#define HAVE_IPC_H 1" >>confdefs.h + +-if test "x$gdktarget" = "xquartz"; then +- GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa" +- if true; then +- USE_QUARTZ_TRUE= +- USE_QUARTZ_FALSE='#' + else +- USE_QUARTZ_TRUE='#' +- USE_QUARTZ_FALSE= ++ no_sys_ipc=yes + fi + ++ ++ ac_fn_c_check_header_mongrel "$LINENO" "sys/shm.h" "ac_cv_header_sys_shm_h" "$ac_includes_default" ++if test "x$ac_cv_header_sys_shm_h" = x""yes; then : ++ ++$as_echo "#define HAVE_SHM_H 1" >>confdefs.h ++ + else +- if false; then +- USE_QUARTZ_TRUE= +- USE_QUARTZ_FALSE='#' +-else +- USE_QUARTZ_TRUE='#' +- USE_QUARTZ_FALSE= ++ no_sys_shm=yes + fi + +-fi + +-GDK_PIXBUF_XLIB_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_XLIB_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS" +-GDK_PIXBUF_XLIB_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_PIXBUF_XLIB_EXTRA_CFLAGS" + ++ # Check for the X shared memory extension header file ++ have_xshm=no ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking X11/extensions/XShm.h" >&5 ++$as_echo_n "checking X11/extensions/XShm.h... " >&6; } ++ if test "x$no_xext_lib" = "xyes"; then ++ : ++ else ++ gtk_save_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS $x_cflags" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ + ++#include ++#include ++#include ++#include ++#include ++#include ++#include + ++int ++main () ++{ ++XShmSegmentInfo *x_shm_info; ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ have_xshm=yes ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ CFLAGS="$gtk_save_CFLAGS" ++ fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_xshm" >&5 ++$as_echo "$have_xshm" >&6; } ++ if test $have_xshm = yes ; then + ++$as_echo "#define HAVE_XSHM_H 1" >>confdefs.h + ++ fi ++ fi + ++ if test "x$enable_xinerama" = "xyes"; then ++ # Check for Xinerama extension (Solaris impl or Xfree impl) ++ gtk_save_cppflags="$CPPFLAGS" ++ CPPFLAGS="$CPPFLAGS $x_cflags" + +-if test "x$gdktarget" = "xdirectfb"; then +- DIRECTFB_REQUIRED_VERSION=1.0.0 - { $as_echo "$as_me:$LINENO: checking for DirectFB" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DirectFB" >&5 - $as_echo_n "checking for DirectFB... " >&6; } +-$as_echo_n "checking for DirectFB... " >&6; } ++ # Check for XFree ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Xinerama support on XFree86" >&5 ++$as_echo_n "checking for Xinerama support on XFree86... " >&6; } ++ have_xfree_xinerama=false ++ if $PKG_CONFIG --exists xinerama ; then ++ have_xfree_xinerama=true ++ X_PACKAGES="$X_PACKAGES xinerama" ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XineramaQueryExtension in -lXinerama" >&5 ++$as_echo_n "checking for XineramaQueryExtension in -lXinerama... " >&6; } ++if test "${ac_cv_lib_Xinerama_XineramaQueryExtension+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lXinerama $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ - pkg_failed=no +-pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for DIRECTFB" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DIRECTFB" >&5 - $as_echo_n "checking for DIRECTFB... " >&6; } +-$as_echo_n "checking for DIRECTFB... " >&6; } ++/* 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 XineramaQueryExtension (); ++int ++main () ++{ ++return XineramaQueryExtension (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_Xinerama_XineramaQueryExtension=yes ++else ++ ac_cv_lib_Xinerama_XineramaQueryExtension=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_Xinerama_XineramaQueryExtension" >&5 ++$as_echo "$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6; } ++if test "x$ac_cv_lib_Xinerama_XineramaQueryExtension" = x""yes; then : ++ ac_fn_c_check_header_compile "$LINENO" "X11/extensions/Xinerama.h" "ac_cv_header_X11_extensions_Xinerama_h" "#include ++" ++if test "x$ac_cv_header_X11_extensions_Xinerama_h" = x""yes; then : ++ case "$x_extra_libs " in ++ *-lXinerama[\ \ ]*) ;; ++ *) x_extra_libs="-lXinerama $x_extra_libs" ;; ++ esac -if test -n "$DIRECTFB_CFLAGS"; then - pkg_cv_DIRECTFB_CFLAGS="$DIRECTFB_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"directfb >= \$DIRECTFB_REQUIRED_VERSION\"") >&5 -+if test -n "$PKG_CONFIG"; then -+ if test -n "$DIRECTFB_CFLAGS"; then -+ pkg_cv_DIRECTFB_CFLAGS="$DIRECTFB_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"directfb >= \$DIRECTFB_REQUIRED_VERSION\""; } >&5 - ($PKG_CONFIG --exists --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION") 2>&5 - ac_status=$? +- ($PKG_CONFIG --exists --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION") 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 - pkg_cv_DIRECTFB_CFLAGS=`$PKG_CONFIG --cflags "directfb >= $DIRECTFB_REQUIRED_VERSION" 2>/dev/null` +- pkg_cv_DIRECTFB_CFLAGS=`$PKG_CONFIG --cflags "directfb >= $DIRECTFB_REQUIRED_VERSION" 2>/dev/null` ++ have_xfree_xinerama=true else - pkg_failed=yes +- pkg_failed=yes ++ : fi - else - pkg_failed=untried -+ fi -+else -+ pkg_failed=untried ++ ++ fi -if test -n "$DIRECTFB_LIBS"; then - pkg_cv_DIRECTFB_LIBS="$DIRECTFB_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"directfb >= \$DIRECTFB_REQUIRED_VERSION\"") >&5 +- ($PKG_CONFIG --exists --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- pkg_cv_DIRECTFB_LIBS=`$PKG_CONFIG --libs "directfb >= $DIRECTFB_REQUIRED_VERSION" 2>/dev/null` ++ ++ fi ++ ++ if $have_xfree_xinerama ; then ++ ++$as_echo "#define HAVE_XFREE_XINERAMA 1" >>confdefs.h ++ ++ ++$as_echo "#define HAVE_XINERAMA 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; } ++ ++ case "$host" in ++ *-*-solaris*) ++ # Check for solaris ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Xinerama support on Solaris" >&5 ++$as_echo_n "checking for Xinerama support on Solaris... " >&6; } ++ ++ have_solaris_xinerama=false ++ ac_fn_c_check_func "$LINENO" "XineramaGetInfo" "ac_cv_func_XineramaGetInfo" ++if test "x$ac_cv_func_XineramaGetInfo" = x""yes; then : ++ ac_fn_c_check_header_compile "$LINENO" "X11/extensions/xinerama.h" "ac_cv_header_X11_extensions_xinerama_h" "#include ++" ++if test "x$ac_cv_header_X11_extensions_xinerama_h" = x""yes; then : ++ have_solaris_xinerama=true + else +- pkg_failed=yes ++ : + fi +- else +- pkg_failed=untried ++ ++ + fi + + ++ if $have_solaris_xinerama ; then + +-if test $pkg_failed = yes; then ++$as_echo "#define HAVE_SOLARIS_XINERAMA 1" >>confdefs.h + +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +-else +- _pkg_short_errors_supported=no +-fi +- if test $_pkg_short_errors_supported = yes; then +- DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION" 2>&1` +- else +- DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION" 2>&1` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$DIRECTFB_PKG_ERRORS" >&5 + +- { { $as_echo "$as_me:$LINENO: error: Package requirements (directfb >= $DIRECTFB_REQUIRED_VERSION) were not met: ++$as_echo "#define HAVE_XINERAMA 1" >>confdefs.h + +-$DIRECTFB_PKG_ERRORS ++ { $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 ++ ;; ++ *) ++ ;; ++ esac ++ fi ++ fi + +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. ++ # set up things for XInput + +-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. +-" >&5 +-$as_echo "$as_me: error: Package requirements (directfb >= $DIRECTFB_REQUIRED_VERSION) were not met: ++ if test "x$with_xinput" = "xxfree" || test "x$with_xinput" = "xyes"; then + +-$DIRECTFB_PKG_ERRORS ++$as_echo "#define XINPUT_XFREE 1" >>confdefs.h + +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. + +-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. +-" >&2;} +- { (exit 1); exit 1; }; } +-elif test $pkg_failed = untried; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +-is in your PATH or set the PKG_CONFIG environment variable to the full +-path to pkg-config. ++ if $PKG_CONFIG --exists xi ; then ++ X_PACKAGES="$X_PACKAGES xi" ++ else ++ case "$x_extra_libs " in ++ *-lXi[\ \ ]*) ;; ++ *) x_extra_libs="-lXi $x_extra_libs" ;; ++ esac + +-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. ++ fi ++ else + +-To get pkg-config, see . +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +-is in your PATH or set the PKG_CONFIG environment variable to the full +-path to pkg-config. ++$as_echo "#define XINPUT_NONE 1" >>confdefs.h + +-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. ++ fi + +-To get pkg-config, see . +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } +-else +- DIRECTFB_CFLAGS=$pkg_cv_DIRECTFB_CFLAGS +- DIRECTFB_LIBS=$pkg_cv_DIRECTFB_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +- : +-fi +- if true; then +- USE_DIRECTFB_TRUE= +- USE_DIRECTFB_FALSE='#' ++ if test x$with_xinput = xxfree || test x$with_xinput = xyes; then ++ XINPUT_XFREE_TRUE= ++ XINPUT_XFREE_FALSE='#' + else +- USE_DIRECTFB_TRUE='#' +- USE_DIRECTFB_FALSE= ++ XINPUT_XFREE_TRUE='#' ++ XINPUT_XFREE_FALSE= + fi + +-else +- if false; then +- USE_DIRECTFB_TRUE= +- USE_DIRECTFB_FALSE='#' +-else +- USE_DIRECTFB_TRUE='#' +- USE_DIRECTFB_FALSE= +-fi + +-fi ++ # Check for the RANDR extension ++ if $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then + ++$as_echo "#define HAVE_RANDR 1" >>confdefs.h + +-# Check for Pango flags + +-if test "x$gdktarget" = "xwin32"; then +- PANGO_PACKAGES="pangowin32 pangocairo" +-else +- PANGO_PACKAGES="pango pangocairo" +-fi ++ X_PACKAGES="$X_PACKAGES xrandr" ++ fi + +-{ $as_echo "$as_me:$LINENO: checking Pango flags" >&5 +-$as_echo_n "checking Pango flags... " >&6; } +-if $PKG_CONFIG --exists $PANGO_PACKAGES ; then +- PANGO_CFLAGS=`$PKG_CONFIG --cflags $PANGO_PACKAGES` +- PANGO_LIBS=`$PKG_CONFIG --libs $PANGO_PACKAGES` ++ # Checks for Xcursor library + +- { $as_echo "$as_me:$LINENO: result: $PANGO_CFLAGS $PANGO_LIBS" >&5 +-$as_echo "$PANGO_CFLAGS $PANGO_LIBS" >&6; } +-else +- { { $as_echo "$as_me:$LINENO: error: +-*** Pango not found. Pango built with Cairo support is required +-*** to build GTK+. See http://www.pango.org for Pango information. +-" >&5 +-$as_echo "$as_me: error: +-*** Pango not found. Pango built with Cairo support is required +-*** to build GTK+. See http://www.pango.org for Pango information. +-" >&2;} +- { (exit 1); exit 1; }; } +-fi ++ if $PKG_CONFIG --exists xcursor ; then + +-CFLAGS="$CFLAGS $PANGO_CFLAGS" ++$as_echo "#define HAVE_XCURSOR 1" >>confdefs.h + +-if $PKG_CONFIG --uninstalled $PANGO_PACKAGES; then +- : +-else +- gtk_save_LIBS="$LIBS" +- LIBS="$PANGO_LIBS $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 pango_context_new (); +-int +-main () +-{ +-return pango_context_new (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (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:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ X_PACKAGES="$X_PACKAGES xcursor" ++ fi + +- { { $as_echo "$as_me:$LINENO: error: +-*** Can't link to Pango. Pango is required to build +-*** GTK+. For more information see http://www.pango.org" >&5 +-$as_echo "$as_me: error: +-*** Can't link to Pango. Pango is required to build +-*** GTK+. For more information see http://www.pango.org" >&2;} +- { (exit 1); exit 1; }; } +-fi ++ # Checks for XFixes extension + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +- LIBS="$gtk_save_LIBS" +-fi ++ if $PKG_CONFIG --exists xfixes ; then + +-CFLAGS="$saved_cflags" +-LDFLAGS="$saved_ldflags" ++$as_echo "#define HAVE_XFIXES 1" >>confdefs.h + +-GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 $X_PACKAGES cairo-$cairo_backend" +-GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" +-GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS" +-# +-# If we aren't writing explicit dependencies, then don't put the extra libraries we need +-# into the pkg-config files +-# +-if test $enable_explicit_deps != yes ; then +- GDK_PACKAGES="$PANGO_PACKAGES" +- GDK_EXTRA_LIBS= +-fi + ++ X_PACKAGES="$X_PACKAGES xfixes" ++ GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xfixes" ++ fi + ++ # Checks for Xcomposite extension + ++ if $PKG_CONFIG --exists xcomposite ; then + ++$as_echo "#define HAVE_XCOMPOSITE 1" >>confdefs.h + + ++ X_PACKAGES="$X_PACKAGES xcomposite" ++ GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xcomposite" ++ fi + ++ # Checks for Xdamage extension + +-######################################## +-# Check for Accessibility Toolkit flags +-######################################## ++ if $PKG_CONFIG --exists xdamage ; then + +-ATK_PACKAGES=atk +-{ $as_echo "$as_me:$LINENO: checking ATK flags" >&5 +-$as_echo_n "checking ATK flags... " >&6; } +-if $PKG_CONFIG --exists $ATK_PACKAGES ; then +- ATK_CFLAGS=`$PKG_CONFIG --cflags $ATK_PACKAGES` +- ATK_LIBS=`$PKG_CONFIG --libs $ATK_PACKAGES` ++$as_echo "#define HAVE_XDAMAGE 1" >>confdefs.h + +- { $as_echo "$as_me:$LINENO: result: $ATK_CFLAGS $ATK_LIBS" >&5 +-$as_echo "$ATK_CFLAGS $ATK_LIBS" >&6; } +-else +- { { $as_echo "$as_me:$LINENO: error: +-*** Accessibility Toolkit not found. Accessibility Toolkit is required +-*** to build GTK+. +-" >&5 +-$as_echo "$as_me: error: +-*** Accessibility Toolkit not found. Accessibility Toolkit is required +-*** to build GTK+. +-" >&2;} +- { (exit 1); exit 1; }; } +-fi + +-if $PKG_CONFIG --uninstalled $ATK_PACKAGES; then +- : +-else +- gtk_save_LIBS="$LIBS" +- LIBS="$ATK_LIBS $LIBS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ ++ X_PACKAGES="$X_PACKAGES xdamage" ++ GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xdamage" ++ 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. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char atk_object_get_type (); +-int +-main () +-{ +-return atk_object_get_type (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (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:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ if $have_base_x_pc ; then ++ GDK_EXTRA_LIBS="$x_extra_libs" ++ else ++ GDK_EXTRA_LIBS="$X_LIBS $x_extra_libs -lXext -lX11 $GDK_EXTRA_LIBS" ++ fi + +- { { $as_echo "$as_me:$LINENO: error: +- *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required +- *** to build GTK+" >&5 +-$as_echo "$as_me: error: +- *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required +- *** to build GTK+" >&2;} +- { (exit 1); exit 1; }; } ++ CPPFLAGS="$gtk_save_cppflags" ++ LIBS="$gtk_save_libs" ++ ++ if true; then ++ USE_X11_TRUE= ++ USE_X11_FALSE='#' ++else ++ USE_X11_TRUE='#' ++ USE_X11_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="$gtk_save_LIBS" ++else ++ XPACKAGES= ++ ++ if false; then ++ XINPUT_XFREE_TRUE= ++ XINPUT_XFREE_FALSE='#' ++else ++ XINPUT_XFREE_TRUE='#' ++ XINPUT_XFREE_FALSE= + fi + +-GTK_PACKAGES="atk cairo gio-2.0" +-if test "x$gdktarget" = "xx11"; then +- GTK_PACKAGES="$GTK_PACKAGES pangoft2" ++ if false; then ++ USE_X11_TRUE= ++ USE_X11_FALSE='#' ++else ++ USE_X11_TRUE='#' ++ USE_X11_FALSE= + fi +-GTK_EXTRA_LIBS= +-GTK_EXTRA_CFLAGS= +-GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS" +-GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS" + +-if test x"$os_win32" = xyes; then +- GTK_EXTRA_CFLAGS="$msnative_struct" ++ if false; then ++ HAVE_X11R6_TRUE= ++ HAVE_X11R6_FALSE='#' ++else ++ HAVE_X11R6_TRUE='#' ++ HAVE_X11R6_FALSE= + fi + +-GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`" +-ATK_PREFIX="`$PKG_CONFIG --variable=prefix atk`" +-PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`" +-CAIRO_PREFIX="`pkg-config --variable=prefix cairo`" ++fi + +-if test $enable_explicit_deps != yes ; then +- GDK_PIXBUF_EXTRA_LIBS= ++if test "x$gdktarget" = "xwin32"; then ++ GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid" ++ if true; then ++ USE_WIN32_TRUE= ++ USE_WIN32_FALSE='#' ++else ++ USE_WIN32_TRUE='#' ++ USE_WIN32_FALSE= + fi + ++else ++ if false; then ++ USE_WIN32_TRUE= ++ USE_WIN32_FALSE='#' ++else ++ USE_WIN32_TRUE='#' ++ USE_WIN32_FALSE= ++fi + ++fi + ++if test "x$gdktarget" = "xquartz"; then ++ GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa" ++ if true; then ++ USE_QUARTZ_TRUE= ++ USE_QUARTZ_FALSE='#' ++else ++ USE_QUARTZ_TRUE='#' ++ USE_QUARTZ_FALSE= ++fi + ++else ++ if false; then ++ USE_QUARTZ_TRUE= ++ USE_QUARTZ_FALSE='#' ++else ++ USE_QUARTZ_TRUE='#' ++ USE_QUARTZ_FALSE= ++fi + ++fi + ++GDK_PIXBUF_XLIB_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_XLIB_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS" ++GDK_PIXBUF_XLIB_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_PIXBUF_XLIB_EXTRA_CFLAGS" + + + +@@ -32360,204 +24177,152 @@ + + + ++if test "x$gdktarget" = "xdirectfb"; then ++ DIRECTFB_REQUIRED_VERSION=1.0.0 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DirectFB" >&5 ++$as_echo_n "checking for DirectFB... " >&6; } + + ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DIRECTFB" >&5 ++$as_echo_n "checking for DIRECTFB... " >&6; } + ++if test -n "$PKG_CONFIG"; then ++ if test -n "$DIRECTFB_CFLAGS"; then ++ pkg_cv_DIRECTFB_CFLAGS="$DIRECTFB_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"directfb >= \$DIRECTFB_REQUIRED_VERSION\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_DIRECTFB_CFLAGS=`$PKG_CONFIG --cflags "directfb >= $DIRECTFB_REQUIRED_VERSION" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi +if test -n "$PKG_CONFIG"; then + if test -n "$DIRECTFB_LIBS"; then + pkg_cv_DIRECTFB_LIBS="$DIRECTFB_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"directfb >= \$DIRECTFB_REQUIRED_VERSION\""; } >&5 - ($PKG_CONFIG --exists --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then ++ ($PKG_CONFIG --exists --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION") 2>&5 ++ ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then - pkg_cv_DIRECTFB_LIBS=`$PKG_CONFIG --libs "directfb >= $DIRECTFB_REQUIRED_VERSION" 2>/dev/null` - else - pkg_failed=yes - fi -- else -- pkg_failed=untried ++ pkg_cv_DIRECTFB_LIBS=`$PKG_CONFIG --libs "directfb >= $DIRECTFB_REQUIRED_VERSION" 2>/dev/null` ++else ++ pkg_failed=yes ++fi + fi +else + pkg_failed=untried - fi ++fi -@@ -32022,25 +24224,14 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION" 2>&1` + ++if test $pkg_failed = yes; then + ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then + DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION"` - else -- DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION" 2>&1` ++ else + DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION"` - fi - # Put the nasty error message in config.log where it belongs - echo "$DIRECTFB_PKG_ERRORS" >&5 ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$DIRECTFB_PKG_ERRORS" >&5 -- { { $as_echo "$as_me:$LINENO: error: Package requirements (directfb >= $DIRECTFB_REQUIRED_VERSION) were not met: -- --$DIRECTFB_PKG_ERRORS -- --Consider adjusting the PKG_CONFIG_PATH environment variable if you --installed software in a non-standard prefix. -- --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. --" >&5 --$as_echo "$as_me: error: Package requirements (directfb >= $DIRECTFB_REQUIRED_VERSION) were not met: +-######################## +-# Checks needed for gail +-######################## + as_fn_error "Package requirements (directfb >= $DIRECTFB_REQUIRED_VERSION) were not met: - $DIRECTFB_PKG_ERRORS - -@@ -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. --" >&2;} -- { (exit 1); exit 1; }; } -+" "$LINENO" 5 - elif test $pkg_failed = untried; then -- { { $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:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it --is in your PATH or set the PKG_CONFIG environment variable to the full --path to pkg-config. -- --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. -- --To get pkg-config, see . --See \`config.log' for more details." >&5 --$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it -+as_fn_error "The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full - path to pkg-config. - -@@ -32074,12 +24254,11 @@ - See the pkg-config man page for more details. - - To get pkg-config, see . --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; }; } -+See \`config.log' for more details." "$LINENO" 5; } - else - DIRECTFB_CFLAGS=$pkg_cv_DIRECTFB_CFLAGS - DIRECTFB_LIBS=$pkg_cv_DIRECTFB_LIBS -- { $as_echo "$as_me:$LINENO: result: yes" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - : - fi -@@ -32111,24 +24290,19 @@ - PANGO_PACKAGES="pango pangocairo" - fi - --{ $as_echo "$as_me:$LINENO: checking Pango flags" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Pango flags" >&5 - $as_echo_n "checking Pango flags... " >&6; } - if $PKG_CONFIG --exists $PANGO_PACKAGES ; then - PANGO_CFLAGS=`$PKG_CONFIG --cflags $PANGO_PACKAGES` - PANGO_LIBS=`$PKG_CONFIG --libs $PANGO_PACKAGES` - -- { $as_echo "$as_me:$LINENO: result: $PANGO_CFLAGS $PANGO_LIBS" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PANGO_CFLAGS $PANGO_LIBS" >&5 - $as_echo "$PANGO_CFLAGS $PANGO_LIBS" >&6; } - else -- { { $as_echo "$as_me:$LINENO: error: --*** Pango not found. Pango built with Cairo support is required --*** to build GTK+. See http://www.pango.org for Pango information. --" >&5 --$as_echo "$as_me: error: -+ as_fn_error " - *** Pango not found. Pango built with Cairo support is required - *** to build GTK+. See http://www.pango.org for Pango information. --" >&2;} -- { (exit 1); exit 1; }; } -+" "$LINENO" 5 - fi - - CFLAGS="$CFLAGS $PANGO_CFLAGS" -@@ -32138,11 +24312,7 @@ - else - gtk_save_LIBS="$LIBS" - LIBS="$PANGO_LIBS $LIBS" -- 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. */ - - /* Override any GCC internal prototype to avoid an error. -@@ -32160,60 +24330,33 @@ - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (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:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+if ac_fn_c_try_link "$LINENO"; then : - : - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- { { $as_echo "$as_me:$LINENO: error: --*** Can't link to Pango. Pango is required to build --*** GTK+. For more information see http://www.pango.org" >&5 --$as_echo "$as_me: error: -+ as_fn_error " - *** Can't link to Pango. Pango is required to build --*** GTK+. For more information see http://www.pango.org" >&2;} -- { (exit 1); exit 1; }; } -+*** GTK+. For more information see http://www.pango.org" "$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 -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS="$gtk_save_LIBS" - fi - - CFLAGS="$saved_cflags" - LDFLAGS="$saved_ldflags" - --GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 $X_PACKAGES cairo-$cairo_backend" --GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" --GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS" -+GDK_PACKAGES="$PANGO_PACKAGES gio-2.0" -+GDK_PRIVATE_PACKAGES="$X_PACKAGES cairo-$cairo_backend" -+GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" -+GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS" - # - # If we aren't writing explicit dependencies, then don't put the extra libraries we need - # into the pkg-config files - # - if test $enable_explicit_deps != yes ; then -- GDK_PACKAGES="$PANGO_PACKAGES" - GDK_EXTRA_LIBS= -+else -+ GDK_PACKAGES="$GDK_PACKAGES $GDK_PRIVATE_PACKAGES" - fi - - -@@ -32223,29 +24366,25 @@ - - - -+ - ######################################## - # Check for Accessibility Toolkit flags - ######################################## - - ATK_PACKAGES=atk --{ $as_echo "$as_me:$LINENO: checking ATK flags" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking ATK flags" >&5 - $as_echo_n "checking ATK flags... " >&6; } - if $PKG_CONFIG --exists $ATK_PACKAGES ; then - ATK_CFLAGS=`$PKG_CONFIG --cflags $ATK_PACKAGES` - ATK_LIBS=`$PKG_CONFIG --libs $ATK_PACKAGES` - -- { $as_echo "$as_me:$LINENO: result: $ATK_CFLAGS $ATK_LIBS" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ATK_CFLAGS $ATK_LIBS" >&5 - $as_echo "$ATK_CFLAGS $ATK_LIBS" >&6; } - else -- { { $as_echo "$as_me:$LINENO: error: --*** Accessibility Toolkit not found. Accessibility Toolkit is required --*** to build GTK+. --" >&5 --$as_echo "$as_me: error: -+ as_fn_error " - *** Accessibility Toolkit not found. Accessibility Toolkit is required - *** to build GTK+. --" >&2;} -- { (exit 1); exit 1; }; } -+" "$LINENO" 5 - fi - - if $PKG_CONFIG --uninstalled $ATK_PACKAGES; then -@@ -32253,11 +24392,7 @@ - else - gtk_save_LIBS="$LIBS" - LIBS="$ATK_LIBS $LIBS" -- 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. */ - - /* Override any GCC internal prototype to avoid an error. -@@ -32275,44 +24410,15 @@ - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (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:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+if ac_fn_c_try_link "$LINENO"; then : - : - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- { { $as_echo "$as_me:$LINENO: error: -+ as_fn_error " - *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required -- *** to build GTK+" >&5 --$as_echo "$as_me: error: -- *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required -- *** to build GTK+" >&2;} -- { (exit 1); exit 1; }; } -+ *** to build GTK+" "$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 -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS="$gtk_save_LIBS" - fi - -@@ -32335,7 +24441,7 @@ - CAIRO_PREFIX="`pkg-config --variable=prefix cairo`" - - if test $enable_explicit_deps != yes ; then -- GDK_PIXBUF_EXTRA_LIBS= -+ GDK_PIXBUF_EXTRA_LIBS="$MATH_LIB" - fi - - -@@ -32363,17 +24469,13 @@ - ######################## - - old_LIBS="$LIBS" +-old_LIBS="$LIBS" -{ $as_echo "$as_me:$LINENO: checking for library containing gethostent" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gethostent" >&5 - $as_echo_n "checking for library containing gethostent... " >&6; } +-$as_echo_n "checking for library containing gethostent... " >&6; } -if test "${ac_cv_search_gethostent+set}" = set; then -+if test "${ac_cv_search_gethostent+set}" = set; then : - $as_echo_n "(cached) " >&6 - else - ac_func_search_save_LIBS=$LIBS +- $as_echo_n "(cached) " >&6 +-else +- ac_func_search_save_LIBS=$LIBS -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. */ ++$DIRECTFB_PKG_ERRORS - /* Override any GCC internal prototype to avoid an error. -@@ -32397,70 +24499,39 @@ - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" +-/* 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 gethostent (); +-int +-main () +-{ +-return gethostent (); +- ; +- return 0; +-} +-_ACEOF +-for ac_lib in '' nsl; do +- if test -z "$ac_lib"; then +- ac_res="none required" +- else +- ac_res=-l$ac_lib +- LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" @@ -26343,67 +27078,108 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 +- ac_cv_search_gethostent=$ac_res -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- -- - fi -- ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. + ++Alternatively, you may set the environment variables DIRECTFB_CFLAGS ++and DIRECTFB_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++" "$LINENO" 5 ++elif test $pkg_failed = untried; 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 "The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. + +-fi ++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. + -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_gethostent+set}" = set; then -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext -+ if test "${ac_cv_search_gethostent+set}" = set; then : - break - fi - done +- break +-fi +-done -if test "${ac_cv_search_gethostent+set}" = set; then - : -+if test "${ac_cv_search_gethostent+set}" = set; then : -+ ++To get pkg-config, see . ++See \`config.log' for more details." "$LINENO" 5; } else - ac_cv_search_gethostent=no +- ac_cv_search_gethostent=no ++ DIRECTFB_CFLAGS=$pkg_cv_DIRECTFB_CFLAGS ++ DIRECTFB_LIBS=$pkg_cv_DIRECTFB_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ : fi - rm conftest.$ac_ext - LIBS=$ac_func_search_save_LIBS +-rm conftest.$ac_ext +-LIBS=$ac_func_search_save_LIBS ++ if true; then ++ USE_DIRECTFB_TRUE= ++ USE_DIRECTFB_FALSE='#' ++else ++ USE_DIRECTFB_TRUE='#' ++ USE_DIRECTFB_FALSE= fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_gethostent" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostent" >&5 - $as_echo "$ac_cv_search_gethostent" >&6; } - ac_res=$ac_cv_search_gethostent +-$as_echo "$ac_cv_search_gethostent" >&6; } +-ac_res=$ac_cv_search_gethostent -if test "$ac_res" != no; then -+if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" ++else ++ if false; then ++ USE_DIRECTFB_TRUE= ++ USE_DIRECTFB_FALSE='#' ++else ++ USE_DIRECTFB_TRUE='#' ++ USE_DIRECTFB_FALSE= fi -{ $as_echo "$as_me:$LINENO: checking for library containing setsockopt" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing setsockopt" >&5 - $as_echo_n "checking for library containing setsockopt... " >&6; } +-$as_echo_n "checking for library containing setsockopt... " >&6; } -if test "${ac_cv_search_setsockopt+set}" = set; then -+if test "${ac_cv_search_setsockopt+set}" = set; then : - $as_echo_n "(cached) " >&6 - else - ac_func_search_save_LIBS=$LIBS +- $as_echo_n "(cached) " >&6 +-else +- ac_func_search_save_LIBS=$LIBS -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. */ ++fi - /* Override any GCC internal prototype to avoid an error. -@@ -32485,69 +24556,38 @@ - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - 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. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char setsockopt (); +-int +-main () +-{ +-return setsockopt (); +- ; +- return 0; +-} +-_ACEOF +-for ac_lib in '' socket; do +- if test -z "$ac_lib"; then +- ac_res="none required" +- else +- ac_res=-l$ac_lib +- LIBS="-l$ac_lib $ac_func_search_save_LIBS" +- fi - rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -26425,66 +27201,96 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -+ if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_setsockopt=$ac_res +- ac_cv_search_setsockopt=$ac_res -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- -- + ++# Check for Pango flags + ++if test "x$gdktarget" = "xwin32"; then ++ PANGO_PACKAGES="pangowin32 pangocairo" ++else ++ PANGO_PACKAGES="pango pangocairo" fi -- + -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_setsockopt+set}" = set; then -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext -+ if test "${ac_cv_search_setsockopt+set}" = set; then : - break - fi - done +- break +-fi +-done -if test "${ac_cv_search_setsockopt+set}" = set; then - : -+if test "${ac_cv_search_setsockopt+set}" = set; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Pango flags" >&5 ++$as_echo_n "checking Pango flags... " >&6; } ++if $PKG_CONFIG --exists $PANGO_PACKAGES ; then ++ PANGO_CFLAGS=`$PKG_CONFIG --cflags $PANGO_PACKAGES` ++ PANGO_LIBS=`$PKG_CONFIG --libs $PANGO_PACKAGES` + ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PANGO_CFLAGS $PANGO_LIBS" >&5 ++$as_echo "$PANGO_CFLAGS $PANGO_LIBS" >&6; } else - ac_cv_search_setsockopt=no - fi - rm conftest.$ac_ext - LIBS=$ac_func_search_save_LIBS +- ac_cv_search_setsockopt=no +-fi +-rm conftest.$ac_ext +-LIBS=$ac_func_search_save_LIBS ++ as_fn_error " ++*** Pango not found. Pango built with Cairo support is required ++*** to build GTK+. See http://www.pango.org for Pango information. ++" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_setsockopt" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_setsockopt" >&5 - $as_echo "$ac_cv_search_setsockopt" >&6; } - ac_res=$ac_cv_search_setsockopt +-$as_echo "$ac_cv_search_setsockopt" >&6; } +-ac_res=$ac_cv_search_setsockopt -if test "$ac_res" != no; then -+if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - fi +-fi ++CFLAGS="$CFLAGS $PANGO_CFLAGS" -{ $as_echo "$as_me:$LINENO: checking for library containing connect" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing connect" >&5 - $as_echo_n "checking for library containing connect... " >&6; } +-$as_echo_n "checking for library containing connect... " >&6; } -if test "${ac_cv_search_connect+set}" = set; then -+if test "${ac_cv_search_connect+set}" = set; then : - $as_echo_n "(cached) " >&6 +- $as_echo_n "(cached) " >&6 ++if $PKG_CONFIG --uninstalled $PANGO_PACKAGES; then ++ : else - ac_func_search_save_LIBS=$LIBS +- ac_func_search_save_LIBS=$LIBS -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 ++ gtk_save_LIBS="$LIBS" ++ LIBS="$PANGO_LIBS $LIBS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -32572,161 +24612,37 @@ - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi +@@ -32566,539 +24331,274 @@ + #ifdef __cplusplus + extern "C" + #endif +-char connect (); ++char pango_context_new (); + int + main () + { +-return connect (); ++return pango_context_new (); + ; + return 0; + } + _ACEOF +-for ac_lib in '' inet; do +- if test -z "$ac_lib"; then +- ac_res="none required" +- else +- ac_res=-l$ac_lib +- LIBS="-l$ac_lib $ac_func_search_save_LIBS" +- fi - rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -26506,43 +27312,57 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -+ if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_connect=$ac_res +- ac_cv_search_connect=$ac_res -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - - fi +-fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_connect+set}" = set; then -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext -+ if test "${ac_cv_search_connect+set}" = set; then : - break - fi - done +- break +-fi +-done -if test "${ac_cv_search_connect+set}" = set; then -- : -+if test "${ac_cv_search_connect+set}" = set; then : -+ ++if ac_fn_c_try_link "$LINENO"; then : + : else - ac_cv_search_connect=no +- ac_cv_search_connect=no ++ as_fn_error " ++*** Can't link to Pango. Pango is required to build ++*** GTK+. For more information see http://www.pango.org" "$LINENO" 5 fi - rm conftest.$ac_ext - LIBS=$ac_func_search_save_LIBS +-rm conftest.$ac_ext +-LIBS=$ac_func_search_save_LIBS ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ LIBS="$gtk_save_LIBS" fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_connect" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_connect" >&5 - $as_echo "$ac_cv_search_connect" >&6; } - ac_res=$ac_cv_search_connect +-$as_echo "$ac_cv_search_connect" >&6; } +-ac_res=$ac_cv_search_connect -if test "$ac_res" != no; then -+if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" ++CFLAGS="$saved_cflags" ++LDFLAGS="$saved_ldflags" ++ ++GDK_PACKAGES="$PANGO_PACKAGES gio-2.0" ++GDK_PRIVATE_PACKAGES="$X_PACKAGES cairo-$cairo_backend" ++GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" ++GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS" ++# ++# If we aren't writing explicit dependencies, then don't put the extra libraries we need ++# into the pkg-config files ++# ++if test $enable_explicit_deps != yes ; then ++ GDK_EXTRA_LIBS= ++else ++ GDK_PACKAGES="$GDK_PACKAGES $GDK_PRIVATE_PACKAGES" fi @@ -26559,8 +27379,8 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -/* end confdefs.h. */ -#include - #include -- -- + + -int -main () -{ @@ -26590,31 +27410,67 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_member_struct_sockaddr_un_sun_len=yes --else ++ ++ ++ ++ ++ ++######################################## ++# Check for Accessibility Toolkit flags ++######################################## ++ ++ATK_PACKAGES=atk ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking ATK flags" >&5 ++$as_echo_n "checking ATK flags... " >&6; } ++if $PKG_CONFIG --exists $ATK_PACKAGES ; then ++ ATK_CFLAGS=`$PKG_CONFIG --cflags $ATK_PACKAGES` ++ ATK_LIBS=`$PKG_CONFIG --libs $ATK_PACKAGES` ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ATK_CFLAGS $ATK_LIBS" >&5 ++$as_echo "$ATK_CFLAGS $ATK_LIBS" >&6; } + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++ as_fn_error " ++*** Accessibility Toolkit not found. Accessibility Toolkit is required ++*** to build GTK+. ++" "$LINENO" 5 ++fi + - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++if $PKG_CONFIG --uninstalled $ATK_PACKAGES; then ++ : ++else ++ gtk_save_LIBS="$LIBS" ++ LIBS="$ATK_LIBS $LIBS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ -#include -+ac_fn_c_check_member "$LINENO" "struct sockaddr_un" "sun_len" "ac_cv_member_struct_sockaddr_un_sun_len" "#include - #include - +- #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 atk_object_get_type (); + int + main () + { -static struct sockaddr_un ac_aggr; -if (sizeof ac_aggr.sun_len) -return 0; -- ; -- return 0; --} --_ACEOF ++return atk_object_get_type (); + ; + return 0; + } + _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -26634,106 +27490,167 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_member_struct_sockaddr_un_sun_len=yes --else ++if ac_fn_c_try_link "$LINENO"; then : ++ : + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_member_struct_sockaddr_un_sun_len=no --fi ++ as_fn_error " ++ *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required ++ *** to build GTK+" "$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_exeext conftest.$ac_ext ++ LIBS="$gtk_save_LIBS" + fi + -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_un_sun_len" >&5 -$as_echo "$ac_cv_member_struct_sockaddr_un_sun_len" >&6; } -if test "x$ac_cv_member_struct_sockaddr_un_sun_len" = x""yes; then -+" -+if test "x$ac_cv_member_struct_sockaddr_un_sun_len" = x""yes; then : - struct_sockaddr_un_sun_len=true - else - struct_sockaddr_un_suin_len=false -@@ -32754,7 +24670,7 @@ - ################################################################ +- struct_sockaddr_un_sun_len=true +-else +- struct_sockaddr_un_suin_len=false ++GTK_PACKAGES="atk cairo gio-2.0" ++if test "x$gdktarget" = "xx11"; then ++ GTK_PACKAGES="$GTK_PACKAGES pangoft2" + fi ++GTK_EXTRA_LIBS= ++GTK_EXTRA_CFLAGS= ++GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS" ++GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS" - # Check whether --enable-cups was given. +-case $struct_sockaddr_un_sun_len in +- true) +- +-cat >>confdefs.h <<_ACEOF +-#define HAVE_SOCKADDR_UN_SUN_LEN 1 +-_ACEOF +- +- ;; +- *) +- ;; +-esac +- +-GAIL_INET_LIBS="$LIBS" +- +- +-LIBS="$old_LIBS" +- +-################################################################ +-# Printing system checks +-################################################################ +- +-# Check whether --enable-cups was given. -if test "${enable_cups+set}" = set; then -+if test "${enable_cups+set}" = set; then : - enableval=$enable_cups; - else - enable_cups=auto -@@ -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 +- enableval=$enable_cups; +-else +- enable_cups=auto ++if test x"$os_win32" = xyes; then ++ GTK_EXTRA_CFLAGS="$msnative_struct" + fi + ++GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`" ++ATK_PREFIX="`$PKG_CONFIG --variable=prefix atk`" ++PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`" ++CAIRO_PREFIX="`pkg-config --variable=prefix cairo`" + +-if test "x$enable_cups" = "xno"; then +- if false; then +- HAVE_CUPS_TRUE= +- HAVE_CUPS_FALSE='#' +-else +- HAVE_CUPS_TRUE='#' +- HAVE_CUPS_FALSE= ++if test $enable_explicit_deps != yes ; then ++ GDK_PIXBUF_EXTRA_LIBS="$MATH_LIB" + fi + +-else +- # Extract the first word of "cups-config", so it can be a program name with args. +-set dummy cups-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } +-$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_CUPS_CONFIG+set}" = set; then -+if test "${ac_cv_path_CUPS_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 - else - case $CUPS_CONFIG in -@@ -32788,14 +24704,14 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. +- $as_echo_n "(cached) " >&6 +-else +- case $CUPS_CONFIG in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_CUPS_CONFIG="$CUPS_CONFIG" # 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 -+ 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_CUPS_CONFIG="$as_dir/$ac_word$ac_exec_ext" +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_CUPS_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done +- break 2 +- fi -done -+ done - IFS=$as_save_IFS +-done +-IFS=$as_save_IFS - test -z "$ac_cv_path_CUPS_CONFIG" && ac_cv_path_CUPS_CONFIG="no" -@@ -32804,10 +24720,10 @@ - fi - CUPS_CONFIG=$ac_cv_path_CUPS_CONFIG - if test -n "$CUPS_CONFIG"; then +- test -z "$ac_cv_path_CUPS_CONFIG" && ac_cv_path_CUPS_CONFIG="no" +- ;; +-esac +-fi +-CUPS_CONFIG=$ac_cv_path_CUPS_CONFIG +-if test -n "$CUPS_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $CUPS_CONFIG" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUPS_CONFIG" >&5 - $as_echo "$CUPS_CONFIG" >&6; } - else +-$as_echo "$CUPS_CONFIG" >&6; } +-else - { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi +-$as_echo "no" >&6; } +-fi -@@ -32823,13 +24739,9 @@ - fi - else +- 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:$LINENO: error: -+ as_fn_error " - *** cups not found. +-*** cups not found. -" >&5 -$as_echo "$as_me: error: -*** cups not found. -" >&2;} - { (exit 1); exit 1; }; } -+" "$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 +- 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 -cat >>confdefs.h <<\_ACEOF -#define HAVE_CUPS_API_1_2 1 -_ACEOF -+$as_echo "#define HAVE_CUPS_API_1_2 1" >>confdefs.h - fi +- fi + + -@@ -32853,144 +24763,11 @@ @@ -26780,14 +27697,14 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 cups/cups.h presence" >&5 -$as_echo_n "checking cups/cups.h presence... " >&6; } @@ -26820,14 +27737,14 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- + - 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; } -- + -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) @@ -26861,40 +27778,114 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -{ $as_echo "$as_me:$LINENO: checking for cups/cups.h" >&5 -$as_echo_n "checking for cups/cups.h... " >&6; } -if test "${ac_cv_header_cups_cups_h+set}" = set; then -- $as_echo_n "(cached) " >&6 --else ++######################## ++# Checks needed for gail ++######################## ++ ++old_LIBS="$LIBS" ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gethostent" >&5 ++$as_echo_n "checking for library containing gethostent... " >&6; } ++if test "${ac_cv_search_gethostent+set}" = set; then : + $as_echo_n "(cached) " >&6 + else - ac_cv_header_cups_cups_h=$ac_header_preproc -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 -$as_echo "$ac_cv_header_cups_cups_h" >&6; } -+ 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 : ++ ac_func_search_save_LIBS=$LIBS ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ --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. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char gethostent (); ++int ++main () ++{ ++return gethostent (); ++ ; ++ return 0; ++} ++_ACEOF ++for ac_lib in '' nsl; do ++ if test -z "$ac_lib"; then ++ ac_res="none required" ++ else ++ ac_res=-l$ac_lib ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS" ++ fi ++ if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_search_gethostent=$ac_res + fi -if test "x$ac_cv_header_cups_cups_h" = x""yes; then - : - else +-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;} - { (exit 1); exit 1; }; } -+ as_fn_error "*** Sorry, cups-config present but cups/cups.h missing." "$LINENO" 5 ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext ++ if test "${ac_cv_search_gethostent+set}" = set; then : ++ break fi ++done ++if test "${ac_cv_search_gethostent+set}" = set; then : +- +- +- if true; then +- HAVE_CUPS_TRUE= +- HAVE_CUPS_FALSE='#' + else +- HAVE_CUPS_TRUE='#' +- HAVE_CUPS_FALSE= ++ ac_cv_search_gethostent=no + fi ++rm conftest.$ac_ext ++LIBS=$ac_func_search_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostent" >&5 ++$as_echo "$ac_cv_search_gethostent" >&6; } ++ac_res=$ac_cv_search_gethostent ++if test "$ac_res" != no; then : ++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -@@ -33006,11 +24783,7 @@ ++fi - gtk_save_cflags="$CFLAGS" - CFLAGS="$CUPS_CFLAGS" +- gtk_save_cflags="$CFLAGS" +- CFLAGS="$CUPS_CFLAGS" - 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 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing setsockopt" >&5 ++$as_echo_n "checking for library containing setsockopt... " >&6; } ++if test "${ac_cv_search_setsockopt+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_func_search_save_LIBS=$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 setsockopt (); int -@@ -33021,36 +24794,11 @@ + main () + { +-http_t http; char *s = http.authstring; ++return setsockopt (); + ; return 0; } _ACEOF @@ -26920,38 +27911,68 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -cat >>confdefs.h <<\_ACEOF -#define HAVE_HTTP_AUTHSTRING /**/ -_ACEOF -- --else ++for ac_lib in '' socket; do ++ if test -z "$ac_lib"; then ++ ac_res="none required" ++ else ++ ac_res=-l$ac_lib ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS" ++ fi ++ if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_search_setsockopt=$ac_res ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext ++ if test "${ac_cv_search_setsockopt+set}" = set; then : ++ break ++fi ++done ++if test "${ac_cv_search_setsockopt+set}" = set; then : + + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_compile "$LINENO"; then : - -+$as_echo "#define HAVE_HTTP_AUTHSTRING /**/" >>confdefs.h - +- +- ++ ac_cv_search_setsockopt=no fi -- - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS="$gtk_save_cflags" ++rm conftest.$ac_ext ++LIBS=$ac_func_search_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_setsockopt" >&5 ++$as_echo "$ac_cv_search_setsockopt" >&6; } ++ac_res=$ac_cv_search_setsockopt ++if test "$ac_res" != no; then : ++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -@@ -33058,102 +24806,12 @@ - - gtk_save_libs="$LIBS" - LIBS="$CUPS_LIBS" +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- CFLAGS="$gtk_save_cflags" - +- +- +- gtk_save_libs="$LIBS" +- LIBS="$CUPS_LIBS" ++fi + -for ac_func in httpGetAuthString -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 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing connect" >&5 ++$as_echo_n "checking for library containing connect... " >&6; } ++if test "${ac_cv_search_connect+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_func_search_save_LIBS=$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 @@ -26968,13 +27989,13 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 +@@ -33106,640 +24606,358 @@ + #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 @@ -26983,99 +28004,13 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -choke me -#endif - --int --main () --{ ++char connect (); + int + main () + { -return $ac_func (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (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:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- eval "$as_ac_var=yes" --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- eval "$as_ac_var=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 --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -+ for ac_func in httpGetAuthString -+do : -+ ac_fn_c_check_func "$LINENO" "httpGetAuthString" "ac_cv_func_httpGetAuthString" -+if test "x$ac_cv_func_httpGetAuthString" = x""yes; then : - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define HAVE_HTTPGETAUTHSTRING 1 - _ACEOF - - fi -@@ -33167,7 +24825,7 @@ - # - - # Check whether --enable-papi was given. --if test "${enable_papi+set}" = set; then -+if test "${enable_papi+set}" = set; then : - enableval=$enable_papi; - else - enable_papi=auto -@@ -33184,20 +24842,16 @@ - fi - - else -- { $as_echo "$as_me:$LINENO: checking libpapi" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking libpapi" >&5 - $as_echo_n "checking libpapi... " >&6; } -- { $as_echo "$as_me:$LINENO: checking for papiServiceCreate in -lpapi" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for papiServiceCreate in -lpapi" >&5 - $as_echo_n "checking for papiServiceCreate in -lpapi... " >&6; } --if test "${ac_cv_lib_papi_papiServiceCreate+set}" = set; then -+if test "${ac_cv_lib_papi_papiServiceCreate+set}" = set; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lpapi $LIBS" --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. */ - - /* Override any GCC internal prototype to avoid an error. -@@ -33215,43 +24869,18 @@ ++return connect (); + ; return 0; } _ACEOF @@ -27100,61 +28035,283 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -+if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_papi_papiServiceCreate=yes +- eval "$as_ac_var=yes" ++for ac_lib in '' inet; do ++ if test -z "$ac_lib"; then ++ ac_res="none required" ++ else ++ ac_res=-l$ac_lib ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS" ++ fi ++ if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_search_connect=$ac_res ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext ++ if test "${ac_cv_search_connect+set}" = set; then : ++ break ++fi ++done ++if test "${ac_cv_search_connect+set}" = set; then : ++ else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 ++ ac_cv_search_connect=no ++fi ++rm conftest.$ac_ext ++LIBS=$ac_func_search_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_connect" >&5 ++$as_echo "$ac_cv_search_connect" >&6; } ++ac_res=$ac_cv_search_connect ++if test "$ac_res" != no; then : ++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +- eval "$as_ac_var=no" + fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++ ++ac_fn_c_check_member "$LINENO" "struct sockaddr_un" "sun_len" "ac_cv_member_struct_sockaddr_un_sun_len" "#include ++ #include ++ ++" ++if test "x$ac_cv_member_struct_sockaddr_un_sun_len" = x""yes; then : ++ struct_sockaddr_un_sun_len=true ++else ++ struct_sockaddr_un_suin_len=false + fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++ ++case $struct_sockaddr_un_sun_len in ++ true) ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_SOCKADDR_UN_SUN_LEN 1 + _ACEOF + +-fi +-done ++ ;; ++ *) ++ ;; ++esac + +- LIBS="$gtk_save_libs" +- fi +-fi ++GAIL_INET_LIBS="$LIBS" ++ ++ ++LIBS="$old_LIBS" + +-# Checks to see if we should compile with PAPI backend for GTK+ +-# ++################################################################ ++# Printing system checks ++################################################################ + +-# Check whether --enable-papi was given. +-if test "${enable_papi+set}" = set; then +- enableval=$enable_papi; ++# Check whether --enable-cups was given. ++if test "${enable_cups+set}" = set; then : ++ enableval=$enable_cups; + else +- enable_papi=auto ++ enable_cups=auto + fi + + +-if test "x$enable_papi" = "xno"; then ++if test "x$enable_cups" = "xno"; then + if false; then +- HAVE_PAPI_TRUE= +- HAVE_PAPI_FALSE='#' ++ HAVE_CUPS_TRUE= ++ HAVE_CUPS_FALSE='#' + else +- HAVE_PAPI_TRUE='#' +- HAVE_PAPI_FALSE= ++ HAVE_CUPS_TRUE='#' ++ HAVE_CUPS_FALSE= + fi + + else +- { $as_echo "$as_me:$LINENO: checking libpapi" >&5 +-$as_echo_n "checking libpapi... " >&6; } +- { $as_echo "$as_me:$LINENO: checking for papiServiceCreate in -lpapi" >&5 +-$as_echo_n "checking for papiServiceCreate in -lpapi... " >&6; } +-if test "${ac_cv_lib_papi_papiServiceCreate+set}" = set; then ++ # Extract the first word of "cups-config", so it can be a program name with args. ++set dummy cups-config; 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_CUPS_CONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lpapi $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ ++ case $CUPS_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_CUPS_CONFIG="$CUPS_CONFIG" # 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_CUPS_CONFIG="$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. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char papiServiceCreate (); +-int +-main () +-{ +-return papiServiceCreate (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; ++ test -z "$ac_cv_path_CUPS_CONFIG" && ac_cv_path_CUPS_CONFIG="no" ++ ;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_papi_papiServiceCreate=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_papi_papiServiceCreate=no -+ ac_cv_lib_papi_papiServiceCreate=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 +-LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_papi_papiServiceCreate" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_papi_papiServiceCreate" >&5 - $as_echo "$ac_cv_lib_papi_papiServiceCreate" >&6; } +-$as_echo "$ac_cv_lib_papi_papiServiceCreate" >&6; } -if test "x$ac_cv_lib_papi_papiServiceCreate" = x""yes; then -+if test "x$ac_cv_lib_papi_papiServiceCreate" = x""yes; then : - have_papi=yes +- have_papi=yes ++CUPS_CONFIG=$ac_cv_path_CUPS_CONFIG ++if test -n "$CUPS_CONFIG"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUPS_CONFIG" >&5 ++$as_echo "$CUPS_CONFIG" >&6; } else - have_papi=no -@@ -33259,9 +24888,7 @@ - - if test $have_papi = yes; then +- have_papi=no ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi +- if test $have_papi = yes; then +- -cat >>confdefs.h <<\_ACEOF -#define HAVE_PAPI /**/ -_ACEOF -+$as_echo "#define HAVE_PAPI /**/" >>confdefs.h - fi - if test $have_papi = yes; then -@@ -33273,13 +24900,9 @@ +- fi +- if test $have_papi = yes; then +- HAVE_PAPI_TRUE= +- HAVE_PAPI_FALSE='#' ++ 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_PAPI_TRUE='#' +- HAVE_PAPI_FALSE= ++ HAVE_CUPS_TRUE='#' ++ HAVE_CUPS_FALSE= fi - if test "x$enable_papi" = "xyes" -a "x$have_papi" = "xno"; then +- if test "x$enable_papi" = "xyes" -a "x$have_papi" = "xno"; then - { { $as_echo "$as_me:$LINENO: error: -+ as_fn_error " - *** papi not found. +-*** papi not found. -" >&5 -$as_echo "$as_me: error: -*** papi not found. -" >&2;} - { (exit 1); exit 1; }; } +- fi +-fi ++ else ++ as_fn_error " ++*** cups not found. +" "$LINENO" 5 - fi - fi ++ fi ++ else ++ CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed 's/-O0-9*//' | sed 's/-m^\t*//g'` ++ CUPS_LIBS=`$CUPS_CONFIG --libs` -@@ -33295,295 +24918,25 @@ - gtk_save_cppflags="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS $GDK_DEP_CFLAGS" +- 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 ++ 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 + +-gtk_save_cppflags="$CPPFLAGS" +-CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS $GDK_DEP_CFLAGS" ++$as_echo "#define HAVE_CUPS_API_1_2 1" >>confdefs.h -if test "${ac_cv_header_cairo_pdf_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for cairo-pdf.h" >&5 @@ -27199,14 +28356,15 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++ fi + - 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 cairo-pdf.h presence" >&5 -$as_echo_n "checking cairo-pdf.h presence... " >&6; } @@ -27239,14 +28397,14 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- + - 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; } -- + -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) @@ -27286,27 +28444,26 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 : ++ 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_cairo_pdf_h" = x""yes; then - : else - { { $as_echo "$as_me:$LINENO: error: -+ as_fn_error " - *** Can't find cairo-pdf.h. You must build Cairo with the pdf +-*** 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; }; } -+*** backend enabled." "$LINENO" 5 ++ as_fn_error "*** Sorry, cups-config present but cups/cups.h missing." "$LINENO" 5 fi - if test "$os_win32" != "yes"; then +-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; } @@ -27315,7 +28472,10 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cairo_ps_h" >&5 -$as_echo "$ac_cv_header_cairo_ps_h" >&6; } --else ++ if true; then ++ HAVE_CUPS_TRUE= ++ HAVE_CUPS_FALSE='#' + else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking cairo-ps.h usability" >&5 -$as_echo_n "checking cairo-ps.h usability... " >&6; } @@ -27324,10 +28484,26 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++ HAVE_CUPS_TRUE='#' ++ HAVE_CUPS_FALSE= ++fi ++ ++ ++ gtk_save_cflags="$CFLAGS" ++ CFLAGS="$CUPS_CFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ -$ac_includes_default -#include --_ACEOF ++#include ++int ++main () ++{ ++http_t http; char *s = http.authstring; ++ ; ++ return 0; ++} + _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -27350,14 +28526,18 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++if ac_fn_c_try_compile "$LINENO"; then : + - ac_header_compiler=no -fi -- --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++$as_echo "#define HAVE_HTTP_AUTHSTRING /**/" >>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; } -- ++ CFLAGS="$gtk_save_cflags" + -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking cairo-ps.h presence" >&5 -$as_echo_n "checking cairo-ps.h presence... " >&6; } @@ -27368,7 +28548,17 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include --_ACEOF ++ ++ ++ gtk_save_libs="$LIBS" ++ LIBS="$CUPS_LIBS" ++ for ac_func in httpGetAuthString ++do : ++ ac_fn_c_check_func "$LINENO" "httpGetAuthString" "ac_cv_func_httpGetAuthString" ++if test "x$ac_cv_func_httpGetAuthString" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_HTTPGETAUTHSTRING 1 + _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -27390,16 +28580,21 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- + - ac_header_preproc=no --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 : ++fi ++done ++ ++ LIBS="$gtk_save_libs" ++ 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; } -- ++# Checks to see if we should compile with PAPI backend for GTK+ ++# + -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) @@ -27434,29 +28629,272 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 --else ++# Check whether --enable-papi was given. ++if test "${enable_papi+set}" = set; then : ++ enableval=$enable_papi; + else - ac_cv_header_cairo_ps_h=$ac_header_preproc --fi ++ enable_papi=auto + 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 "x$enable_papi" = "xno"; then ++ if false; then ++ HAVE_PAPI_TRUE= ++ HAVE_PAPI_FALSE='#' else - { { $as_echo "$as_me:$LINENO: error: -+ as_fn_error " - *** Can't find cairo-ps.h. You must build Cairo with the +-*** Can't find cairo-ps.h. You must build Cairo with the -*** postscript backend enabled." >&5 -$as_echo "$as_me: error: -*** Can't find cairo-ps.h. You must build Cairo with the -*** postscript backend enabled." >&2;} - { (exit 1); exit 1; }; } ++ HAVE_PAPI_TRUE='#' ++ HAVE_PAPI_FALSE= + fi + +- +- +- if test "${ac_cv_header_cairo_svg_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for cairo-svg.h" >&5 +-$as_echo_n "checking for cairo-svg.h... " >&6; } +-if test "${ac_cv_header_cairo_svg_h+set}" = set; then ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking libpapi" >&5 ++$as_echo_n "checking libpapi... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for papiServiceCreate in -lpapi" >&5 ++$as_echo_n "checking for papiServiceCreate in -lpapi... " >&6; } ++if test "${ac_cv_lib_papi_papiServiceCreate+set}" = set; then : + $as_echo_n "(cached) " >&6 +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cairo_svg_h" >&5 +-$as_echo "$ac_cv_header_cairo_svg_h" >&6; } + else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking cairo-svg.h usability" >&5 +-$as_echo_n "checking cairo-svg.h usability... " >&6; } +-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="-lpapi $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* 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 papiServiceCreate (); ++int ++main () ++{ ++return papiServiceCreate (); ++ ; ++ return 0; ++} + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-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_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- 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_papi_papiServiceCreate=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_compiler=no ++ ac_cv_lib_papi_papiServiceCreate=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_papi_papiServiceCreate" >&5 ++$as_echo "$ac_cv_lib_papi_papiServiceCreate" >&6; } ++if test "x$ac_cv_lib_papi_papiServiceCreate" = x""yes; then : ++ have_papi=yes ++else ++ have_papi=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; } ++ if test $have_papi = yes; then + +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking cairo-svg.h presence" >&5 +-$as_echo_n "checking cairo-svg.h presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-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_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes ++$as_echo "#define HAVE_PAPI /**/" >>confdefs.h ++ ++ fi ++ if test $have_papi = yes; then ++ HAVE_PAPI_TRUE= ++ HAVE_PAPI_FALSE='#' + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ HAVE_PAPI_TRUE='#' ++ HAVE_PAPI_FALSE= ++fi + +- ac_header_preproc=no ++ if test "x$enable_papi" = "xyes" -a "x$have_papi" = "xno"; then ++ as_fn_error " ++*** papi not found. ++" "$LINENO" 5 ++ 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 "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" ++ ++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 : + +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: cairo-svg.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: cairo-svg.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-svg.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: cairo-svg.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: cairo-svg.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: cairo-svg.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-svg.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: cairo-svg.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-svg.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: cairo-svg.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-svg.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: cairo-svg.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-svg.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: cairo-svg.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-svg.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: cairo-svg.h: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## --------------------------------------------------------------------- ## +-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +-## --------------------------------------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for cairo-svg.h" >&5 +-$as_echo_n "checking for cairo-svg.h... " >&6; } +-if test "${ac_cv_header_cairo_svg_h+set}" = set; then +- $as_echo_n "(cached) " >&6 + else +- ac_cv_header_cairo_svg_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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cairo_svg_h" >&5 +-$as_echo "$ac_cv_header_cairo_svg_h" >&6; } + ++ ++ ++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_fn_error " ++*** Can't find cairo-ps.h. You must build Cairo with the +*** postscript backend enabled." "$LINENO" 5 fi +-if test "x$ac_cv_header_cairo_svg_h" = x""yes; then +- : ++ ++ ++ ++ ac_fn_c_check_header_mongrel "$LINENO" "cairo-svg.h" "ac_cv_header_cairo_svg_h" "$ac_includes_default" ++if test "x$ac_cv_header_cairo_svg_h" = x""yes; then : ++ + else +- { { $as_echo "$as_me:$LINENO: error: ++ as_fn_error " + *** Can't find cairo-svg.h. You must build Cairo with the +-*** svg backend enabled." >&5 +-$as_echo "$as_me: error: +-*** Can't find cairo-svg.h. You must build Cairo with the +-*** svg backend enabled." >&2;} +- { (exit 1); exit 1; }; } ++*** svg backend enabled." "$LINENO" 5 + fi -@@ -33593,7 +24946,7 @@ +@@ -33749,7 +24967,7 @@ # Check whether --enable-test-print-backend was given. @@ -27465,7 +28903,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure enableval=$enable_test_print_backend; else enable_test_print_backend=no -@@ -33638,136 +24991,8 @@ +@@ -33794,136 +25012,8 @@ @@ -27603,7 +29041,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure withval=$with_html_dir; else with_html_dir='${datadir}/gtk-doc/html' -@@ -33777,7 +25002,7 @@ +@@ -33933,7 +25023,7 @@ # Check whether --enable-gtk-doc was given. @@ -27612,7 +29050,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure enableval=$enable_gtk_doc; else enable_gtk_doc=no -@@ -33786,42 +25011,66 @@ +@@ -33942,42 +25032,66 @@ if test x$enable_gtk_doc = xyes; then if test -n "$PKG_CONFIG" && \ @@ -27703,7 +29141,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure if test x$enable_gtk_doc = xyes; then -@@ -33832,22 +25081,6 @@ +@@ -33988,22 +25102,6 @@ ENABLE_GTK_DOC_FALSE= fi @@ -27726,7 +29164,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure if test -n "$LIBTOOL"; then GTK_DOC_USE_LIBTOOL_TRUE= GTK_DOC_USE_LIBTOOL_FALSE='#' -@@ -33856,21 +25089,13 @@ +@@ -34012,21 +25110,13 @@ GTK_DOC_USE_LIBTOOL_FALSE= fi @@ -27750,7 +29188,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else if test -n "$DB2HTML"; then -@@ -33881,14 +25106,14 @@ +@@ -34037,14 +25127,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -27768,7 +29206,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure IFS=$as_save_IFS test -z "$ac_cv_prog_DB2HTML" && ac_cv_prog_DB2HTML="false" -@@ -33896,10 +25121,10 @@ +@@ -34052,10 +25142,10 @@ fi DB2HTML=$ac_cv_prog_DB2HTML if test -n "$DB2HTML"; then @@ -27781,7 +29219,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -33914,7 +25139,7 @@ +@@ -34070,7 +25160,7 @@ # Check whether --enable-man was given. @@ -27790,7 +29228,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure enableval=$enable_man; enable_man=yes else enable_man=no -@@ -33924,9 +25149,9 @@ +@@ -34080,9 +25170,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 @@ -27802,7 +29240,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else case $XSLTPROC in -@@ -33939,14 +25164,14 @@ +@@ -34095,14 +25185,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -27820,7 +29258,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure IFS=$as_save_IFS ;; -@@ -33954,10 +25179,10 @@ +@@ -34110,10 +25200,10 @@ fi XSLTPROC=$ac_cv_path_XSLTPROC if test -n "$XSLTPROC"; then @@ -27833,7 +29271,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -33970,7 +25195,7 @@ +@@ -34126,7 +25216,7 @@ # check for the presence of the XML catalog # Check whether --with-xml-catalog was given. @@ -27842,7 +29280,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure withval=$with_xml_catalog; else with_xml_catalog=/etc/xml/catalog -@@ -33979,23 +25204,23 @@ +@@ -34135,23 +25225,23 @@ jh_found_xmlcatalog=true XML_CATALOG_FILE="$with_xml_catalog" @@ -27871,7 +29309,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo_n "(cached) " >&6 else case $XMLCATALOG in -@@ -34008,14 +25233,14 @@ +@@ -34164,14 +25254,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -27889,7 +29327,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure IFS=$as_save_IFS test -z "$ac_cv_path_XMLCATALOG" && ac_cv_path_XMLCATALOG="no" -@@ -34024,10 +25249,10 @@ +@@ -34180,10 +25270,10 @@ fi XMLCATALOG=$ac_cv_path_XMLCATALOG if test -n "$XMLCATALOG"; then @@ -27902,7 +29340,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "no" >&6; } fi -@@ -34043,35 +25268,35 @@ +@@ -34199,35 +25289,35 @@ fi @@ -27950,7 +29388,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "not found" >&6; } enable_man=no fi -@@ -34125,13 +25350,13 @@ +@@ -34281,13 +25371,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( @@ -27966,7 +29404,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure esac ;; esac done -@@ -34139,8 +25364,8 @@ +@@ -34295,8 +25385,8 @@ (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) @@ -27977,7 +29415,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -@@ -34163,11 +25388,11 @@ +@@ -34319,11 +25409,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" && @@ -27991,7 +29429,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi -@@ -34187,8 +25412,8 @@ +@@ -34343,8 +25433,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. @@ -28002,7 +29440,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure done LIBOBJS=$ac_libobjs -@@ -34204,580 +25429,330 @@ +@@ -34360,587 +25450,334 @@ fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then @@ -28304,6 +29742,15 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"INCLUDE_JASPER\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${INCLUDE_QTIF_TRUE}" && test -z "${INCLUDE_QTIF_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_QTIF\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_QTIF\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"INCLUDE_QTIF\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${INCLUDE_GDIPLUS_TRUE}" && test -z "${INCLUDE_GDIPLUS_FALSE}"; then @@ -28746,7 +30193,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. -@@ -34787,17 +25762,18 @@ +@@ -34950,17 +25787,18 @@ debug=false ac_cs_recheck=false ac_cs_silent=false @@ -28772,7 +30219,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -@@ -34805,23 +25781,15 @@ +@@ -34968,23 +25806,15 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else @@ -28801,7 +30248,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure as_nl=' ' export as_nl -@@ -34829,7 +25797,13 @@ +@@ -34992,7 +25822,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 @@ -28816,7 +30263,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure as_echo='printf %s\n' as_echo_n='printf %s' else -@@ -34840,7 +25814,7 @@ +@@ -35003,7 +25839,7 @@ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; @@ -28825,7 +30272,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -@@ -34863,13 +25837,6 @@ +@@ -35026,13 +25862,6 @@ } fi @@ -28839,7 +30286,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure # IFS # We need space, tab and new line, in precisely that order. Quoting is -@@ -34879,15 +25846,15 @@ +@@ -35042,15 +25871,15 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. @@ -28858,7 +30305,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure IFS=$as_save_IFS ;; -@@ -34899,12 +25866,16 @@ +@@ -35062,12 +25891,16 @@ fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 @@ -28879,7 +30326,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure done PS1='$ ' PS2='> ' -@@ -34916,7 +25887,89 @@ +@@ -35079,7 +25912,89 @@ LANGUAGE=C export LANGUAGE @@ -28970,7 +30417,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr -@@ -34930,8 +25983,12 @@ +@@ -35093,8 +26008,12 @@ as_basename=false fi @@ -28984,7 +30431,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ -@@ -34951,76 +26008,25 @@ +@@ -35114,76 +26033,25 @@ } s/.*/./; q'` @@ -29072,7 +30519,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then -@@ -35049,8 +26055,56 @@ +@@ -35212,8 +26080,56 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -29130,7 +30577,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure else test -d ./-p && rmdir ./-p as_mkdir_p=false -@@ -35069,10 +26123,10 @@ +@@ -35232,10 +26148,10 @@ if test -d "$1"; then test -d "$1/."; else @@ -29143,7 +30590,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure ???[sx]*):;;*)false;;esac;fi '\'' sh ' -@@ -35087,13 +26141,19 @@ +@@ -35250,13 +26166,19 @@ exec 6>&1 @@ -29159,13 +30606,13 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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.18.4, which was + This file was extended by gtk+ $as_me 2.19.1, which was -generated by GNU Autoconf 2.63. Invocation command line was +generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS -@@ -35125,13 +26185,15 @@ +@@ -35288,13 +26210,15 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ @@ -29184,7 +30631,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure -q, --quiet, --silent do not print progress messages -d, --debug don't remove temporary files -@@ -35150,16 +26212,17 @@ +@@ -35313,16 +26237,17 @@ Configuration commands: $config_commands @@ -29195,7 +30642,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure 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.18.4 + gtk+ config.status 2.19.1 -configured by $0, generated by GNU Autoconf 2.63, - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +configured by $0, generated by GNU Autoconf 2.65, @@ -29206,7 +30653,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -@@ -35195,6 +26258,8 @@ +@@ -35358,6 +26283,8 @@ ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) $as_echo "$ac_cs_version"; exit ;; @@ -29215,7 +30662,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) -@@ -35202,20 +26267,19 @@ +@@ -35365,20 +26292,19 @@ case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac @@ -29240,7 +30687,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -@@ -35223,11 +26287,10 @@ +@@ -35386,11 +26312,10 @@ ac_cs_silent=: ;; # This is an error. @@ -29255,7 +30702,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure ac_need_defaults=false ;; esac -@@ -35742,9 +26805,7 @@ +@@ -35905,9 +26830,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" ;; @@ -29266,7 +30713,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure esac done -@@ -35771,7 +26832,7 @@ +@@ -35934,7 +26857,7 @@ trap 'exit_status=$? { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ' 0 @@ -29275,7 +30722,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure } # Create a (secure) tmp directory for tmp files. -@@ -35782,11 +26843,7 @@ +@@ -35945,11 +26868,7 @@ { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") @@ -29288,7 +30735,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. -@@ -35794,10 +26851,16 @@ +@@ -35957,10 +26876,16 @@ if test -n "$CONFIG_FILES"; then @@ -29307,7 +30754,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure else ac_cs_awk_cr=$ac_cr fi -@@ -35811,24 +26874,18 @@ +@@ -35974,24 +26899,18 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || @@ -29335,7 +30782,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi -@@ -35850,7 +26907,7 @@ +@@ -36013,7 +26932,7 @@ t delim :nl h @@ -29344,7 +30791,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure t more1 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ p -@@ -35864,7 +26921,7 @@ +@@ -36027,7 +26946,7 @@ t nl :delim h @@ -29353,7 +30800,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure t more2 s/["\\]/\\&/g; s/^/"/; s/$/"/ p -@@ -35917,9 +26974,7 @@ +@@ -36080,9 +26999,7 @@ else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ @@ -29364,7 +30811,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure _ACEOF # VPATH may cause trouble with some makes, so we remove $(srcdir), -@@ -35960,9 +27015,7 @@ +@@ -36123,9 +27040,7 @@ if test -z "$ac_t"; then break elif $ac_last_try; then @@ -29375,7 +30822,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi -@@ -36047,9 +27100,7 @@ +@@ -36210,9 +27125,7 @@ _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 @@ -29386,7 +30833,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure fi # test -n "$CONFIG_HEADERS" -@@ -36062,9 +27113,7 @@ +@@ -36225,9 +27138,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; @@ -29397,7 +30844,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac -@@ -36092,12 +27141,10 @@ +@@ -36255,12 +27166,10 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || @@ -29412,7 +30859,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure done # Let's still pretend it is `configure' which instantiates (i.e., don't -@@ -36108,7 +27155,7 @@ +@@ -36271,7 +27180,7 @@ `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" @@ -29421,7 +30868,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. -@@ -36121,9 +27168,7 @@ +@@ -36284,9 +27193,7 @@ case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ @@ -29432,7 +30879,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure esac ;; esac -@@ -36151,47 +27196,7 @@ +@@ -36314,47 +27221,7 @@ q } s/.*/./; q'` @@ -29481,7 +30928,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure ac_builddir=. case "$ac_dir" in -@@ -36248,7 +27253,6 @@ +@@ -36411,7 +27278,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= @@ -29489,7 +30936,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure ac_sed_dataroot=' /datarootdir/ { p -@@ -36258,12 +27262,11 @@ +@@ -36421,12 +27287,11 @@ /@docdir@/p /@infodir@/p /@localedir@/p @@ -29504,7 +30951,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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 -@@ -36273,7 +27276,7 @@ +@@ -36436,7 +27301,7 @@ s&@infodir@&$infodir&g s&@localedir@&$localedir&g s&@mandir@&$mandir&g @@ -29513,7 +30960,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure esac _ACEOF -@@ -36302,14 +27305,12 @@ +@@ -36465,14 +27330,12 @@ $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ @@ -29530,7 +30977,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/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;} -@@ -36319,9 +27320,7 @@ +@@ -36482,9 +27345,7 @@ -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ @@ -29541,7 +30988,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure ;; :H) # -@@ -36332,25 +27331,19 @@ +@@ -36495,25 +27356,19 @@ $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" } >"$tmp/config.h" \ @@ -29571,7 +31018,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" -@@ -36388,7 +27381,7 @@ +@@ -36551,7 +27406,7 @@ s/.*/./; q'`/stamp-h$_am_stamp_count ;; @@ -29580,7 +31027,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: executing $ac_file commands" >&6;} ;; esac -@@ -36483,47 +27476,7 @@ +@@ -36646,47 +27501,7 @@ q } s/.*/./; q'` @@ -29629,7 +31076,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done -@@ -37386,7 +28339,7 @@ +@@ -37549,7 +28364,7 @@ if cmp -s $outfile gdk/gdkconfig.h; then @@ -29638,7 +31085,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: gdk/gdkconfig.h is unchanged" >&6;} rm -f $outfile else -@@ -37398,15 +28351,12 @@ +@@ -37561,15 +28376,12 @@ done # for ac_tag @@ -29656,7 +31103,7 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure # configure is writing to config.log, and then calls config.status. -@@ -37427,10 +28377,10 @@ +@@ -37590,10 +28402,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. @@ -29669,9 +31116,9 @@ diff -Naur gtk+2.0-2.18.4.old/configure gtk+2.0-2.18.4/configure $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi -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 +diff -Naur gtk+2.0-2.19.1.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.19.1/contrib/gdk-pixbuf-xlib/Makefile.in +--- gtk+2.0-2.19.1.old/contrib/gdk-pixbuf-xlib/Makefile.in 2009-11-30 22:17:31.000000000 +0100 ++++ gtk+2.0-2.19.1/contrib/gdk-pixbuf-xlib/Makefile.in 2009-12-01 16:03:33.076292670 +0100 @@ -48,7 +48,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -29706,9 +31153,9 @@ diff -Naur gtk+2.0-2.18.4.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.18.4 PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -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 +diff -Naur gtk+2.0-2.19.1.old/contrib/Makefile.in gtk+2.0-2.19.1/contrib/Makefile.in +--- gtk+2.0-2.19.1.old/contrib/Makefile.in 2009-11-30 22:17:30.000000000 +0100 ++++ gtk+2.0-2.19.1/contrib/Makefile.in 2009-12-01 16:03:32.968291942 +0100 @@ -44,7 +44,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -29743,9 +31190,9 @@ diff -Naur gtk+2.0-2.18.4.old/contrib/Makefile.in gtk+2.0-2.18.4/contrib/Makefil PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -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 +diff -Naur gtk+2.0-2.19.1.old/demos/gtk-demo/Makefile.in gtk+2.0-2.19.1/demos/gtk-demo/Makefile.in +--- gtk+2.0-2.19.1.old/demos/gtk-demo/Makefile.in 2009-11-30 22:17:31.000000000 +0100 ++++ gtk+2.0-2.19.1/demos/gtk-demo/Makefile.in 2009-12-01 16:03:33.324292421 +0100 @@ -46,7 +46,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -29755,7 +31202,7 @@ diff -Naur gtk+2.0-2.18.4.old/demos/gtk-demo/Makefile.in gtk+2.0-2.18.4/demos/gt CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = geninclude.pl CONFIG_CLEAN_VPATH_FILES = -@@ -201,6 +201,7 @@ +@@ -202,6 +202,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@ @@ -29763,7 +31210,7 @@ diff -Naur gtk+2.0-2.18.4.old/demos/gtk-demo/Makefile.in gtk+2.0-2.18.4/demos/gt GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -213,8 +214,6 @@ +@@ -214,8 +215,6 @@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -29772,7 +31219,7 @@ diff -Naur gtk+2.0-2.18.4.old/demos/gtk-demo/Makefile.in gtk+2.0-2.18.4/demos/gt GTK_API_VERSION = @GTK_API_VERSION@ GTK_BINARY_AGE = @GTK_BINARY_AGE@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -278,6 +277,7 @@ +@@ -279,6 +278,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -29780,9 +31227,9 @@ diff -Naur gtk+2.0-2.18.4.old/demos/gtk-demo/Makefile.in gtk+2.0-2.18.4/demos/gt PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -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 +diff -Naur gtk+2.0-2.19.1.old/demos/Makefile.in gtk+2.0-2.19.1/demos/Makefile.in +--- gtk+2.0-2.19.1.old/demos/Makefile.in 2009-11-30 22:17:31.000000000 +0100 ++++ gtk+2.0-2.19.1/demos/Makefile.in 2009-12-01 16:03:33.216292029 +0100 @@ -50,7 +50,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -29817,9 +31264,9 @@ diff -Naur gtk+2.0-2.18.4.old/demos/Makefile.in gtk+2.0-2.18.4/demos/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -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 +diff -Naur gtk+2.0-2.19.1.old/docs/faq/Makefile.in gtk+2.0-2.19.1/docs/faq/Makefile.in +--- gtk+2.0-2.19.1.old/docs/faq/Makefile.in 2009-11-30 22:17:31.000000000 +0100 ++++ gtk+2.0-2.19.1/docs/faq/Makefile.in 2009-12-01 16:03:33.520291356 +0100 @@ -43,7 +43,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -29854,9 +31301,9 @@ diff -Naur gtk+2.0-2.18.4.old/docs/faq/Makefile.in gtk+2.0-2.18.4/docs/faq/Makef PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -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 +diff -Naur gtk+2.0-2.19.1.old/docs/Makefile.in gtk+2.0-2.19.1/docs/Makefile.in +--- gtk+2.0-2.19.1.old/docs/Makefile.in 2009-11-30 22:17:31.000000000 +0100 ++++ gtk+2.0-2.19.1/docs/Makefile.in 2009-12-01 16:03:33.428292865 +0100 @@ -43,7 +43,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -29891,9 +31338,9 @@ diff -Naur gtk+2.0-2.18.4.old/docs/Makefile.in gtk+2.0-2.18.4/docs/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -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 +diff -Naur gtk+2.0-2.19.1.old/docs/reference/gdk/Makefile.in gtk+2.0-2.19.1/docs/reference/gdk/Makefile.in +--- gtk+2.0-2.19.1.old/docs/reference/gdk/Makefile.in 2009-11-30 22:17:32.000000000 +0100 ++++ gtk+2.0-2.19.1/docs/reference/gdk/Makefile.in 2009-12-01 16:03:33.860293577 +0100 @@ -50,7 +50,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -30125,9 +31572,9 @@ diff -Naur gtk+2.0-2.18.4.old/docs/reference/gdk/Makefile.in gtk+2.0-2.18.4/docs .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 +diff -Naur gtk+2.0-2.19.1.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.19.1/docs/reference/gdk-pixbuf/Makefile.in +--- gtk+2.0-2.19.1.old/docs/reference/gdk-pixbuf/Makefile.in 2009-11-30 22:17:31.000000000 +0100 ++++ gtk+2.0-2.19.1/docs/reference/gdk-pixbuf/Makefile.in 2009-12-01 16:03:33.760293011 +0100 @@ -50,7 +50,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -30359,9 +31806,9 @@ diff -Naur gtk+2.0-2.18.4.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.18 .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 +diff -Naur gtk+2.0-2.19.1.old/docs/reference/gtk/Makefile.in gtk+2.0-2.19.1/docs/reference/gtk/Makefile.in +--- gtk+2.0-2.19.1.old/docs/reference/gtk/Makefile.in 2009-11-30 22:17:32.000000000 +0100 ++++ gtk+2.0-2.19.1/docs/reference/gtk/Makefile.in 2009-12-01 16:03:33.976293378 +0100 @@ -50,7 +50,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -30396,7 +31843,7 @@ diff -Naur gtk+2.0-2.18.4.old/docs/reference/gtk/Makefile.in gtk+2.0-2.18.4/docs PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -@@ -713,10 +713,10 @@ +@@ -716,10 +716,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) @@ -30410,7 +31857,7 @@ diff -Naur gtk+2.0-2.18.4.old/docs/reference/gtk/Makefile.in gtk+2.0-2.18.4/docs @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 @@ +@@ -730,9 +730,7 @@ GPATH = $(srcdir) TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ @@ -30421,7 +31868,7 @@ diff -Naur gtk+2.0-2.18.4.old/docs/reference/gtk/Makefile.in gtk+2.0-2.18.4/docs SCANOBJ_FILES = \ $(DOC_MODULE).args \ -@@ -744,10 +742,6 @@ +@@ -747,10 +745,6 @@ $(DOC_MODULE)-unused.txt CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) @@ -30432,7 +31879,7 @@ diff -Naur gtk+2.0-2.18.4.old/docs/reference/gtk/Makefile.in gtk+2.0-2.18.4/docs ######################################################################## @ENABLE_MAN_TRUE@man_MANS = gtk-query-immodules-2.0.1 gtk-update-icon-cache.1 gtk-builder-convert.1 -@@ -1057,10 +1051,10 @@ +@@ -1060,10 +1054,10 @@ # run make test as part of make check check-local: test @@ -30445,7 +31892,7 @@ diff -Naur gtk+2.0-2.18.4.old/docs/reference/gtk/Makefile.in gtk+2.0-2.18.4/docs $(REPORT_FILES): sgml-build.stamp -@@ -1069,9 +1063,9 @@ +@@ -1072,9 +1066,9 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) @echo 'gtk-doc: Scanning header files' @-chmod -R u+w $(srcdir) @@ -30457,7 +31904,7 @@ diff -Naur gtk+2.0-2.18.4.old/docs/reference/gtk/Makefile.in gtk+2.0-2.18.4/docs 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 @@ +@@ -1082,7 +1076,7 @@ test -f $$i || touch $$i ; \ done \ fi @@ -30466,7 +31913,7 @@ diff -Naur gtk+2.0-2.18.4.old/docs/reference/gtk/Makefile.in gtk+2.0-2.18.4/docs $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @true -@@ -1089,23 +1083,23 @@ +@@ -1092,23 +1086,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) @@ -30496,7 +31943,7 @@ diff -Naur gtk+2.0-2.18.4.old/docs/reference/gtk/Makefile.in gtk+2.0-2.18.4/docs sgml.stamp: sgml-build.stamp @true -@@ -1115,37 +1109,18 @@ +@@ -1118,37 +1112,18 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) @echo 'gtk-doc: Building HTML' @-chmod -R u+w $(srcdir) @@ -30542,7 +31989,7 @@ diff -Naur gtk+2.0-2.18.4.old/docs/reference/gtk/Makefile.in gtk+2.0-2.18.4/docs ############## -@@ -1155,14 +1130,14 @@ +@@ -1158,14 +1133,14 @@ distclean-local: cd $(srcdir) && \ @@ -30559,7 +32006,7 @@ diff -Naur gtk+2.0-2.18.4.old/docs/reference/gtk/Makefile.in gtk+2.0-2.18.4/docs if test "$$installfiles" = '$(srcdir)/html/*'; \ then echo '-- Nothing to install' ; \ else \ -@@ -1182,11 +1157,12 @@ +@@ -1185,11 +1160,12 @@ mv -f $${installdir}/$(DOC_MODULE).devhelp \ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ fi; \ @@ -30574,7 +32021,7 @@ diff -Naur gtk+2.0-2.18.4.old/docs/reference/gtk/Makefile.in gtk+2.0-2.18.4/docs installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ else \ installdir="$(DESTDIR)$(TARGET_DIR)"; \ -@@ -1203,14 +1179,16 @@ +@@ -1206,14 +1182,16 @@ dist-hook: dist-check-gtkdoc dist-hook-local mkdir $(distdir)/tmpl @@ -30593,9 +32040,9 @@ diff -Naur gtk+2.0-2.18.4.old/docs/reference/gtk/Makefile.in gtk+2.0-2.18.4/docs .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 +diff -Naur gtk+2.0-2.19.1.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2.19.1/docs/reference/libgail-util/Makefile.in +--- gtk+2.0-2.19.1.old/docs/reference/libgail-util/Makefile.in 2009-11-30 22:17:32.000000000 +0100 ++++ gtk+2.0-2.19.1/docs/reference/libgail-util/Makefile.in 2009-12-01 16:03:34.076293020 +0100 @@ -49,7 +49,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -30827,9 +32274,9 @@ diff -Naur gtk+2.0-2.18.4.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2. .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 +diff -Naur gtk+2.0-2.19.1.old/docs/reference/Makefile.in gtk+2.0-2.19.1/docs/reference/Makefile.in +--- gtk+2.0-2.19.1.old/docs/reference/Makefile.in 2009-11-30 22:17:31.000000000 +0100 ++++ gtk+2.0-2.19.1/docs/reference/Makefile.in 2009-12-01 16:03:33.624292693 +0100 @@ -43,7 +43,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -30864,9 +32311,9 @@ diff -Naur gtk+2.0-2.18.4.old/docs/reference/Makefile.in gtk+2.0-2.18.4/docs/ref PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -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 +diff -Naur gtk+2.0-2.19.1.old/docs/tools/Makefile.in gtk+2.0-2.19.1/docs/tools/Makefile.in +--- gtk+2.0-2.19.1.old/docs/tools/Makefile.in 2009-11-30 22:17:32.000000000 +0100 ++++ gtk+2.0-2.19.1/docs/tools/Makefile.in 2009-12-01 16:03:34.180293318 +0100 @@ -45,7 +45,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -30901,9 +32348,9 @@ diff -Naur gtk+2.0-2.18.4.old/docs/tools/Makefile.in gtk+2.0-2.18.4/docs/tools/M PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -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 +diff -Naur gtk+2.0-2.19.1.old/docs/tutorial/Makefile.in gtk+2.0-2.19.1/docs/tutorial/Makefile.in +--- gtk+2.0-2.19.1.old/docs/tutorial/Makefile.in 2009-11-30 22:17:32.000000000 +0100 ++++ gtk+2.0-2.19.1/docs/tutorial/Makefile.in 2009-12-01 16:03:34.260293153 +0100 @@ -43,7 +43,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -30938,9 +32385,9 @@ diff -Naur gtk+2.0-2.18.4.old/docs/tutorial/Makefile.in gtk+2.0-2.18.4/docs/tuto PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -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 +diff -Naur gtk+2.0-2.19.1.old/gdk/directfb/Makefile.in gtk+2.0-2.19.1/gdk/directfb/Makefile.in +--- gtk+2.0-2.19.1.old/gdk/directfb/Makefile.in 2009-11-30 22:17:33.000000000 +0100 ++++ gtk+2.0-2.19.1/gdk/directfb/Makefile.in 2009-12-01 16:03:34.952291376 +0100 @@ -45,7 +45,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -30975,9 +32422,9 @@ diff -Naur gtk+2.0-2.18.4.old/gdk/directfb/Makefile.in gtk+2.0-2.18.4/gdk/direct PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -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 +diff -Naur gtk+2.0-2.19.1.old/gdk/Makefile.in gtk+2.0-2.19.1/gdk/Makefile.in +--- gtk+2.0-2.19.1.old/gdk/Makefile.in 2009-11-30 22:17:33.000000000 +0100 ++++ gtk+2.0-2.19.1/gdk/Makefile.in 2009-12-01 16:03:34.844291751 +0100 @@ -46,7 +46,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -31012,9 +32459,9 @@ diff -Naur gtk+2.0-2.18.4.old/gdk/Makefile.in gtk+2.0-2.18.4/gdk/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -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 +diff -Naur gtk+2.0-2.19.1.old/gdk/quartz/Makefile.in gtk+2.0-2.19.1/gdk/quartz/Makefile.in +--- gtk+2.0-2.19.1.old/gdk/quartz/Makefile.in 2009-11-30 22:17:33.000000000 +0100 ++++ gtk+2.0-2.19.1/gdk/quartz/Makefile.in 2009-12-01 16:03:35.060291128 +0100 @@ -45,7 +45,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -31049,9 +32496,9 @@ diff -Naur gtk+2.0-2.18.4.old/gdk/quartz/Makefile.in gtk+2.0-2.18.4/gdk/quartz/M PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -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 +diff -Naur gtk+2.0-2.19.1.old/gdk/tests/Makefile.in gtk+2.0-2.19.1/gdk/tests/Makefile.in +--- gtk+2.0-2.19.1.old/gdk/tests/Makefile.in 2009-11-30 22:17:33.000000000 +0100 ++++ gtk+2.0-2.19.1/gdk/tests/Makefile.in 2009-12-01 16:03:35.144291534 +0100 @@ -45,7 +45,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -31086,9 +32533,9 @@ diff -Naur gtk+2.0-2.18.4.old/gdk/tests/Makefile.in gtk+2.0-2.18.4/gdk/tests/Mak PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -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 +diff -Naur gtk+2.0-2.19.1.old/gdk/win32/Makefile.in gtk+2.0-2.19.1/gdk/win32/Makefile.in +--- gtk+2.0-2.19.1.old/gdk/win32/Makefile.in 2009-11-30 22:17:33.000000000 +0100 ++++ gtk+2.0-2.19.1/gdk/win32/Makefile.in 2009-12-01 16:03:35.268293471 +0100 @@ -45,7 +45,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -31123,9 +32570,9 @@ diff -Naur gtk+2.0-2.18.4.old/gdk/win32/Makefile.in gtk+2.0-2.18.4/gdk/win32/Mak PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -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 +diff -Naur gtk+2.0-2.19.1.old/gdk/win32/rc/Makefile.in gtk+2.0-2.19.1/gdk/win32/rc/Makefile.in +--- gtk+2.0-2.19.1.old/gdk/win32/rc/Makefile.in 2009-11-30 22:17:33.000000000 +0100 ++++ gtk+2.0-2.19.1/gdk/win32/rc/Makefile.in 2009-12-01 16:03:35.356293279 +0100 @@ -44,7 +44,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -31160,9 +32607,9 @@ diff -Naur gtk+2.0-2.18.4.old/gdk/win32/rc/Makefile.in gtk+2.0-2.18.4/gdk/win32/ PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -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 +diff -Naur gtk+2.0-2.19.1.old/gdk/x11/Makefile.in gtk+2.0-2.19.1/gdk/x11/Makefile.in +--- gtk+2.0-2.19.1.old/gdk/x11/Makefile.in 2009-11-30 22:17:34.000000000 +0100 ++++ gtk+2.0-2.19.1/gdk/x11/Makefile.in 2009-12-01 16:03:35.500291749 +0100 @@ -50,7 +50,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -31197,9 +32644,9 @@ diff -Naur gtk+2.0-2.18.4.old/gdk/x11/Makefile.in gtk+2.0-2.18.4/gdk/x11/Makefil PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -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 +diff -Naur gtk+2.0-2.19.1.old/gdk-pixbuf/Makefile.in gtk+2.0-2.19.1/gdk-pixbuf/Makefile.in +--- gtk+2.0-2.19.1.old/gdk-pixbuf/Makefile.in 2009-11-30 22:17:32.000000000 +0100 ++++ gtk+2.0-2.19.1/gdk-pixbuf/Makefile.in 2009-12-01 16:03:34.568293611 +0100 @@ -52,7 +52,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -31209,7 +32656,7 @@ diff -Naur gtk+2.0-2.18.4.old/gdk-pixbuf/Makefile.in gtk+2.0-2.18.4/gdk-pixbuf/M CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = gdk_pixbuf.rc gdk-pixbuf-features.h CONFIG_CLEAN_VPATH_FILES = -@@ -752,6 +752,7 @@ +@@ -772,6 +772,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@ @@ -31217,7 +32664,7 @@ diff -Naur gtk+2.0-2.18.4.old/gdk-pixbuf/Makefile.in gtk+2.0-2.18.4/gdk-pixbuf/M GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -764,8 +765,6 @@ +@@ -784,8 +785,6 @@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -31226,7 +32673,7 @@ diff -Naur gtk+2.0-2.18.4.old/gdk-pixbuf/Makefile.in gtk+2.0-2.18.4/gdk-pixbuf/M GTK_API_VERSION = @GTK_API_VERSION@ GTK_BINARY_AGE = @GTK_BINARY_AGE@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -829,6 +828,7 @@ +@@ -849,6 +848,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -31234,7 +32681,7 @@ diff -Naur gtk+2.0-2.18.4.old/gdk-pixbuf/Makefile.in gtk+2.0-2.18.4/gdk-pixbuf/M PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -@@ -961,6 +961,7 @@ +@@ -981,6 +981,7 @@ libgdk_pixbuf-2.0.la loaderdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loaders @@ -31242,7 +32689,7 @@ diff -Naur gtk+2.0-2.18.4.old/gdk-pixbuf/Makefile.in gtk+2.0-2.18.4/gdk-pixbuf/M module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS) # -@@ -1320,7 +1321,7 @@ +@@ -1352,7 +1353,7 @@ $(GDK_PIXBUF_DEP_CFLAGS) \ -DGDK_PIXBUF_ENABLE_BACKEND @@ -31251,9 +32698,9 @@ diff -Naur gtk+2.0-2.18.4.old/gdk-pixbuf/Makefile.in gtk+2.0-2.18.4/gdk-pixbuf/M 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.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 +diff -Naur gtk+2.0-2.19.1.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.19.1/gdk-pixbuf/pixops/Makefile.in +--- gtk+2.0-2.19.1.old/gdk-pixbuf/pixops/Makefile.in 2009-11-30 22:17:33.000000000 +0100 ++++ gtk+2.0-2.19.1/gdk-pixbuf/pixops/Makefile.in 2009-12-01 16:03:34.684292428 +0100 @@ -46,7 +46,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -31288,9 +32735,9 @@ diff -Naur gtk+2.0-2.18.4.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.18.4/gdk-p PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -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 +diff -Naur gtk+2.0-2.19.1.old/gtk/Makefile.in gtk+2.0-2.19.1/gtk/Makefile.in +--- gtk+2.0-2.19.1.old/gtk/Makefile.in 2009-11-30 22:56:45.000000000 +0100 ++++ gtk+2.0-2.19.1/gtk/Makefile.in 2009-12-01 16:03:35.880314279 +0100 @@ -79,7 +79,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -31300,7 +32747,7 @@ diff -Naur gtk+2.0-2.18.4.old/gtk/Makefile.in gtk+2.0-2.18.4/gtk/Makefile.in CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = makefile.msc gtkversion.h gtk-win32.rc CONFIG_CLEAN_VPATH_FILES = -@@ -727,6 +727,7 @@ +@@ -733,6 +733,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@ @@ -31308,7 +32755,7 @@ diff -Naur gtk+2.0-2.18.4.old/gtk/Makefile.in gtk+2.0-2.18.4/gtk/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -739,8 +740,6 @@ +@@ -745,8 +746,6 @@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ @@ -31317,7 +32764,7 @@ diff -Naur gtk+2.0-2.18.4.old/gtk/Makefile.in gtk+2.0-2.18.4/gtk/Makefile.in GTK_API_VERSION = @GTK_API_VERSION@ GTK_BINARY_AGE = @GTK_BINARY_AGE@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -@@ -804,6 +803,7 @@ +@@ -810,6 +809,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -31325,7 +32772,7 @@ diff -Naur gtk+2.0-2.18.4.old/gtk/Makefile.in gtk+2.0-2.18.4/gtk/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -@@ -957,6 +957,8 @@ +@@ -963,6 +963,8 @@ -I$(top_srcdir)/gdk \ -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \ -DGDK_DISABLE_DEPRECATED \ @@ -31334,7 +32781,7 @@ diff -Naur gtk+2.0-2.18.4.old/gtk/Makefile.in gtk+2.0-2.18.4/gtk/Makefile.in -DGTK_DISABLE_DEPRECATED \ -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \ -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ -@@ -1068,17 +1070,21 @@ +@@ -1075,17 +1077,21 @@ # Installed header files without compatibility guarantees # that are not included in gtk/gtk.h gtk_semi_private_h_sources = \ @@ -31364,9 +32811,9 @@ diff -Naur gtk+2.0-2.18.4.old/gtk/Makefile.in gtk+2.0-2.18.4/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.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 +diff -Naur gtk+2.0-2.19.1.old/gtk/tests/Makefile.in gtk+2.0-2.19.1/gtk/tests/Makefile.in +--- gtk+2.0-2.19.1.old/gtk/tests/Makefile.in 2009-11-30 22:17:34.000000000 +0100 ++++ gtk+2.0-2.19.1/gtk/tests/Makefile.in 2009-12-01 16:03:36.036294645 +0100 @@ -46,7 +46,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -31401,9 +32848,9 @@ diff -Naur gtk+2.0-2.18.4.old/gtk/tests/Makefile.in gtk+2.0-2.18.4/gtk/tests/Mak PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -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 +diff -Naur gtk+2.0-2.19.1.old/gtk/theme-bits/Makefile.in gtk+2.0-2.19.1/gtk/theme-bits/Makefile.in +--- gtk+2.0-2.19.1.old/gtk/theme-bits/Makefile.in 2009-11-30 22:17:34.000000000 +0100 ++++ gtk+2.0-2.19.1/gtk/theme-bits/Makefile.in 2009-12-01 16:03:36.136291215 +0100 @@ -45,7 +45,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -31438,9 +32885,9 @@ diff -Naur gtk+2.0-2.18.4.old/gtk/theme-bits/Makefile.in gtk+2.0-2.18.4/gtk/them PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -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 +diff -Naur gtk+2.0-2.19.1.old/gtk-doc.make gtk+2.0-2.19.1/gtk-doc.make +--- gtk+2.0-2.19.1.old/gtk-doc.make 2009-11-30 05:33:42.000000000 +0100 ++++ gtk+2.0-2.19.1/gtk-doc.make 2009-12-01 16:03:26.483397214 +0100 @@ -5,13 +5,13 @@ #################################### @@ -31643,9 +33090,9 @@ diff -Naur gtk+2.0-2.18.4.old/gtk-doc.make gtk+2.0-2.18.4/gtk-doc.make + 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 +diff -Naur gtk+2.0-2.19.1.old/ltmain.sh gtk+2.0-2.19.1/ltmain.sh +--- gtk+2.0-2.19.1.old/ltmain.sh 2009-10-19 14:18:27.000000000 +0200 ++++ gtk+2.0-2.19.1/ltmain.sh 2009-12-01 16:03:25.880303314 +0100 @@ -65,7 +65,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS @@ -31724,9 +33171,9 @@ diff -Naur gtk+2.0-2.18.4.old/ltmain.sh gtk+2.0-2.18.4/ltmain.sh esac ;; no) -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 +diff -Naur gtk+2.0-2.19.1.old/m4macros/Makefile.in gtk+2.0-2.19.1/m4macros/Makefile.in +--- gtk+2.0-2.19.1.old/m4macros/Makefile.in 2009-11-30 22:17:35.000000000 +0100 ++++ gtk+2.0-2.19.1/m4macros/Makefile.in 2009-12-01 16:03:36.220291350 +0100 @@ -44,7 +44,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -31761,9 +33208,9 @@ diff -Naur gtk+2.0-2.18.4.old/m4macros/Makefile.in gtk+2.0-2.18.4/m4macros/Makef PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -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 +diff -Naur gtk+2.0-2.19.1.old/Makefile.in gtk+2.0-2.19.1/Makefile.in +--- gtk+2.0-2.19.1.old/Makefile.in 2009-11-30 22:17:38.000000000 +0100 ++++ gtk+2.0-2.19.1/Makefile.in 2009-12-01 16:03:38.860291552 +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 \ @@ -31829,9 +33276,9 @@ diff -Naur gtk+2.0-2.18.4.old/Makefile.in gtk+2.0-2.18.4/Makefile.in SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros # require automake 1.4 -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 +diff -Naur gtk+2.0-2.19.1.old/mkinstalldirs gtk+2.0-2.19.1/mkinstalldirs +--- gtk+2.0-2.19.1.old/mkinstalldirs 1970-01-01 01:00:00.000000000 +0100 ++++ gtk+2.0-2.19.1/mkinstalldirs 2009-12-01 16:03:38.783318005 +0100 @@ -0,0 +1,162 @@ +#! /bin/sh +# mkinstalldirs --- make directory hierarchy @@ -31995,9 +33442,9 @@ diff -Naur gtk+2.0-2.18.4.old/mkinstalldirs gtk+2.0-2.18.4/mkinstalldirs +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: -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 +diff -Naur gtk+2.0-2.19.1.old/modules/engines/Makefile.in gtk+2.0-2.19.1/modules/engines/Makefile.in +--- gtk+2.0-2.19.1.old/modules/engines/Makefile.in 2009-11-30 22:17:35.000000000 +0100 ++++ gtk+2.0-2.19.1/modules/engines/Makefile.in 2009-12-01 16:03:36.388291621 +0100 @@ -43,7 +43,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -32032,9 +33479,9 @@ diff -Naur gtk+2.0-2.18.4.old/modules/engines/Makefile.in gtk+2.0-2.18.4/modules PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -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 +diff -Naur gtk+2.0-2.19.1.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.19.1/modules/engines/ms-windows/Makefile.in +--- gtk+2.0-2.19.1.old/modules/engines/ms-windows/Makefile.in 2009-11-30 22:17:35.000000000 +0100 ++++ gtk+2.0-2.19.1/modules/engines/ms-windows/Makefile.in 2009-12-01 16:03:36.496292777 +0100 @@ -44,7 +44,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -32069,9 +33516,9 @@ diff -Naur gtk+2.0-2.18.4.old/modules/engines/ms-windows/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.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 +diff -Naur gtk+2.0-2.19.1.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.19.1/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in +--- gtk+2.0-2.19.1.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2009-11-30 22:17:35.000000000 +0100 ++++ gtk+2.0-2.19.1/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2009-12-01 16:03:36.664293307 +0100 @@ -44,7 +44,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -32106,9 +33553,9 @@ diff -Naur gtk+2.0-2.18.4.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.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 +diff -Naur gtk+2.0-2.19.1.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.19.1/modules/engines/ms-windows/Theme/Makefile.in +--- gtk+2.0-2.19.1.old/modules/engines/ms-windows/Theme/Makefile.in 2009-11-30 22:17:35.000000000 +0100 ++++ gtk+2.0-2.19.1/modules/engines/ms-windows/Theme/Makefile.in 2009-12-01 16:03:36.580292830 +0100 @@ -43,7 +43,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -32143,9 +33590,9 @@ diff -Naur gtk+2.0-2.18.4.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2 PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -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 +diff -Naur gtk+2.0-2.19.1.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.19.1/modules/engines/pixbuf/Makefile.in +--- gtk+2.0-2.19.1.old/modules/engines/pixbuf/Makefile.in 2009-11-30 22:17:35.000000000 +0100 ++++ gtk+2.0-2.19.1/modules/engines/pixbuf/Makefile.in 2009-12-01 16:03:36.768291793 +0100 @@ -44,7 +44,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -32180,9 +33627,9 @@ diff -Naur gtk+2.0-2.18.4.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.18.4/ PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -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 +diff -Naur gtk+2.0-2.19.1.old/modules/input/Makefile.in gtk+2.0-2.19.1/modules/input/Makefile.in +--- gtk+2.0-2.19.1.old/modules/input/Makefile.in 2009-11-30 22:17:35.000000000 +0100 ++++ gtk+2.0-2.19.1/modules/input/Makefile.in 2009-12-01 16:03:36.972293359 +0100 @@ -45,7 +45,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -32247,9 +33694,9 @@ diff -Naur gtk+2.0-2.18.4.old/modules/input/Makefile.in gtk+2.0-2.18.4/modules/i @CROSS_COMPILING_FALSE@all-local: gtk.immodules -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 +diff -Naur gtk+2.0-2.19.1.old/modules/Makefile.in gtk+2.0-2.19.1/modules/Makefile.in +--- gtk+2.0-2.19.1.old/modules/Makefile.in 2009-11-30 22:17:35.000000000 +0100 ++++ gtk+2.0-2.19.1/modules/Makefile.in 2009-12-01 16:03:36.308292899 +0100 @@ -44,7 +44,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -32284,9 +33731,9 @@ diff -Naur gtk+2.0-2.18.4.old/modules/Makefile.in gtk+2.0-2.18.4/modules/Makefil PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -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 +diff -Naur gtk+2.0-2.19.1.old/modules/other/gail/libgail-util/Makefile.in gtk+2.0-2.19.1/modules/other/gail/libgail-util/Makefile.in +--- gtk+2.0-2.19.1.old/modules/other/gail/libgail-util/Makefile.in 2009-11-30 22:17:36.000000000 +0100 ++++ gtk+2.0-2.19.1/modules/other/gail/libgail-util/Makefile.in 2009-12-01 16:03:37.536291084 +0100 @@ -46,7 +46,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -32321,9 +33768,9 @@ diff -Naur gtk+2.0-2.18.4.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.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 +diff -Naur gtk+2.0-2.19.1.old/modules/other/gail/Makefile.in gtk+2.0-2.19.1/modules/other/gail/Makefile.in +--- gtk+2.0-2.19.1.old/modules/other/gail/Makefile.in 2009-11-30 22:17:36.000000000 +0100 ++++ gtk+2.0-2.19.1/modules/other/gail/Makefile.in 2009-12-01 16:03:37.416291619 +0100 @@ -45,7 +45,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -32358,9 +33805,9 @@ diff -Naur gtk+2.0-2.18.4.old/modules/other/gail/Makefile.in gtk+2.0-2.18.4/modu PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -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 +diff -Naur gtk+2.0-2.19.1.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.19.1/modules/other/gail/tests/Makefile.in +--- gtk+2.0-2.19.1.old/modules/other/gail/tests/Makefile.in 2009-11-30 22:17:36.000000000 +0100 ++++ gtk+2.0-2.19.1/modules/other/gail/tests/Makefile.in 2009-12-01 16:03:37.700291319 +0100 @@ -44,7 +44,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -32395,9 +33842,9 @@ diff -Naur gtk+2.0-2.18.4.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.18. PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -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 +diff -Naur gtk+2.0-2.19.1.old/modules/other/Makefile.in gtk+2.0-2.19.1/modules/other/Makefile.in +--- gtk+2.0-2.19.1.old/modules/other/Makefile.in 2009-11-30 22:17:36.000000000 +0100 ++++ gtk+2.0-2.19.1/modules/other/Makefile.in 2009-12-01 16:03:37.060291827 +0100 @@ -43,7 +43,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -32432,9 +33879,9 @@ diff -Naur gtk+2.0-2.18.4.old/modules/other/Makefile.in gtk+2.0-2.18.4/modules/o PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -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 +diff -Naur gtk+2.0-2.19.1.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.19.1/modules/printbackends/cups/Makefile.in +--- gtk+2.0-2.19.1.old/modules/printbackends/cups/Makefile.in 2009-11-30 22:17:37.000000000 +0100 ++++ gtk+2.0-2.19.1/modules/printbackends/cups/Makefile.in 2009-12-01 16:03:37.892291570 +0100 @@ -45,7 +45,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -32469,9 +33916,9 @@ diff -Naur gtk+2.0-2.18.4.old/modules/printbackends/cups/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.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 +diff -Naur gtk+2.0-2.19.1.old/modules/printbackends/file/Makefile.in gtk+2.0-2.19.1/modules/printbackends/file/Makefile.in +--- gtk+2.0-2.19.1.old/modules/printbackends/file/Makefile.in 2009-11-30 22:17:37.000000000 +0100 ++++ gtk+2.0-2.19.1/modules/printbackends/file/Makefile.in 2009-12-01 16:03:38.004294771 +0100 @@ -45,7 +45,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -32506,9 +33953,9 @@ diff -Naur gtk+2.0-2.18.4.old/modules/printbackends/file/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.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 +diff -Naur gtk+2.0-2.19.1.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.19.1/modules/printbackends/lpr/Makefile.in +--- gtk+2.0-2.19.1.old/modules/printbackends/lpr/Makefile.in 2009-11-30 22:17:37.000000000 +0100 ++++ gtk+2.0-2.19.1/modules/printbackends/lpr/Makefile.in 2009-12-01 16:03:38.108292755 +0100 @@ -45,7 +45,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -32543,9 +33990,9 @@ diff -Naur gtk+2.0-2.18.4.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.18 PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -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 +diff -Naur gtk+2.0-2.19.1.old/modules/printbackends/Makefile.in gtk+2.0-2.19.1/modules/printbackends/Makefile.in +--- gtk+2.0-2.19.1.old/modules/printbackends/Makefile.in 2009-11-30 22:17:36.000000000 +0100 ++++ gtk+2.0-2.19.1/modules/printbackends/Makefile.in 2009-12-01 16:03:37.784290964 +0100 @@ -46,7 +46,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -32580,9 +34027,9 @@ diff -Naur gtk+2.0-2.18.4.old/modules/printbackends/Makefile.in gtk+2.0-2.18.4/m PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -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 +diff -Naur gtk+2.0-2.19.1.old/modules/printbackends/papi/Makefile.in gtk+2.0-2.19.1/modules/printbackends/papi/Makefile.in +--- gtk+2.0-2.19.1.old/modules/printbackends/papi/Makefile.in 2009-11-30 22:17:37.000000000 +0100 ++++ gtk+2.0-2.19.1/modules/printbackends/papi/Makefile.in 2009-12-01 16:03:38.212291381 +0100 @@ -43,7 +43,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -32617,9 +34064,9 @@ diff -Naur gtk+2.0-2.18.4.old/modules/printbackends/papi/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.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 +diff -Naur gtk+2.0-2.19.1.old/modules/printbackends/test/Makefile.in gtk+2.0-2.19.1/modules/printbackends/test/Makefile.in +--- gtk+2.0-2.19.1.old/modules/printbackends/test/Makefile.in 2009-11-30 22:17:37.000000000 +0100 ++++ gtk+2.0-2.19.1/modules/printbackends/test/Makefile.in 2009-12-01 16:03:38.320297220 +0100 @@ -45,7 +45,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -32654,9 +34101,9 @@ diff -Naur gtk+2.0-2.18.4.old/modules/printbackends/test/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.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 +diff -Naur gtk+2.0-2.19.1.old/perf/Makefile.in gtk+2.0-2.19.1/perf/Makefile.in +--- gtk+2.0-2.19.1.old/perf/Makefile.in 2009-11-30 22:17:37.000000000 +0100 ++++ gtk+2.0-2.19.1/perf/Makefile.in 2009-12-01 16:03:38.424291728 +0100 @@ -45,7 +45,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -32691,9 +34138,9 @@ diff -Naur gtk+2.0-2.18.4.old/perf/Makefile.in gtk+2.0-2.18.4/perf/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ -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 +diff -Naur gtk+2.0-2.19.1.old/po/Makefile.in.in gtk+2.0-2.19.1/po/Makefile.in.in +--- gtk+2.0-2.19.1.old/po/Makefile.in.in 2009-10-09 07:00:46.000000000 +0200 ++++ gtk+2.0-2.19.1/po/Makefile.in.in 2009-12-01 16:03:26.427322770 +0100 @@ -25,22 +25,23 @@ prefix = @prefix@ @@ -32805,9 +34252,9 @@ diff -Naur gtk+2.0-2.18.4.old/po/Makefile.in.in gtk+2.0-2.18.4/po/Makefile.in.in $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ else \ -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 +diff -Naur gtk+2.0-2.19.1.old/tests/Makefile.in gtk+2.0-2.19.1/tests/Makefile.in +--- gtk+2.0-2.19.1.old/tests/Makefile.in 2009-11-30 22:17:37.000000000 +0100 ++++ gtk+2.0-2.19.1/tests/Makefile.in 2009-12-01 16:03:38.684292497 +0100 @@ -79,7 +79,7 @@ $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ diff --git a/debian/rules b/debian/rules index de96288093..404a1f3b4b 100644 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,7 @@ # Debian GNOME Maintainers DISABLE_UPDATE_UPLOADERS := 1 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk # get-orig-source target -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk @@ -53,7 +54,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.18.0 +SHVER := 2.19.1 # earliest version that this release has backwards binary compatibility for GTK_BINARY_VERSION := 2.10.0