r21213 - in /desktop/experimental/gtk+2.0/debian: changelog control libgtk-directfb-2.0-0.symbols libgtk2.0-0.symbols patches/070_mandatory-relibtoolize.patch rules
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Tue Sep 1 14:12:52 UTC 2009
Author: slomo
Date: Tue Sep 1 14:12:52 2009
New Revision: 21213
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21213
Log:
* New upstream development release:
+ debian/patches/070_mandatory-relibtoolize.patch:
- Updated for the new version.
+ debian/rules,
debian/*.symbols:
- Updated for the new version.
Modified:
desktop/experimental/gtk+2.0/debian/changelog
desktop/experimental/gtk+2.0/debian/control
desktop/experimental/gtk+2.0/debian/libgtk-directfb-2.0-0.symbols
desktop/experimental/gtk+2.0/debian/libgtk2.0-0.symbols
desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch
desktop/experimental/gtk+2.0/debian/rules
Modified: desktop/experimental/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/changelog?rev=21213&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/changelog [utf-8] Tue Sep 1 14:12:52 2009
@@ -1,3 +1,14 @@
+gtk+2.0 (2.17.10-1) experimental; urgency=low
+
+ * New upstream development release:
+ + debian/patches/070_mandatory-relibtoolize.patch:
+ - Updated for the new version.
+ + debian/rules,
+ debian/*.symbols:
+ - Updated for the new version.
+
+ -- Sebastian Dröge <slomo at debian.org> Tue, 01 Sep 2009 16:08:43 +0200
+
gtk+2.0 (2.17.9-1) experimental; urgency=low
[ Josselin Mouette ]
Modified: desktop/experimental/gtk+2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/control?rev=21213&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/control [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/control [utf-8] Tue Sep 1 14:12:52 2009
@@ -2,7 +2,7 @@
Section: libs
Priority: optional
Maintainer: Sebastien Bacher <seb128 at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at ubuntu.com>, Gustavo Noronha Silva <kov at debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: debhelper (>= 5.0.22),
gettext,
pkg-config,
Modified: desktop/experimental/gtk+2.0/debian/libgtk-directfb-2.0-0.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgtk-directfb-2.0-0.symbols?rev=21213&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgtk-directfb-2.0-0.symbols [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/libgtk-directfb-2.0-0.symbols [utf-8] Tue Sep 1 14:12:52 2009
@@ -105,13 +105,13 @@
gdk_directfb_visual_by_format at Base 2.8.0
gdk_directfb_window_find_focus at Base 2.8.0
gdk_directfb_window_find_toplevel at Base 2.8.0
- gdk_directfb_window_get_pointer_helper at Base 2.17.9
+ gdk_directfb_window_get_pointer_helper at Base 2.17.10
gdk_directfb_window_id_table_insert at Base 2.8.0
gdk_directfb_window_id_table_lookup at Base 2.8.0
gdk_directfb_window_id_table_remove at Base 2.8.0
- gdk_directfb_window_input_shape_combine_region at Base 2.17.9
+ gdk_directfb_window_input_shape_combine_region at Base 2.17.10
gdk_directfb_window_lookup at Base 2.10.0
- gdk_directfb_window_new at Base 2.17.9
+ gdk_directfb_window_new at Base 2.17.10
gdk_directfb_window_send_crossing_events at Base 2.8.0
gdk_directfb_window_set_opacity at Base 2.8.0
gdk_display_add_client_message_filter at Base 2.8.0
@@ -363,10 +363,10 @@
gdk_notify_startup_complete at Base 2.8.0
gdk_notify_startup_complete_with_id at Base 2.12.0
gdk_notify_type_get_type at Base 2.8.0
- gdk_offscreen_window_get_embedder at Base 2.17.9
- gdk_offscreen_window_get_pixmap at Base 2.17.9
- gdk_offscreen_window_get_type at Base 2.17.9
- gdk_offscreen_window_set_embedder at Base 2.17.9
+ gdk_offscreen_window_get_embedder at Base 2.17.10
+ gdk_offscreen_window_get_pixmap at Base 2.17.10
+ gdk_offscreen_window_get_type at Base 2.17.10
+ gdk_offscreen_window_set_embedder at Base 2.17.10
gdk_overlap_type_get_type at Base 2.8.0
gdk_owner_change_get_type at Base 2.8.0
gdk_pango_attr_emboss_color_new at Base 2.12.0
@@ -431,7 +431,7 @@
gdk_region_offset at Base 2.8.0
gdk_region_point_in at Base 2.8.0
gdk_region_polygon at Base 2.8.0
- gdk_region_rect_equal at Base 2.17.9
+ gdk_region_rect_equal at Base 2.17.10
gdk_region_rect_in at Base 2.8.0
gdk_region_rectangle at Base 2.8.0
gdk_region_shrink at Base 2.8.0
@@ -587,16 +587,16 @@
gdk_window_edge_get_type at Base 2.8.0
gdk_window_enable_synchronized_configure at Base 2.8.0
gdk_window_end_paint at Base 2.8.0
- gdk_window_ensure_native at Base 2.17.9
+ gdk_window_ensure_native at Base 2.17.10
gdk_window_focus at Base 2.8.0
gdk_window_foreign_new at Base 2.8.0
gdk_window_foreign_new_for_display at Base 2.8.0
gdk_window_freeze_toplevel_updates_libgtk_only at Base 2.12.0
gdk_window_freeze_updates at Base 2.8.0
gdk_window_fullscreen at Base 2.8.0
- gdk_window_geometry_changed at Base 2.17.9
+ gdk_window_geometry_changed at Base 2.17.10
gdk_window_get_children at Base 2.8.0
- gdk_window_get_cursor at Base 2.17.9
+ gdk_window_get_cursor at Base 2.17.10
gdk_window_get_decorations at Base 2.8.0
gdk_window_get_deskrelative_origin at Base 2.8.0
gdk_window_get_events at Base 2.8.0
@@ -608,7 +608,7 @@
gdk_window_get_parent at Base 2.8.0
gdk_window_get_pointer at Base 2.8.0
gdk_window_get_position at Base 2.8.0
- gdk_window_get_root_coords at Base 2.17.9
+ gdk_window_get_root_coords at Base 2.17.10
gdk_window_get_root_origin at Base 2.8.0
gdk_window_get_state at Base 2.8.0
gdk_window_get_toplevel at Base 2.8.0
@@ -1055,24 +1055,24 @@
gtk_cell_renderer_combo_get_type at Base 2.8.0
gtk_cell_renderer_combo_new at Base 2.8.0
gtk_cell_renderer_editing_canceled at Base 2.8.0
- gtk_cell_renderer_get_alignment at Base 2.17.9
+ gtk_cell_renderer_get_alignment at Base 2.17.10
gtk_cell_renderer_get_fixed_size at Base 2.8.0
- gtk_cell_renderer_get_padding at Base 2.17.9
- gtk_cell_renderer_get_sensitive at Base 2.17.9
+ gtk_cell_renderer_get_padding at Base 2.17.10
+ gtk_cell_renderer_get_sensitive at Base 2.17.10
gtk_cell_renderer_get_size at Base 2.8.0
gtk_cell_renderer_get_type at Base 2.8.0
- gtk_cell_renderer_get_visible at Base 2.17.9
+ gtk_cell_renderer_get_visible at Base 2.17.10
gtk_cell_renderer_mode_get_type at Base 2.8.0
gtk_cell_renderer_pixbuf_get_type at Base 2.8.0
gtk_cell_renderer_pixbuf_new at Base 2.8.0
gtk_cell_renderer_progress_get_type at Base 2.8.0
gtk_cell_renderer_progress_new at Base 2.8.0
gtk_cell_renderer_render at Base 2.8.0
- gtk_cell_renderer_set_alignment at Base 2.17.9
+ gtk_cell_renderer_set_alignment at Base 2.17.10
gtk_cell_renderer_set_fixed_size at Base 2.8.0
- gtk_cell_renderer_set_padding at Base 2.17.9
- gtk_cell_renderer_set_sensitive at Base 2.17.9
- gtk_cell_renderer_set_visible at Base 2.17.9
+ gtk_cell_renderer_set_padding at Base 2.17.10
+ gtk_cell_renderer_set_sensitive at Base 2.17.10
+ gtk_cell_renderer_set_visible at Base 2.17.10
gtk_cell_renderer_spin_get_type at Base 2.10.0
gtk_cell_renderer_spin_new at Base 2.10.0
gtk_cell_renderer_start_editing at Base 2.8.0
@@ -1081,12 +1081,12 @@
gtk_cell_renderer_text_get_type at Base 2.8.0
gtk_cell_renderer_text_new at Base 2.8.0
gtk_cell_renderer_text_set_fixed_height_from_font at Base 2.8.0
- gtk_cell_renderer_toggle_get_activatable at Base 2.17.9
+ gtk_cell_renderer_toggle_get_activatable at Base 2.17.10
gtk_cell_renderer_toggle_get_active at Base 2.8.0
gtk_cell_renderer_toggle_get_radio at Base 2.8.0
gtk_cell_renderer_toggle_get_type at Base 2.8.0
gtk_cell_renderer_toggle_new at Base 2.8.0
- gtk_cell_renderer_toggle_set_activatable at Base 2.17.9
+ gtk_cell_renderer_toggle_set_activatable at Base 2.17.10
gtk_cell_renderer_toggle_set_active at Base 2.8.0
gtk_cell_renderer_toggle_set_radio at Base 2.8.0
gtk_cell_type_get_type at Base 2.8.0
@@ -1425,7 +1425,7 @@
gtk_curve_set_range at Base 2.8.0
gtk_curve_set_vector at Base 2.8.0
gtk_curve_type_get_type at Base 2.8.0
- gtk_custom_paper_unix_dialog_get_type at Base 2.17.9
+ gtk_custom_paper_unix_dialog_get_type at Base 2.17.10
gtk_debug_flag_get_type at Base 2.8.0
gtk_debug_flags at Base 2.8.0
gtk_decorated_window_calculate_frame_size at Base 2.8.0
@@ -1531,18 +1531,18 @@
gtk_editable_set_editable at Base 2.8.0
gtk_editable_set_position at Base 2.8.0
gtk_entry_append_text at Base 2.8.0
- gtk_entry_buffer_delete_text at Base 2.17.9
- gtk_entry_buffer_emit_deleted_text at Base 2.17.9
- gtk_entry_buffer_emit_inserted_text at Base 2.17.9
- gtk_entry_buffer_get_bytes at Base 2.17.9
- gtk_entry_buffer_get_length at Base 2.17.9
- gtk_entry_buffer_get_max_length at Base 2.17.9
- gtk_entry_buffer_get_text at Base 2.17.9
- gtk_entry_buffer_get_type at Base 2.17.9
- gtk_entry_buffer_insert_text at Base 2.17.9
- gtk_entry_buffer_new at Base 2.17.9
- gtk_entry_buffer_set_max_length at Base 2.17.9
- gtk_entry_buffer_set_text at Base 2.17.9
+ gtk_entry_buffer_delete_text at Base 2.17.10
+ gtk_entry_buffer_emit_deleted_text at Base 2.17.10
+ gtk_entry_buffer_emit_inserted_text at Base 2.17.10
+ gtk_entry_buffer_get_bytes at Base 2.17.10
+ gtk_entry_buffer_get_length at Base 2.17.10
+ gtk_entry_buffer_get_max_length at Base 2.17.10
+ gtk_entry_buffer_get_text at Base 2.17.10
+ gtk_entry_buffer_get_type at Base 2.17.10
+ gtk_entry_buffer_insert_text at Base 2.17.10
+ gtk_entry_buffer_new at Base 2.17.10
+ gtk_entry_buffer_set_max_length at Base 2.17.10
+ gtk_entry_buffer_set_text at Base 2.17.10
gtk_entry_completion_complete at Base 2.8.0
gtk_entry_completion_delete_action at Base 2.8.0
gtk_entry_completion_get_completion_prefix at Base 2.12.0
@@ -1571,7 +1571,7 @@
gtk_entry_completion_set_text_column at Base 2.8.0
gtk_entry_get_activates_default at Base 2.8.0
gtk_entry_get_alignment at Base 2.8.0
- gtk_entry_get_buffer at Base 2.17.9
+ gtk_entry_get_buffer at Base 2.17.10
gtk_entry_get_completion at Base 2.8.0
gtk_entry_get_current_icon_drag_source at Base 2.16.0
gtk_entry_get_cursor_hadjustment at Base 2.12.0
@@ -1602,14 +1602,14 @@
gtk_entry_icon_position_get_type at Base 2.16.0
gtk_entry_layout_index_to_text_index at Base 2.8.0
gtk_entry_new at Base 2.8.0
- gtk_entry_new_with_buffer at Base 2.17.9
+ gtk_entry_new_with_buffer at Base 2.17.10
gtk_entry_new_with_max_length at Base 2.8.0
gtk_entry_prepend_text at Base 2.8.0
gtk_entry_progress_pulse at Base 2.16.0
gtk_entry_select_region at Base 2.8.0
gtk_entry_set_activates_default at Base 2.8.0
gtk_entry_set_alignment at Base 2.8.0
- gtk_entry_set_buffer at Base 2.17.9
+ gtk_entry_set_buffer at Base 2.17.10
gtk_entry_set_completion at Base 2.8.0
gtk_entry_set_cursor_hadjustment at Base 2.12.0
gtk_entry_set_editable at Base 2.8.0
@@ -1682,7 +1682,7 @@
gtk_file_chooser_error_get_type at Base 2.8.0
gtk_file_chooser_error_quark at Base 2.8.0
gtk_file_chooser_get_action at Base 2.8.0
- gtk_file_chooser_get_create_folders at Base 2.17.9
+ gtk_file_chooser_get_create_folders at Base 2.17.10
gtk_file_chooser_get_current_folder at Base 2.8.0
gtk_file_chooser_get_current_folder_file at Base 2.14.0
gtk_file_chooser_get_current_folder_uri at Base 2.8.0
@@ -1716,7 +1716,7 @@
gtk_file_chooser_select_filename at Base 2.8.0
gtk_file_chooser_select_uri at Base 2.8.0
gtk_file_chooser_set_action at Base 2.8.0
- gtk_file_chooser_set_create_folders at Base 2.17.9
+ gtk_file_chooser_set_create_folders at Base 2.17.10
gtk_file_chooser_set_current_folder at Base 2.8.0
gtk_file_chooser_set_current_folder_file at Base 2.14.0
gtk_file_chooser_set_current_folder_uri at Base 2.8.0
@@ -1958,7 +1958,7 @@
gtk_icon_view_get_dest_item_at_pos at Base 2.8.0
gtk_icon_view_get_drag_dest_item at Base 2.8.0
gtk_icon_view_get_item_at_pos at Base 2.8.0
- gtk_icon_view_get_item_padding at Base 2.17.9
+ gtk_icon_view_get_item_padding at Base 2.17.10
gtk_icon_view_get_item_width at Base 2.8.0
gtk_icon_view_get_margin at Base 2.8.0
gtk_icon_view_get_markup_column at Base 2.8.0
@@ -1988,7 +1988,7 @@
gtk_icon_view_set_columns at Base 2.8.0
gtk_icon_view_set_cursor at Base 2.8.0
gtk_icon_view_set_drag_dest_item at Base 2.8.0
- gtk_icon_view_set_item_padding at Base 2.17.9
+ gtk_icon_view_set_item_padding at Base 2.17.10
gtk_icon_view_set_item_width at Base 2.8.0
gtk_icon_view_set_margin at Base 2.8.0
gtk_icon_view_set_markup_column at Base 2.8.0
@@ -2082,19 +2082,19 @@
gtk_image_set_from_stock at Base 2.8.0
gtk_image_set_pixel_size at Base 2.8.0
gtk_image_type_get_type at Base 2.8.0
- gtk_info_bar_add_action_widget at Base 2.17.9
- gtk_info_bar_add_button at Base 2.17.9
- gtk_info_bar_add_buttons at Base 2.17.9
- gtk_info_bar_get_action_area at Base 2.17.9
- gtk_info_bar_get_content_area at Base 2.17.9
- gtk_info_bar_get_message_type at Base 2.17.9
- gtk_info_bar_get_type at Base 2.17.9
- gtk_info_bar_new at Base 2.17.9
- gtk_info_bar_new_with_buttons at Base 2.17.9
- gtk_info_bar_response at Base 2.17.9
- gtk_info_bar_set_default_response at Base 2.17.9
- gtk_info_bar_set_message_type at Base 2.17.9
- gtk_info_bar_set_response_sensitive at Base 2.17.9
+ gtk_info_bar_add_action_widget at Base 2.17.10
+ gtk_info_bar_add_button at Base 2.17.10
+ gtk_info_bar_add_buttons at Base 2.17.10
+ gtk_info_bar_get_action_area at Base 2.17.10
+ gtk_info_bar_get_content_area at Base 2.17.10
+ gtk_info_bar_get_message_type at Base 2.17.10
+ gtk_info_bar_get_type at Base 2.17.10
+ gtk_info_bar_new at Base 2.17.10
+ gtk_info_bar_new_with_buttons at Base 2.17.10
+ gtk_info_bar_response at Base 2.17.10
+ gtk_info_bar_set_default_response at Base 2.17.10
+ gtk_info_bar_set_message_type at Base 2.17.10
+ gtk_info_bar_set_response_sensitive at Base 2.17.10
gtk_init at Base 2.8.0
gtk_init_add at Base 2.8.0
gtk_init_check at Base 2.8.0
@@ -2143,7 +2143,7 @@
gtk_label_get at Base 2.8.0
gtk_label_get_angle at Base 2.8.0
gtk_label_get_attributes at Base 2.8.0
- gtk_label_get_current_uri at Base 2.17.9
+ gtk_label_get_current_uri at Base 2.17.10
gtk_label_get_ellipsize at Base 2.8.0
gtk_label_get_justify at Base 2.8.0
gtk_label_get_label at Base 2.8.0
@@ -2158,7 +2158,7 @@
gtk_label_get_selection_bounds at Base 2.8.0
gtk_label_get_single_line_mode at Base 2.8.0
gtk_label_get_text at Base 2.8.0
- gtk_label_get_track_visited_links at Base 2.17.9
+ gtk_label_get_track_visited_links at Base 2.17.10
gtk_label_get_type at Base 2.8.0
gtk_label_get_use_markup at Base 2.8.0
gtk_label_get_use_underline at Base 2.8.0
@@ -2183,7 +2183,7 @@
gtk_label_set_single_line_mode at Base 2.8.0
gtk_label_set_text at Base 2.8.0
gtk_label_set_text_with_mnemonic at Base 2.8.0
- gtk_label_set_track_visited_links at Base 2.17.9
+ gtk_label_set_track_visited_links at Base 2.17.10
gtk_label_set_use_markup at Base 2.8.0
gtk_label_set_use_underline at Base 2.8.0
gtk_label_set_width_chars at Base 2.8.0
@@ -2311,7 +2311,7 @@
gtk_menu_get_attach_widget at Base 2.8.0
gtk_menu_get_for_attach_widget at Base 2.8.0
gtk_menu_get_monitor at Base 2.14.0
- gtk_menu_get_reserve_toggle_size at Base 2.17.9
+ gtk_menu_get_reserve_toggle_size at Base 2.17.10
gtk_menu_get_tearoff_state at Base 2.8.0
gtk_menu_get_title at Base 2.8.0
gtk_menu_get_type at Base 2.8.0
@@ -2344,7 +2344,7 @@
gtk_menu_set_accel_path at Base 2.8.0
gtk_menu_set_active at Base 2.8.0
gtk_menu_set_monitor at Base 2.8.0
- gtk_menu_set_reserve_toggle_size at Base 2.17.9
+ gtk_menu_set_reserve_toggle_size at Base 2.17.10
gtk_menu_set_screen at Base 2.8.0
gtk_menu_set_tearoff_state at Base 2.8.0
gtk_menu_set_title at Base 2.8.0
@@ -2619,7 +2619,7 @@
gtk_print_backend_printer_list_is_done at Base 2.10.0
gtk_print_backend_remove_printer at Base 2.10.0
gtk_print_backend_set_list_done at Base 2.10.0
- gtk_print_backend_set_password at Base 2.17.9
+ gtk_print_backend_set_password at Base 2.17.10
gtk_print_capabilities_get_type at Base 2.10.0
gtk_print_context_create_pango_context at Base 2.10.0
gtk_print_context_create_pango_layout at Base 2.10.0
@@ -2651,14 +2651,14 @@
gtk_print_operation_cancel at Base 2.10.0
gtk_print_operation_draw_page_finish at Base 2.16.0
gtk_print_operation_get_default_page_setup at Base 2.10.0
- gtk_print_operation_get_embed_page_setup at Base 2.17.9
+ gtk_print_operation_get_embed_page_setup at Base 2.17.10
gtk_print_operation_get_error at Base 2.10.0
- gtk_print_operation_get_has_selection at Base 2.17.9
- gtk_print_operation_get_n_pages_to_print at Base 2.17.9
+ gtk_print_operation_get_has_selection at Base 2.17.10
+ gtk_print_operation_get_n_pages_to_print at Base 2.17.10
gtk_print_operation_get_print_settings at Base 2.10.0
gtk_print_operation_get_status at Base 2.10.0
gtk_print_operation_get_status_string at Base 2.10.0
- gtk_print_operation_get_support_selection at Base 2.17.9
+ gtk_print_operation_get_support_selection at Base 2.17.10
gtk_print_operation_get_type at Base 2.10.0
gtk_print_operation_is_finished at Base 2.10.0
gtk_print_operation_new at Base 2.10.0
@@ -2673,14 +2673,14 @@
gtk_print_operation_set_custom_tab_label at Base 2.10.0
gtk_print_operation_set_default_page_setup at Base 2.10.0
gtk_print_operation_set_defer_drawing at Base 2.16.0
- gtk_print_operation_set_embed_page_setup at Base 2.17.9
+ gtk_print_operation_set_embed_page_setup at Base 2.17.10
gtk_print_operation_set_export_filename at Base 2.10.0
- gtk_print_operation_set_has_selection at Base 2.17.9
+ gtk_print_operation_set_has_selection at Base 2.17.10
gtk_print_operation_set_job_name at Base 2.10.0
gtk_print_operation_set_n_pages at Base 2.10.0
gtk_print_operation_set_print_settings at Base 2.10.0
gtk_print_operation_set_show_progress at Base 2.10.0
- gtk_print_operation_set_support_selection at Base 2.17.9
+ gtk_print_operation_set_support_selection at Base 2.17.10
gtk_print_operation_set_track_print_status at Base 2.10.0
gtk_print_operation_set_unit at Base 2.10.0
gtk_print_operation_set_use_full_page at Base 2.10.0
@@ -2766,23 +2766,23 @@
gtk_print_status_get_type at Base 2.10.0
gtk_print_unix_dialog_add_custom_tab at Base 2.10.0
gtk_print_unix_dialog_get_current_page at Base 2.10.0
- gtk_print_unix_dialog_get_embed_page_setup at Base 2.17.9
- gtk_print_unix_dialog_get_has_selection at Base 2.17.9
- gtk_print_unix_dialog_get_manual_capabilities at Base 2.17.9
+ gtk_print_unix_dialog_get_embed_page_setup at Base 2.17.10
+ gtk_print_unix_dialog_get_has_selection at Base 2.17.10
+ gtk_print_unix_dialog_get_manual_capabilities at Base 2.17.10
gtk_print_unix_dialog_get_page_setup at Base 2.10.0
- gtk_print_unix_dialog_get_page_setup_set at Base 2.17.9
+ gtk_print_unix_dialog_get_page_setup_set at Base 2.17.10
gtk_print_unix_dialog_get_selected_printer at Base 2.10.0
gtk_print_unix_dialog_get_settings at Base 2.10.0
- gtk_print_unix_dialog_get_support_selection at Base 2.17.9
+ gtk_print_unix_dialog_get_support_selection at Base 2.17.10
gtk_print_unix_dialog_get_type at Base 2.10.0
gtk_print_unix_dialog_new at Base 2.10.0
gtk_print_unix_dialog_set_current_page at Base 2.10.0
- gtk_print_unix_dialog_set_embed_page_setup at Base 2.17.9
- gtk_print_unix_dialog_set_has_selection at Base 2.17.9
+ gtk_print_unix_dialog_set_embed_page_setup at Base 2.17.10
+ gtk_print_unix_dialog_set_has_selection at Base 2.17.10
gtk_print_unix_dialog_set_manual_capabilities at Base 2.10.0
gtk_print_unix_dialog_set_page_setup at Base 2.10.0
gtk_print_unix_dialog_set_settings at Base 2.10.0
- gtk_print_unix_dialog_set_support_selection at Base 2.17.9
+ gtk_print_unix_dialog_set_support_selection at Base 2.17.10
gtk_printer_accepts_pdf at Base 2.10.0
gtk_printer_accepts_ps at Base 2.10.0
gtk_printer_compare at Base 2.10.0
@@ -2808,12 +2808,12 @@
gtk_printer_option_allocate_choices at Base 2.10.0
gtk_printer_option_choices_from_array at Base 2.10.0
gtk_printer_option_clear_has_conflict at Base 2.10.0
- gtk_printer_option_get_activates_default at Base 2.17.9
+ gtk_printer_option_get_activates_default at Base 2.17.10
gtk_printer_option_get_type at Base 2.10.0
gtk_printer_option_has_choice at Base 2.10.0
gtk_printer_option_new at Base 2.10.0
gtk_printer_option_set at Base 2.10.0
- gtk_printer_option_set_activates_default at Base 2.17.9
+ gtk_printer_option_set_activates_default at Base 2.17.10
gtk_printer_option_set_add at Base 2.10.0
gtk_printer_option_set_boolean at Base 2.10.0
gtk_printer_option_set_clear_conflicts at Base 2.10.0
@@ -3257,7 +3257,7 @@
gtk_status_icon_get_size at Base 2.10.0
gtk_status_icon_get_stock at Base 2.10.0
gtk_status_icon_get_storage_type at Base 2.10.0
- gtk_status_icon_get_title at Base 2.17.9
+ gtk_status_icon_get_title at Base 2.17.10
gtk_status_icon_get_tooltip_markup at Base 2.16.0
gtk_status_icon_get_tooltip_text at Base 2.16.0
gtk_status_icon_get_type at Base 2.10.0
@@ -3279,7 +3279,7 @@
gtk_status_icon_set_from_stock at Base 2.10.0
gtk_status_icon_set_has_tooltip at Base 2.16.0
gtk_status_icon_set_screen at Base 2.12.0
- gtk_status_icon_set_title at Base 2.17.9
+ gtk_status_icon_set_title at Base 2.17.10
gtk_status_icon_set_tooltip at Base 2.10.0
gtk_status_icon_set_tooltip_markup at Base 2.16.0
gtk_status_icon_set_tooltip_text at Base 2.16.0
@@ -4247,11 +4247,11 @@
gtk_widget_freeze_child_notify at Base 2.8.0
gtk_widget_get_accessible at Base 2.8.0
gtk_widget_get_action at Base 2.10.0
- gtk_widget_get_allocation at Base 2.17.9
+ gtk_widget_get_allocation at Base 2.17.10
gtk_widget_get_ancestor at Base 2.8.0
- gtk_widget_get_app_paintable at Base 2.17.9
- gtk_widget_get_can_default at Base 2.17.9
- gtk_widget_get_can_focus at Base 2.17.9
+ gtk_widget_get_app_paintable at Base 2.17.10
+ gtk_widget_get_can_default at Base 2.17.10
+ gtk_widget_get_can_focus at Base 2.17.10
gtk_widget_get_child_requisition at Base 2.8.0
gtk_widget_get_child_visible at Base 2.8.0
gtk_widget_get_clipboard at Base 2.8.0
@@ -4263,11 +4263,11 @@
gtk_widget_get_default_visual at Base 2.8.0
gtk_widget_get_direction at Base 2.8.0
gtk_widget_get_display at Base 2.8.0
- gtk_widget_get_double_buffered at Base 2.17.9
+ gtk_widget_get_double_buffered at Base 2.17.10
gtk_widget_get_events at Base 2.8.0
gtk_widget_get_extension_events at Base 2.8.0
gtk_widget_get_has_tooltip at Base 2.12.0
- gtk_widget_get_has_window at Base 2.17.9
+ gtk_widget_get_has_window at Base 2.17.10
gtk_widget_get_modifier_style at Base 2.8.0
gtk_widget_get_name at Base 2.8.0
gtk_widget_get_no_show_all at Base 2.8.0
@@ -4277,25 +4277,25 @@
gtk_widget_get_pointer at Base 2.8.0
gtk_widget_get_root_window at Base 2.8.0
gtk_widget_get_screen at Base 2.8.0
- gtk_widget_get_sensitive at Base 2.17.9
+ gtk_widget_get_sensitive at Base 2.17.10
gtk_widget_get_settings at Base 2.8.0
gtk_widget_get_size_request at Base 2.8.0
gtk_widget_get_snapshot at Base 2.14.0
- gtk_widget_get_state at Base 2.17.9
+ gtk_widget_get_state at Base 2.17.10
gtk_widget_get_style at Base 2.8.0
gtk_widget_get_tooltip_markup at Base 2.12.0
gtk_widget_get_tooltip_text at Base 2.12.0
gtk_widget_get_tooltip_window at Base 2.12.0
gtk_widget_get_toplevel at Base 2.8.0
gtk_widget_get_type at Base 2.8.0
- gtk_widget_get_visible at Base 2.17.9
+ gtk_widget_get_visible at Base 2.17.10
gtk_widget_get_visual at Base 2.8.0
gtk_widget_get_window at Base 2.14.0
gtk_widget_grab_default at Base 2.8.0
gtk_widget_grab_focus at Base 2.8.0
- gtk_widget_has_default at Base 2.17.9
- gtk_widget_has_focus at Base 2.17.9
- gtk_widget_has_grab at Base 2.17.9
+ gtk_widget_has_default at Base 2.17.10
+ gtk_widget_has_focus at Base 2.17.10
+ gtk_widget_has_grab at Base 2.17.10
gtk_widget_has_screen at Base 2.8.0
gtk_widget_help_type_get_type at Base 2.8.0
gtk_widget_hide at Base 2.8.0
@@ -4306,7 +4306,7 @@
gtk_widget_is_ancestor at Base 2.8.0
gtk_widget_is_composited at Base 2.10.0
gtk_widget_is_focus at Base 2.8.0
- gtk_widget_is_sensitive at Base 2.17.9
+ gtk_widget_is_sensitive at Base 2.17.10
gtk_widget_keynav_failed at Base 2.12.0
gtk_widget_list_accel_closures at Base 2.8.0
gtk_widget_list_mnemonic_labels at Base 2.8.0
@@ -4343,10 +4343,10 @@
gtk_widget_send_expose at Base 2.8.0
gtk_widget_set at Base 2.8.0
gtk_widget_set_accel_path at Base 2.8.0
- gtk_widget_set_allocation at Base 2.17.9
+ gtk_widget_set_allocation at Base 2.17.10
gtk_widget_set_app_paintable at Base 2.8.0
- gtk_widget_set_can_default at Base 2.17.9
- gtk_widget_set_can_focus at Base 2.17.9
+ gtk_widget_set_can_default at Base 2.17.10
+ gtk_widget_set_can_focus at Base 2.17.10
gtk_widget_set_child_visible at Base 2.8.0
gtk_widget_set_colormap at Base 2.8.0
gtk_widget_set_composite_name at Base 2.8.0
@@ -4357,7 +4357,7 @@
gtk_widget_set_events at Base 2.8.0
gtk_widget_set_extension_events at Base 2.8.0
gtk_widget_set_has_tooltip at Base 2.12.0
- gtk_widget_set_has_window at Base 2.17.9
+ gtk_widget_set_has_window at Base 2.17.10
gtk_widget_set_name at Base 2.8.0
gtk_widget_set_no_show_all at Base 2.8.0
gtk_widget_set_parent at Base 2.8.0
@@ -4373,7 +4373,7 @@
gtk_widget_set_tooltip_window at Base 2.12.0
gtk_widget_set_uposition at Base 2.8.0
gtk_widget_set_usize at Base 2.8.0
- gtk_widget_set_visible at Base 2.17.9
+ gtk_widget_set_visible at Base 2.17.10
gtk_widget_shape_combine_mask at Base 2.8.0
gtk_widget_show at Base 2.8.0
gtk_widget_show_all at Base 2.8.0
Modified: desktop/experimental/gtk+2.0/debian/libgtk2.0-0.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgtk2.0-0.symbols?rev=21213&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgtk2.0-0.symbols [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/libgtk2.0-0.symbols [utf-8] Tue Sep 1 14:12:52 2009
@@ -321,10 +321,10 @@
gdk_notify_startup_complete at Base 2.8.0
gdk_notify_startup_complete_with_id at Base 2.12.0
gdk_notify_type_get_type at Base 2.8.0
- gdk_offscreen_window_get_embedder at Base 2.17.9
- gdk_offscreen_window_get_pixmap at Base 2.17.9
- gdk_offscreen_window_get_type at Base 2.17.9
- gdk_offscreen_window_set_embedder at Base 2.17.9
+ gdk_offscreen_window_get_embedder at Base 2.17.10
+ gdk_offscreen_window_get_pixmap at Base 2.17.10
+ gdk_offscreen_window_get_type at Base 2.17.10
+ gdk_offscreen_window_set_embedder at Base 2.17.10
gdk_overlap_type_get_type at Base 2.8.0
gdk_owner_change_get_type at Base 2.8.0
gdk_pango_attr_emboss_color_new at Base 2.12.0
@@ -389,7 +389,7 @@
gdk_region_offset at Base 2.8.0
gdk_region_point_in at Base 2.8.0
gdk_region_polygon at Base 2.8.0
- gdk_region_rect_equal at Base 2.17.9
+ gdk_region_rect_equal at Base 2.17.10
gdk_region_rect_in at Base 2.8.0
gdk_region_rectangle at Base 2.8.0
gdk_region_shrink at Base 2.8.0
@@ -545,16 +545,16 @@
gdk_window_edge_get_type at Base 2.8.0
gdk_window_enable_synchronized_configure at Base 2.8.0
gdk_window_end_paint at Base 2.8.0
- gdk_window_ensure_native at Base 2.17.9
+ gdk_window_ensure_native at Base 2.17.10
gdk_window_focus at Base 2.8.0
gdk_window_foreign_new at Base 2.8.0
gdk_window_foreign_new_for_display at Base 2.8.0
gdk_window_freeze_toplevel_updates_libgtk_only at Base 2.12.0
gdk_window_freeze_updates at Base 2.8.0
gdk_window_fullscreen at Base 2.8.0
- gdk_window_geometry_changed at Base 2.17.9
+ gdk_window_geometry_changed at Base 2.17.10
gdk_window_get_children at Base 2.8.0
- gdk_window_get_cursor at Base 2.17.9
+ gdk_window_get_cursor at Base 2.17.10
gdk_window_get_decorations at Base 2.8.0
gdk_window_get_deskrelative_origin at Base 2.8.0
gdk_window_get_events at Base 2.8.0
@@ -566,7 +566,7 @@
gdk_window_get_parent at Base 2.8.0
gdk_window_get_pointer at Base 2.8.0
gdk_window_get_position at Base 2.8.0
- gdk_window_get_root_coords at Base 2.17.9
+ gdk_window_get_root_coords at Base 2.17.10
gdk_window_get_root_origin at Base 2.8.0
gdk_window_get_state at Base 2.8.0
gdk_window_get_toplevel at Base 2.8.0
@@ -802,11 +802,11 @@
gdk_pixbuf_scaled_anim_iter_get_type at Base 2.12.0
gdk_pixbuf_set_option at Base 2.8.0
gdk_pixbuf_simple_anim_add_frame at Base 2.8.0
- gdk_pixbuf_simple_anim_get_loop at Base 2.17.9
+ gdk_pixbuf_simple_anim_get_loop at Base 2.17.10
gdk_pixbuf_simple_anim_get_type at Base 2.8.0
gdk_pixbuf_simple_anim_iter_get_type at Base 2.8.0
gdk_pixbuf_simple_anim_new at Base 2.8.0
- gdk_pixbuf_simple_anim_set_loop at Base 2.17.9
+ gdk_pixbuf_simple_anim_set_loop at Base 2.17.10
gdk_pixbuf_unref at Base 2.8.0
gdk_pixbuf_version at Base 2.8.0
gdk_pixdata_deserialize at Base 2.8.0
@@ -1199,24 +1199,24 @@
gtk_cell_renderer_combo_get_type at Base 2.8.0
gtk_cell_renderer_combo_new at Base 2.8.0
gtk_cell_renderer_editing_canceled at Base 2.8.0
- gtk_cell_renderer_get_alignment at Base 2.17.9
+ gtk_cell_renderer_get_alignment at Base 2.17.10
gtk_cell_renderer_get_fixed_size at Base 2.8.0
- gtk_cell_renderer_get_padding at Base 2.17.9
- gtk_cell_renderer_get_sensitive at Base 2.17.9
+ gtk_cell_renderer_get_padding at Base 2.17.10
+ gtk_cell_renderer_get_sensitive at Base 2.17.10
gtk_cell_renderer_get_size at Base 2.8.0
gtk_cell_renderer_get_type at Base 2.8.0
- gtk_cell_renderer_get_visible at Base 2.17.9
+ gtk_cell_renderer_get_visible at Base 2.17.10
gtk_cell_renderer_mode_get_type at Base 2.8.0
gtk_cell_renderer_pixbuf_get_type at Base 2.8.0
gtk_cell_renderer_pixbuf_new at Base 2.8.0
gtk_cell_renderer_progress_get_type at Base 2.8.0
gtk_cell_renderer_progress_new at Base 2.8.0
gtk_cell_renderer_render at Base 2.8.0
- gtk_cell_renderer_set_alignment at Base 2.17.9
+ gtk_cell_renderer_set_alignment at Base 2.17.10
gtk_cell_renderer_set_fixed_size at Base 2.8.0
- gtk_cell_renderer_set_padding at Base 2.17.9
- gtk_cell_renderer_set_sensitive at Base 2.17.9
- gtk_cell_renderer_set_visible at Base 2.17.9
+ gtk_cell_renderer_set_padding at Base 2.17.10
+ gtk_cell_renderer_set_sensitive at Base 2.17.10
+ gtk_cell_renderer_set_visible at Base 2.17.10
gtk_cell_renderer_spin_get_type at Base 2.10.0
gtk_cell_renderer_spin_new at Base 2.10.0
gtk_cell_renderer_start_editing at Base 2.8.0
@@ -1225,12 +1225,12 @@
gtk_cell_renderer_text_get_type at Base 2.8.0
gtk_cell_renderer_text_new at Base 2.8.0
gtk_cell_renderer_text_set_fixed_height_from_font at Base 2.8.0
- gtk_cell_renderer_toggle_get_activatable at Base 2.17.9
+ gtk_cell_renderer_toggle_get_activatable at Base 2.17.10
gtk_cell_renderer_toggle_get_active at Base 2.8.0
gtk_cell_renderer_toggle_get_radio at Base 2.8.0
gtk_cell_renderer_toggle_get_type at Base 2.8.0
gtk_cell_renderer_toggle_new at Base 2.8.0
- gtk_cell_renderer_toggle_set_activatable at Base 2.17.9
+ gtk_cell_renderer_toggle_set_activatable at Base 2.17.10
gtk_cell_renderer_toggle_set_active at Base 2.8.0
gtk_cell_renderer_toggle_set_radio at Base 2.8.0
gtk_cell_type_get_type at Base 2.8.0
@@ -1569,7 +1569,7 @@
gtk_curve_set_range at Base 2.8.0
gtk_curve_set_vector at Base 2.8.0
gtk_curve_type_get_type at Base 2.8.0
- gtk_custom_paper_unix_dialog_get_type at Base 2.17.9
+ gtk_custom_paper_unix_dialog_get_type at Base 2.17.10
gtk_debug_flag_get_type at Base 2.8.0
gtk_debug_flags at Base 2.8.0
gtk_decorated_window_calculate_frame_size at Base 2.8.0
@@ -1675,18 +1675,18 @@
gtk_editable_set_editable at Base 2.8.0
gtk_editable_set_position at Base 2.8.0
gtk_entry_append_text at Base 2.8.0
- gtk_entry_buffer_delete_text at Base 2.17.9
- gtk_entry_buffer_emit_deleted_text at Base 2.17.9
- gtk_entry_buffer_emit_inserted_text at Base 2.17.9
- gtk_entry_buffer_get_bytes at Base 2.17.9
- gtk_entry_buffer_get_length at Base 2.17.9
- gtk_entry_buffer_get_max_length at Base 2.17.9
- gtk_entry_buffer_get_text at Base 2.17.9
- gtk_entry_buffer_get_type at Base 2.17.9
- gtk_entry_buffer_insert_text at Base 2.17.9
- gtk_entry_buffer_new at Base 2.17.9
- gtk_entry_buffer_set_max_length at Base 2.17.9
- gtk_entry_buffer_set_text at Base 2.17.9
+ gtk_entry_buffer_delete_text at Base 2.17.10
+ gtk_entry_buffer_emit_deleted_text at Base 2.17.10
+ gtk_entry_buffer_emit_inserted_text at Base 2.17.10
+ gtk_entry_buffer_get_bytes at Base 2.17.10
+ gtk_entry_buffer_get_length at Base 2.17.10
+ gtk_entry_buffer_get_max_length at Base 2.17.10
+ gtk_entry_buffer_get_text at Base 2.17.10
+ gtk_entry_buffer_get_type at Base 2.17.10
+ gtk_entry_buffer_insert_text at Base 2.17.10
+ gtk_entry_buffer_new at Base 2.17.10
+ gtk_entry_buffer_set_max_length at Base 2.17.10
+ gtk_entry_buffer_set_text at Base 2.17.10
gtk_entry_completion_complete at Base 2.8.0
gtk_entry_completion_delete_action at Base 2.8.0
gtk_entry_completion_get_completion_prefix at Base 2.12.0
@@ -1715,7 +1715,7 @@
gtk_entry_completion_set_text_column at Base 2.8.0
gtk_entry_get_activates_default at Base 2.8.0
gtk_entry_get_alignment at Base 2.8.0
- gtk_entry_get_buffer at Base 2.17.9
+ gtk_entry_get_buffer at Base 2.17.10
gtk_entry_get_completion at Base 2.8.0
gtk_entry_get_current_icon_drag_source at Base 2.16.0
gtk_entry_get_cursor_hadjustment at Base 2.12.0
@@ -1746,14 +1746,14 @@
gtk_entry_icon_position_get_type at Base 2.16.0
gtk_entry_layout_index_to_text_index at Base 2.8.0
gtk_entry_new at Base 2.8.0
- gtk_entry_new_with_buffer at Base 2.17.9
+ gtk_entry_new_with_buffer at Base 2.17.10
gtk_entry_new_with_max_length at Base 2.8.0
gtk_entry_prepend_text at Base 2.8.0
gtk_entry_progress_pulse at Base 2.16.0
gtk_entry_select_region at Base 2.8.0
gtk_entry_set_activates_default at Base 2.8.0
gtk_entry_set_alignment at Base 2.8.0
- gtk_entry_set_buffer at Base 2.17.9
+ gtk_entry_set_buffer at Base 2.17.10
gtk_entry_set_completion at Base 2.8.0
gtk_entry_set_cursor_hadjustment at Base 2.12.0
gtk_entry_set_editable at Base 2.8.0
@@ -1826,7 +1826,7 @@
gtk_file_chooser_error_get_type at Base 2.8.0
gtk_file_chooser_error_quark at Base 2.8.0
gtk_file_chooser_get_action at Base 2.8.0
- gtk_file_chooser_get_create_folders at Base 2.17.9
+ gtk_file_chooser_get_create_folders at Base 2.17.10
gtk_file_chooser_get_current_folder at Base 2.8.0
gtk_file_chooser_get_current_folder_file at Base 2.14.0
gtk_file_chooser_get_current_folder_uri at Base 2.8.0
@@ -1860,7 +1860,7 @@
gtk_file_chooser_select_filename at Base 2.8.0
gtk_file_chooser_select_uri at Base 2.8.0
gtk_file_chooser_set_action at Base 2.8.0
- gtk_file_chooser_set_create_folders at Base 2.17.9
+ gtk_file_chooser_set_create_folders at Base 2.17.10
gtk_file_chooser_set_current_folder at Base 2.8.0
gtk_file_chooser_set_current_folder_file at Base 2.14.0
gtk_file_chooser_set_current_folder_uri at Base 2.8.0
@@ -2102,7 +2102,7 @@
gtk_icon_view_get_dest_item_at_pos at Base 2.8.0
gtk_icon_view_get_drag_dest_item at Base 2.8.0
gtk_icon_view_get_item_at_pos at Base 2.8.0
- gtk_icon_view_get_item_padding at Base 2.17.9
+ gtk_icon_view_get_item_padding at Base 2.17.10
gtk_icon_view_get_item_width at Base 2.8.0
gtk_icon_view_get_margin at Base 2.8.0
gtk_icon_view_get_markup_column at Base 2.8.0
@@ -2132,7 +2132,7 @@
gtk_icon_view_set_columns at Base 2.8.0
gtk_icon_view_set_cursor at Base 2.8.0
gtk_icon_view_set_drag_dest_item at Base 2.8.0
- gtk_icon_view_set_item_padding at Base 2.17.9
+ gtk_icon_view_set_item_padding at Base 2.17.10
gtk_icon_view_set_item_width at Base 2.8.0
gtk_icon_view_set_margin at Base 2.8.0
gtk_icon_view_set_markup_column at Base 2.8.0
@@ -2226,19 +2226,19 @@
gtk_image_set_from_stock at Base 2.8.0
gtk_image_set_pixel_size at Base 2.8.0
gtk_image_type_get_type at Base 2.8.0
- gtk_info_bar_add_action_widget at Base 2.17.9
- gtk_info_bar_add_button at Base 2.17.9
- gtk_info_bar_add_buttons at Base 2.17.9
- gtk_info_bar_get_action_area at Base 2.17.9
- gtk_info_bar_get_content_area at Base 2.17.9
- gtk_info_bar_get_message_type at Base 2.17.9
- gtk_info_bar_get_type at Base 2.17.9
- gtk_info_bar_new at Base 2.17.9
- gtk_info_bar_new_with_buttons at Base 2.17.9
- gtk_info_bar_response at Base 2.17.9
- gtk_info_bar_set_default_response at Base 2.17.9
- gtk_info_bar_set_message_type at Base 2.17.9
- gtk_info_bar_set_response_sensitive at Base 2.17.9
+ gtk_info_bar_add_action_widget at Base 2.17.10
+ gtk_info_bar_add_button at Base 2.17.10
+ gtk_info_bar_add_buttons at Base 2.17.10
+ gtk_info_bar_get_action_area at Base 2.17.10
+ gtk_info_bar_get_content_area at Base 2.17.10
+ gtk_info_bar_get_message_type at Base 2.17.10
+ gtk_info_bar_get_type at Base 2.17.10
+ gtk_info_bar_new at Base 2.17.10
+ gtk_info_bar_new_with_buttons at Base 2.17.10
+ gtk_info_bar_response at Base 2.17.10
+ gtk_info_bar_set_default_response at Base 2.17.10
+ gtk_info_bar_set_message_type at Base 2.17.10
+ gtk_info_bar_set_response_sensitive at Base 2.17.10
gtk_init at Base 2.8.0
gtk_init_add at Base 2.8.0
gtk_init_check at Base 2.8.0
@@ -2287,7 +2287,7 @@
gtk_label_get at Base 2.8.0
gtk_label_get_angle at Base 2.8.0
gtk_label_get_attributes at Base 2.8.0
- gtk_label_get_current_uri at Base 2.17.9
+ gtk_label_get_current_uri at Base 2.17.10
gtk_label_get_ellipsize at Base 2.8.0
gtk_label_get_justify at Base 2.8.0
gtk_label_get_label at Base 2.8.0
@@ -2302,7 +2302,7 @@
gtk_label_get_selection_bounds at Base 2.8.0
gtk_label_get_single_line_mode at Base 2.8.0
gtk_label_get_text at Base 2.8.0
- gtk_label_get_track_visited_links at Base 2.17.9
+ gtk_label_get_track_visited_links at Base 2.17.10
gtk_label_get_type at Base 2.8.0
gtk_label_get_use_markup at Base 2.8.0
gtk_label_get_use_underline at Base 2.8.0
@@ -2327,7 +2327,7 @@
gtk_label_set_single_line_mode at Base 2.8.0
gtk_label_set_text at Base 2.8.0
gtk_label_set_text_with_mnemonic at Base 2.8.0
- gtk_label_set_track_visited_links at Base 2.17.9
+ gtk_label_set_track_visited_links at Base 2.17.10
gtk_label_set_use_markup at Base 2.8.0
gtk_label_set_use_underline at Base 2.8.0
gtk_label_set_width_chars at Base 2.8.0
@@ -2455,7 +2455,7 @@
gtk_menu_get_attach_widget at Base 2.8.0
gtk_menu_get_for_attach_widget at Base 2.8.0
gtk_menu_get_monitor at Base 2.14.0
- gtk_menu_get_reserve_toggle_size at Base 2.17.9
+ gtk_menu_get_reserve_toggle_size at Base 2.17.10
gtk_menu_get_tearoff_state at Base 2.8.0
gtk_menu_get_title at Base 2.8.0
gtk_menu_get_type at Base 2.8.0
@@ -2488,7 +2488,7 @@
gtk_menu_set_accel_path at Base 2.8.0
gtk_menu_set_active at Base 2.8.0
gtk_menu_set_monitor at Base 2.8.0
- gtk_menu_set_reserve_toggle_size at Base 2.17.9
+ gtk_menu_set_reserve_toggle_size at Base 2.17.10
gtk_menu_set_screen at Base 2.8.0
gtk_menu_set_tearoff_state at Base 2.8.0
gtk_menu_set_title at Base 2.8.0
@@ -2763,7 +2763,7 @@
gtk_print_backend_printer_list_is_done at Base 2.10.0
gtk_print_backend_remove_printer at Base 2.10.0
gtk_print_backend_set_list_done at Base 2.10.0
- gtk_print_backend_set_password at Base 2.17.9
+ gtk_print_backend_set_password at Base 2.17.10
gtk_print_capabilities_get_type at Base 2.10.0
gtk_print_context_create_pango_context at Base 2.10.0
gtk_print_context_create_pango_layout at Base 2.10.0
@@ -2795,14 +2795,14 @@
gtk_print_operation_cancel at Base 2.10.0
gtk_print_operation_draw_page_finish at Base 2.16.0
gtk_print_operation_get_default_page_setup at Base 2.10.0
- gtk_print_operation_get_embed_page_setup at Base 2.17.9
+ gtk_print_operation_get_embed_page_setup at Base 2.17.10
gtk_print_operation_get_error at Base 2.10.0
- gtk_print_operation_get_has_selection at Base 2.17.9
- gtk_print_operation_get_n_pages_to_print at Base 2.17.9
+ gtk_print_operation_get_has_selection at Base 2.17.10
+ gtk_print_operation_get_n_pages_to_print at Base 2.17.10
gtk_print_operation_get_print_settings at Base 2.10.0
gtk_print_operation_get_status at Base 2.10.0
gtk_print_operation_get_status_string at Base 2.10.0
- gtk_print_operation_get_support_selection at Base 2.17.9
+ gtk_print_operation_get_support_selection at Base 2.17.10
gtk_print_operation_get_type at Base 2.10.0
gtk_print_operation_is_finished at Base 2.10.0
gtk_print_operation_new at Base 2.10.0
@@ -2817,14 +2817,14 @@
gtk_print_operation_set_custom_tab_label at Base 2.10.0
gtk_print_operation_set_default_page_setup at Base 2.10.0
gtk_print_operation_set_defer_drawing at Base 2.16.0
- gtk_print_operation_set_embed_page_setup at Base 2.17.9
+ gtk_print_operation_set_embed_page_setup at Base 2.17.10
gtk_print_operation_set_export_filename at Base 2.10.0
- gtk_print_operation_set_has_selection at Base 2.17.9
+ gtk_print_operation_set_has_selection at Base 2.17.10
gtk_print_operation_set_job_name at Base 2.10.0
gtk_print_operation_set_n_pages at Base 2.10.0
gtk_print_operation_set_print_settings at Base 2.10.0
gtk_print_operation_set_show_progress at Base 2.10.0
- gtk_print_operation_set_support_selection at Base 2.17.9
+ gtk_print_operation_set_support_selection at Base 2.17.10
gtk_print_operation_set_track_print_status at Base 2.10.0
gtk_print_operation_set_unit at Base 2.10.0
gtk_print_operation_set_use_full_page at Base 2.10.0
@@ -2910,23 +2910,23 @@
gtk_print_status_get_type at Base 2.10.0
gtk_print_unix_dialog_add_custom_tab at Base 2.10.0
gtk_print_unix_dialog_get_current_page at Base 2.10.0
- gtk_print_unix_dialog_get_embed_page_setup at Base 2.17.9
- gtk_print_unix_dialog_get_has_selection at Base 2.17.9
- gtk_print_unix_dialog_get_manual_capabilities at Base 2.17.9
+ gtk_print_unix_dialog_get_embed_page_setup at Base 2.17.10
+ gtk_print_unix_dialog_get_has_selection at Base 2.17.10
+ gtk_print_unix_dialog_get_manual_capabilities at Base 2.17.10
gtk_print_unix_dialog_get_page_setup at Base 2.10.0
- gtk_print_unix_dialog_get_page_setup_set at Base 2.17.9
+ gtk_print_unix_dialog_get_page_setup_set at Base 2.17.10
gtk_print_unix_dialog_get_selected_printer at Base 2.10.0
gtk_print_unix_dialog_get_settings at Base 2.10.0
- gtk_print_unix_dialog_get_support_selection at Base 2.17.9
+ gtk_print_unix_dialog_get_support_selection at Base 2.17.10
gtk_print_unix_dialog_get_type at Base 2.10.0
gtk_print_unix_dialog_new at Base 2.10.0
gtk_print_unix_dialog_set_current_page at Base 2.10.0
- gtk_print_unix_dialog_set_embed_page_setup at Base 2.17.9
- gtk_print_unix_dialog_set_has_selection at Base 2.17.9
+ gtk_print_unix_dialog_set_embed_page_setup at Base 2.17.10
+ gtk_print_unix_dialog_set_has_selection at Base 2.17.10
gtk_print_unix_dialog_set_manual_capabilities at Base 2.10.0
gtk_print_unix_dialog_set_page_setup at Base 2.10.0
gtk_print_unix_dialog_set_settings at Base 2.10.0
- gtk_print_unix_dialog_set_support_selection at Base 2.17.9
+ gtk_print_unix_dialog_set_support_selection at Base 2.17.10
gtk_printer_accepts_pdf at Base 2.10.0
gtk_printer_accepts_ps at Base 2.10.0
gtk_printer_compare at Base 2.10.0
@@ -2952,12 +2952,12 @@
gtk_printer_option_allocate_choices at Base 2.10.0
gtk_printer_option_choices_from_array at Base 2.10.0
gtk_printer_option_clear_has_conflict at Base 2.10.0
- gtk_printer_option_get_activates_default at Base 2.17.9
+ gtk_printer_option_get_activates_default at Base 2.17.10
gtk_printer_option_get_type at Base 2.10.0
gtk_printer_option_has_choice at Base 2.10.0
gtk_printer_option_new at Base 2.10.0
gtk_printer_option_set at Base 2.10.0
- gtk_printer_option_set_activates_default at Base 2.17.9
+ gtk_printer_option_set_activates_default at Base 2.17.10
gtk_printer_option_set_add at Base 2.10.0
gtk_printer_option_set_boolean at Base 2.10.0
gtk_printer_option_set_clear_conflicts at Base 2.10.0
@@ -3401,7 +3401,7 @@
gtk_status_icon_get_size at Base 2.10.0
gtk_status_icon_get_stock at Base 2.10.0
gtk_status_icon_get_storage_type at Base 2.10.0
- gtk_status_icon_get_title at Base 2.17.9
+ gtk_status_icon_get_title at Base 2.17.10
gtk_status_icon_get_tooltip_markup at Base 2.16.0
gtk_status_icon_get_tooltip_text at Base 2.16.0
gtk_status_icon_get_type at Base 2.10.0
@@ -3423,7 +3423,7 @@
gtk_status_icon_set_from_stock at Base 2.10.0
gtk_status_icon_set_has_tooltip at Base 2.16.0
gtk_status_icon_set_screen at Base 2.12.0
- gtk_status_icon_set_title at Base 2.17.9
+ gtk_status_icon_set_title at Base 2.17.10
gtk_status_icon_set_tooltip at Base 2.10.0
gtk_status_icon_set_tooltip_markup at Base 2.16.0
gtk_status_icon_set_tooltip_text at Base 2.16.0
@@ -4392,11 +4392,11 @@
gtk_widget_freeze_child_notify at Base 2.8.0
gtk_widget_get_accessible at Base 2.8.0
gtk_widget_get_action at Base 2.10.0
- gtk_widget_get_allocation at Base 2.17.9
+ gtk_widget_get_allocation at Base 2.17.10
gtk_widget_get_ancestor at Base 2.8.0
- gtk_widget_get_app_paintable at Base 2.17.9
- gtk_widget_get_can_default at Base 2.17.9
- gtk_widget_get_can_focus at Base 2.17.9
+ gtk_widget_get_app_paintable at Base 2.17.10
+ gtk_widget_get_can_default at Base 2.17.10
+ gtk_widget_get_can_focus at Base 2.17.10
gtk_widget_get_child_requisition at Base 2.8.0
gtk_widget_get_child_visible at Base 2.8.0
gtk_widget_get_clipboard at Base 2.8.0
@@ -4408,11 +4408,11 @@
gtk_widget_get_default_visual at Base 2.8.0
gtk_widget_get_direction at Base 2.8.0
gtk_widget_get_display at Base 2.8.0
- gtk_widget_get_double_buffered at Base 2.17.9
+ gtk_widget_get_double_buffered at Base 2.17.10
gtk_widget_get_events at Base 2.8.0
gtk_widget_get_extension_events at Base 2.8.0
gtk_widget_get_has_tooltip at Base 2.12.0
- gtk_widget_get_has_window at Base 2.17.9
+ gtk_widget_get_has_window at Base 2.17.10
gtk_widget_get_modifier_style at Base 2.8.0
gtk_widget_get_name at Base 2.8.0
gtk_widget_get_no_show_all at Base 2.8.0
@@ -4422,25 +4422,25 @@
gtk_widget_get_pointer at Base 2.8.0
gtk_widget_get_root_window at Base 2.8.0
gtk_widget_get_screen at Base 2.8.0
- gtk_widget_get_sensitive at Base 2.17.9
+ gtk_widget_get_sensitive at Base 2.17.10
gtk_widget_get_settings at Base 2.8.0
gtk_widget_get_size_request at Base 2.8.0
gtk_widget_get_snapshot at Base 2.14.0
- gtk_widget_get_state at Base 2.17.9
+ gtk_widget_get_state at Base 2.17.10
gtk_widget_get_style at Base 2.8.0
gtk_widget_get_tooltip_markup at Base 2.12.0
gtk_widget_get_tooltip_text at Base 2.12.0
gtk_widget_get_tooltip_window at Base 2.12.0
gtk_widget_get_toplevel at Base 2.8.0
gtk_widget_get_type at Base 2.8.0
- gtk_widget_get_visible at Base 2.17.9
+ gtk_widget_get_visible at Base 2.17.10
gtk_widget_get_visual at Base 2.8.0
gtk_widget_get_window at Base 2.14.0
gtk_widget_grab_default at Base 2.8.0
gtk_widget_grab_focus at Base 2.8.0
- gtk_widget_has_default at Base 2.17.9
- gtk_widget_has_focus at Base 2.17.9
- gtk_widget_has_grab at Base 2.17.9
+ gtk_widget_has_default at Base 2.17.10
+ gtk_widget_has_focus at Base 2.17.10
+ gtk_widget_has_grab at Base 2.17.10
gtk_widget_has_screen at Base 2.8.0
gtk_widget_help_type_get_type at Base 2.8.0
gtk_widget_hide at Base 2.8.0
@@ -4451,7 +4451,7 @@
gtk_widget_is_ancestor at Base 2.8.0
gtk_widget_is_composited at Base 2.10.0
gtk_widget_is_focus at Base 2.8.0
- gtk_widget_is_sensitive at Base 2.17.9
+ gtk_widget_is_sensitive at Base 2.17.10
gtk_widget_keynav_failed at Base 2.12.0
gtk_widget_list_accel_closures at Base 2.8.0
gtk_widget_list_mnemonic_labels at Base 2.8.0
@@ -4488,10 +4488,10 @@
gtk_widget_send_expose at Base 2.8.0
gtk_widget_set at Base 2.8.0
gtk_widget_set_accel_path at Base 2.8.0
- gtk_widget_set_allocation at Base 2.17.9
+ gtk_widget_set_allocation at Base 2.17.10
gtk_widget_set_app_paintable at Base 2.8.0
- gtk_widget_set_can_default at Base 2.17.9
- gtk_widget_set_can_focus at Base 2.17.9
+ gtk_widget_set_can_default at Base 2.17.10
+ gtk_widget_set_can_focus at Base 2.17.10
gtk_widget_set_child_visible at Base 2.8.0
gtk_widget_set_colormap at Base 2.8.0
gtk_widget_set_composite_name at Base 2.8.0
@@ -4502,7 +4502,7 @@
gtk_widget_set_events at Base 2.8.0
gtk_widget_set_extension_events at Base 2.8.0
gtk_widget_set_has_tooltip at Base 2.12.0
- gtk_widget_set_has_window at Base 2.17.9
+ gtk_widget_set_has_window at Base 2.17.10
gtk_widget_set_name at Base 2.8.0
gtk_widget_set_no_show_all at Base 2.8.0
gtk_widget_set_parent at Base 2.8.0
@@ -4518,7 +4518,7 @@
gtk_widget_set_tooltip_window at Base 2.12.0
gtk_widget_set_uposition at Base 2.8.0
gtk_widget_set_usize at Base 2.8.0
- gtk_widget_set_visible at Base 2.17.9
+ gtk_widget_set_visible at Base 2.17.10
gtk_widget_shape_combine_mask at Base 2.8.0
gtk_widget_show at Base 2.8.0
gtk_widget_show_all at Base 2.8.0
Modified: desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/070_mandatory-relibtoolize.patch?rev=21213&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch [utf-8] Tue Sep 1 14:12:52 2009
@@ -1,6 +1,6 @@
-diff -Naur gtk+2.0-2.17.9.old/aclocal.m4 gtk+2.0-2.17.9/aclocal.m4
---- gtk+2.0-2.17.9.old/aclocal.m4 2009-08-24 22:38:33.000000000 +0200
-+++ gtk+2.0-2.17.9/aclocal.m4 2009-08-25 18:43:26.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/aclocal.m4 gtk+2.0-2.17.10/aclocal.m4
+--- gtk+2.0-2.17.10.old/aclocal.m4 2009-09-01 06:02:43.000000000 +0200
++++ gtk+2.0-2.17.10/aclocal.m4 2009-09-01 16:11:34.000000000 +0200
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.7.9 -*- Autoconf -*-
+# generated automatically by aclocal 1.11 -*- Autoconf -*-
@@ -5346,9 +5346,9 @@
+]) # _AM_PROG_TAR
+m4_include([acinclude.m4])
-diff -Naur gtk+2.0-2.17.9.old/config.h.in gtk+2.0-2.17.9/config.h.in
---- gtk+2.0-2.17.9.old/config.h.in 2009-08-24 22:38:36.000000000 +0200
-+++ gtk+2.0-2.17.9/config.h.in 2009-08-25 18:43:29.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/config.h.in gtk+2.0-2.17.10/config.h.in
+--- gtk+2.0-2.17.10.old/config.h.in 2009-09-01 06:02:46.000000000 +0200
++++ gtk+2.0-2.17.10/config.h.in 2009-09-01 16:11:36.000000000 +0200
@@ -232,6 +232,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
@@ -5359,14 +5359,14 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-diff -Naur gtk+2.0-2.17.9.old/configure gtk+2.0-2.17.9/configure
---- gtk+2.0-2.17.9.old/configure 2009-08-24 22:38:53.000000000 +0200
-+++ gtk+2.0-2.17.9/configure 2009-08-25 18:43:28.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/configure gtk+2.0-2.17.10/configure
+--- gtk+2.0-2.17.10.old/configure 2009-09-01 06:03:03.000000000 +0200
++++ gtk+2.0-2.17.10/configure 2009-09-01 16:11:35.000000000 +0200
@@ -1,20 +1,22 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.63 for gtk+ 2.17.9.
-+# Generated by GNU Autoconf 2.64 for gtk+ 2.17.9.
+-# Generated by GNU Autoconf 2.63 for gtk+ 2.17.10.
++# Generated by GNU Autoconf 2.64 for gtk+ 2.17.10.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B>.
#
@@ -6160,8 +6160,8 @@
# Identity of this package.
PACKAGE_NAME='gtk+'
@@ -748,6 +702,7 @@
- PACKAGE_VERSION='2.17.9'
- PACKAGE_STRING='gtk+ 2.17.9'
+ PACKAGE_VERSION='2.17.10'
+ PACKAGE_STRING='gtk+ 2.17.10'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B'
+PACKAGE_URL=''
@@ -6416,7 +6416,7 @@
@@ -1981,466 +1948,973 @@
if $ac_init_version; then
cat <<\_ACEOF
- gtk+ configure 2.17.9
+ gtk+ configure 2.17.10
-generated by GNU Autoconf 2.63
+generated by GNU Autoconf 2.64
@@ -6432,7 +6432,7 @@
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
--It was created by gtk+ $as_me 2.17.9, which was
+-It was created by gtk+ $as_me 2.17.10, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+## ------------------------ ##
+## Autoconf initialization. ##
@@ -7268,7 +7268,7 @@
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
-+It was created by gtk+ $as_me 2.17.9, which was
++It was created by gtk+ $as_me 2.17.10, which was
+generated by GNU Autoconf 2.64. Invocation command line was
+ $ $0 $@
@@ -8056,7 +8056,7 @@
-
-# Define the identity of the package.
- PACKAGE='gtk+'
-- VERSION='2.17.9'
+- VERSION='2.17.10'
-
-
-# Some tools Automake needs.
@@ -8294,7 +8294,7 @@
+
+# Define the identity of the package.
+ PACKAGE='gtk+'
-+ VERSION='2.17.9'
++ VERSION='2.17.10'
+
+
+# Some tools Automake needs.
@@ -15825,7 +15825,7 @@
@@ -16388,7 +15706,7 @@
lt_cl_version="\
- gtk+ config.lt 2.17.9
+ gtk+ config.lt 2.17.10
-configured by $0, generated by GNU Autoconf 2.63.
+configured by $0, generated by GNU Autoconf 2.64.
@@ -16654,7 +16654,7 @@
MS_LIB_AVAILABLE_TRUE=
MS_LIB_AVAILABLE_FALSE='#'
else
-@@ -18249,5578 +17515,167 @@
+@@ -18249,42 +17515,42 @@
# Check whether --enable-debug was given.
@@ -16695,157 +16695,133 @@
enableval=$enable_rebuilds;
else
enable_rebuilds=yes
--fi
--
--# Check whether --enable-visibility was given.
+ fi
+
+ # Check whether --enable-visibility was given.
-if test "${enable_visibility+set}" = set; then
-- enableval=$enable_visibility;
--else
-- enable_visibility=yes
--fi
--
--
--
--# Check whether --with-xinput was given.
++if test "${enable_visibility+set}" = set; then :
+ enableval=$enable_visibility;
+ else
+ enable_visibility=yes
+@@ -18293,7 +17559,7 @@
+
+
+ # Check whether --with-xinput was given.
-if test "${with_xinput+set}" = set; then
-- withval=$with_xinput;
--fi
--
--
--if test "$platform_win32" = yes; then
-- gdktarget=win32
--else
-- gdktarget=x11
--fi
--
--
--# Check whether --with-gdktarget was given.
++if test "${with_xinput+set}" = set; then :
+ withval=$with_xinput;
+ fi
+
+@@ -18306,7 +17572,7 @@
+
+
+ # Check whether --with-gdktarget was given.
-if test "${with_gdktarget+set}" = set; then
-- withval=$with_gdktarget; gdktarget=$with_gdktarget
--fi
--
--
--
--case $gdktarget in
-- x11|win32|quartz|directfb) ;;
++if test "${with_gdktarget+set}" = set; then :
+ withval=$with_gdktarget; gdktarget=$with_gdktarget
+ fi
+
+@@ -18314,9 +17580,7 @@
+
+ case $gdktarget in
+ x11|win32|quartz|directfb) ;;
- *) { { $as_echo "$as_me:$LINENO: error: Invalid target for GDK: use x11, quartz, directfb or win32." >&5
-$as_echo "$as_me: error: Invalid target for GDK: use x11, quartz, directfb or win32." >&2;}
- { (exit 1); exit 1; }; };;
--esac
--
--gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la
--gtktargetlib=libgtk-$gdktarget-$GTK_API_VERSION.la
--
--
--
--
--if test "x$enable_debug" = "xyes"; then
-- test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
-- GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_ERRORCHECK_MUTEXES"
--else
-- if test "x$enable_debug" = "xno"; then
-- GTK_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS"
-- else
-- GTK_DEBUG_FLAGS="-DG_DISABLE_CAST_CHECKS"
-- fi
--fi
--
--
--if test "x$enable_visibility" = "xno"; then
-- GTK_DEBUG_FLAGS="$GTK_DEBUG_FLAGS -DDISABLE_VISIBILITY"
--fi
--
--
--
--cat >>confdefs.h <<_ACEOF
--#define GTK_COMPILED_WITH_DEBUGGING "${enable_debug}"
--_ACEOF
--
--
--
--# Build time sanity check...
++ *) as_fn_error "Invalid target for GDK: use x11, quartz, directfb or win32." "$LINENO" 5;;
+ esac
+
+ gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la
+@@ -18350,21 +17614,34 @@
+
+
+ # Build time sanity check...
-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
--$as_echo_n "checking whether build environment is sane... " >&6; }
--# Just in case
--sleep 1
--echo timestamp > conftest.file
--# Do `set' in a subshell so we don't clobber the current shell's
--# arguments. Must try -L first in case configure is actually a
--# symlink; some systems play weird games with the mod time of symlinks
--# (eg FreeBSD returns the mod time of the symlink's containing
--# directory).
--if (
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+ $as_echo_n "checking whether build environment is sane... " >&6; }
+ # Just in case
+ sleep 1
+ echo timestamp > conftest.file
++# Reject unsafe characters in $srcdir or the absolute working directory
++# name. Accept space and tab only in the latter.
++am_lf='
++'
++case `pwd` in
++ *[\\\"\#\$\&\'\`$am_lf]*)
++ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
++esac
++case $srcdir in
++ *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
++ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
++esac
++
+ # Do `set' in a subshell so we don't clobber the current shell's
+ # arguments. Must try -L first in case configure is actually a
+ # symlink; some systems play weird games with the mod time of symlinks
+ # (eg FreeBSD returns the mod time of the symlink's containing
+ # directory).
+ if (
- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-- if test "$*" = "X"; then
-- # -L didn't work.
++ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$*" = "X"; then
+ # -L didn't work.
- set X `ls -t $srcdir/configure conftest.file`
-- fi
-- rm -f conftest.file
-- if test "$*" != "X $srcdir/configure conftest.file" \
-- && test "$*" != "X conftest.file $srcdir/configure"; then
--
-- # If neither matched, then we have a broken ls. This can happen
-- # 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".
++ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ rm -f conftest.file
+ if test "$*" != "X $srcdir/configure conftest.file" \
+@@ -18374,11 +17651,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".
- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
-alias in your environment" >&5
-$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
-alias in your environment" >&2;}
- { (exit 1); exit 1; }; }
-- fi
--
-- test "$2" = conftest.file
-- )
--then
-- # Ok.
-- :
--else
++ as_fn_error "ls -t appears to fail. Make sure there is not a broken
++alias in your environment" "$LINENO" 5
+ fi
+
+ test "$2" = conftest.file
+@@ -18387,27 +17661,20 @@
+ # Ok.
+ :
+ else
- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-$as_echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
- { (exit 1); exit 1; }; }
--fi
++ as_fn_error "newly created file is older than distributed files!
++Check your system clock" "$LINENO" 5
+ fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
--
--# Checks for programs.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+
+ # Checks for programs.
-{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5
--$as_echo_n "checking for library containing strerror... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
+ $as_echo_n "checking for library containing strerror... " >&6; }
-if test "${ac_cv_search_strerror+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_func_search_save_LIBS=$LIBS
++if test "${ac_cv_search_strerror+set}" = set; then :
+ $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
--/* 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 strerror ();
--int
--main ()
--{
--return strerror ();
-- ;
-- return 0;
--}
--_ACEOF
--for ac_lib in '' cposix; 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
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -18432,6999 +17699,1596 @@
+ 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
@@ -16867,45 +16843,64 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_search_strerror=$ac_res
++ if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_search_strerror=$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_strerror+set}" = set; then
-- break
--fi
--done
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext
++ if test "${ac_cv_search_strerror+set}" = set; then :
+ break
+ fi
+ done
-if test "${ac_cv_search_strerror+set}" = set; then
- :
--else
-- ac_cv_search_strerror=no
--fi
--rm conftest.$ac_ext
--LIBS=$ac_func_search_save_LIBS
--fi
++if test "${ac_cv_search_strerror+set}" = set; then :
++
+ else
+ ac_cv_search_strerror=no
+ fi
+ rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
--$as_echo "$ac_cv_search_strerror" >&6; }
--ac_res=$ac_cv_search_strerror
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
+ $as_echo "$ac_cv_search_strerror" >&6; }
+ ac_res=$ac_cv_search_strerror
-if test "$ac_res" != no; then
-- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
--
--fi
--
++if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+ fi
+
-
-
-
-{ $as_echo "$as_me:$LINENO: checking for ${CC-cc} option to accept ANSI C" >&5
-$as_echo_n "checking for ${CC-cc} option to accept ANSI C... " >&6; }
-if test "${am_cv_prog_cc_stdc+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++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
++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
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- am_cv_prog_cc_stdc=no
-ac_save_CC="$CC"
-# Don't try gcc -ansi; that turns off useful extensions and
@@ -16916,7 +16911,12 @@
-# HP-UX older versions -Aa -D_HPUX_SOURCE
-# SVR4 -Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
--do
++ if test -n "$CC"; then
++ ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
+ do
- CC="$ac_save_CC $ac_arg"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -16958,7 +16958,18 @@
-{
-
-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
--
++ 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_prog_CC="${ac_tool_prefix}gcc"
++ $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
+
- ;
- return 0;
-}
@@ -16982,23 +16993,39 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- am_cv_prog_cc_stdc="$ac_arg"; break
--else
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
++$as_echo "$CC" >&6; }
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
--fi
--
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-CC="$ac_save_CC"
--
--fi
+
+ fi
-
-if test -z "$am_cv_prog_cc_stdc"; then
- { $as_echo "$as_me:$LINENO: result: none needed" >&5
-$as_echo "none needed" >&6; }
--else
++if test -z "$ac_cv_prog_CC"; then
++ 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
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
++ $as_echo_n "(cached) " >&6
+ else
- { $as_echo "$as_me:$LINENO: result: $am_cv_prog_cc_stdc" >&5
-$as_echo "$am_cv_prog_cc_stdc" >&6; }
-fi
@@ -17026,12 +17053,15 @@
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
- $as_echo_n "(cached) " >&6
--else
++ if test -n "$ac_ct_CC"; then
++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+ else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
- # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
- ./ | .// | /cC/* | \
@@ -17073,9 +17103,16 @@
- ;;
-esac
-
--done
--IFS=$as_save_IFS
--
++ 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_prog_ac_ct_CC="gcc"
++ $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
+
-rm -rf conftest.one conftest.two conftest.dir
-
-fi
@@ -17088,7 +17125,7 @@
- # removed, or if the value is a relative name.
- INSTALL=$ac_install_sh
- fi
--fi
+ fi
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
-
@@ -17120,14 +17157,19 @@
- eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
--fi
+ fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
- SET_MAKE=
--else
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
++$as_echo "$ac_ct_CC" >&6; }
+ else
- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
- SET_MAKE="MAKE=${MAKE-make}"
-fi
-
@@ -17149,8 +17191,8 @@
- *) CFLAGS="$CFLAGS -pedantic" ;;
- esac
- fi
--fi
--
+ fi
+
-CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES -DATK_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
-
-# Ensure MSVC-compatible struct packing convention is used when
@@ -17189,9 +17231,21 @@
- { $as_echo "$as_me:$LINENO: result: ${msnative_struct}" >&5
-$as_echo "${msnative_struct}" >&6; }
- fi
-- fi
--fi
--
++ if test "x$ac_ct_CC" = x; then
++ CC=""
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++ CC=$ac_ct_CC
+ fi
++else
++ CC="$ac_cv_prog_CC"
+ fi
+
-# Honor aclocal flags
-ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
-
@@ -17208,73 +17262,112 @@
- # 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
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
++if test -z "$CC"; then
++ 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
++{ $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_PKG_CONFIG+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
++if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- case $PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_PKG_CONFIG="$PKG_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=.
++ if test -n "$CC"; then
++ ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++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
++ 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_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
++ ac_cv_prog_CC="${ac_tool_prefix}cc"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
-done
--done
--IFS=$as_save_IFS
--
++ done
+ IFS=$as_save_IFS
+
- ;;
-esac
--fi
+ fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
--else
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
++$as_echo "$CC" >&6; }
+ else
- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--fi
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
++ fi
+ fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
- 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
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
++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
++{ $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_ac_pt_PKG_CONFIG+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
++if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- case $ac_pt_PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_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=.
++ if test -n "$CC"; then
++ ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++ ac_prog_rejected=no
++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
++ 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_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
++ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
++ ac_prog_rejected=yes
++ continue
++ fi
++ ac_cv_prog_CC="cc"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
-done
--done
--IFS=$as_save_IFS
--
++ done
+ IFS=$as_save_IFS
+
- ;;
-esac
-fi
@@ -17297,7 +17390,17 @@
-ac_tool_warned=yes ;;
-esac
- PKG_CONFIG=$ac_pt_PKG_CONFIG
-- fi
++if test $ac_prog_rejected = yes; then
++ # We found a bogon in the path, so make sure we never use it.
++ set dummy $ac_cv_prog_CC
++ shift
++ if test $# != 0; then
++ # We chose a different compiler from the bogus one.
++ # However, it has the same basename, so the bogon will be chosen
++ # first if we set CC to just the basename; use the full file name.
++ shift
++ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+ fi
-else
- PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
@@ -17554,7 +17657,7 @@
-else
- # We currently use .def files on Windows (for gdk-pixbuf, gdk and gtk)
- LIBTOOL_EXPORT_OPTIONS=
--fi
+ fi
-
-
-
@@ -17563,7 +17666,7 @@
- enableval=$enable_explicit_deps;
-else
- enable_explicit_deps=auto
--fi
+ fi
-
-
-{ $as_echo "$as_me:$LINENO: checking Whether to write dependencies into .pc files" >&5
@@ -17596,7 +17699,7 @@
-else
- DISABLE_EXPLICIT_DEPS_TRUE='#'
- DISABLE_EXPLICIT_DEPS_FALSE=
--fi
+ fi
-
-
-# define a MAINT-like variable REBUILD which is set if Perl
@@ -22077,50 +22180,133 @@
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_func_mmap_fixed_mapped=yes
--else
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
++$as_echo "$CC" >&6; }
+ 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
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+fi
++
++
++fi
++if test -z "$CC"; then
++ if test -n "$ac_tool_prefix"; then
++ for ac_prog in cl.exe
++ 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
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_CC+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test -n "$CC"; then
++ ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++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_prog_CC="$ac_tool_prefix$ac_prog"
++ $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
-( exit $ac_status )
-ac_cv_func_mmap_fixed_mapped=no
-+# Check whether --enable-visibility was given.
-+if test "${enable_visibility+set}" = set; then :
-+ enableval=$enable_visibility;
-+else
-+ enable_visibility=yes
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+
-+
-+
-+# Check whether --with-xinput was given.
-+if test "${with_xinput+set}" = set; then :
-+ withval=$with_xinput;
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
++$as_echo "$CC" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
fi
-+if test "$platform_win32" = yes; then
-+ gdktarget=win32
-+else
-+ gdktarget=x11
++ test -n "$CC" && break
++ done
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
++if test -z "$CC"; then
++ ac_ct_CC=$CC
++ for ac_prog in cl.exe
++do
++ # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test -n "$ac_ct_CC"; then
++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
++else
++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_prog_ac_ct_CC="$ac_prog"
++ $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
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MMAP 1
-_ACEOF
-
-+# Check whether --with-gdktarget was given.
-+if test "${with_gdktarget+set}" = set; then :
-+ withval=$with_gdktarget; gdktarget=$with_gdktarget
++fi
++fi
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
++$as_echo "$ac_ct_CC" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++ test -n "$ac_ct_CC" && break
++done
+
++ if test "x$ac_ct_CC" = x; then
++ CC=""
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++ CC=$ac_ct_CC
++ fi
fi
-rm -f conftest.mmap
++fi
-for ac_func in mallinfo
@@ -22129,36 +22315,80 @@
-{ $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
++test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "no acceptable C compiler found in \$PATH
++See \`config.log' for more details." "$LINENO" 5; }
++
++# Provide some information about the compiler.
++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
++set X $ac_compile
++ac_compiler=$2
++for ac_option in --version -v -V -qversion; do
++ { { ac_try="$ac_compiler $ac_option >&5"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
++ ac_status=$?
++ if test -s conftest.err; then
++ sed '10a\
++... rest of stderr output deleted ...
++ 10q' conftest.err >conftest.er1
++ cat conftest.er1 >&5
++ rm -f conftest.er1 conftest.err
++ fi
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }
++done
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
++$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
++if test "${ac_cv_c_compiler_gnu+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. */
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-+case $gdktarget in
-+ x11|win32|quartz|directfb) ;;
-+ *) as_fn_error "Invalid target for GDK: use x11, quartz, directfb or win32." "$LINENO" 5;;
-+esac
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la
-+gtktargetlib=libgtk-$gdktarget-$GTK_API_VERSION.la
-
+-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
--#endif
++int
++main ()
++{
++#ifndef __GNUC__
++ choke me
+ #endif
-#undef $ac_func
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_compiler_gnu=yes
++else
++ ac_compiler_gnu=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_cv_c_compiler_gnu=$ac_compiler_gnu
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -22173,190 +22403,33 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
--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"
-+if test "x$enable_debug" = "xyes"; then
-+ test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
-+ GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_ERRORCHECK_MUTEXES"
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- eval "$as_ac_var=no"
-+ if test "x$enable_debug" = "xno"; then
-+ GTK_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS"
-+ else
-+ GTK_DEBUG_FLAGS="-DG_DISABLE_CAST_CHECKS"
-+ fi
- fi
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--fi
--ac_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
--_ACEOF
-
-+if test "x$enable_visibility" = "xno"; then
-+ GTK_DEBUG_FLAGS="$GTK_DEBUG_FLAGS -DDISABLE_VISIBILITY"
- fi
--done
-
-
--for ac_func in getresuid
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
-+
-+cat >>confdefs.h <<_ACEOF
-+#define GTK_COMPILED_WITH_DEBUGGING "${enable_debug}"
- _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
-
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-
--#undef $ac_func
-+# Build time sanity check...
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
-+$as_echo_n "checking whether build environment is sane... " >&6; }
-+# Just in case
-+sleep 1
-+echo timestamp > conftest.file
-+# Reject unsafe characters in $srcdir or the absolute working directory
-+# name. Accept space and tab only in the latter.
-+am_lf='
-+'
-+case `pwd` in
-+ *[\\\"\#\$\&\'\`$am_lf]*)
-+ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
-+esac
-+case $srcdir in
-+ *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
-+ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
-+esac
-+
-+# Do `set' in a subshell so we don't clobber the current shell's
-+# arguments. Must try -L first in case configure is actually a
-+# symlink; some systems play weird games with the mod time of symlinks
-+# (eg FreeBSD returns the mod time of the symlink's containing
-+# directory).
-+if (
-+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-+ if test "$*" = "X"; then
-+ # -L didn't work.
-+ set X `ls -t "$srcdir/configure" conftest.file`
-+ fi
-+ rm -f conftest.file
-+ if test "$*" != "X $srcdir/configure conftest.file" \
-+ && test "$*" != "X conftest.file $srcdir/configure"; then
-+
-+ # If neither matched, then we have a broken ls. This can happen
-+ # if, for instance, CONFIG_SHELL is bash and it inherits a
-+ # broken ls alias from the environment. This has actually
-+ # happened. Such a system could not be considered "sane".
-+ as_fn_error "ls -t appears to fail. Make sure there is not a broken
-+alias in your environment" "$LINENO" 5
-+ fi
-+
-+ test "$2" = conftest.file
-+ )
-+then
-+ # Ok.
-+ :
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
++$as_echo "$ac_cv_c_compiler_gnu" >&6; }
++if test $ac_compiler_gnu = yes; then
++ GCC=yes
+else
-+ as_fn_error "newly created file is older than distributed files!
-+Check your system clock" "$LINENO" 5
++ GCC=
+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
-+# Checks for programs.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
-+$as_echo_n "checking for library containing strerror... " >&6; }
-+if test "${ac_cv_search_strerror+set}" = set; then :
++ac_test_CFLAGS=${CFLAGS+set}
++ac_save_CFLAGS=$CFLAGS
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
++$as_echo_n "checking whether $CC accepts -g... " >&6; }
++if test "${ac_cv_prog_cc_g+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
-+ ac_func_search_save_LIBS=$LIBS
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ ac_save_c_werror_flag=$ac_c_werror_flag
++ ac_c_werror_flag=yes
++ ac_cv_prog_cc_g=no
++ CFLAGS="-g"
++ 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
-@@ -23828,1603 +17683,1612 @@
- #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
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
--
-+char strerror ();
int
main ()
{
-return $ac_func ();
-+return strerror ();
++
;
return 0;
}
@@ -22383,118 +22456,216 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-+for ac_lib in '' cposix; 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_strerror=$ac_res
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext
-+ if test "${ac_cv_search_strerror+set}" = set; then :
-+ break
-+fi
-+done
-+if test "${ac_cv_search_strerror+set}" = set; then :
-+
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_prog_cc_g=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ ac_cv_search_strerror=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
-+$as_echo "$ac_cv_search_strerror" >&6; }
-+ac_res=$ac_cv_search_strerror
-+if test "$ac_res" != no; then :
-+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+
-+fi
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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
-+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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ if test -n "$CC"; then
-+ ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+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_prog_CC="${ac_tool_prefix}gcc"
-+ $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
-+
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-+$as_echo "$CC" >&6; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_CC"; then
-+ 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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ if test -n "$ac_ct_CC"; then
-+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+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_prog_ac_ct_CC="gcc"
-+ $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
++ CFLAGS=""
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
- eval "$as_ac_var=no"
- fi
--
+-fi
++int
++main ()
++{
+
-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
+-$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
++ ;
++ return 0;
++}
+ _ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
+
+-fi
+-done
++else
++ ac_c_werror_flag=$ac_save_c_werror_flag
++ CFLAGS="-g"
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
++int
++main ()
++{
+
+-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
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_prog_cc_g=yes
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ ac_c_werror_flag=$ac_save_c_werror_flag
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
++$as_echo "$ac_cv_prog_cc_g" >&6; }
++if test "$ac_test_CFLAGS" = set; then
++ CFLAGS=$ac_save_CFLAGS
++elif test $ac_cv_prog_cc_g = yes; then
++ if test "$GCC" = yes; then
++ CFLAGS="-g -O2"
++ else
++ CFLAGS="-g"
++ fi
++else
++ if test "$GCC" = yes; then
++ CFLAGS="-O2"
++ else
++ CFLAGS=
++ fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
++$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
++if test "${ac_cv_prog_cc_c89+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
++ ac_cv_prog_cc_c89=no
++ac_save_CC=$CC
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++#include <stdarg.h>
++#include <stdio.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
++struct buf { int x; };
++FILE * (*rcsopen) (struct buf *, struct stat *, int);
++static char *e (p, i)
++ char **p;
++ int i;
++{
++ return p[i];
++}
++static char *f (char * (*g) (char **, int), char **p, ...)
++{
++ char *s;
++ va_list v;
++ va_start (v,p);
++ s = g (p, va_arg (v,int));
++ va_end (v);
++ return s;
++}
+
+-#undef $ac_func
++/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
++ function prototypes and stuff, but not '\xHH' hex character constants.
++ These don't provoke an error unfortunately, instead are silently treated
++ as 'x'. The following induces an error, until -std is added to get
++ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
++ array size at least. It's necessary to write '\x00'==0 to get something
++ that's true only with -std. */
++int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+-/* 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
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
++ inside strings and character constants. */
++#define FOO(x) 'x'
++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
++int test (int i, double x);
++struct s1 {int (*f) (int a);};
++struct s2 {int (*f) (double a);};
++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
++int argc;
++char **argv;
+ int
+ main ()
+ {
+-return $ac_func ();
++return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
+ ;
+ 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
@@ -22505,43 +22676,25 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-+$as_echo "$ac_ct_CC" >&6; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-
-+ if test "x$ac_ct_CC" = x; then
-+ CC=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ CC=$ac_ct_CC
-+ fi
-+else
-+ CC="$ac_cv_prog_CC"
+-
++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
++ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
++do
++ CC="$ac_save_CC $ac_arg"
++ if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_prog_cc_c89=$ac_arg
fi
--done
++rm -f core conftest.err conftest.$ac_objext
++ test "x$ac_cv_prog_cc_c89" != "xno" && break
+ done
++rm -f conftest.$ac_ext
++CC=$ac_save_CC
-{ $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
-+if test -z "$CC"; then
-+ 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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -22554,105 +22707,94 @@
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "uid_t" >/dev/null 2>&1; then
- ac_cv_type_uid_t=yes
-+ if test -n "$CC"; then
-+ ac_cv_prog_CC="$CC" # Let the user override the test.
- else
+-else
- ac_cv_type_uid_t=no
--fi
+ fi
-rm -f conftest*
-+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_prog_CC="${ac_tool_prefix}cc"
-+ $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
++# AC_CACHE_VAL
++case "x$ac_cv_prog_cc_c89" in
++ x)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
++$as_echo "none needed" >&6; } ;;
++ xno)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
++$as_echo "unsupported" >&6; } ;;
++ *)
++ CC="$CC $ac_cv_prog_cc_c89"
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
++$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
++esac
++if test "x$ac_cv_prog_cc_c89" != xno; then :
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
-$as_echo "$ac_cv_type_uid_t" >&6; }
-if test $ac_cv_type_uid_t = no; then
--
+
-cat >>confdefs.h <<\_ACEOF
-#define uid_t int
-_ACEOF
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-+$as_echo "$CC" >&6; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++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
+
++depcc="$CC" am_compiler_list=
-cat >>confdefs.h <<\_ACEOF
-#define gid_t int
-_ACEOF
-+ fi
-+fi
-+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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
++$as_echo_n "checking dependency style of $depcc... " >&6; }
++if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
-+ if test -n "$CC"; then
-+ ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+ ac_prog_rejected=no
-+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
-+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-+ ac_prog_rejected=yes
-+ continue
-+ fi
-+ ac_cv_prog_CC="cc"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
++ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
++ # We make a subdir and do the tests there. Otherwise we can end up
++ # making bogus files that we don't know about and never remove. For
++ # instance it was reported that on HP-UX the gcc test will end up
++ # making a dummy file named `D' -- because `-MD' means `put the output
++ # in D'.
++ mkdir conftest.dir
++ # Copy depcomp to subdir because otherwise we won't find it if we're
++ # using a relative directory.
++ cp "$am_depcomp" conftest.dir
++ cd conftest.dir
++ # We will build objects and dependencies in a subdirectory because
++ # it helps to detect inapplicable dependency modes. For instance
++ # both Tru64's cc and ICC support -MD to output dependencies as a
++ # side effect of compilation, but ICC will put the dependencies in
++ # the current directory while Tru64 will put them in the object
++ # directory.
++ mkdir sub
+
+-fi
++ am_cv_CC_dependencies_compiler_type=none
++ if test "$am_compiler_list" = ""; then
++ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+ fi
-+done
-+ done
-+IFS=$as_save_IFS
-
-+if test $ac_prog_rejected = yes; then
-+ # We found a bogon in the path, so make sure we never use it.
-+ set dummy $ac_cv_prog_CC
-+ shift
-+ if test $# != 0; then
-+ # We chose a different compiler from the bogus one.
-+ # However, it has the same basename, so the bogon will be chosen
-+ # first if we set CC to just the basename; use the full file name.
-+ shift
-+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-+ fi
-+fi
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-+$as_echo "$CC" >&6; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
-
++ am__universal=false
++ case " $depcc " in #(
++ *\ -arch\ *\ -arch\ *) am__universal=true ;;
++ esac
+
++ for depmode in $am_compiler_list; do
++ # Setup a source with many dependencies, because some compilers
++ # like to wrap large dependency lists on column 80 (with \), and
++ # we should not choose a depcomp mode which is confused by this.
++ #
++ # We need to recreate these files for each test, as the compiler may
++ # overwrite some of them when testing with obscure command lines.
++ # This happens at least with the AIX C compiler.
++ : > sub/conftest.c
++ for i in 1 2 3 4 5 6; do
++ echo '#include "conftst'$i'.h"' >> sub/conftest.c
++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
++ # Solaris 8's {/usr,}/bin/sh.
++ touch sub/conftst$i.h
++ done
++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-# Check if <sys/select.h> needs to be included for fd_set
-{ $as_echo "$as_me:$LINENO: checking for fd_set" >&5
@@ -22691,743 +22833,6 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- gtk_ok=yes
-+fi
-+if test -z "$CC"; then
-+ if test -n "$ac_tool_prefix"; then
-+ for ac_prog in cl.exe
-+ 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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+ if test -n "$CC"; then
-+ ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+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_prog_CC="$ac_tool_prefix$ac_prog"
-+ $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
-
-- 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:$LINENO: result: yes, found in sys/types.h" >&5
--$as_echo "yes, found in sys/types.h" >&6; }
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-+$as_echo "$CC" >&6; }
- else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <sys/select.h>
--
--_ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-- $EGREP "fd_mask" >/dev/null 2>&1; then
-- gtk_ok=yes
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
--rm -f conftest*
--
-- if test $gtk_ok = yes; then
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_SYS_SELECT_H 1
--_ACEOF
--
-- { $as_echo "$as_me:$LINENO: result: yes, found in sys/select.h" >&5
--$as_echo "yes, found in sys/select.h" >&6; }
-- else
-
--cat >>confdefs.h <<\_ACEOF
--#define NO_FD_SET 1
--_ACEOF
-+ test -n "$CC" && break
-+ done
-+fi
-+if test -z "$CC"; then
-+ ac_ct_CC=$CC
-+ for ac_prog in cl.exe
-+do
-+ # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ if test -n "$ac_ct_CC"; then
-+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+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_prog_ac_ct_CC="$ac_prog"
-+ $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
-
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+fi
-+fi
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-+$as_echo "$ac_ct_CC" >&6; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-- fi
- fi
-
--# `widechar' tests for gdki18n.h
--{ $as_echo "$as_me:$LINENO: checking for wchar.h" >&5
--$as_echo_n "checking for wchar.h... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <wchar.h>
--_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
-- gdk_wchar_h=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-
-- gdk_wchar_h=no
-+ test -n "$ac_ct_CC" && break
-+done
-+
-+ if test "x$ac_ct_CC" = x; then
-+ CC=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ CC=$ac_ct_CC
-+ fi
- fi
-
--rm -f conftest.err conftest.$ac_ext
--if test $gdk_wchar_h = yes; then
-+fi
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_WCHAR_H 1
--_ACEOF
-
--fi
--{ $as_echo "$as_me:$LINENO: result: $gdk_wchar_h" >&5
--$as_echo "$gdk_wchar_h" >&6; }
-+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." "$LINENO" 5; }
-
--# Check for wctype.h (for iswalnum)
--{ $as_echo "$as_me:$LINENO: checking for wctype.h" >&5
--$as_echo_n "checking for wctype.h... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <wctype.h>
--_ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
-+# Provide some information about the compiler.
-+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-+set X $ac_compile
-+ac_compiler=$2
-+for ac_option in --version -v -V -qversion; do
-+ { { ac_try="$ac_compiler $ac_option >&5"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
- ac_status=$?
-- 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
-- gdk_wctype_h=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- gdk_wctype_h=no
--fi
--
--rm -f conftest.err conftest.$ac_ext
--if test $gdk_wctype_h = yes; then
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_WCTYPE_H 1
--_ACEOF
--
--fi
--{ $as_echo "$as_me:$LINENO: result: $gdk_wctype_h" >&5
--$as_echo "$gdk_wctype_h" >&6; }
-+ if test -s conftest.err; then
-+ sed '10a\
-+... rest of stderr output deleted ...
-+ 10q' conftest.err >conftest.er1
-+ cat conftest.er1 >&5
-+ rm -f conftest.er1 conftest.err
-+ fi
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }
-+done
-
--# in Solaris 2.5, `iswalnum' is in -lw
--GDK_WLIBS=
--{ $as_echo "$as_me:$LINENO: checking for iswalnum" >&5
--$as_echo_n "checking for iswalnum... " >&6; }
--if test "${ac_cv_func_iswalnum+set}" = set; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-+if test "${ac_cv_c_compiler_gnu+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
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--/* Define iswalnum to an innocuous variant, in case <limits.h> declares iswalnum.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define iswalnum innocuous_iswalnum
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char iswalnum (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef iswalnum
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char iswalnum ();
--/* 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_iswalnum || defined __stub___iswalnum
--choke me
--#endif
-
- int
- main ()
- {
--return iswalnum ();
-+#ifndef __GNUC__
-+ choke me
-+#endif
-+
- ;
- 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_iswalnum=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_compiler_gnu=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_func_iswalnum=no
-+ ac_compiler_gnu=no
- fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
--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_iswalnum" >&5
--$as_echo "$ac_cv_func_iswalnum" >&6; }
--if test "x$ac_cv_func_iswalnum" = x""yes; then
-- :
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-+if test $ac_compiler_gnu = yes; then
-+ GCC=yes
- else
-- { $as_echo "$as_me:$LINENO: checking for iswalnum in -lw" >&5
--$as_echo_n "checking for iswalnum in -lw... " >&6; }
--if test "${ac_cv_lib_w_iswalnum+set}" = set; then
-+ GCC=
-+fi
-+ac_test_CFLAGS=${CFLAGS+set}
-+ac_save_CFLAGS=$CFLAGS
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-+$as_echo_n "checking whether $CC accepts -g... " >&6; }
-+if test "${ac_cv_prog_cc_g+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lw $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
-+ ac_save_c_werror_flag=$ac_c_werror_flag
-+ ac_c_werror_flag=yes
-+ ac_cv_prog_cc_g=no
-+ CFLAGS="-g"
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
- _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_prog_cc_g=yes
-+else
-+ CFLAGS=""
-+ 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
--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_w_iswalnum=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+ ac_c_werror_flag=$ac_save_c_werror_flag
-+ CFLAGS="-g"
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-
-- ac_cv_lib_w_iswalnum=no
--fi
-+int
-+main ()
-+{
-
--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
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_prog_cc_g=yes
- 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
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ ac_c_werror_flag=$ac_save_c_werror_flag
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-+$as_echo "$ac_cv_prog_cc_g" >&6; }
-+if test "$ac_test_CFLAGS" = set; then
-+ CFLAGS=$ac_save_CFLAGS
-+elif test $ac_cv_prog_cc_g = yes; then
-+ if test "$GCC" = yes; then
-+ CFLAGS="-g -O2"
-+ else
-+ CFLAGS="-g"
-+ fi
-+else
-+ if test "$GCC" = yes; then
-+ CFLAGS="-O2"
-+ else
-+ CFLAGS=
-+ fi
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-+if test "${ac_cv_prog_cc_c89+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_cv_prog_cc_c89=no
-+ac_save_CC=$CC
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <stdarg.h>
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
-+struct buf { int x; };
-+FILE * (*rcsopen) (struct buf *, struct stat *, int);
-+static char *e (p, i)
-+ char **p;
-+ int i;
-+{
-+ return p[i];
-+}
-+static char *f (char * (*g) (char **, int), char **p, ...)
-+{
-+ char *s;
-+ va_list v;
-+ va_start (v,p);
-+ s = g (p, va_arg (v,int));
-+ va_end (v);
-+ return s;
-+}
-+
-+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
-+ function prototypes and stuff, but not '\xHH' hex character constants.
-+ These don't provoke an error unfortunately, instead are silently treated
-+ as 'x'. The following induces an error, until -std is added to get
-+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
-+ array size at least. It's necessary to write '\x00'==0 to get something
-+ that's true only with -std. */
-+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-+ inside strings and character constants. */
-+#define FOO(x) 'x'
-+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
--oLIBS="$LIBS"
--LIBS="$LIBS $GDK_WLIBS"
--# The following is necessary for Linux libc-5.4.38
--{ $as_echo "$as_me:$LINENO: checking if iswalnum() and friends are properly defined" >&5
--$as_echo_n "checking if iswalnum() and friends are properly defined... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <stdlib.h>
-+int test (int i, double x);
-+struct s1 {int (*f) (int a);};
-+struct s2 {int (*f) (double a);};
-+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-+int argc;
-+char **argv;
- int
- main ()
- {
-+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+do
-+ CC="$ac_save_CC $ac_arg"
-+ if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_prog_cc_c89=$ac_arg
-+fi
-+rm -f core conftest.err conftest.$ac_objext
-+ test "x$ac_cv_prog_cc_c89" != "xno" && break
-+done
-+rm -f conftest.$ac_ext
-+CC=$ac_save_CC
-
--#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H))
--# ifdef HAVE_WCTYPE_H
--# include <wctype.h>
--# else
--# ifdef HAVE_WCHAR_H
--# include <wchar.h>
--# 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
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
-+fi
-+# AC_CACHE_VAL
-+case "x$ac_cv_prog_cc_c89" in
-+ x)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-+$as_echo "none needed" >&6; } ;;
-+ xno)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-+$as_echo "unsupported" >&6; } ;;
-+ *)
-+ CC="$CC $ac_cv_prog_cc_c89"
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
- 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
-- gdk_working_wctype=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-- 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"
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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
-
--if test $gdk_working_wctype = no; then
-+depcc="$CC" am_compiler_list=
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_BROKEN_WCTYPE 1
--_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-+$as_echo_n "checking dependency style of $depcc... " >&6; }
-+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+ # We make a subdir and do the tests there. Otherwise we can end up
-+ # making bogus files that we don't know about and never remove. For
-+ # instance it was reported that on HP-UX the gcc test will end up
-+ # making a dummy file named `D' -- because `-MD' means `put the output
-+ # in D'.
-+ mkdir conftest.dir
-+ # Copy depcomp to subdir because otherwise we won't find it if we're
-+ # using a relative directory.
-+ cp "$am_depcomp" conftest.dir
-+ cd conftest.dir
-+ # We will build objects and dependencies in a subdirectory because
-+ # it helps to detect inapplicable dependency modes. For instance
-+ # both Tru64's cc and ICC support -MD to output dependencies as a
-+ # side effect of compilation, but ICC will put the dependencies in
-+ # the current directory while Tru64 will put them in the object
-+ # directory.
-+ mkdir sub
-
-- GDK_WLIBS=
--fi
--{ $as_echo "$as_me:$LINENO: result: $gdk_working_wctype" >&5
--$as_echo "$gdk_working_wctype" >&6; }
-+ am_cv_CC_dependencies_compiler_type=none
-+ if test "$am_compiler_list" = ""; then
-+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-+ fi
-+ am__universal=false
-+ case " $depcc " in #(
-+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
-+ esac
-
-+ for depmode in $am_compiler_list; do
-+ # Setup a source with many dependencies, because some compilers
-+ # like to wrap large dependency lists on column 80 (with \), and
-+ # we should not choose a depcomp mode which is confused by this.
-+ #
-+ # We need to recreate these files for each test, as the compiler may
-+ # overwrite some of them when testing with obscure command lines.
-+ # This happens at least with the AIX C compiler.
-+ : > sub/conftest.c
-+ for i in 1 2 3 4 5 6; do
-+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+ # Solaris 8's {/usr,}/bin/sh.
-+ touch sub/conftst$i.h
-+ done
-+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
--# 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; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <uxtheme.h>
--_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
-- gtk_uxtheme_h=yes
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this. Also, some Intel
@@ -23489,96 +22894,106 @@
+ am_cv_CC_dependencies_compiler_type=none
+fi
-- gtk_uxtheme_h=no
+- gtk_ok=no
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
--rm -f conftest.err conftest.$ac_ext
--if test $gtk_uxtheme_h = 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, found in sys/types.h" >&5
+-$as_echo "yes, found in sys/types.h" >&6; }
+ if
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+ am__fastdepCC_TRUE=
+ am__fastdepCC_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. */
+-#include <sys/select.h>
+-
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+- $EGREP "fd_mask" >/dev/null 2>&1; then
+- gtk_ok=yes
+ am__fastdepCC_TRUE='#'
+ am__fastdepCC_FALSE=
-+fi
+ fi
+-rm -f conftest*
+-
+- if test $gtk_ok = yes; then
-cat >>confdefs.h <<\_ACEOF
--#define HAVE_UXTHEME_H 1
+-#define HAVE_SYS_SELECT_H 1
-_ACEOF
+- { $as_echo "$as_me:$LINENO: result: yes, found in sys/select.h" >&5
+-$as_echo "yes, found in sys/select.h" >&6; }
+- else
+
+-cat >>confdefs.h <<\_ACEOF
+-#define NO_FD_SET 1
+-_ACEOF
++am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
+
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+- fi
-fi
--{ $as_echo "$as_me:$LINENO: result: $gtk_uxtheme_h" >&5
--$as_echo "$gtk_uxtheme_h" >&6; }
-
--# Checks for gdkspawn
-+am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
-
--for ac_header in crt_externs.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 "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-+set x ${MAKE-make}
-+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-+if { as_var=ac_cv_prog_make_${ac_make}_set; 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; }
+
+-# `widechar' tests for gdki18n.h
+-{ $as_echo "$as_me:$LINENO: checking for wchar.h" >&5
+-$as_echo_n "checking for wchar.h... " >&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>
+-#include <wchar.h>
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
++$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
++set x ${MAKE-make}
++ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
++if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
++ $as_echo_n "(cached) " >&6
++else
+ cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+ @echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
+-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
+- gdk_wchar_h=yes
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+ *@@@%%%=?*=@@@%%%*)
+ eval ac_cv_prog_make_${ac_make}_set=yes;;
+ *)
+ eval ac_cv_prog_make_${ac_make}_set=no;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- 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
++esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -23589,26 +23004,49 @@
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_header_compiler=no
+- gdk_wchar_h=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ SET_MAKE="MAKE=${MAKE-make}"
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; }
+-rm -f conftest.err conftest.$ac_ext
+-if test $gdk_wchar_h = yes; then
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_WCHAR_H 1
+-_ACEOF
++if test "x$GCC" = "xyes"; then
++ case " $CFLAGS " in
++ *[\ \ ]-Wall[\ \ ]*) ;;
++ *) CFLAGS="$CFLAGS -Wall" ;;
++ esac
++
++ if test "x$enable_ansi" = "xyes"; then
++ case " $CFLAGS " in
++ *[\ \ ]-ansi[\ \ ]*) ;;
++ *) CFLAGS="$CFLAGS -ansi" ;;
++ esac
+
++ case " $CFLAGS " in
++ *[\ \ ]-pedantic[\ \ ]*) ;;
++ *) CFLAGS="$CFLAGS -pedantic" ;;
++ esac
++ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $gdk_wchar_h" >&5
+-$as_echo "$gdk_wchar_h" >&6; }
+
+-# Check for wctype.h (for iswalnum)
+-{ $as_echo "$as_me:$LINENO: checking for wctype.h" >&5
+-$as_echo_n "checking for wctype.h... " >&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>
+-#include <wctype.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
@@ -23627,32 +23065,13 @@
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
-- ac_header_preproc=yes
+- gdk_wctype_h=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+if test "x$GCC" = "xyes"; then
-+ case " $CFLAGS " in
-+ *[\ \ ]-Wall[\ \ ]*) ;;
-+ *) CFLAGS="$CFLAGS -Wall" ;;
-+ esac
-
-- ac_header_preproc=no
-+ if test "x$enable_ansi" = "xyes"; then
-+ case " $CFLAGS " in
-+ *[\ \ ]-ansi[\ \ ]*) ;;
-+ *) CFLAGS="$CFLAGS -ansi" ;;
-+ esac
-+
-+ case " $CFLAGS " in
-+ *[\ \ ]-pedantic[\ \ ]*) ;;
-+ *) CFLAGS="$CFLAGS -pedantic" ;;
-+ esac
-+ fi
-+fi
-+
+CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES -DATK_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
-+
+
+- gdk_wctype_h=no
+# Ensure MSVC-compatible struct packing convention is used when
+# compiling for Win32 with gcc.
+# What flag to depends on gcc version: gcc3 uses "-mms-bitfields", while
@@ -23693,52 +23112,29 @@
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 $gdk_wctype_h = yes; then
+# Honor aclocal flags
+ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
--# 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
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_WCTYPE_H 1
+-_ACEOF
+## Initial sanity check, done here so that users get told they
+## have the wrong dependencies as early in the process as possible.
+## Later on we actually use the cflags/libs from separate pkg-config
+## calls. Oh, also the later pkg-config calls don't include
+## the version requirements since those make the module lists
+## annoying to construct
-+
-+
+
+-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$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ 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.
@@ -23748,12 +23144,42 @@
+if test "${ac_cv_path_PKG_CONFIG+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; }
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define iswalnum to an innocuous variant, in case <limits.h> declares iswalnum.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define iswalnum innocuous_iswalnum
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char iswalnum (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef iswalnum
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char iswalnum ();
+-/* 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_iswalnum || defined __stub___iswalnum
+-choke me
+-#endif
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
@@ -23774,104 +23200,10 @@
+ done
+IFS=$as_save_IFS
-+ ;;
-+esac
- 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
--
-+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-+if test -n "$PKG_CONFIG"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-+$as_echo "$PKG_CONFIG" >&6; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
-
--done
--
-
--for ac_func in _NSGetEnviron
--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
-+fi
-+if test -z "$ac_cv_path_PKG_CONFIG"; then
-+ 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
-+{ $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_ac_pt_PKG_CONFIG+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. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#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
--char $ac_func ();
--/* 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_$ac_func || defined __stub___$ac_func
--choke me
--#endif
-+ case $ac_pt_PKG_CONFIG in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_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_ac_pt_PKG_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
-
-int
-main ()
-{
--return $ac_func ();
+-return iswalnum ();
- ;
- return 0;
-}
@@ -23898,7 +23230,109 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- eval "$as_ac_var=yes"
+- ac_cv_func_iswalnum=yes
++fi
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
++if test -n "$PKG_CONFIG"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
++$as_echo "$PKG_CONFIG" >&6; }
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_func_iswalnum=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_iswalnum" >&5
+-$as_echo "$ac_cv_func_iswalnum" >&6; }
+-if test "x$ac_cv_func_iswalnum" = x""yes; then
+- :
+-else
+- { $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
++if test -z "$ac_cv_path_PKG_CONFIG"; then
++ 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
++{ $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_ac_pt_PKG_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lw $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
++ case $ac_pt_PKG_CONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_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_ac_pt_PKG_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 iswalnum ();
+-int
+-main ()
+-{
+-return iswalnum ();
+- ;
+- 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_w_iswalnum=yes
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
@@ -23907,15 +23341,11 @@
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
-- eval "$as_ac_var=no"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
- fi
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
++fi
+
+- ac_cv_lib_w_iswalnum=no
+ if test "x$ac_pt_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
+ else
@@ -23930,20 +23360,16 @@
+else
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
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
--_ACEOF
-
+
+-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
--done
--
+-{ $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
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=0.9.0
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
@@ -23956,16 +23382,13 @@
+$as_echo "no" >&6; }
+ PKG_CONFIG=""
+ fi
-
-+fi
-
--##################################################
--# Checks for gdk-pixbuf
--##################################################
++
+ fi
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BASE_DEPENDENCIES" >&5
+$as_echo_n "checking for BASE_DEPENDENCIES... " >&6; }
-
++
+if test -n "$PKG_CONFIG"; then
+ if test -n "$BASE_DEPENDENCIES_CFLAGS"; then
+ pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS"
@@ -24001,23 +23424,72 @@
+ fi
+else
+ pkg_failed=untried
-+fi
-
--use_la_modules=false
--case $host in
-- *-aix*) use_la_modules=true
+ fi
+
+
+-oLIBS="$LIBS"
+-LIBS="$LIBS $GDK_WLIBS"
+-# The following is necessary for Linux libc-5.4.38
+-{ $as_echo "$as_me:$LINENO: checking if iswalnum() and friends are properly defined" >&5
+-$as_echo_n "checking if iswalnum() and friends are properly defined... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stdlib.h>
+-int
+-main ()
+-{
+
+-#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H))
+-# ifdef HAVE_WCTYPE_H
+-# include <wctype.h>
+-# else
+-# ifdef HAVE_WCHAR_H
+-# include <wchar.h>
+-# endif
+-# endif
+-#else
+-# define iswalnum(c) ((wchar_t)(c) <= 0xFF && isalnum(c))
+-#endif
+-iswalnum((wchar_t) 0);
++if test $pkg_failed = yes; then
+
+- ;
+- 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
-
--if $use_la_modules ; then
-
--cat >>confdefs.h <<\_ACEOF
--#define USE_LA_MODULES 1
--_ACEOF
-+if test $pkg_failed = yes; then
-
+-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
+- gdk_working_wctype=yes
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
-+else
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- gdk_working_wctype=no
+ _pkg_short_errors_supported=no
fi
+ if test $_pkg_short_errors_supported = yes; then
@@ -24028,19 +23500,25 @@
+ # Put the nasty error message in config.log where it belongs
+ echo "$BASE_DEPENDENCIES_PKG_ERRORS" >&5
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS="$oLIBS"
+ 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:$LINENO: checking whether to build gmodulized gdk-pixbuf" >&5
--$as_echo_n "checking whether to build gmodulized gdk-pixbuf... " >&6; }
+-if test $gdk_working_wctype = no; then
+$BASE_DEPENDENCIES_PKG_ERRORS
--# Check whether --enable-modules was given.
--if test "${enable_modules+set}" = set; then
-- enableval=$enable_modules;
--fi
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_BROKEN_WCTYPE 1
+-_ACEOF
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
-+
+
+- GDK_WLIBS=
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $gdk_working_wctype" >&5
+-$as_echo "$gdk_working_wctype" >&6; }
+Alternatively, you may set the environment variables BASE_DEPENDENCIES_CFLAGS
+and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
@@ -24056,69 +23534,85 @@
+and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
--dynworks=false
--deps=
--if test x$enable_modules = xno; then
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&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; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <uxtheme.h>
+-_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
+- gtk_uxtheme_h=yes
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." "$LINENO" 5; }
else
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-- { $as_echo "$as_me:$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
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- gtk_uxtheme_h=no
+ BASE_DEPENDENCIES_CFLAGS=$pkg_cv_BASE_DEPENDENCIES_CFLAGS
+ BASE_DEPENDENCIES_LIBS=$pkg_cv_BASE_DEPENDENCIES_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ :
-+fi
-
-- if $dynworks; then
+ fi
+
+-rm -f conftest.err conftest.$ac_ext
+-if test $gtk_uxtheme_h = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_UXTHEME_H 1
+-_ACEOF
+## In addition to checking that cairo is present, we also need to
+## check that the correct cairo backend is there. E.g. if the GDK
+## target is win32 we need the cairo-win32 backend and so on.
+cairo_backend=$gdktarget
--cat >>confdefs.h <<\_ACEOF
--#define USE_GMODULE 1
--_ACEOF
+# GDK calls the xlib backend "x11," cairo calls it "xlib." Other
+# backend names are identical.
+if test "x$cairo_backend" = "xx11"; then
+ cairo_backend=xlib
-+fi
-
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $gtk_uxtheme_h" >&5
+-$as_echo "$gtk_uxtheme_h" >&6; }
+
+-# Checks for gdkspawn
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAIRO_BACKEND" >&5
+$as_echo_n "checking for CAIRO_BACKEND... " >&6; }
-+
+
+-for ac_header in crt_externs.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
+if test -n "$PKG_CONFIG"; then
+ if test -n "$CAIRO_BACKEND_CFLAGS"; then
+ pkg_cv_CAIRO_BACKEND_CFLAGS="$CAIRO_BACKEND_CFLAGS"
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
++ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-\$cairo_backend >= 1.6\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "cairo-$cairo_backend >= 1.6") 2>&5
@@ -24128,9 +23622,34 @@
+ pkg_cv_CAIRO_BACKEND_CFLAGS=`$PKG_CONFIG --cflags "cairo-$cairo_backend >= 1.6" 2>/dev/null`
+else
+ pkg_failed=yes
-+fi
- fi
-+else
+ 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
+ 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
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
@@ -24140,11 +23659,24 @@
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-\$cairo_backend >= 1.6\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "cairo-$cairo_backend >= 1.6") 2>&5
-+ ac_status=$?
+ 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
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_CAIRO_BACKEND_LIBS=`$PKG_CONFIG --libs "cairo-$cairo_backend >= 1.6" 2>/dev/null`
-+else
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_compiler=no
+ pkg_failed=yes
+fi
+ fi
@@ -24152,18 +23684,46 @@
+ pkg_failed=untried
fi
-
-
--# Check whether --with-libpng was given.
--if test "${with_libpng+set}" = set; then
-- withval=$with_libpng;
--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
+if test $pkg_failed = yes; then
-
--# Check whether --with-libjpeg was given.
--if test "${with_libjpeg+set}" = set; then
-- withval=$with_libjpeg;
++
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
@@ -24177,21 +23737,50 @@
+ # Put the nasty error message in config.log where it belongs
+ echo "$CAIRO_BACKEND_PKG_ERRORS" >&5
+-rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
+ as_fn_error "Package requirements (cairo-$cairo_backend >= 1.6) were not met:
--# Check whether --with-libtiff was given.
--if test "${with_libtiff+set}" = set; then
-- withval=$with_libtiff;
--fi
+-# 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
+$CAIRO_BACKEND_PKG_ERRORS
-
++
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
-
--# Check whether --with-libjasper was given.
--if test "${with_libjasper+set}" = set; then
-- withval=$with_libjasper;
--fi
++
+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.
@@ -24202,85 +23791,51 @@
+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.
-
++
+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.
-
--# Check whether --enable-gdiplus was given.
--if test "${enable_gdiplus+set}" = set; then
-- enableval=$enable_gdiplus;
++
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." "$LINENO" 5; }
- else
-- enable_gdiplus=no
++else
+ CAIRO_BACKEND_CFLAGS=$pkg_cv_CAIRO_BACKEND_CFLAGS
+ CAIRO_BACKEND_LIBS=$pkg_cv_CAIRO_BACKEND_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ :
- fi
-
++fi
++
+if test "$os_win32" != yes; then
+ # libtool option to control which symbols are exported
+ # right now, symbols starting with _ are not exported
+ LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[^_].*"'
-+else
+ else
+- eval "$as_ac_Header=\$ac_header_preproc"
+ # We currently use .def files on Windows (for gdk-pixbuf, gdk and gtk)
+ LIBTOOL_EXPORT_OPTIONS=
-+fi
-
-
-
--if test x$os_win32 = xyes && test x$enable_gdiplus != xno ; then
-- BUILD_GDIPLUS_LOADERS_TRUE=
-- BUILD_GDIPLUS_LOADERS_FALSE='#'
+ 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 --enable-explicit-deps was given.
+if test "${enable_explicit_deps+set}" = set; then :
+ enableval=$enable_explicit_deps;
- else
-- BUILD_GDIPLUS_LOADERS_TRUE='#'
-- BUILD_GDIPLUS_LOADERS_FALSE=
++else
+ enable_explicit_deps=auto
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:$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 >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
+-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 >>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 TIFFReadRGBAImageOriented ();
--int
--main ()
--{
--return TIFFReadRGBAImageOriented ();
-- ;
-- 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;;
+
++
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Whether to write dependencies into .pc files" >&5
+$as_echo_n "checking Whether to write dependencies into .pc files... " >&6; }
+case $enable_explicit_deps in
@@ -24297,30 +23852,10 @@
+ ;;
+ *) as_fn_error "Value given to --enable-explicit-deps must be one of yes, no or auto" "$LINENO" 5
+ ;;
- 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_tiff_TIFFReadRGBAImageOriented=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_explicit_deps" >&5
+$as_echo "$enable_explicit_deps" >&6; }
-
-- ac_cv_lib_tiff_TIFFReadRGBAImageOriented=no
++
+ if test $enable_explicit_deps = no; then
+ DISABLE_EXPLICIT_DEPS_TRUE=
+ DISABLE_EXPLICIT_DEPS_FALSE='#'
@@ -24329,51 +23864,34 @@
+ DISABLE_EXPLICIT_DEPS_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
--{ $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
-- if test "${ac_cv_header_tiffio_h+set}" = set; then
-- { $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5
--$as_echo_n "checking for tiffio.h... " >&6; }
--if test "${ac_cv_header_tiffio_h+set}" = set; then
-+
+-done
+
+# define a MAINT-like variable REBUILD which is set if Perl
+# and awk are found, so autogenerated sources can be rebuilt
-+
+
+-for ac_func in _NSGetEnviron
+for ac_prog in perl5 perl
-+do
+ 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
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PERL+set}" = set; then :
$as_echo_n "(cached) " >&6
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5
--$as_echo "$ac_cv_header_tiffio_h" >&6; }
else
-- # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking tiffio.h usability" >&5
--$as_echo_n "checking tiffio.h usability... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
+- 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 <tiffio.h>
--_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;;
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+ case $PERL in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
@@ -24393,12 +23911,64 @@
+done
+ done
+IFS=$as_save_IFS
-+
+
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+ ;;
- esac
++esac
++fi
++PERL=$ac_cv_path_PERL
++if test -n "$PERL"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
++$as_echo "$PERL" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
+
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+
+-#undef $ac_func
++ test -n "$PERL" && break
++done
+
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#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
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+
+-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_compile") 2>conftest.er1
+- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
@@ -24407,59 +23977,11 @@
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_header_compiler=yes
-+fi
-+PERL=$ac_cv_path_PERL
-+if test -n "$PERL"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
-+$as_echo "$PERL" >&6; }
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_header_compiler=no
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $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; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <tiffio.h>
--_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
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
- }; then
-- ac_header_preproc=yes
-+ test -n "$PERL" && break
-+done
-+
-+
+- eval "$as_ac_var=yes"
+# 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
@@ -24488,9 +24010,24 @@
+ done
+IFS=$as_save_IFS
-- ac_header_preproc=no
-+fi
-+fi
+- 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
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
+INDENT=$ac_cv_prog_INDENT
+if test -n "$INDENT"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INDENT" >&5
@@ -24499,58 +24036,30 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
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: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;}
-- ac_header_preproc=yes
-- ;;
-- no:yes:* )
-- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5
--$as_echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5
--$as_echo "$as_me: WARNING: tiffio.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
-- ;;
+-done
+-
+
+
+-##################################################
+-# Checks for gdk-pixbuf
+-##################################################
+-
+
+-use_la_modules=false
+-case $host in
+- *-aix*) use_la_modules=true
-esac
--{ $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5
--$as_echo_n "checking for tiffio.h... " >&6; }
--if test "${ac_cv_header_tiffio_h+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_cv_header_tiffio_h=$ac_header_preproc
-+
+REBUILD=\#
+if test "x$enable_rebuilds" = "xyes" && \
+ test -n "$PERL" && \
+ $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 ; then
+ REBUILD=
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5
--$as_echo "$ac_cv_header_tiffio_h" >&6; }
-+
-+
++fi
+
+-if $use_la_modules ; then
+
+-cat >>confdefs.h <<\_ACEOF
+-#define USE_LA_MODULES 1
+for ac_func in lstat mkstemp flockfile getc_unlocked
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -24559,16 +24068,11 @@
+ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
+ _ACEOF
fi
--if test "x$ac_cv_header_tiffio_h" = x""yes; then
-- TIFF='tiff'; LIBTIFF='-ltiff'
--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;}
+done
-+
+
+for ac_func in localtime_r
+do :
+ ac_fn_c_check_func "$LINENO" "localtime_r" "ac_cv_func_localtime_r"
@@ -24576,27 +24080,195 @@
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LOCALTIME_R 1
+_ACEOF
-+
+
+-{ $as_echo "$as_me:$LINENO: checking whether to build gmodulized gdk-pixbuf" >&5
+-$as_echo_n "checking whether to build gmodulized gdk-pixbuf... " >&6; }
+-
+-# Check whether --enable-modules was given.
+-if test "${enable_modules+set}" = set; then
+- enableval=$enable_modules;
fi
+done
+-dynworks=false
+-deps=
+-if test x$enable_modules = xno; then
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
-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:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+- { $as_echo "$as_me:$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
++# _NL_TIME_FIRST_WEEKDAY is an enum and not a define
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _NL_TIME_FIRST_WEEKDAY" >&5
++$as_echo_n "checking for _NL_TIME_FIRST_WEEKDAY... " >&6; }
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <langinfo.h>
++int
++main ()
++{
+
+- if $dynworks; then
++char c;
++c = *((unsigned char *) nl_langinfo(_NL_TIME_FIRST_WEEKDAY));
+
+-cat >>confdefs.h <<\_ACEOF
+-#define USE_GMODULE 1
++ ;
++ return 0;
++}
+ _ACEOF
+-
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+- else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+- fi
++if ac_fn_c_try_link "$LINENO"; then :
++ gtk_ok=yes
++else
++ gtk_ok=no
+ fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gtk_ok" >&5
++$as_echo "$gtk_ok" >&6; }
++if test "$gtk_ok" = "yes"; then
+
++$as_echo "#define HAVE__NL_TIME_FIRST_WEEKDAY 1" >>confdefs.h
+
+-
+-# Check whether --with-libpng was given.
+-if test "${with_libpng+set}" = set; then
+- withval=$with_libpng;
+ fi
+
++# _NL_MEASUREMENT_MEASUREMENT is an enum and not a define
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _NL_MEASUREMENT_MEASUREMENT" >&5
++$as_echo_n "checking for _NL_MEASUREMENT_MEASUREMENT... " >&6; }
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <langinfo.h>
++int
++main ()
++{
+
+-# Check whether --with-libjpeg was given.
+-if test "${with_libjpeg+set}" = set; then
+- withval=$with_libjpeg;
+-fi
+-
++char c;
++c = *((unsigned char *) nl_langinfo(_NL_MEASUREMENT_MEASUREMENT));
+
+-# Check whether --with-libtiff was given.
+-if test "${with_libtiff+set}" = set; then
+- withval=$with_libtiff;
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++ gtk_ok=yes
++else
++ gtk_ok=no
+ fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gtk_ok" >&5
++$as_echo "$gtk_ok" >&6; }
++if test "$gtk_ok" = "yes"; then
+
++$as_echo "#define HAVE__NL_MEASUREMENT_MEASUREMENT 1" >>confdefs.h
+
+-# Check whether --with-libjasper was given.
+-if test "${with_libjasper+set}" = set; then
+- withval=$with_libjasper;
+ fi
+
++# _NL_PAPER_HEIGHT is an enum and not a define
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _NL_PAPER_HEIGHT" >&5
++$as_echo_n "checking for _NL_PAPER_HEIGHT... " >&6; }
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <langinfo.h>
++int
++main ()
++{
++
++char c;
++c = *((unsigned char *) nl_langinfo(_NL_PAPER_HEIGHT));
+
+-# Check whether --enable-gdiplus was given.
+-if test "${enable_gdiplus+set}" = set; then
+- enableval=$enable_gdiplus;
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++ gtk_ok=yes
+ else
+- enable_gdiplus=no
++ gtk_ok=no
+ fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gtk_ok" >&5
++$as_echo "$gtk_ok" >&6; }
++if test "$gtk_ok" = "yes"; then
+
++$as_echo "#define HAVE__NL_PAPER_HEIGHT 1" >>confdefs.h
+
+-
+-
+-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:$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 -ljpeg -lz -lm $LIBS"
+-LIBS="-ltiff -lm $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+# _NL_TIME_FIRST_WEEKDAY is an enum and not a define
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _NL_TIME_FIRST_WEEKDAY" >&5
-+$as_echo_n "checking for _NL_TIME_FIRST_WEEKDAY... " >&6; }
++# _NL_PAPER_WIDTH is an enum and not a define
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _NL_PAPER_WIDTH" >&5
++$as_echo_n "checking for _NL_PAPER_WIDTH... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
@@ -24606,15 +24278,15 @@
-#ifdef __cplusplus
-extern "C"
-#endif
--char TIFFWriteScanline ();
+-char TIFFReadRGBAImageOriented ();
+#include <langinfo.h>
int
main ()
{
--return TIFFWriteScanline ();
+-return TIFFReadRGBAImageOriented ();
+
+char c;
-+c = *((unsigned char *) nl_langinfo(_NL_TIME_FIRST_WEEKDAY));
++c = *((unsigned char *) nl_langinfo(_NL_PAPER_WIDTH));
+
;
return 0;
@@ -24641,14 +24313,14 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_tiff_TIFFWriteScanline=yes
+- ac_cv_lib_tiff_TIFFReadRGBAImageOriented=yes
+if ac_fn_c_try_link "$LINENO"; then :
+ gtk_ok=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_tiff_TIFFWriteScanline=no
+- ac_cv_lib_tiff_TIFFReadRGBAImageOriented=no
+ gtk_ok=no
fi
+rm -f core conftest.err conftest.$ac_objext \
@@ -24662,9 +24334,9 @@
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
--{ $as_echo "$as_me:$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
+-{ $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
- if test "${ac_cv_header_tiffio_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5
-$as_echo_n "checking for tiffio.h... " >&6; }
@@ -24708,7 +24380,7 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+$as_echo "#define HAVE__NL_TIME_FIRST_WEEKDAY 1" >>confdefs.h
++$as_echo "#define HAVE__NL_PAPER_WIDTH 1" >>confdefs.h
- ac_header_compiler=no
fi
@@ -24725,19 +24397,19 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+# _NL_MEASUREMENT_MEASUREMENT is an enum and not a define
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _NL_MEASUREMENT_MEASUREMENT" >&5
-+$as_echo_n "checking for _NL_MEASUREMENT_MEASUREMENT... " >&6; }
++# sigsetjmp is a macro on some platforms, so AC_CHECK_FUNCS is not reliable
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigsetjmp" >&5
++$as_echo_n "checking for sigsetjmp... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <tiffio.h>
-+#include <langinfo.h>
++#include <setjmp.h>
+int
+main ()
+{
+
-+char c;
-+c = *((unsigned char *) nl_langinfo(_NL_MEASUREMENT_MEASUREMENT));
++sigjmp_buf env;
++sigsetjmp(env, 0);
+
+ ;
+ return 0;
@@ -24779,7 +24451,7 @@
-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__NL_MEASUREMENT_MEASUREMENT 1" >>confdefs.h
++$as_echo "#define HAVE_SIGSETJMP 1" >>confdefs.h
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -24823,76 +24495,58 @@
-fi
-if test "x$ac_cv_header_tiffio_h" = x""yes; then
-- TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz'
-+# _NL_PAPER_HEIGHT is an enum and not a define
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _NL_PAPER_HEIGHT" >&5
-+$as_echo_n "checking for _NL_PAPER_HEIGHT... " >&6; }
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <langinfo.h>
-+int
-+main ()
-+{
-+
-+char c;
-+c = *((unsigned char *) nl_langinfo(_NL_PAPER_HEIGHT));
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+ gtk_ok=yes
- else
+- TIFF='tiff'; LIBTIFF='-ltiff'
+-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;}
-+ gtk_ok=no
++# i18n stuff
++ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
++
++ for ac_header in locale.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
++if test "x$ac_cv_header_locale_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_LOCALE_H 1
++_ACEOF
++
fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gtk_ok" >&5
-+$as_echo "$gtk_ok" >&6; }
-+if test "$gtk_ok" = "yes"; then
-
-+$as_echo "#define HAVE__NL_PAPER_HEIGHT 1" >>confdefs.h
+
++done
-else
-- { $as_echo "$as_me:$LINENO: checking for TIFFFlushData in -ltiff34" >&5
--$as_echo_n "checking for TIFFFlushData in -ltiff34... " >&6; }
--if test "${ac_cv_lib_tiff34_TIFFFlushData+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
+- { $as_echo "$as_me:$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
++ if test $ac_cv_header_locale_h = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
++$as_echo_n "checking for LC_MESSAGES... " >&6; }
++if test "${am_cv_val_LC_MESSAGES+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-ltiff34 -ljpeg -lz -lm $LIBS"
+-LIBS="-ltiff -ljpeg -lz -lm $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-+fi
-
++ 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 TIFFFlushData ();
-+# _NL_PAPER_WIDTH is an enum and not a define
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _NL_PAPER_WIDTH" >&5
-+$as_echo_n "checking for _NL_PAPER_WIDTH... " >&6; }
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <langinfo.h>
+-char TIFFWriteScanline ();
++#include <locale.h>
int
main ()
{
--return TIFFFlushData ();
-+
-+char c;
-+c = *((unsigned char *) nl_langinfo(_NL_PAPER_WIDTH));
-+
+-return TIFFWriteScanline ();
++return LC_MESSAGES
;
return 0;
}
@@ -24918,37 +24572,30 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_tiff34_TIFFFlushData=yes
+- ac_cv_lib_tiff_TIFFWriteScanline=yes
+if ac_fn_c_try_link "$LINENO"; then :
-+ gtk_ok=yes
++ am_cv_val_LC_MESSAGES=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_tiff34_TIFFFlushData=no
-+ gtk_ok=no
- fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gtk_ok" >&5
-+$as_echo "$gtk_ok" >&6; }
-+if test "$gtk_ok" = "yes"; then
-+
-+$as_echo "#define HAVE__NL_PAPER_WIDTH 1" >>confdefs.h
-
+- 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
--{ $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
+-{ $as_echo "$as_me:$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
- if test "${ac_cv_header_tiffio_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5
-$as_echo_n "checking for tiffio.h... " >&6; }
-if test "${ac_cv_header_tiffio_h+set}" = set; then
- $as_echo_n "(cached) " >&6
++ am_cv_val_LC_MESSAGES=no
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5
-$as_echo "$ac_cv_header_tiffio_h" >&6; }
@@ -24961,26 +24608,10 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+
-+# sigsetjmp is a macro on some platforms, so AC_CHECK_FUNCS is not reliable
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigsetjmp" >&5
-+$as_echo_n "checking for sigsetjmp... " >&6; }
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-$ac_includes_default
-#include <tiffio.h>
-+#include <setjmp.h>
-+int
-+main ()
-+{
-+
-+sigjmp_buf env;
-+sigsetjmp(env, 0);
-+
-+ ;
-+ return 0;
-+}
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -25000,67 +24631,33 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ gtk_ok=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ gtk_ok=no
-+fi
+-
+- ac_header_compiler=no
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gtk_ok" >&5
-+$as_echo "$gtk_ok" >&6; }
-+if test "$gtk_ok" = "yes"; then
-+
-+$as_echo "#define HAVE_SIGSETJMP 1" >>confdefs.h
-
-- ac_header_compiler=no
fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5
++$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
++ if test $am_cv_val_LC_MESSAGES = yes; then
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-+# i18n stuff
-+ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
-
+-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking tiffio.h presence" >&5
-$as_echo_n "checking tiffio.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+ for ac_header in locale.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
-+if test "x$ac_cv_header_locale_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_LOCALE_H 1
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+
-+fi
-+
-+done
-+
-+ if test $ac_cv_header_locale_h = yes; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
-+$as_echo_n "checking for LC_MESSAGES... " >&6; }
-+if test "${am_cv_val_LC_MESSAGES+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-#include <tiffio.h>
-+#include <locale.h>
-+int
-+main ()
-+{
-+return LC_MESSAGES
-+ ;
-+ return 0;
-+}
- _ACEOF
+-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -25079,26 +24676,20 @@
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ am_cv_val_LC_MESSAGES=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
+
- ac_header_preproc=no
-+ am_cv_val_LC_MESSAGES=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5
-+$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
-+ if test $am_cv_val_LC_MESSAGES = yes; then
+-fi
++ fi
++ fi
++ USE_NLS=yes
-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_LC_MESSAGES 1" >>confdefs.h
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -25133,22 +24724,34 @@
-{ $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5
-$as_echo_n "checking for tiffio.h... " >&6; }
-if test "${ac_cv_header_tiffio_h+set}" = set; then
-+ fi
-+ fi
-+ USE_NLS=yes
-+
-+
+- $as_echo_n "(cached) " >&6
+-else
+- ac_cv_header_tiffio_h=$ac_header_preproc
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5
+-$as_echo "$ac_cv_header_tiffio_h" >&6; }
+ gt_cv_have_gettext=no
-+
+
+-fi
+-if test "x$ac_cv_header_tiffio_h" = x""yes; then
+- TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz'
+-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
+ CATOBJEXT=NONE
+ XGETTEXT=:
+ INTLLIBS=
-+
+
+ ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
+if test "x$ac_cv_header_libintl_h" = x""yes; then :
+ gt_cv_func_dgettext_libintl="no"
+ libintl_extra_libs=""
-+
+
+-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
+ #
+ # First check in libc
+ #
@@ -25157,33 +24760,80 @@
+if test "${gt_cv_func_ngettext_libc+set}" = set; then :
$as_echo_n "(cached) " >&6
else
-- ac_cv_header_tiffio_h=$ac_header_preproc
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ltiff34 -ljpeg -lz -lm $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. */
+
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char TIFFFlushData ();
+#include <libintl.h>
+
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-return TIFFFlushData ();
+return !ngettext ("","", 1)
-+ ;
-+ 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
+-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_tiff34_TIFFFlushData=yes
+if ac_fn_c_try_link "$LINENO"; then :
+ gt_cv_func_ngettext_libc=yes
-+else
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_tiff34_TIFFFlushData=no
+ gt_cv_func_ngettext_libc=no
fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5
--$as_echo "$ac_cv_header_tiffio_h" >&6; }
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+-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$ac_cv_header_tiffio_h" = x""yes; then
-- TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz'
+-{ $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
+- if test "${ac_cv_header_tiffio_h+set}" = set; then
+- { $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5
+-$as_echo_n "checking for tiffio.h... " >&6; }
+-if test "${ac_cv_header_tiffio_h+set}" = set; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5
+$as_echo "$gt_cv_func_ngettext_libc" >&6; }
+
@@ -25191,16 +24841,65 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
+$as_echo_n "checking for dgettext in libc... " >&6; }
+if test "${gt_cv_func_dgettext_libc+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
+ $as_echo_n "(cached) " >&6
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5
+-$as_echo "$ac_cv_header_tiffio_h" >&6; }
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;}
+- # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking tiffio.h usability" >&5
+-$as_echo_n "checking tiffio.h 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. */
+-$ac_includes_default
+-#include <tiffio.h>
+-_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
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-
+
+-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; }
+#include <libintl.h>
+-# Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking tiffio.h presence" >&5
+-$as_echo_n "checking tiffio.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 <tiffio.h>
+int
+main ()
+{
@@ -25208,22 +24907,99 @@
+ ;
+ return 0;
+}
-+_ACEOF
+ _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: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: tiffio.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 tiffio.h" >&5
+-$as_echo_n "checking for tiffio.h... " >&6; }
+-if test "${ac_cv_header_tiffio_h+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- ac_cv_header_tiffio_h=$ac_header_preproc
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5
+-$as_echo "$ac_cv_header_tiffio_h" >&6; }
+-
+-fi
+-if test "x$ac_cv_header_tiffio_h" = x""yes; then
+- TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz'
+if ac_fn_c_try_link "$LINENO"; then :
+ gt_cv_func_dgettext_libc=yes
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;}
+- { $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;}
+ gt_cv_func_dgettext_libc=no
fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+-
+-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;}
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5
+$as_echo "$gt_cv_func_dgettext_libc" >&6; }
+ fi
-+
+
+-fi
+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+ for ac_func in bind_textdomain_codeset
+do :
@@ -25280,7 +25056,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -25433,116 +19297,35 @@
+@@ -25433,116 +19297,72 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -25338,7 +25114,14 @@
-$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
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
++$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
++if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
++$as_echo_n "checking for ngettext in -lintl... " >&6; }
++if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
++ $as_echo_n "(cached) " >&6
+ else
- 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;}
@@ -25352,13 +25135,31 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lintl $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-#include <stdio.h>
-#undef PACKAGE
-#undef VERSION
-#undef HAVE_STDLIB_H
-#include <jpeglib.h>
--_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 ngettext ();
++int
++main ()
++{
++return ngettext ();
++ ;
++ return 0;
++}
+ _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -25377,12 +25178,15 @@
- test ! -s conftest.err
- }; then
- jpeg_ok=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_intl_ngettext=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- jpeg_ok=no
--fi
++ ac_cv_lib_intl_ngettext=no
+ fi
-
-rm -f conftest.err conftest.$ac_ext
- { $as_echo "$as_me:$LINENO: result: $jpeg_ok" >&5
@@ -25392,12 +25196,16 @@
- { $as_echo "$as_me:$LINENO: checking for jpeg_simple_progression in -ljpeg" >&5
-$as_echo_n "checking for jpeg_simple_progression in -ljpeg... " >&6; }
-if test "${ac_cv_lib_jpeg_jpeg_simple_progression+set}" = set; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
-+$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
-+if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
-+$as_echo_n "checking for ngettext in -lintl... " >&6; }
-+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
++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_intl_ngettext" >&5
++$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
++if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
++$as_echo_n "checking for dgettext in -lintl... " >&6; }
++if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -25412,17 +25220,17 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -25551,106 +19334,35 @@
+@@ -25551,106 +19371,48 @@
#ifdef __cplusplus
extern "C"
#endif
-char jpeg_simple_progression ();
-+char ngettext ();
++char dgettext ();
int
main ()
{
-return jpeg_simple_progression ();
-+return ngettext ();
++return dgettext ();
;
return 0;
}
@@ -25450,13 +25258,13 @@
- }; then
- ac_cv_lib_jpeg_jpeg_simple_progression=yes
+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_intl_ngettext=yes
++ ac_cv_lib_intl_dgettext=yes
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_intl_ngettext=no
++ ac_cv_lib_intl_dgettext=no
fi
-
-rm -rf conftest.dSYM
@@ -25478,14 +25286,20 @@
- { $as_echo "$as_me:$LINENO: WARNING: JPEG library does not support progressive saving." >&5
-$as_echo "$as_me: WARNING: JPEG library does not support progressive saving." >&2;}
-fi
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
++$as_echo "$ac_cv_lib_intl_dgettext" >&6; }
++if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
++ gt_cv_func_dgettext_libintl=yes
++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
--
++fi
+
- 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
@@ -25497,8 +25311,8 @@
-*** not work properly" >&2;}
- { (exit 1); exit 1; }; }
- fi
--fi
--
+ fi
+
- 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; }
@@ -25514,12 +25328,15 @@
- { $as_echo "$as_me:$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 "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
-+$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
-+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
-+$as_echo_n "checking for dgettext in -lintl... " >&6; }
-+if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
++
++ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5
++$as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
++$as_echo "" >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
++$as_echo_n "checking for ngettext in -lintl... " >&6; }
++if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -25529,22 +25346,22 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+LIBS="-lintl $LIBS"
++LIBS="-lintl -liconv $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -25659,283 +19371,85 @@
+@@ -25659,1409 +19421,1637 @@
#ifdef __cplusplus
extern "C"
#endif
-char png_read_info ();
-+char dgettext ();
++char ngettext ();
int
main ()
{
-return png_read_info ();
-+return dgettext ();
++return ngettext ();
;
return 0;
}
@@ -25572,13 +25389,13 @@
- }; then
- ac_cv_lib_png_png_read_info=yes
+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_intl_dgettext=yes
++ ac_cv_lib_intl_ngettext=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_png_png_read_info=no
-+ ac_cv_lib_intl_dgettext=no
++ ac_cv_lib_intl_ngettext=no
fi
-
-rm -rf conftest.dSYM
@@ -25595,15 +25412,17 @@
- { $as_echo "$as_me:$LINENO: checking for png.h" >&5
-$as_echo_n "checking for png.h... " >&6; }
-if test "${ac_cv_header_png_h+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
-+$as_echo "$ac_cv_lib_intl_dgettext" >&6; }
-+if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
-+ gt_cv_func_dgettext_libintl=yes
- fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
++$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
++if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
++$as_echo_n "checking for dcgettext in -lintl... " >&6; }
++if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
-$as_echo "$ac_cv_header_png_h" >&6; }
--else
+ else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking png.h usability" >&5
-$as_echo_n "checking png.h usability... " >&6; }
@@ -25612,10 +25431,28 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lintl -liconv $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-$ac_includes_default
-#include <png.h>
--_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 dcgettext ();
++int
++main ()
++{
++return dcgettext ();
++ ;
++ return 0;
++}
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -25635,17 +25472,36 @@
- 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_intl_dcgettext=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++ ac_cv_lib_intl_dcgettext=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_intl_dcgettext" >&5
++$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
++if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
++ gt_cv_func_dgettext_libintl=yes
++ libintl_extra_libs=-liconv
++else
++ :
++fi
- ac_header_compiler=no
++else
++ :
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
--
++ fi
+
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking png.h presence" >&5
-$as_echo_n "checking png.h presence... " >&6; }
@@ -25656,12 +25512,82 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <png.h>
--_ACEOF
++ #
++ # If we found libintl, then check in it for bind_textdomain_codeset();
++ # we'll prefer libc if neither have bind_textdomain_codeset(),
++ # and both have dgettext and ngettext
++ #
++ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
++ glib_save_LIBS="$LIBS"
++ LIBS="$LIBS -lintl $libintl_extra_libs"
++ unset ac_cv_func_bind_textdomain_codeset
++ 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
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
--esac
++
++fi
++done
++
++ LIBS="$glib_save_LIBS"
++
++ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
++ gt_cv_func_dgettext_libc=no
++ else
++ if test "$gt_cv_func_dgettext_libc" = "yes" \
++ && test "$gt_cv_func_ngettext_libc" = "yes"; then
++ gt_cv_func_dgettext_libintl=no
++ fi
++ fi
++ fi
++ fi
++
++ if test "$gt_cv_func_dgettext_libc" = "yes" \
++ || test "$gt_cv_func_dgettext_libintl" = "yes"; then
++ gt_cv_have_gettext=yes
++ fi
++
++ if test "$gt_cv_func_dgettext_libintl" = "yes"; then
++ INTLLIBS="-lintl $libintl_extra_libs"
++ fi
++
++ if test "$gt_cv_have_gettext" = "yes"; then
++
++$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
++
++ # Extract the first word of "msgfmt", so it can be a program name with args.
++set dummy msgfmt; 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_MSGFMT+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ case "$MSGFMT" in
++ /*)
++ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
++ ;;
++ *)
++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
++ for ac_dir in $PATH; do
++ test -z "$ac_dir" && ac_dir=.
++ if test -f $ac_dir/$ac_word; then
++ if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
++ ac_cv_path_MSGFMT="$ac_dir/$ac_word"
++ break
++ fi
++ fi
++ done
++ IFS="$ac_save_ifs"
++ test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no"
++ ;;
+ 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
@@ -25675,16 +25601,39 @@
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
--else
++fi
++MSGFMT="$ac_cv_path_MSGFMT"
++if test "$MSGFMT" != "no"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
++$as_echo "$MSGFMT" >&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 "$MSGFMT" != "no"; then
++ glib_save_LIBS="$LIBS"
++ LIBS="$LIBS $INTLLIBS"
++ for ac_func in dcgettext
++do :
++ ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
++if test "x$ac_cv_func_dcgettext" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_DCGETTEXT 1
++_ACEOF
+
- ac_header_preproc=no
fi
++done
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
++ MSGFMT_OPTS=
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5
++$as_echo_n "checking if msgfmt accepts -c... " >&6; }
++ cat >conftest.foo <<_ACEOF
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -25719,30 +25668,85 @@
-{ $as_echo "$as_me:$LINENO: checking for png.h" >&5
-$as_echo_n "checking for png.h... " >&6; }
-if test "${ac_cv_header_png_h+set}" = set; then
-+ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5
-+$as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
-+$as_echo "" >&6; }
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
-+$as_echo_n "checking for ngettext in -lintl... " >&6; }
-+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
++msgid ""
++msgstr ""
++"Content-Type: text/plain; charset=UTF-8\n"
++"Project-Id-Version: test 1.0\n"
++"PO-Revision-Date: 2007-02-15 12:01+0100\n"
++"Last-Translator: test <foo at bar.xx>\n"
++"Language-Team: C <LL at li.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++_ACEOF
++if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5
++ ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ MSGFMT_OPTS=-c; { $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; }
++echo "$as_me: failed input was:" >&5
++sed 's/^/| /' conftest.foo >&5
++fi
++
++ # Extract the first word of "gmsgfmt", so it can be a program name with args.
++set dummy gmsgfmt; 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_GMSGFMT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- ac_cv_header_png_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
-$as_echo "$ac_cv_header_png_h" >&6; }
--
--fi
++ case $GMSGFMT in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_GMSGFMT="$GMSGFMT" # 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_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
+
++ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
++ ;;
++esac
+ fi
-if test "x$ac_cv_header_png_h" = x""yes; then
- png_ok=yes
--else
++GMSGFMT=$ac_cv_path_GMSGFMT
++if test -n "$GMSGFMT"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
++$as_echo "$GMSGFMT" >&6; }
+ else
- png_ok=no
--fi
--
--
--else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+
+
++ # Extract the first word of "xgettext", so it can be a program name with args.
++set dummy xgettext; 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_XGETTEXT+set}" = set; then :
++ $as_echo_n "(cached) " >&6
+ else
- { $as_echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&5
-$as_echo "$as_me: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&2;}
-fi
@@ -25755,34 +25759,40 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lintl -liconv $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-#include <png.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 ngettext ();
- int
- main ()
- {
+-int
+-main ()
+-{
-png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;
-+return ngettext ();
- ;
- return 0;
- }
- _ACEOF
+- ;
+- 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
++ case "$XGETTEXT" in
++ /*)
++ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
++ ;;
++ *)
++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
++ for ac_dir in $PATH; do
++ test -z "$ac_dir" && ac_dir=.
++ if test -f $ac_dir/$ac_word; then
++ if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
++ ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
++ break
++ fi
++ fi
++ done
++ IFS="$ac_save_ifs"
++ test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
++ ;;
+ esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
@@ -25796,16 +25806,20 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- png_ok=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_intl_ngettext=yes
++fi
++XGETTEXT="$ac_cv_path_XGETTEXT"
++if test "$XGETTEXT" != ":"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
++$as_echo "$XGETTEXT" >&6; }
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- png_ok=no
-+ ac_cv_lib_intl_ngettext=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
fi
--
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- { $as_echo "$as_me:$LINENO: result: $png_ok" >&5
-$as_echo "$png_ok" >&6; }
@@ -25840,41 +25854,31 @@
- { $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
-+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_intl_ngettext" >&5
-+$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
-+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
-+$as_echo_n "checking for dcgettext in -lintl... " >&6; }
-+if test "${ac_cv_lib_intl_dcgettext+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="-ljasper -ljpeg $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+LIBS="-lintl -liconv $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- /* Override any GCC internal prototype to avoid an error.
-@@ -25944,1922 +19458,2147 @@
- #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 jas_init ();
-+char dcgettext ();
int
main ()
{
-return jas_init ();
-+return dcgettext ();
++extern int _nl_msg_cat_cntr;
++ return _nl_msg_cat_cntr
;
return 0;
}
@@ -25902,30 +25906,52 @@
- }; then
- ac_cv_lib_jasper_jas_init=yes
+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_intl_dcgettext=yes
++ CATOBJEXT=.gmo
++ DATADIRNAME=share
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_jasper_jas_init=no
-+ ac_cv_lib_intl_dcgettext=no
++ case $host in
++ *-*-solaris*)
++ 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 :
++ CATOBJEXT=.gmo
++ DATADIRNAME=share
++else
++ CATOBJEXT=.mo
++ DATADIRNAME=lib
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
++ ;;
++ *)
++ CATOBJEXT=.mo
++ DATADIRNAME=lib
++ ;;
++ esac
fi
-{ $as_echo "$as_me:$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
--
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++ LIBS="$glib_save_LIBS"
++ INSTOBJEXT=.mo
++ else
++ gt_cv_have_gettext=no
++ fi
++ 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
@@ -25935,73 +25961,67 @@
-*** --without-libjasper to configure" >&2;}
- { (exit 1); exit 1; }; }
- fi
--
--
--
--
--
--
--
--
+
++ if test "$gt_cv_have_gettext" = "yes" ; then
+
++$as_echo "#define ENABLE_NLS 1" >>confdefs.h
+
++ fi
+
++ if test "$XGETTEXT" != ":"; then
++ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
++ : ;
++ else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
++$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
++ XGETTEXT=":"
++ fi
++ fi
+
++ # We need to process the po/ directory.
++ POSUB=po
+
++ ac_config_commands="$ac_config_commands default-1"
+
+
-if $dynworks; then
- BUILD_DYNAMIC_MODULES_TRUE=
- BUILD_DYNAMIC_MODULES_FALSE='#'
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
-+$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
-+if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
-+ gt_cv_func_dgettext_libintl=yes
-+ libintl_extra_libs=-liconv
- else
+-else
- BUILD_DYNAMIC_MODULES_TRUE='#'
- BUILD_DYNAMIC_MODULES_FALSE=
-fi
--
--
++ for lang in $ALL_LINGUAS; do
++ GMOFILES="$GMOFILES $lang.gmo"
++ POFILES="$POFILES $lang.po"
++ done
+
+
-#
-# 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; }
--
--
+
+
-# Check whether --with-included_loaders was given.
-if test "${with_included_loaders+set}" = set; then
- withval=$with_included_loaders;
-+ :
- fi
-
--
+-fi
+
+
-if $dynworks; then
- :
- else
+-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
-# 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+
-+ fi
-+
-+ #
-+ # If we found libintl, then check in it for bind_textdomain_codeset();
-+ # we'll prefer libc if neither have bind_textdomain_codeset(),
-+ # and both have dgettext and ngettext
-+ #
-+ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
-+ glib_save_LIBS="$LIBS"
-+ LIBS="$LIBS -lintl $libintl_extra_libs"
-+ unset ac_cv_func_bind_textdomain_codeset
-+ 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
-all_loaders="ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm"
-if test x$with_libjasper != xno; then
@@ -26022,25 +26042,13 @@
- included_loaders="$all_loaders"
-else
- included_loaders="$with_included_loaders"
- fi
-+done
+-fi
-{ $as_echo "$as_me:$LINENO: result: $included_loaders" >&5
-$as_echo "$included_loaders" >&6; }
-+ LIBS="$glib_save_LIBS"
-INCLUDED_LOADER_OBJ=
-INCLUDED_LOADER_DEFINE=
-+ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
-+ gt_cv_func_dgettext_libc=no
-+ else
-+ if test "$gt_cv_func_dgettext_libc" = "yes" \
-+ && test "$gt_cv_func_ngettext_libc" = "yes"; then
-+ gt_cv_func_dgettext_libintl=no
-+ fi
-+ fi
-+ fi
-+ fi
-IFS="${IFS= }"; gtk_save_ifs="$IFS"; IFS=","
-for loader in $included_loaders; do
@@ -26051,16 +26059,9 @@
-$as_echo "$as_me: error: the specified loader $loader does not exist" >&2;}
- { (exit 1); exit 1; }; }
- fi
-+ if test "$gt_cv_func_dgettext_libc" = "yes" \
-+ || test "$gt_cv_func_dgettext_libintl" = "yes"; then
-+ gt_cv_have_gettext=yes
-+ fi
- loader_underscores=`echo $loader | sed -e 's/-/_/g'`
- INCLUDED_LOADER_OBJ="$INCLUDED_LOADER_OBJ libstatic-pixbufloader-$loader.la"
-+ if test "$gt_cv_func_dgettext_libintl" = "yes"; then
-+ INTLLIBS="-lintl $libintl_extra_libs"
-+ fi
- # Don't bother defining separate -DINCLUDE_gdip_foo for each gdip-foo loader
- case $loader in
@@ -26069,337 +26070,6 @@
- esac
- eval INCLUDE_$loader_underscores=yes
-done
-+ if test "$gt_cv_have_gettext" = "yes"; then
-
--# 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"
-+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
-+
-+ # Extract the first word of "msgfmt", so it can be a program name with args.
-+set dummy msgfmt; 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_MSGFMT+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ case "$MSGFMT" in
-+ /*)
-+ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-+ for ac_dir in $PATH; do
-+ test -z "$ac_dir" && ac_dir=.
-+ if test -f $ac_dir/$ac_word; then
-+ if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
-+ ac_cv_path_MSGFMT="$ac_dir/$ac_word"
-+ break
-+ fi
-+ fi
-+ done
-+ IFS="$ac_save_ifs"
-+ test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no"
-+ ;;
-+esac
-+fi
-+MSGFMT="$ac_cv_path_MSGFMT"
-+if test "$MSGFMT" != "no"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
-+$as_echo "$MSGFMT" >&6; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
-+ if test "$MSGFMT" != "no"; then
-+ glib_save_LIBS="$LIBS"
-+ LIBS="$LIBS $INTLLIBS"
-+ for ac_func in dcgettext
-+do :
-+ ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
-+if test "x$ac_cv_func_dcgettext" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_DCGETTEXT 1
-+_ACEOF
-
--IFS="$gtk_save_ifs"
-+fi
-+done
-
-+ MSGFMT_OPTS=
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5
-+$as_echo_n "checking if msgfmt accepts -c... " >&6; }
-+ cat >conftest.foo <<_ACEOF
-
-+msgid ""
-+msgstr ""
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Project-Id-Version: test 1.0\n"
-+"PO-Revision-Date: 2007-02-15 12:01+0100\n"
-+"Last-Translator: test <foo at bar.xx>\n"
-+"Language-Team: C <LL at li.org>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Transfer-Encoding: 8bit\n"
-
-+_ACEOF
-+if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5
-+ ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ MSGFMT_OPTS=-c; { $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; }
-+echo "$as_me: failed input was:" >&5
-+sed 's/^/| /' conftest.foo >&5
-+fi
-
-+ # Extract the first word of "gmsgfmt", so it can be a program name with args.
-+set dummy gmsgfmt; 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_GMSGFMT+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ case $GMSGFMT in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_GMSGFMT="$GMSGFMT" # 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_GMSGFMT="$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
-
--if test x"$INCLUDE_png" = xyes; then
-- INCLUDE_PNG_TRUE=
-- INCLUDE_PNG_FALSE='#'
-+ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-+ ;;
-+esac
-+fi
-+GMSGFMT=$ac_cv_path_GMSGFMT
-+if test -n "$GMSGFMT"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
-+$as_echo "$GMSGFMT" >&6; }
- else
-- INCLUDE_PNG_TRUE='#'
-- INCLUDE_PNG_FALSE=
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
-
-
--
--if test x"$INCLUDE_bmp" = xyes; then
-- INCLUDE_BMP_TRUE=
-- INCLUDE_BMP_FALSE='#'
-+ # Extract the first word of "xgettext", so it can be a program name with args.
-+set dummy xgettext; 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_XGETTEXT+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
- else
-- INCLUDE_BMP_TRUE='#'
-- INCLUDE_BMP_FALSE=
-+ case "$XGETTEXT" in
-+ /*)
-+ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-+ for ac_dir in $PATH; do
-+ test -z "$ac_dir" && ac_dir=.
-+ if test -f $ac_dir/$ac_word; then
-+ if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
-+ ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
-+ break
-+ fi
-+ fi
-+ done
-+ IFS="$ac_save_ifs"
-+ test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
-+ ;;
-+esac
- fi
--
--
--
--if test x"$INCLUDE_wbmp" = xyes; then
-- INCLUDE_WBMP_TRUE=
-- INCLUDE_WBMP_FALSE='#'
-+XGETTEXT="$ac_cv_path_XGETTEXT"
-+if test "$XGETTEXT" != ":"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
-+$as_echo "$XGETTEXT" >&6; }
- else
-- INCLUDE_WBMP_TRUE='#'
-- INCLUDE_WBMP_FALSE=
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
-
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-
--
--if test x"$INCLUDE_gif" = xyes; then
-- INCLUDE_GIF_TRUE=
-- INCLUDE_GIF_FALSE='#'
-+int
-+main ()
-+{
-+extern int _nl_msg_cat_cntr;
-+ return _nl_msg_cat_cntr
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+ CATOBJEXT=.gmo
-+ DATADIRNAME=share
- else
-- INCLUDE_GIF_TRUE='#'
-- INCLUDE_GIF_FALSE=
-+ case $host in
-+ *-*-solaris*)
-+ 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 :
-+ CATOBJEXT=.gmo
-+ DATADIRNAME=share
-+else
-+ CATOBJEXT=.mo
-+ DATADIRNAME=lib
- fi
-
-+ ;;
-+ *)
-+ CATOBJEXT=.mo
-+ DATADIRNAME=lib
-+ ;;
-+ esac
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+ LIBS="$glib_save_LIBS"
-+ INSTOBJEXT=.mo
-+ else
-+ gt_cv_have_gettext=no
-+ fi
-+ fi
-
--
--if test x"$INCLUDE_ico" = xyes; then
-- INCLUDE_ICO_TRUE=
-- INCLUDE_ICO_FALSE='#'
--else
-- INCLUDE_ICO_TRUE='#'
-- INCLUDE_ICO_FALSE=
- fi
-
-
-
--if test x"$INCLUDE_ani" = xyes; then
-- INCLUDE_ANI_TRUE=
-- INCLUDE_ANI_FALSE='#'
--else
-- INCLUDE_ANI_TRUE='#'
-- INCLUDE_ANI_FALSE=
--fi
-+ if test "$gt_cv_have_gettext" = "yes" ; then
-
-+$as_echo "#define ENABLE_NLS 1" >>confdefs.h
-
-+ fi
-
--if test x"$INCLUDE_jpeg" = xyes; then
-- INCLUDE_JPEG_TRUE=
-- INCLUDE_JPEG_FALSE='#'
--else
-- INCLUDE_JPEG_TRUE='#'
-- INCLUDE_JPEG_FALSE=
--fi
-+ if test "$XGETTEXT" != ":"; then
-+ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-+ : ;
-+ else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
-+$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
-+ XGETTEXT=":"
-+ fi
-+ fi
-
-+ # We need to process the po/ directory.
-+ POSUB=po
-
-+ ac_config_commands="$ac_config_commands default-1"
-
--if test x"$INCLUDE_pnm" = xyes; then
-- INCLUDE_PNM_TRUE=
-- INCLUDE_PNM_FALSE='#'
--else
-- INCLUDE_PNM_TRUE='#'
-- INCLUDE_PNM_FALSE=
--fi
-
-+ for lang in $ALL_LINGUAS; do
-+ GMOFILES="$GMOFILES $lang.gmo"
-+ POFILES="$POFILES $lang.po"
-+ done
-
-
--if test x"$INCLUDE_ras" = xyes; then
-- INCLUDE_RAS_TRUE=
-- INCLUDE_RAS_FALSE='#'
--else
-- INCLUDE_RAS_TRUE='#'
-- INCLUDE_RAS_FALSE=
--fi
-
-
-
--if test x"$INCLUDE_tiff" = xyes; then
-- INCLUDE_TIFF_TRUE=
-- INCLUDE_TIFF_FALSE='#'
--else
-- INCLUDE_TIFF_TRUE='#'
-- INCLUDE_TIFF_FALSE=
--fi
-
-
-
--if test x"$INCLUDE_xpm" = xyes; then
-- INCLUDE_XPM_TRUE=
-- INCLUDE_XPM_FALSE='#'
--else
-- INCLUDE_XPM_TRUE='#'
-- INCLUDE_XPM_FALSE=
--fi
-
-
-
--if test x"$INCLUDE_xbm" = xyes; then
-- INCLUDE_XBM_TRUE=
-- INCLUDE_XBM_FALSE='#'
--else
-- INCLUDE_XBM_TRUE='#'
-- INCLUDE_XBM_FALSE=
--fi
-
-
+ if test "$gt_cv_have_gettext" = "yes"; then
+ if test "x$ALL_LINGUAS" = "x"; then
+ LINGUAS=
@@ -26432,19 +26102,17 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
+$as_echo "$LINGUAS" >&6; }
+ fi
-
--if test x"$INCLUDE_tga" = xyes; then
-- INCLUDE_TGA_TRUE=
-- INCLUDE_TGA_FALSE='#'
--else
-- INCLUDE_TGA_TRUE='#'
-- INCLUDE_TGA_FALSE=
--fi
++
+ if test -n "$LINGUAS"; then
+ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+ fi
+ fi
+-# 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
+ MKINSTALLDIRS=
+ if test -n "$ac_aux_dir"; then
+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
@@ -26453,14 +26121,8 @@
+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+ fi
-
--if test x"$INCLUDE_pcx" = xyes; then
-- INCLUDE_PCX_TRUE=
-- INCLUDE_PCX_FALSE='#'
--else
-- INCLUDE_PCX_TRUE='#'
-- INCLUDE_PCX_FALSE=
--fi
+-IFS="$gtk_save_ifs"
+
+ test -d po || mkdir po
+ if test "x$srcdir" != "x."; then
+ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
@@ -26479,9 +26141,6 @@
+ac_config_commands="$ac_config_commands default-2"
--if test x"$INCLUDE_icns" = xyes; then
-- INCLUDE_ICNS_TRUE=
-- INCLUDE_ICNS_FALSE='#'
+test -d po-properties || mkdir po-properties
+if test "x$srcdir" != "x."; then
+ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
@@ -26489,20 +26148,16 @@
+ else
+ popropsrcprefix="../$srcdir/"
+ fi
- else
-- INCLUDE_ICNS_TRUE='#'
-- INCLUDE_ICNS_FALSE=
++else
+ popropsrcprefix="../"
- fi
++fi
+rm -f po-properties/POTFILES
+sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $popropsrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+< $srcdir/po-properties/POTFILES.in > po-properties/POTFILES
--
--
--if test x"$INCLUDE_jasper" = xyes; then
-- INCLUDE_JASPER_TRUE=
-- INCLUDE_JASPER_FALSE='#'
+-if test x"$INCLUDE_png" = xyes; then
+- INCLUDE_PNG_TRUE=
+- INCLUDE_PNG_FALSE='#'
+glib_save_prefix="$prefix"
+glib_save_exec_prefix="$exec_prefix"
+glib_save_datarootdir="$datarootdir"
@@ -26512,61 +26167,44 @@
+if test "x$CATOBJEXT" = "x.mo" ; then
+ localedir=`eval echo "${libdir}/locale"`
else
-- INCLUDE_JASPER_TRUE='#'
-- INCLUDE_JASPER_FALSE=
+- INCLUDE_PNG_TRUE='#'
+- INCLUDE_PNG_FALSE=
+ localedir=`eval echo "${datadir}/locale"`
fi
+prefix="$glib_save_prefix"
+exec_prefix="$glib_save_exec_prefix"
+datarootdir="$glib_save_datarootdir"
--# As all GDI+ loaders are either built-in or not, arbitrarily just
--# check one of the variables here
+cat >>confdefs.h <<_ACEOF
+#define GTK_LOCALEDIR "$localedir"
+_ACEOF
--if test x"$INCLUDE_gdip_ico" = xyes; then
-- INCLUDE_GDIPLUS_TRUE=
-- INCLUDE_GDIPLUS_FALSE='#'
+-if test x"$INCLUDE_bmp" = xyes; then
+- INCLUDE_BMP_TRUE=
+- INCLUDE_BMP_FALSE='#'
-else
-- INCLUDE_GDIPLUS_TRUE='#'
-- INCLUDE_GDIPLUS_FALSE=
+- INCLUDE_BMP_TRUE='#'
+- INCLUDE_BMP_FALSE=
-fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for extra flags to get ANSI library prototypes" >&5
+$as_echo_n "checking for extra flags to get ANSI library prototypes... " >&6; }
-+
+
+gtk_save_LIBS=$LIBS
+LIBS="$LIBS -lm"
+if test "$cross_compiling" = yes; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; }
--if test x$gio_can_sniff = x; then
-- { $as_echo "$as_me:$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:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
+-if test x"$INCLUDE_wbmp" = xyes; then
+- INCLUDE_WBMP_TRUE=
+- INCLUDE_WBMP_FALSE='#'
else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
+- INCLUDE_WBMP_TRUE='#'
+- INCLUDE_WBMP_FALSE=
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
++/* end confdefs.h. */
+#include <math.h>
+ int main (void) { return (log(1) != log(1.)); }
+_ACEOF
@@ -26578,46 +26216,13 @@
+ CFLAGS="$CFLAGS -std1"
+ if test "$cross_compiling" = yes; then :
+ true
-
-- #include <gio/gio.h>
-- 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);
-- }
++
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <math.h>
+ int main (void) { return (log(1) != log(1.)); }
- _ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
++_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: -std1" >&5
+$as_echo "-std1" >&6; }
@@ -26630,15 +26235,18 @@
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
+ fi
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
-+
+
+LIBS=$gtk_save_LIBS
-+
+
+-if test x"$INCLUDE_gif" = xyes; then
+- INCLUDE_GIF_TRUE=
+- INCLUDE_GIF_FALSE='#'
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the BeOS" >&5
+$as_echo_n "checking for the BeOS... " >&6; }
+case $host in
@@ -26651,16 +26259,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ ;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
++esac
+
+#
+# see bug 162979
@@ -26677,17 +26276,8 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ ;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- gio_can_sniff=yes
-
--cat >>confdefs.h <<\_ACEOF
--#define GDK_PIXBUF_USE_GIO_MIME 1
++esac
++
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for extra flags for POSIX compliance" >&5
+$as_echo_n "checking for extra flags for POSIX compliance... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -26704,7 +26294,9 @@
+if ac_fn_c_try_compile "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; }
-+else
+ else
+- INCLUDE_GIF_TRUE='#'
+- INCLUDE_GIF_FALSE=
+ gtk_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -posix"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -26717,81 +26309,40 @@
+ ;
+ return 0;
+}
- _ACEOF
--
++_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: -posix" >&5
+$as_echo "-posix" >&6; }
- else
-- $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--gio_can_sniff=no
--fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+ CFLAGS="$gtk_save_CFLAGS"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not determine POSIX flag. (-posix didn't work.)" >&5
+$as_echo "$as_me: WARNING: Could not determine POSIX flag. (-posix didn't work.)" >&2;}
- fi
--
--
-- { $as_echo "$as_me:$LINENO: result: $gio_can_sniff" >&5
--$as_echo "$gio_can_sniff" >&6; }
-- LIBS="$gtk_save_LIBS"
-- CFLAGS="$gtk_save_CFLAGS"
++fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- #
--# Allow building some or all immodules included
++#
+# Run AM_PATH_GLIB_2_0 to make sure that GLib is installed and working
- #
--{ $as_echo "$as_me:$LINENO: checking immodules to build" >&5
--$as_echo_n "checking immodules to build... " >&6; }
--
--
--# Check whether --with-included_immodules was given.
--if test "${with_included_immodules+set}" = set; then
-- withval=$with_included_immodules;
--fi
++#
+GLIB_PACKAGES="gobject-2.0 gmodule-no-export-2.0"
--if $dynworks; then
-- :
+-if test x"$INCLUDE_ico" = xyes; then
+- INCLUDE_ICO_TRUE=
+- INCLUDE_ICO_FALSE='#'
+# Check whether --enable-glibtest was given.
+if test "${enable_glibtest+set}" = set; then :
+ enableval=$enable_glibtest;
else
-- ## if the option was specified, leave it; otherwise disable included immodules
-- if test x$with_included_immodules = xno; then
-- with_included_immodules=yes
-- fi
+- INCLUDE_ICO_TRUE='#'
+- INCLUDE_ICO_FALSE=
+ enable_glibtest=yes
fi
--all_immodules="am-et,cedilla,cyrillic-translit"
--if test "$gdktarget" = "win32"; then
-- all_immodules="${all_immodules},ime"
--fi
--all_immodules="${all_immodules},inuktitut,ipa,multipress,thai,ti-er,ti-et,viqr"
--if test "$gdktarget" = "x11"; then
-- all_immodules="${all_immodules},xim"
--fi
-
--included_immodules=""
--# If the switch specified without listing any specific ones, include all
--if test "x$with_included_immodules" = xyes ; then
-- included_immodules="$all_immodules"
--else
-- included_immodules="$with_included_immodules"
--fi
+
+ pkg_config_args=glib-2.0
+ for module in . gobject gmodule-no-export gthread
+ do
@@ -26814,13 +26365,15 @@
+ esac
+ done
--{ $as_echo "$as_me:$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='#'
+-if test x"$INCLUDE_ani" = xyes; then
+- INCLUDE_ANI_TRUE=
+- INCLUDE_ANI_FALSE='#'
+-else
+- INCLUDE_ANI_TRUE='#'
+- INCLUDE_ANI_FALSE=
+-fi
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ 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.
@@ -26829,29 +26382,7 @@
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
- else
-- HAVE_INCLUDED_IMMMODULES_TRUE='#'
-- HAVE_INCLUDED_IMMMODULES_FALSE=
--fi
--
--
--INCLUDED_IMMODULE_OBJ=
--INCLUDED_IMMODULE_DEFINE=
--
--IFS="${IFS= }"; gtk_save_ifs="$IFS"; IFS=","
--for immodule in $included_immodules; do
-- immodule_underscores=`echo $immodule | sed -e 's/-/_/g'`
-- if echo "$all_immodules" | egrep "(^|,)$immodule(\$|,)" > /dev/null; then
-- :
-- else
-- { { $as_echo "$as_me:$LINENO: error: the specified input method $immodule does not exist" >&5
--$as_echo "$as_me: error: the specified input method $immodule does not exist" >&2;}
-- { (exit 1); exit 1; }; }
-- 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
++else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
@@ -26868,56 +26399,29 @@
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
- done
--IFS="$gtk_save_ifs"
--
--
--
--
++done
+ done
+IFS=$as_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=
+-if test x"$INCLUDE_jpeg" = xyes; then
+- INCLUDE_JPEG_TRUE=
+- INCLUDE_JPEG_FALSE='#'
+ ;;
+esac
- fi
--
--
--
--if test x"$INCLUDE_cedilla" = xyes; then
-- INCLUDE_IM_CEDILLA_TRUE=
-- INCLUDE_IM_CEDILLA_FALSE='#'
++fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
else
-- INCLUDE_IM_CEDILLA_TRUE='#'
-- INCLUDE_IM_CEDILLA_FALSE=
+- INCLUDE_JPEG_TRUE='#'
+- INCLUDE_JPEG_FALSE=
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
--
--if test x"$INCLUDE_cyrillic_translit" = xyes; then
-- INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE=
-- INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE='#'
--else
-- INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE='#'
-- INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE=
- fi
--
--
--
--if test x"$INCLUDE_ime" = xyes; then
-- INCLUDE_IM_IME_TRUE=
-- INCLUDE_IM_IME_FALSE='#'
++fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
@@ -26926,12 +26430,7 @@
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
- else
-- INCLUDE_IM_IME_TRUE='#'
-- INCLUDE_IM_IME_FALSE=
--fi
--
--
++else
+ case $ac_pt_PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
@@ -26952,37 +26451,28 @@
+ done
+IFS=$as_save_IFS
--if test x"$INCLUDE_inuktitut" = xyes; then
-- INCLUDE_IM_INUKTITUT_TRUE=
-- INCLUDE_IM_INUKTITUT_FALSE='#'
--else
-- INCLUDE_IM_INUKTITUT_TRUE='#'
-- INCLUDE_IM_INUKTITUT_FALSE=
+-if test x"$INCLUDE_pnm" = xyes; then
+- INCLUDE_PNM_TRUE=
+- INCLUDE_PNM_FALSE='#'
+ ;;
+esac
- fi
--
--
--
--if test x"$INCLUDE_ipa" = xyes; then
-- INCLUDE_IM_IPA_TRUE=
-- INCLUDE_IM_IPA_FALSE='#'
++fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
else
-- INCLUDE_IM_IPA_TRUE='#'
-- INCLUDE_IM_IPA_FALSE=
+- INCLUDE_PNM_TRUE='#'
+- INCLUDE_PNM_FALSE=
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
-
-
--if test x"$INCLUDE_multipress" = xyes; then
-- INCLUDE_IM_MULTIPRESS_TRUE=
-- INCLUDE_IM_MULTIPRESS_FALSE='#'
+-if test x"$INCLUDE_ras" = xyes; then
+- INCLUDE_RAS_TRUE=
+- INCLUDE_RAS_FALSE='#'
+ if test "x$ac_pt_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
+ else
@@ -26995,8 +26485,8 @@
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+ fi
else
-- INCLUDE_IM_MULTIPRESS_TRUE='#'
-- INCLUDE_IM_MULTIPRESS_FALSE=
+- INCLUDE_RAS_TRUE='#'
+- INCLUDE_RAS_FALSE=
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
fi
@@ -27015,12 +26505,12 @@
+ fi
-
--if test x"$INCLUDE_thai" = xyes; then
-- INCLUDE_IM_THAI_TRUE=
-- INCLUDE_IM_THAI_FALSE='#'
+-if test x"$INCLUDE_tiff" = xyes; then
+- INCLUDE_TIFF_TRUE=
+- INCLUDE_TIFF_FALSE='#'
-else
-- INCLUDE_IM_THAI_TRUE='#'
-- INCLUDE_IM_THAI_FALSE=
+- INCLUDE_TIFF_TRUE='#'
+- INCLUDE_TIFF_FALSE=
fi
+ no_glib=""
@@ -27030,12 +26520,12 @@
+ PKG_CONFIG=no
+ fi
--if test x"$INCLUDE_ti_er" = xyes; then
-- INCLUDE_IM_TI_ER_TRUE=
-- INCLUDE_IM_TI_ER_FALSE='#'
+-if test x"$INCLUDE_xpm" = xyes; then
+- INCLUDE_XPM_TRUE=
+- INCLUDE_XPM_FALSE='#'
-else
-- INCLUDE_IM_TI_ER_TRUE='#'
-- INCLUDE_IM_TI_ER_FALSE=
+- INCLUDE_XPM_TRUE='#'
+- INCLUDE_XPM_FALSE=
-fi
+ min_glib_version=2.21.3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB - version >= $min_glib_version" >&5
@@ -27060,9 +26550,9 @@
+ GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
+ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
--if test x"$INCLUDE_ti_et" = xyes; then
-- INCLUDE_IM_TI_ET_TRUE=
-- INCLUDE_IM_TI_ET_FALSE='#'
+-if test x"$INCLUDE_xbm" = xyes; then
+- INCLUDE_XBM_TRUE=
+- INCLUDE_XBM_FALSE='#'
+ GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
+ GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
+ glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
@@ -27080,12 +26570,12 @@
+ if test "$cross_compiling" = yes; then :
+ echo $ac_n "cross compiling; assumed OK... $ac_c"
else
-- INCLUDE_IM_TI_ET_TRUE='#'
-- INCLUDE_IM_TI_ET_FALSE=
+- INCLUDE_XBM_TRUE='#'
+- INCLUDE_XBM_FALSE=
-fi
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-+
+
+#include <glib.h>
+#include <stdio.h>
+#include <stdlib.h>
@@ -27097,15 +26587,15 @@
+ char *tmp_version;
+ int ignored;
+-if test x"$INCLUDE_tga" = xyes; then
+- INCLUDE_TGA_TRUE=
+- INCLUDE_TGA_FALSE='#'
+-else
+- INCLUDE_TGA_TRUE='#'
+- INCLUDE_TGA_FALSE=
+-fi
+ ignored = system ("touch conf.glibtest");
-
--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
++
+ /* HP/UX 9 (%@#!) writes to sscanf strings */
+ tmp_version = g_strdup("$min_glib_version");
+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
@@ -27168,29 +26658,18 @@
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
--if test x"$INCLUDE_xim" = xyes; then
-- INCLUDE_IM_XIM_TRUE=
-- INCLUDE_IM_XIM_FALSE='#'
+-if test x"$INCLUDE_pcx" = xyes; then
+- INCLUDE_PCX_TRUE=
+- INCLUDE_PCX_FALSE='#'
else
-- INCLUDE_IM_XIM_TRUE='#'
-- INCLUDE_IM_XIM_FALSE=
+- INCLUDE_PCX_TRUE='#'
+- INCLUDE_PCX_FALSE=
+ no_glib=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
--
--{ $as_echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
--$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
--if test "${ac_cv_header_sys_wait_h+set}" = set; then
-- $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
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
+ fi
@@ -27215,6 +26694,681 @@
+ CFLAGS="$CFLAGS $GLIB_CFLAGS"
+ LIBS="$LIBS $GLIB_LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
++#include <glib.h>
++#include <stdio.h>
+
+-if test x"$INCLUDE_icns" = xyes; then
+- INCLUDE_ICNS_TRUE=
+- INCLUDE_ICNS_FALSE='#'
++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_ICNS_TRUE='#'
+- INCLUDE_ICNS_FALSE=
++ 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_jasper" = xyes; then
+- INCLUDE_JASPER_TRUE=
+- INCLUDE_JASPER_FALSE='#'
+-else
+- INCLUDE_JASPER_TRUE='#'
+- INCLUDE_JASPER_FALSE=
+-fi
+
+-# As all GDI+ loaders are either built-in or not, arbitrarily just
+-# check one of the variables here
+
++ rm -f conf.glibtest
+
+-if test x"$INCLUDE_gdip_ico" = xyes; then
+- INCLUDE_GDIPLUS_TRUE=
+- INCLUDE_GDIPLUS_FALSE='#'
+-else
+- INCLUDE_GDIPLUS_TRUE='#'
+- INCLUDE_GDIPLUS_FALSE=
++
++# 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"
+
+-if test x$gio_can_sniff = x; then
+- { $as_echo "$as_me:$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:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+
+- #include <gio/gio.h>
+- 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);
+- }
++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_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>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (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_try") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- gio_can_sniff=yes
+
+-cat >>confdefs.h <<\_ACEOF
+-#define GDK_PIXBUF_USE_GIO_MIME 1
++fi
++done
++
++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
+
+-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
++$as_echo "#define HAVE_PWD_H 1" >>confdefs.h
+
+-( exit $ac_status )
+-gio_can_sniff=no
+-fi
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+
++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
+
+- { $as_echo "$as_me:$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:$LINENO: checking immodules to build" >&5
+-$as_echo_n "checking immodules to build... " >&6; }
++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
+
+-# Check whether --with-included_immodules was given.
+-if test "${with_included_immodules+set}" = set; then
+- withval=$with_included_immodules;
+ fi
+
++done
+
+-if $dynworks; then
+- :
+-else
+- ## if the option was specified, leave it; otherwise disable included immodules
+- if test x$with_included_immodules = xno; then
+- with_included_immodules=yes
+- fi
+-fi
++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
+
+-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
++$as_echo "#define HAVE_FTW_H 1" >>confdefs.h
+
+-included_immodules=""
+-# If the switch specified without listing any specific ones, include all
+-if test "x$with_included_immodules" = xyes ; then
+- included_immodules="$all_immodules"
+-else
+- included_immodules="$with_included_immodules"
+ fi
+
+-{ $as_echo "$as_me:$LINENO: result: $included_immodules" >&5
+-$as_echo "$included_immodules" >&6; }
++done
+
+
+-if test "x$included_immodules" != x; then
+- HAVE_INCLUDED_IMMMODULES_TRUE=
+- HAVE_INCLUDED_IMMMODULES_FALSE='#'
++{ $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 <ftw.h>
++int
++main ()
++{
++int flags = FTW_ACTIONRETVAL;
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ gtk_ok=yes
+ else
+- HAVE_INCLUDED_IMMMODULES_TRUE='#'
+- HAVE_INCLUDED_IMMMODULES_FALSE=
++ gtk_ok=no
+ fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++if test $gtk_ok = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
+
++$as_echo "#define HAVE_GNU_FTW 1" >>confdefs.h
+
+-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_echo "$as_me:$LINENO: error: the specified input method $immodule does not exist" >&5
+-$as_echo "$as_me: error: the specified input method $immodule does not exist" >&2;}
+- { (exit 1); exit 1; }; }
+- 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"
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
+
++saved_cflags="$CFLAGS"
++saved_ldflags="$LDFLAGS"
+
+
++# Checks for header files.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
++$as_echo_n "checking for ANSI C header files... " >&6; }
++if test "${ac_cv_header_stdc+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <stdlib.h>
++#include <stdarg.h>
++#include <string.h>
++#include <float.h>
+
++int
++main ()
++{
+
+-if test x"$INCLUDE_am_et" = xyes; then
+- INCLUDE_IM_AM_ET_TRUE=
+- INCLUDE_IM_AM_ET_FALSE='#'
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_header_stdc=yes
+ else
+- INCLUDE_IM_AM_ET_TRUE='#'
+- INCLUDE_IM_AM_ET_FALSE=
++ ac_cv_header_stdc=no
+ fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
++if test $ac_cv_header_stdc = yes; then
++ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <string.h>
+
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++ $EGREP "memchr" >/dev/null 2>&1; then :
+
+-if test x"$INCLUDE_cedilla" = xyes; then
+- INCLUDE_IM_CEDILLA_TRUE=
+- INCLUDE_IM_CEDILLA_FALSE='#'
+ else
+- INCLUDE_IM_CEDILLA_TRUE='#'
+- INCLUDE_IM_CEDILLA_FALSE=
++ ac_cv_header_stdc=no
+ fi
++rm -f conftest*
+
+-
+-
+-if test x"$INCLUDE_cyrillic_translit" = xyes; then
+- INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE=
+- INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE='#'
+-else
+- INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE='#'
+- INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE=
+ fi
+
++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 <stdlib.h>
+
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++ $EGREP "free" >/dev/null 2>&1; then :
+
+-if test x"$INCLUDE_ime" = xyes; then
+- INCLUDE_IM_IME_TRUE=
+- INCLUDE_IM_IME_FALSE='#'
+ else
+- INCLUDE_IM_IME_TRUE='#'
+- INCLUDE_IM_IME_FALSE=
++ ac_cv_header_stdc=no
++fi
++rm -f conftest*
++
+ fi
+
++if test $ac_cv_header_stdc = yes; then
++ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
++ if test "$cross_compiling" = yes; then :
++ :
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <ctype.h>
++#include <stdlib.h>
++#if ((' ' & 0x0FF) == 0x020)
++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
++#else
++# define ISLOWER(c) \
++ (('a' <= (c) && (c) <= 'i') \
++ || ('j' <= (c) && (c) <= 'r') \
++ || ('s' <= (c) && (c) <= 'z'))
++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
++#endif
+
++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
++int
++main ()
++{
++ int i;
++ for (i = 0; i < 256; i++)
++ if (XOR (islower (i), ISLOWER (i))
++ || toupper (i) != TOUPPER (i))
++ return 2;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
+
+-if test x"$INCLUDE_inuktitut" = xyes; then
+- INCLUDE_IM_INUKTITUT_TRUE=
+- INCLUDE_IM_INUKTITUT_FALSE='#'
+ else
+- INCLUDE_IM_INUKTITUT_TRUE='#'
+- INCLUDE_IM_INUKTITUT_FALSE=
++ ac_cv_header_stdc=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+
++fi
++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
+
+-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
+
+
+-
+-if test x"$INCLUDE_multipress" = xyes; then
+- INCLUDE_IM_MULTIPRESS_TRUE=
+- INCLUDE_IM_MULTIPRESS_FALSE='#'
++# 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
+- INCLUDE_IM_MULTIPRESS_TRUE='#'
+- INCLUDE_IM_MULTIPRESS_FALSE=
+-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
+
+-if test x"$INCLUDE_thai" = xyes; then
+- INCLUDE_IM_THAI_TRUE=
+- INCLUDE_IM_THAI_FALSE='#'
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_c_const=yes
+ else
+- INCLUDE_IM_THAI_TRUE='#'
+- INCLUDE_IM_THAI_FALSE=
++ 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
+
+-
+-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
+
+
++# 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
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <sys/types.h>
++#include <signal.h>
+
+-if test x"$INCLUDE_ti_et" = xyes; then
+- INCLUDE_IM_TI_ET_TRUE=
+- INCLUDE_IM_TI_ET_FALSE='#'
++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
+- INCLUDE_IM_TI_ET_TRUE='#'
+- INCLUDE_IM_TI_ET_FALSE=
++ ac_cv_type_signal=void
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
++$as_echo "$ac_cv_type_signal" >&6; }
+
++cat >>confdefs.h <<_ACEOF
++#define RETSIGTYPE $ac_cv_type_signal
++_ACEOF
+
+
+-if test x"$INCLUDE_viqr" = xyes; then
+- INCLUDE_IM_VIQR_TRUE=
+- INCLUDE_IM_VIQR_FALSE='#'
+-else
+- INCLUDE_IM_VIQR_TRUE='#'
+- INCLUDE_IM_VIQR_FALSE=
++for ac_header in stdlib.h unistd.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
+ fi
+
++done
+
++for ac_func in getpagesize
++do :
++ ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
++if test "x$ac_cv_func_getpagesize" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_GETPAGESIZE 1
++_ACEOF
+
+-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
++done
+
+-
+-{ $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
++{ $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
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ if test "$cross_compiling" = yes; then :
++ ac_cv_func_mmap_fixed_mapped=no
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <sys/types.h>
-#include <sys/wait.h>
@@ -27223,19 +27377,134 @@
-#endif
-#ifndef WIFEXITED
-# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
--#endif
-+
-+#include <glib.h>
-+#include <stdio.h>
-
++$ac_includes_default
++/* malloc might have been renamed as rpl_malloc. */
++#undef malloc
++
++/* Thanks to Mike Haertel and Jim Avera for this test.
++ Here is a matrix of mmap possibilities:
++ mmap private not fixed
++ mmap private fixed at somewhere currently unmapped
++ mmap private fixed at somewhere already mapped
++ mmap shared not fixed
++ mmap shared fixed at somewhere currently unmapped
++ mmap shared fixed at somewhere already mapped
++ For private mappings, we should verify that changes cannot be read()
++ back from the file, nor mmap's back from the file at a different
++ address. (There have been systems where private was not correctly
++ implemented like the infamous i386 svr4.0, and systems where the
++ VM page cache was not coherent with the file system buffer cache
++ like early versions of FreeBSD and possibly contemporary NetBSD.)
++ For shared mappings, we should conversely verify that changes get
++ propagated back to all the places they're supposed to be.
++
++ Grep wants private fixed already mapped.
++ The main things grep needs to know about mmap are:
++ * does it exist and is it safe to write into the mmap'd area
++ * how to use it (BSD variants) */
++
++#include <fcntl.h>
++#include <sys/mman.h>
++
++#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
++char *malloc ();
+ #endif
+
++/* This mess was copied from the GNU getpagesize.h. */
++#ifndef HAVE_GETPAGESIZE
++/* Assume that all systems that can run configure have sys/param.h. */
++# ifndef HAVE_SYS_PARAM_H
++# define HAVE_SYS_PARAM_H 1
++# endif
++
++# ifdef _SC_PAGESIZE
++# define getpagesize() sysconf(_SC_PAGESIZE)
++# else /* no _SC_PAGESIZE */
++# ifdef HAVE_SYS_PARAM_H
++# include <sys/param.h>
++# ifdef EXEC_PAGESIZE
++# define getpagesize() EXEC_PAGESIZE
++# else /* no EXEC_PAGESIZE */
++# ifdef NBPG
++# define getpagesize() NBPG * CLSIZE
++# ifndef CLSIZE
++# define CLSIZE 1
++# endif /* no CLSIZE */
++# else /* no NBPG */
++# ifdef NBPC
++# define getpagesize() NBPC
++# else /* no NBPC */
++# ifdef PAGESIZE
++# define getpagesize() PAGESIZE
++# endif /* PAGESIZE */
++# endif /* no NBPC */
++# endif /* no NBPG */
++# endif /* no EXEC_PAGESIZE */
++# else /* no HAVE_SYS_PARAM_H */
++# define getpagesize() 8192 /* punt totally */
++# endif /* no HAVE_SYS_PARAM_H */
++# endif /* no _SC_PAGESIZE */
++
++#endif /* no HAVE_GETPAGESIZE */
++
int
main ()
{
- int s;
- wait (&s);
- s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
-+ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
- ;
+- ;
++ char *data, *data2, *data3;
++ int i, pagesize;
++ int fd;
++
++ pagesize = getpagesize ();
++
++ /* First, make a file with some known garbage in it. */
++ data = (char *) malloc (pagesize);
++ if (!data)
++ return 1;
++ for (i = 0; i < pagesize; ++i)
++ *(data + i) = rand ();
++ umask (0);
++ fd = creat ("conftest.mmap", 0600);
++ if (fd < 0)
++ return 1;
++ if (write (fd, data, pagesize) != pagesize)
++ return 1;
++ close (fd);
++
++ /* Next, try to mmap the file at a fixed address which already has
++ something else allocated at it. If we can, also make sure that
++ we see the same garbage. */
++ fd = open ("conftest.mmap", O_RDWR);
++ if (fd < 0)
++ return 1;
++ data2 = (char *) malloc (2 * pagesize);
++ if (!data2)
++ return 1;
++ data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1);
++ if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
++ MAP_PRIVATE | MAP_FIXED, fd, 0L))
++ return 1;
++ for (i = 0; i < pagesize; ++i)
++ if (*(data + i) != *(data2 + i))
++ return 1;
++
++ /* Finally, make sure that changes to the mapped area do not
++ percolate back to the file as seen by read(). (This is a bug on
++ some variants of i386 svr4.0.) */
++ for (i = 0; i < pagesize; ++i)
++ *(data2 + i) = *(data2 + i) + 1;
++ data3 = (char *) malloc (pagesize);
++ if (!data3)
++ return 1;
++ if (read (fd, data3, pagesize) != pagesize)
++ return 1;
++ for (i = 0; i < pagesize; ++i)
++ if (*(data + i) != *(data3 + i))
++ return 1;
++ close (fd);
return 0;
}
_ACEOF
@@ -27258,77 +27527,36 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_header_sys_wait_h=yes
-+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"
++if ac_fn_c_try_run "$LINENO"; then :
++ ac_cv_func_mmap_fixed_mapped=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_header_sys_wait_h=no
-+ 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."
++ 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
-+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
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+
-+
-+
-+ 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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
-$as_echo "$ac_cv_header_sys_wait_h" >&6; }
-if test $ac_cv_header_sys_wait_h = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5
++$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; }
++if test $ac_cv_func_mmap_fixed_mapped = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SYS_WAIT_H 1
-+CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CFLAGS"
-+
-+
-+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
+-_ACEOF
++$as_echo "#define HAVE_MMAP 1" >>confdefs.h
fi
-+done
-
-+LIBS=$gtk_save_LIBS
++rm -f conftest.mmap
+
-{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-$as_echo_n "checking return type of signal handlers... " >&6; }
@@ -27337,19 +27565,13 @@
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+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
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <signal.h>
-
+-
-int
-main ()
-{
@@ -27357,7 +27579,13 @@
- ;
- return 0;
-}
--_ACEOF
++for ac_func in mallinfo
++do :
++ ac_fn_c_check_func "$LINENO" "mallinfo" "ac_cv_func_mallinfo"
++if test "x$ac_cv_func_mallinfo" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_MALLINFO 1
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -27380,43 +27608,30 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+$as_echo "#define HAVE_PWD_H 1" >>confdefs.h
-
+-
- ac_cv_type_signal=void
+-fi
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-$as_echo "$ac_cv_type_signal" >&6; }
+done
-cat >>confdefs.h <<_ACEOF
-#define RETSIGTYPE $ac_cv_type_signal
-+for ac_header in sys/time.h
++for ac_func in getresuid
+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 :
++ 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_SYS_TIME_H 1
++#define HAVE_GETRESUID 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
-
+-
+-
+-
+-
-if test "x$LIBTIFF" != x; then
- HAVE_TIFF_TRUE=
- HAVE_TIFF_FALSE='#'
@@ -27424,75 +27639,55 @@
- HAVE_TIFF_TRUE='#'
- HAVE_TIFF_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
-
+
+-
+-
-if test "x$LIBPNG" != x; then
- HAVE_PNG_TRUE=
- HAVE_PNG_FALSE='#'
--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
- HAVE_PNG_TRUE='#'
- HAVE_PNG_FALSE=
- fi
-
-+done
-
+-fi
+-
+-
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <sys/types.h>
-if test "x$LIBJPEG" != x; then
- HAVE_JPEG_TRUE=
- HAVE_JPEG_FALSE='#'
-+{ $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 <ftw.h>
-+int
-+main ()
-+{
-+int flags = FTW_ACTIONRETVAL;
-+ ;
-+ return 0;
-+}
+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ gtk_ok=yes
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++ $EGREP "uid_t" >/dev/null 2>&1; then :
++ ac_cv_type_uid_t=yes
else
- HAVE_JPEG_TRUE='#'
- HAVE_JPEG_FALSE=
-+ gtk_ok=no
++ ac_cv_type_uid_t=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
-
++rm -f conftest*
+
+-
-
-if test "x$LIBJASPER" != x; then
- HAVE_JASPER_TRUE=
- HAVE_JASPER_FALSE='#'
- else
+-else
- HAVE_JASPER_TRUE='#'
- HAVE_JASPER_FALSE=
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
fi
-
-+saved_cflags="$CFLAGS"
-+saved_ldflags="$LDFLAGS"
++{ $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
-if $dynworks ; then
- STATIC_LIB_DEPS=
@@ -27519,15 +27714,11 @@
- { $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
-+# 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
-{ $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; }
@@ -27536,23 +27727,10 @@
-_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 <sys/systeminfo.h>
-+#include <stdlib.h>
-+#include <stdarg.h>
-+#include <string.h>
-+#include <float.h>
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -27572,17 +27750,15 @@
- 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
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++$as_echo "#define gid_t int" >>confdefs.h
+
- ac_header_compiler=no
-+ 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; }
@@ -27594,12 +27770,21 @@
-_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
++# Check if <sys/select.h> 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 <sys/systeminfo.h>
--_ACEOF
++#include <sys/types.h>
++int
++main ()
++{
++fd_set readMask, writeMask;
++ ;
++ return 0;
++}
+ _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -27618,21 +27803,20 @@
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++ gtk_ok=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
--fi
-+#include <string.h>
-
++ gtk_ok=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; }
-+_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: )
@@ -27667,49 +27851,48 @@
-$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
++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
- ac_cv_header_sys_systeminfo_h=$ac_header_preproc
-+ ac_cv_header_stdc=no
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_systeminfo_h" >&5
-$as_echo "$ac_cv_header_sys_systeminfo_h" >&6; }
-+rm -f conftest*
-
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <sys/select.h>
+
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++ $EGREP "fd_mask" >/dev/null 2>&1; then :
++ gtk_ok=yes
fi
-if test "x$ac_cv_header_sys_systeminfo_h" = x""yes; then
++rm -f conftest*
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SYS_SYSTEMINFO_H 1
-+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 <stdlib.h>
-+
- _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*
-
--
+-_ACEOF
++ if test $gtk_ok = yes; then
+
+-fi
++$as_echo "#define HAVE_SYS_SELECT_H 1" >>confdefs.h
+
++ { $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
+
-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; }
-+
-+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
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking sys/sysinfo.h usability" >&5
-$as_echo_n "checking sys/sysinfo.h usability... " >&6; }
@@ -27718,35 +27901,10 @@
-_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 <sys/sysinfo.h>
-+#include <ctype.h>
-+#include <stdlib.h>
-+#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
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -27766,32 +27924,21 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-+if ac_fn_c_try_run "$LINENO"; then :
-+
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ ac_cv_header_stdc=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
-+fi
-+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
++$as_echo "#define NO_FD_SET 1" >>confdefs.h
- ac_header_compiler=no
++ { $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: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
+-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking sys/sysinfo.h presence" >&5
-$as_echo_n "checking sys/sysinfo.h presence... " >&6; }
@@ -27800,9 +27947,14 @@
-_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 <sys/sysinfo.h>
--_ACEOF
++#include <wchar.h>
+ _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -27821,74 +27973,20 @@
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-+# 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
++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
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-
+-
- ac_header_preproc=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 conftest.err conftest.$ac_ext
++ gdk_wchar_h=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; }
-+ *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
++if test $gdk_wchar_h = yes; then
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -27924,35 +28022,42 @@
-$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
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_c_const=yes
- else
+-else
- ac_cv_header_sys_sysinfo_h=$ac_header_preproc
-+ ac_cv_c_const=no
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysinfo_h" >&5
-$as_echo "$ac_cv_header_sys_sysinfo_h" >&6; }
--
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++$as_echo "#define HAVE_WCHAR_H 1" >>confdefs.h
+
fi
-if test "x$ac_cv_header_sys_sysinfo_h" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
-+$as_echo "$ac_cv_c_const" >&6; }
-+if test $ac_cv_c_const = no; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdk_wchar_h" >&5
++$as_echo "$gdk_wchar_h" >&6; }
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SYS_SYSINFO_H 1
--_ACEOF
-+$as_echo "#define const /**/" >>confdefs.h
-
++# Check for wctype.h (for iswalnum)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wctype.h" >&5
++$as_echo_n "checking for wctype.h... " >&6; }
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <wctype.h>
+ _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
++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; }
+
-{ $as_echo "$as_me:$LINENO: checking for mediaLib 2.3" >&5
-$as_echo_n "checking for mediaLib 2.3... " >&6; }
-use_mlib25=no
@@ -27961,36 +28066,40 @@
-{ $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
-+# 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 :
++# 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
+ ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmlib $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++LIBS="-lw $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-+#include <sys/types.h>
-+#include <signal.h>
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -27070,796 +21060,639 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
-char mlib_ImageSetStruct ();
++char iswalnum ();
int
main ()
{
-return mlib_ImageSetStruct ();
-+return *(signal (0, 0)) (0) == 1;
++return iswalnum ();
;
return 0;
}
@@ -28017,21 +28126,22 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_mlib_mlib_ImageSetStruct=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_type_signal=int
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_w_iswalnum=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_mlib_mlib_ImageSetStruct=no
-+ ac_cv_type_signal=void
++ ac_cv_lib_w_iswalnum=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
-+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:$LINENO: result: $ac_cv_lib_mlib_mlib_ImageSetStruct" >&5
-$as_echo "$ac_cv_lib_mlib_mlib_ImageSetStruct" >&6; }
@@ -28039,42 +28149,20 @@
- use_mlib=yes
-else
- use_mlib=no
-+{ $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
-+
-+
-+for ac_header in stdlib.h unistd.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
++{ $as_echo "$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
-if test $use_mlib = yes; then
-+done
-
+-
-cat >>confdefs.h <<\_ACEOF
-#define USE_MEDIALIB 1
-+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
++fi
- MEDIA_LIB=-lmlib
-+fi
-+done
- { $as_echo "$as_me:$LINENO: checking for mediaLib 2.5" >&5
-$as_echo_n "checking for mediaLib 2.5... " >&6; }
@@ -28083,11 +28171,8 @@
- { $as_echo "$as_me:$LINENO: checking for mlib_VideoColorRGBint_to_BGRAint in -lmlib" >&5
-$as_echo_n "checking for mlib_VideoColorRGBint_to_BGRAint in -lmlib... " >&6; }
-if test "${ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint+set}" = set; then
-+{ $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
+- $as_echo_n "(cached) " >&6
+-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmlib $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
@@ -28095,143 +28180,41 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ if test "$cross_compiling" = yes; then :
-+ ac_cv_func_mmap_fixed_mapped=no
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++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. */
-+$ac_includes_default
-+/* malloc might have been renamed as rpl_malloc. */
-+#undef 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"
-+/* Thanks to Mike Haertel and Jim Avera for this test.
-+ Here is a matrix of mmap possibilities:
-+ mmap private not fixed
-+ mmap private fixed at somewhere currently unmapped
-+ mmap private fixed at somewhere already mapped
-+ mmap shared not fixed
-+ mmap shared fixed at somewhere currently unmapped
-+ mmap shared fixed at somewhere already mapped
-+ For private mappings, we should verify that changes cannot be read()
-+ back from the file, nor mmap's back from the file at a different
-+ address. (There have been systems where private was not correctly
-+ implemented like the infamous i386 svr4.0, and systems where the
-+ VM page cache was not coherent with the file system buffer cache
-+ like early versions of FreeBSD and possibly contemporary NetBSD.)
-+ For shared mappings, we should conversely verify that changes get
-+ propagated back to all the places they're supposed to be.
-+
-+ Grep wants private fixed already mapped.
-+ The main things grep needs to know about mmap are:
-+ * does it exist and is it safe to write into the mmap'd area
-+ * how to use it (BSD variants) */
-+
-+#include <fcntl.h>
-+#include <sys/mman.h>
-+
-+#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
-+char *malloc ();
- #endif
+-#endif
-char mlib_VideoColorRGBint_to_BGRAint ();
-+
-+/* This mess was copied from the GNU getpagesize.h. */
-+#ifndef HAVE_GETPAGESIZE
-+/* Assume that all systems that can run configure have sys/param.h. */
-+# ifndef HAVE_SYS_PARAM_H
-+# define HAVE_SYS_PARAM_H 1
-+# endif
-+
-+# ifdef _SC_PAGESIZE
-+# define getpagesize() sysconf(_SC_PAGESIZE)
-+# else /* no _SC_PAGESIZE */
-+# ifdef HAVE_SYS_PARAM_H
-+# include <sys/param.h>
-+# ifdef EXEC_PAGESIZE
-+# define getpagesize() EXEC_PAGESIZE
-+# else /* no EXEC_PAGESIZE */
-+# ifdef NBPG
-+# define getpagesize() NBPG * CLSIZE
-+# ifndef CLSIZE
-+# define CLSIZE 1
-+# endif /* no CLSIZE */
-+# else /* no NBPG */
-+# ifdef NBPC
-+# define getpagesize() NBPC
-+# else /* no NBPC */
-+# ifdef PAGESIZE
-+# define getpagesize() PAGESIZE
-+# endif /* PAGESIZE */
-+# endif /* no NBPC */
-+# endif /* no NBPG */
-+# endif /* no EXEC_PAGESIZE */
-+# else /* no HAVE_SYS_PARAM_H */
-+# define getpagesize() 8192 /* punt totally */
-+# endif /* no HAVE_SYS_PARAM_H */
-+# endif /* no _SC_PAGESIZE */
-+
-+#endif /* no HAVE_GETPAGESIZE */
-+
++#include <stdlib.h>
int
main ()
{
-return mlib_VideoColorRGBint_to_BGRAint ();
-- ;
-+ char *data, *data2, *data3;
-+ int i, pagesize;
-+ int fd;
-+
-+ pagesize = getpagesize ();
-+
-+ /* First, make a file with some known garbage in it. */
-+ data = (char *) malloc (pagesize);
-+ if (!data)
-+ return 1;
-+ for (i = 0; i < pagesize; ++i)
-+ *(data + i) = rand ();
-+ umask (0);
-+ fd = creat ("conftest.mmap", 0600);
-+ if (fd < 0)
-+ return 1;
-+ if (write (fd, data, pagesize) != pagesize)
-+ return 1;
-+ close (fd);
-+
-+ /* Next, try to mmap the file at a fixed address which already has
-+ something else allocated at it. If we can, also make sure that
-+ we see the same garbage. */
-+ fd = open ("conftest.mmap", O_RDWR);
-+ if (fd < 0)
-+ return 1;
-+ data2 = (char *) malloc (2 * pagesize);
-+ if (!data2)
-+ return 1;
-+ data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1);
-+ if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
-+ MAP_PRIVATE | MAP_FIXED, fd, 0L))
-+ return 1;
-+ for (i = 0; i < pagesize; ++i)
-+ if (*(data + i) != *(data2 + i))
-+ return 1;
-+
-+ /* Finally, make sure that changes to the mapped area do not
-+ percolate back to the file as seen by read(). (This is a bug on
-+ some variants of i386 svr4.0.) */
-+ for (i = 0; i < pagesize; ++i)
-+ *(data2 + i) = *(data2 + i) + 1;
-+ data3 = (char *) malloc (pagesize);
-+ if (!data3)
-+ return 1;
-+ if (read (fd, data3, pagesize) != pagesize)
-+ return 1;
-+ for (i = 0; i < pagesize; ++i)
-+ if (*(data + i) != *(data3 + i))
-+ return 1;
-+ close (fd);
++
++#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H))
++# ifdef HAVE_WCTYPE_H
++# include <wctype.h>
++# else
++# ifdef HAVE_WCHAR_H
++# include <wchar.h>
++# endif
++# endif
++#else
++# define iswalnum(c) ((wchar_t)(c) <= 0xFF && isalnum(c))
++#endif
++iswalnum((wchar_t) 0);
++
+ ;
return 0;
}
_ACEOF
@@ -28257,62 +28240,82 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
++ gdk_working_wctype=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=no
-+if ac_fn_c_try_run "$LINENO"; then :
-+ ac_cv_func_mmap_fixed_mapped=yes
-+else
-+ 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
++ gdk_working_wctype=no
fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS="$oLIBS"
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
++if test $gdk_working_wctype = no; then
++
++$as_echo "#define HAVE_BROKEN_WCTYPE 1" >>confdefs.h
++
++ GDK_WLIBS=
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&5
-$as_echo "$ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&6; }
-if test "x$ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" = x""yes; then
- use_mlib25=yes
--else
++{ $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 <uxtheme.h>
++_ACEOF
++if ac_fn_c_try_cpp "$LINENO"; then :
++ gtk_uxtheme_h=yes
+ else
- use_mlib25=no
-+{ $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
-+
++ gtk_uxtheme_h=no
fi
-+rm -f conftest.mmap
++rm -f conftest.err conftest.$ac_ext
++if test $gtk_uxtheme_h = yes; then
- if test $use_mlib25 = 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; }
-cat >>confdefs.h <<\_ACEOF
-#define USE_MEDIALIB25 1
-+for ac_func in mallinfo
++# Checks for gdkspawn
++for ac_header in crt_externs.h
+do :
-+ ac_fn_c_check_func "$LINENO" "mallinfo" "ac_cv_func_mallinfo"
-+if test "x$ac_cv_func_mallinfo" = x""yes; then :
++ 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_MALLINFO 1
++#define HAVE_CRT_EXTERNS_H 1
_ACEOF
- fi
fi
+
+done
-
-+for ac_func in getresuid
++
++for ac_func in _NSGetEnviron
+do :
-+ ac_fn_c_check_func "$LINENO" "getresuid" "ac_cv_func_getresuid"
-+if test "x$ac_cv_func_getresuid" = x""yes; then :
++ 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_GETRESUID 1
++#define HAVE__NSGETENVIRON 1
+_ACEOF
-if test $use_mlib = yes; then
@@ -28324,34 +28327,19 @@
fi
+done
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
-+$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
-+if test "${ac_cv_type_uid_t+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <sys/types.h>
-
--
+
+
-if test $use_mlib25 = yes; then
- USE_MEDIALIB25_TRUE=
- USE_MEDIALIB25_FALSE='#'
-+_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
+-else
- USE_MEDIALIB25_TRUE='#'
- USE_MEDIALIB25_FALSE=
-+ 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
+-fi
++##################################################
++# Checks for gdk-pixbuf
++##################################################
+
-# 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
@@ -28367,15 +28355,18 @@
- ;;
- *)
- use_x86_asm=no
--esac
++use_la_modules=false
++case $host in
++ *-aix*) use_la_modules=true
+ esac
-{ $as_echo "$as_me:$LINENO: result: $use_x86_asm" >&5
-$as_echo "$use_x86_asm" >&6; }
-+$as_echo "#define uid_t int" >>confdefs.h
-use_mmx_asm=no
-if test $use_x86_asm = yes; then
- save_ac_ext=$ac_ext
- ac_ext=S
++if $use_la_modules ; then
- { $as_echo "$as_me:$LINENO: checking compiler support for MMX" >&5
-$as_echo_n "checking compiler support for MMX... " >&6; }
@@ -28387,7 +28378,7 @@
- (exit $ac_status); }; then
- use_mmx_asm=yes
- fi
-+$as_echo "#define gid_t int" >>confdefs.h
++$as_echo "#define USE_LA_MODULES 1" >>confdefs.h
- rm -rf conftest*
+fi
@@ -28397,122 +28388,115 @@
-cat >>confdefs.h <<\_ACEOF
-#define USE_MMX 1
-+# Check if <sys/select.h> 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 <sys/types.h>
-+int
-+main ()
-+{
-+fd_set readMask, writeMask;
-+ ;
-+ return 0;
-+}
- _ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ gtk_ok=yes
+-_ACEOF
++{ $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; }
++
++# Check whether --enable-modules was given.
++if test "${enable_modules+set}" = set; then :
++ enableval=$enable_modules;
++fi
++
++
++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
-+ 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 <sys/select.h>
++ { $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 "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+_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
-+
-+$as_echo "#define HAVE_SYS_SELECT_H 1" >>confdefs.h
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, found in sys/select.h" >&5
-+$as_echo "yes, found in sys/select.h" >&6; }
++$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:$LINENO: result: no" >&5
-+
-+$as_echo "#define NO_FD_SET 1" >>confdefs.h
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++ { $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='#'
-+# `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 <wchar.h>
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+ gdk_wchar_h=yes
- else
+-else
- USE_MMX_TRUE='#'
- USE_MMX_FALSE=
-+ gdk_wchar_h=no
++
++# Check whether --with-libpng was given.
++if test "${with_libpng+set}" = set; then :
++ withval=$with_libpng;
++fi
++
++
++# Check whether --with-libjpeg was given.
++if test "${with_libjpeg+set}" = set; then :
++ withval=$with_libjpeg;
++fi
++
++
++# Check whether --with-libtiff was given.
++if test "${with_libtiff+set}" = set; then :
++ withval=$with_libtiff;
fi
-+rm -f conftest.err conftest.$ac_ext
-+if test $gdk_wchar_h = yes; then
-
-+$as_echo "#define HAVE_WCHAR_H 1" >>confdefs.h
+
-REBUILD_PNGS=
-if test -z "$LIBPNG" && test x"$os_win32" = xno -o x$enable_gdiplus = xno; then
- REBUILD_PNGS=#
++# Check whether --with-libjasper was given.
++if test "${with_libjasper+set}" = set; then :
++ withval=$with_libjasper;
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 <wctype.h>
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+ gdk_wctype_h=yes
+
+
++# Check whether --enable-gdiplus was given.
++if test "${enable_gdiplus+set}" = set; then :
++ enableval=$enable_gdiplus;
+else
-+ gdk_wctype_h=no
++ enable_gdiplus=no
+fi
-+rm -f conftest.err conftest.$ac_ext
-+if test $gdk_wctype_h = yes; then
-
-+$as_echo "#define HAVE_WCTYPE_H 1" >>confdefs.h
-
--
+
+
-if test $cross_compiling = yes; then
- CROSS_COMPILING_TRUE=
- CROSS_COMPILING_FALSE='#'
--else
++ if test x$os_win32 = xyes && test x$enable_gdiplus != xno ; then
++ BUILD_GDIPLUS_LOADERS_TRUE=
++ BUILD_GDIPLUS_LOADERS_FALSE='#'
+ else
- CROSS_COMPILING_TRUE='#'
- CROSS_COMPILING_FALSE=
++ BUILD_GDIPLUS_LOADERS_TRUE='#'
++ BUILD_GDIPLUS_LOADERS_FALSE=
fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdk_wctype_h" >&5
-+$as_echo "$gdk_wctype_h" >&6; }
-
-+# in Solaris 2.5, `iswalnum' is in -lw
-+GDK_WLIBS=
-+ac_fn_c_check_func "$LINENO" "iswalnum" "ac_cv_func_iswalnum"
-+if test "x$ac_cv_func_iswalnum" = x""yes; then :
+
-if test $cross_compiling = yes; then
- # Extract the first word of "gdk-pixbuf-csource", so it can be a program name with args.
@@ -28520,10 +28504,11 @@
-{ $as_echo "$as_me:$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
-+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 :
++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
- case $GDK_PIXBUF_CSOURCE in
@@ -28546,90 +28531,65 @@
-done
-IFS=$as_save_IFS
+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lw $LIBS"
++LIBS="-ltiff -lm $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
- 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:$LINENO: result: $GDK_PIXBUF_CSOURCE" >&5
--$as_echo "$GDK_PIXBUF_CSOURCE" >&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 iswalnum ();
++char TIFFReadRGBAImageOriented ();
+int
+main ()
+{
-+return iswalnum ();
++return TIFFReadRGBAImageOriented ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_w_iswalnum=yes
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+ ac_cv_lib_w_iswalnum=no
-+fi
++ ac_cv_lib_tiff_TIFFReadRGBAImageOriented=yes
++else
++ ac_cv_lib_tiff_TIFFReadRGBAImageOriented=no
+ fi
+-GDK_PIXBUF_CSOURCE=$ac_cv_path_GDK_PIXBUF_CSOURCE
+-if test -n "$GDK_PIXBUF_CSOURCE"; then
+- { $as_echo "$as_me:$LINENO: result: $GDK_PIXBUF_CSOURCE" >&5
+-$as_echo "$GDK_PIXBUF_CSOURCE" >&6; }
+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
++{ $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:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
++ { $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
- # 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
-$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
-+
-+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 <stdlib.h>
-+int
-+main ()
-+{
-+
-+#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H))
-+# ifdef HAVE_WCTYPE_H
-+# include <wctype.h>
-+# else
-+# ifdef HAVE_WCHAR_H
-+# include <wchar.h>
-+# endif
-+# endif
-+#else
-+# define iswalnum(c) ((wchar_t)(c) <= 0xFF && isalnum(c))
-+#endif
-+iswalnum((wchar_t) 0);
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+ gdk_working_wctype=yes
++else
++ { $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
- case $GTK_UPDATE_ICON_CACHE in
- [\\/]* | ?:[\\/]*)
@@ -28650,64 +28610,51 @@
-done
-done
-IFS=$as_save_IFS
-+ gdk_working_wctype=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS="$oLIBS"
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-ltiff -ljpeg -lz -lm $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
- test -z "$ac_cv_path_GTK_UPDATE_ICON_CACHE" && ac_cv_path_GTK_UPDATE_ICON_CACHE="no"
- ;;
-esac
-+if test $gdk_working_wctype = no; then
-+
-+$as_echo "#define HAVE_BROKEN_WCTYPE 1" >>confdefs.h
-+
-+ GDK_WLIBS=
- fi
+-fi
-GTK_UPDATE_ICON_CACHE=$ac_cv_path_GTK_UPDATE_ICON_CACHE
-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; }
-+{ $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 <uxtheme.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 TIFFWriteScanline ();
++int
++main ()
++{
++return TIFFWriteScanline ();
++ ;
++ return 0;
++}
+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+ gtk_uxtheme_h=yes
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_tiff_TIFFWriteScanline=yes
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-+ gtk_uxtheme_h=no
++ ac_cv_lib_tiff_TIFFWriteScanline=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
-
+-
+-
- if test x$GTK_UPDATE_ICON_CACHE = xno; then
- REBUILD_PNGS=#
- 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: $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
-
+-
-if test ! -f $srcdir/gtk/gtkbuiltincache.h &&
- test "x$REBUILD_PNGS" = "x#" ; then
- { { $as_echo "$as_me:$LINENO: error:
@@ -28719,51 +28666,43 @@
-*** 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; }; }
++{ $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
-+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
-
+
+-
-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"
-+fi
-+done
-
+-
-########################################
-# 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=
-+##################################################
-+# Checks for gdk-pixbuf
-+##################################################
-
+-
-# 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
-+use_la_modules=false
-+case $host in
-+ *-aix*) use_la_modules=true
-+esac
-
+-
- #
- # We use fontconfig very peripherally when decoding the default
- # settings.
@@ -28775,8 +28714,7 @@
-*** fontconfig (http://www.fontconfig.org) is required by the X11 backend." >&2;}
- { (exit 1); exit 1; }; }
- fi
-+if $use_la_modules ; then
-
+-
- #
- # Check for basic X packages; we use pkg-config if available
- #
@@ -28785,8 +28723,7 @@
- X_PACKAGES="$X_PACKAGES x11 xext xrender"
- x_libs="`$PKG_CONFIG --libs x11 xext xrender`"
- X_CFLAGS="`$PKG_CONFIG --cflags x11 xext xrender`"
-+$as_echo "#define USE_LA_MODULES 1" >>confdefs.h
-
+-
- # Strip out any .la files that pkg-config might give us (this happens
- # with -uninstalled.pc files)
- x_libs_for_checks=
@@ -28796,43 +28733,34 @@
- *) x_libs_for_checks="$x_libs_for_checks $I" ;;
- esac
- done
-+fi
-
+-
- GDK_PIXBUF_XLIB_PACKAGES="x11"
- GTK_PACKAGES_FOR_X="x11"
- else
- have_base_x_pc=false
- { $as_echo "$as_me:$LINENO: checking for X" >&5
-$as_echo_n "checking for X... " >&6; }
-
-+{ $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; }
-
+-
+-
-# Check whether --with-x was given.
-if test "${with_x+set}" = set; then
- withval=$with_x;
-+# Check whether --enable-modules was given.
-+if test "${enable_modules+set}" = set; then :
-+ enableval=$enable_modules;
- 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.
- have_x=disabled
--else
+ else
- case $x_includes,$x_libraries in #(
- *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5
-$as_echo "$as_me: error: cannot use X directory names containing '" >&2;}
- { (exit 1); exit 1; }; };; #(
- *,NONE | NONE,*) if test "${ac_cv_have_x+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; }
++ { $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
- # One or both of the vars are not set, and there is no cached value.
-ac_x_includes=no ac_x_libraries=no
@@ -28858,15 +28786,7 @@
- test -f "$ac_im_libdir/libX11.$ac_extension"; then
- ac_im_usrlibdir=$ac_im_libdir; break
- fi
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether dynamic modules work" >&5
-+$as_echo_n "checking whether dynamic modules work... " >&6; }
-+ ## for loop is to strip newline
-+ tmp=`$PKG_CONFIG --variable=gmodule_supported gmodule-no-export-2.0`
-+ for I in $tmp; do
-+ dynworks=$I
- done
+- 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.
@@ -28881,29 +28801,44 @@
- fi
- cd ..
- rm -f -r conftest.dir
-+
-+ 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
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-ltiff34 -ljpeg -lz -lm $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char TIFFFlushData ();
++int
++main ()
++{
++return TIFFFlushData ();
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_tiff34_TIFFFlushData=yes
++else
++ 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
-# Standard set of common directories for X headers.
@@ -28918,28 +28853,27 @@
-/usr/include/X11R6
-/usr/include/X11R5
-/usr/include/X11R4
++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
-/usr/local/X11/include
-/usr/local/X11R6/include
-/usr/local/X11R5/include
-/usr/local/X11R4/include
-+# Check whether --with-libpng was given.
-+if test "${with_libpng+set}" = set; then :
-+ withval=$with_libpng;
+fi
-/usr/local/include/X11
-/usr/local/include/X11R6
-/usr/local/include/X11R5
-/usr/local/include/X11R4
++fi
-/usr/X386/include
-/usr/x386/include
-/usr/XFree86/include/X11
-+# Check whether --with-libjpeg was given.
-+if test "${with_libjpeg+set}" = set; then :
-+ withval=$with_libjpeg;
-+fi
++ fi
-/usr/include
-/usr/local/include
@@ -28947,120 +28881,80 @@
-/usr/athena/include
-/usr/local/x11r5/include
-/usr/lpp/Xamples/include
++ 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
-/usr/openwin/include
-/usr/openwin/share/include'
-+# Check whether --with-libtiff was given.
-+if test "${with_libtiff+set}" = set; then :
-+ withval=$with_libtiff;
-+fi
-+
-+
-+# 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
-+ enable_gdiplus=no
-+fi
-+
-+
-+ 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 :
++ 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="-ltiff -lm $LIBS"
++LIBS="-ljpeg $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-+
+
+-if test "$ac_x_includes" = no; then
+- # Guess where to find include files, by looking for Xlib.h.
+- # First, try using that file with no special directory specified.
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
-+char TIFFReadRGBAImageOriented ();
++char jpeg_destroy_decompress ();
+int
+main ()
+{
-+return TIFFReadRGBAImageOriented ();
++return jpeg_destroy_decompress ();
+ ;
+ return 0;
+}
-+_ACEOF
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_tiff_TIFFReadRGBAImageOriented=yes
++ ac_cv_lib_jpeg_jpeg_destroy_decompress=yes
+else
-+ ac_cv_lib_tiff_TIFFReadRGBAImageOriented=no
++ ac_cv_lib_jpeg_jpeg_destroy_decompress=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_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'
++{ $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
-+ { $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;}
++ 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_x_includes" = no; then
-- # Guess where to find include files, by looking for Xlib.h.
-- # First, try using that file with no special directory specified.
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFWriteScanline in -ltiff" >&5
-+$as_echo_n "checking for TIFFWriteScanline in -ltiff... " >&6; }
-+if test "${ac_cv_lib_tiff_TIFFWriteScanline+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ltiff -ljpeg -lz -lm $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ 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 <X11/Xlib.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 TIFFWriteScanline ();
-+int
-+main ()
-+{
-+return TIFFWriteScanline ();
-+ ;
-+ return 0;
-+}
++#include <stdio.h>
++#undef PACKAGE
++#undef VERSION
++#undef HAVE_STDLIB_H
++#include <jpeglib.h>
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
@@ -29081,8 +28975,8 @@
- }; then
- # We can compile using X headers with no special include directory.
-ac_x_includes=
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_tiff_TIFFWriteScanline=yes
++if ac_fn_c_try_cpp "$LINENO"; then :
++ jpeg_ok=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
@@ -29093,26 +28987,12 @@
- break
- fi
-done
-+ ac_cv_lib_tiff_TIFFWriteScanline=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFWriteScanline" >&5
-+$as_echo "$ac_cv_lib_tiff_TIFFWriteScanline" >&6; }
-+if test "x$ac_cv_lib_tiff_TIFFWriteScanline" = x""yes; then :
-+ ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default"
-+if test "x$ac_cv_header_tiffio_h" = x""yes; then :
-+ TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz'
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5
-+$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;}
++ jpeg_ok=no
fi
-
--rm -f conftest.err conftest.$ac_ext
+-
+ 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.
@@ -29124,14 +29004,17 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFFlushData in -ltiff34" >&5
-+$as_echo_n "checking for TIFFFlushData in -ltiff34... " >&6; }
-+if test "${ac_cv_lib_tiff34_TIFFFlushData+set}" = set; then :
++ { $as_echo "$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="-ltiff34 -ljpeg -lz -lm $LIBS"
++LIBS="-ljpeg $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <X11/Xlib.h>
@@ -29142,12 +29025,12 @@
+#ifdef __cplusplus
+extern "C"
+#endif
-+char TIFFFlushData ();
++char jpeg_simple_progression ();
int
main ()
{
-XrmInitialize ()
-+return TIFFFlushData ();
++return jpeg_simple_progression ();
;
return 0;
}
@@ -29177,7 +29060,7 @@
-# We can link X programs with no special library path.
-ac_x_libraries=
+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_tiff34_TIFFFlushData=yes
++ ac_cv_lib_jpeg_jpeg_simple_progression=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
@@ -29193,28 +29076,14 @@
- fi
- done
-done
-+ ac_cv_lib_tiff34_TIFFFlushData=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff34_TIFFFlushData" >&5
-+$as_echo "$ac_cv_lib_tiff34_TIFFFlushData" >&6; }
-+if test "x$ac_cv_lib_tiff34_TIFFFlushData" = x""yes; then :
-+ ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default"
-+if test "x$ac_cv_header_tiffio_h" = x""yes; then :
-+ TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz'
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5
-+$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;}
++ 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
-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.
@@ -29225,21 +29094,26 @@
- ac_x_includes='$ac_x_includes'\
- ac_x_libraries='$ac_x_libraries'"
-esac
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** TIFF loader will not be built (TIFF library not found) ***" >&5
-+$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF library not found) ***" >&2;}
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
fi
-;; #(
- *) have_x=yes;;
- esac
- eval "$ac_cv_have_x"
-fi # $with_x != no
++{ $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
-if test "$have_x" != yes; then
- { $as_echo "$as_me:$LINENO: result: $have_x" >&5
-$as_echo "$have_x" >&6; }
- no_x=yes
--else
+ 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
@@ -29249,25 +29123,31 @@
- ac_x_libraries='$x_libraries'"
- { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
-$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
++ { $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
-if test "$no_x" = yes; then
- # Not all programs may use this symbol, but it does not hurt to define it.
-+fi
-
+-
-cat >>confdefs.h <<\_ACEOF
-#define X_DISPLAY_MISSING 1
-_ACEOF
++ 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
- X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
-else
- if test -n "$x_includes"; then
- X_CFLAGS="$X_CFLAGS -I$x_includes"
-+ if test x$with_libtiff != xno && test -z "$LIBTIFF"; then
++ if test x$with_libjpeg != xno && test -z "$LIBJPEG"; 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
++*** 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
@@ -29287,15 +29167,25 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+if test x$os_win32 = xno || test x$enable_gdiplus = xno; then
-+ if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_destroy_decompress in -ljpeg" >&5
-+$as_echo_n "checking for jpeg_destroy_decompress in -ljpeg... " >&6; }
-+if test "${ac_cv_lib_jpeg_jpeg_destroy_decompress+set}" = set; then :
++ if test x$with_libpng != xno && test -z "$LIBPNG"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng12" >&5
++$as_echo_n "checking for libpng12... " >&6; }
++ if $PKG_CONFIG --exists libpng12 ; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++ PNG='png'
++ PNG_DEP_CFLAGS_PACKAGES=libpng12
++ LIBPNG=`$PKG_CONFIG --libs libpng12`
++ else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_read_info in -lpng" >&5
++$as_echo_n "checking for png_read_info in -lpng... " >&6; }
++if test "${ac_cv_lib_png_png_read_info+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ljpeg $LIBS"
++LIBS="-lpng -lz -lm $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -29305,12 +29195,12 @@
+#ifdef __cplusplus
+extern "C"
+#endif
-+char jpeg_destroy_decompress ();
++char png_read_info ();
int
main ()
{
-
-+return jpeg_destroy_decompress ();
++return png_read_info ();
;
return 0;
}
@@ -29340,74 +29230,50 @@
-$as_echo "no" >&6; }
- X_LIBS="$X_LIBS -R$x_libraries"
+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_jpeg_jpeg_destroy_decompress=yes
++ 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_jpeg_jpeg_destroy_decompress=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_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
++{ $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
-+ 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;}
++ png_ok=no
+fi
- LIBS="$ac_xsave_LIBS -R $x_libraries"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+ if test "$jpeg_ok" = yes; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeglib.h" >&5
-+$as_echo_n "checking for jpeglib.h... " >&6; }
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <stdio.h>
-+#undef PACKAGE
-+#undef VERSION
-+#undef HAVE_STDLIB_H
-+#include <jpeglib.h>
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+ jpeg_ok=yes
+-/* end confdefs.h. */
+
+else
-+ jpeg_ok=no
++ { $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
-+rm -f conftest.err conftest.$ac_ext
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jpeg_ok" >&5
-+$as_echo "$jpeg_ok" >&6; }
-+ if test "$jpeg_ok" = yes; then
-+ LIBJPEG='-ljpeg'
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_simple_progression in -ljpeg" >&5
-+$as_echo_n "checking for jpeg_simple_progression in -ljpeg... " >&6; }
-+if test "${ac_cv_lib_jpeg_jpeg_simple_progression+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ljpeg $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char jpeg_simple_progression ();
++
++ 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 <png.h>
int
main ()
{
-
-+return jpeg_simple_progression ();
++png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;
;
return 0;
}
@@ -29436,42 +29302,39 @@
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
- X_LIBS="$X_LIBS -R $x_libraries"
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_jpeg_jpeg_simple_progression=yes
++if ac_fn_c_try_compile "$LINENO"; then :
++ png_ok=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- { $as_echo "$as_me:$LINENO: result: neither works" >&5
-$as_echo "neither works" >&6; }
-+ ac_cv_lib_jpeg_jpeg_simple_progression=no
- fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_simple_progression" >&5
-+$as_echo "$ac_cv_lib_jpeg_jpeg_simple_progression" >&6; }
-+if test "x$ac_cv_lib_jpeg_jpeg_simple_progression" = x""yes; then :
-+
-+$as_echo "#define HAVE_PROGRESSIVE_JPEG 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
-+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;}
++ png_ok=no
fi
-
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- ac_c_werror_flag=$ac_xsave_c_werror_flag
- LIBS=$ac_xsave_LIBS
++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: *** 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;}
++ { $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
@@ -29479,13 +29342,13 @@
- # Check for system-dependent libraries X programs must link with.
- # Do this before checking for the system-independent R6 libraries
- # (-lICE), since we may need -lsocket or whatever for X linking.
-+ if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then
++ if test x$with_libpng != xno && test -z "$LIBPNG"; 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
++*** 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
-+fi
- if test "$ISC" = yes; then
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
@@ -29499,40 +29362,29 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ if test x$with_libpng != xno && test -z "$LIBPNG"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng12" >&5
-+$as_echo_n "checking for libpng12... " >&6; }
-+ if $PKG_CONFIG --exists libpng12 ; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ PNG='png'
-+ PNG_DEP_CFLAGS_PACKAGES=libpng12
-+ LIBPNG=`$PKG_CONFIG --libs libpng12`
-+ else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_read_info in -lpng" >&5
-+$as_echo_n "checking for png_read_info in -lpng... " >&6; }
-+if test "${ac_cv_lib_png_png_read_info+set}" = set; then :
++ 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="-lpng -lz -lm $LIBS"
++LIBS="-ljasper -ljpeg $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -27868,53 +21607,92 @@
+@@ -27868,849 +21701,663 @@
#ifdef __cplusplus
extern "C"
#endif
-char XOpenDisplay ();
-+char png_read_info ();
++char jas_init ();
int
main ()
{
-return XOpenDisplay ();
-+return png_read_info ();
++return jas_init ();
;
return 0;
}
@@ -29560,111 +29412,193 @@
- }; then
- :
+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
++ ac_cv_lib_jasper_jas_init=yes
++else
++ ac_cv_lib_jasper_jas_init=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_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
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jasper_jas_init" >&5
++$as_echo "$ac_cv_lib_jasper_jas_init" >&6; }
++if test "x$ac_cv_lib_jasper_jas_init" = x""yes; then :
++ LIBJASPER=-ljasper
++fi
++
++ fi
++
++ if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then
++ as_fn_error "
++*** Checks for JPEG2000 loader failed. You can build without it by passing
++*** --without-libjasper to configure" "$LINENO" 5
++ fi
++
++
++
++
++
++
++ if $dynworks; then
++ BUILD_DYNAMIC_MODULES_TRUE=
++ BUILD_DYNAMIC_MODULES_FALSE='#'
+else
-+ png_ok=no
++ BUILD_DYNAMIC_MODULES_TRUE='#'
++ BUILD_DYNAMIC_MODULES_FALSE=
++fi
++
++
++#
++# Allow building some or all gdk-pixbuf loaders included
++#
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pixbuf loaders to build" >&5
++$as_echo_n "checking pixbuf loaders to build... " >&6; }
++
++
++# Check whether --with-included_loaders was given.
++if test "${with_included_loaders+set}" = set; then :
++ withval=$with_included_loaders;
++fi
++
++
++if $dynworks; then
++ :
++else
++ ## if the option was specified, leave it; otherwise disable included loaders
++ if test x$with_included_loaders = xno; then
++ with_included_loaders=yes
++ fi
++fi
++
++# Use the traditional png loader instead of the GDI+ one on Windows,
++# because some important apps like GIMP need to read and write
++# arbitrary tEXt chunks which doesn't seem to be possible through GDI+
++
++all_loaders="ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm"
++if test x$with_libjasper != xno; then
++ all_loaders="$all_loaders,jasper"
++fi
++if test x$os_win32 = xyes && test x$enable_gdiplus != xno; then
++ # Skip PNG, see comment above
++ gdip_formats="bmp emf gif ico jpeg tiff wmf"
++ for f in $gdip_formats; do
++ all_loaders="$all_loaders,gdip-$f"
++ done
++else
++ all_loaders="$all_loaders,bmp,gif,ico,jpeg,tiff"
++fi
++included_loaders=""
++# If no loaders specified, include all
++if test "x$with_included_loaders" = xyes ; then
++ included_loaders="$all_loaders"
++else
++ included_loaders="$with_included_loaders"
++fi
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $included_loaders" >&5
++$as_echo "$included_loaders" >&6; }
++
++INCLUDED_LOADER_OBJ=
++INCLUDED_LOADER_DEFINE=
++
++IFS="${IFS= }"; gtk_save_ifs="$IFS"; IFS=","
++for loader in $included_loaders; do
++ if echo "$all_loaders" | egrep "(^|,)$loader(\$|,)" > /dev/null; then
++ :
++ else
++ as_fn_error "the specified loader $loader does not exist" "$LINENO" 5
++ fi
++
++ loader_underscores=`echo $loader | sed -e 's/-/_/g'`
++ INCLUDED_LOADER_OBJ="$INCLUDED_LOADER_OBJ libstatic-pixbufloader-$loader.la"
++
++ # Don't bother defining separate -DINCLUDE_gdip_foo for each gdip-foo loader
++ case $loader in
++ gdip-*) ;;
++ *) INCLUDED_LOADER_DEFINE="$INCLUDED_LOADER_DEFINE -DINCLUDE_$loader_underscores";;
++ esac
++ eval INCLUDE_$loader_underscores=yes
++done
++
++# Just define one -DINCLUDE_gdiplus for all the gdip-foo loaders
++# (except gdip-png, which isn't built at all)
++if test x"$INCLUDE_gdip_ico" = xyes; then
++ INCLUDED_LOADER_DEFINE="$INCLUDED_LOADER_DEFINE -DINCLUDE_gdiplus"
++fi
++
++IFS="$gtk_save_ifs"
++
++
++
++ if test x"$INCLUDE_png" = xyes; then
++ INCLUDE_PNG_TRUE=
++ INCLUDE_PNG_FALSE='#'
++else
++ INCLUDE_PNG_TRUE='#'
++ INCLUDE_PNG_FALSE=
++fi
++
++ if test x"$INCLUDE_bmp" = xyes; then
++ INCLUDE_BMP_TRUE=
++ INCLUDE_BMP_FALSE='#'
++else
++ INCLUDE_BMP_TRUE='#'
++ INCLUDE_BMP_FALSE=
++fi
++
++ if test x"$INCLUDE_wbmp" = xyes; then
++ INCLUDE_WBMP_TRUE=
++ INCLUDE_WBMP_FALSE='#'
++else
++ INCLUDE_WBMP_TRUE='#'
++ INCLUDE_WBMP_FALSE=
++fi
++
++ if test x"$INCLUDE_gif" = xyes; then
++ INCLUDE_GIF_TRUE=
++ INCLUDE_GIF_FALSE='#'
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ INCLUDE_GIF_TRUE='#'
++ INCLUDE_GIF_FALSE=
+fi
- { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
-$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
-if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
-+
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&5
-+$as_echo "$as_me: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&2;}
-+fi
-+
-+ if test "$png_ok" = yes; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_structp in png.h" >&5
-+$as_echo_n "checking for png_structp in png.h... " >&6; }
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <png.h>
-+int
-+main ()
-+{
-+png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ png_ok=yes
-+else
-+ png_ok=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $png_ok" >&5
-+$as_echo "$png_ok" >&6; }
-+ if test "$png_ok" = yes; then
-+ PNG='png'; LIBPNG='-lpng -lz'
-+ else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** PNG loader will not be built (PNG library is too old) ***" >&5
-+$as_echo "$as_me: WARNING: *** PNG loader will not be built (PNG library is too old) ***" >&2;}
-+ fi
-+ else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** PNG loader will not be built (PNG header file not found) ***" >&5
-+$as_echo "$as_me: WARNING: *** PNG loader will not be built (PNG header file not found) ***" >&2;}
-+ fi
-+ fi
-+ fi
-+
-+ if test x$with_libpng != xno && test -z "$LIBPNG"; then
-+ as_fn_error "
-+*** Checks for PNG loader failed. You can build without it by passing
-+*** --without-libpng to configure but many programs using GTK+ will
-+*** not work properly. The PNG loader is also needed if you are compiling
-+*** from CVS." "$LINENO" 5
-+ fi
-+
-+ if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jas_init in -ljasper" >&5
-+$as_echo_n "checking for jas_init in -ljasper... " >&6; }
-+if test "${ac_cv_lib_jasper_jas_init+set}" = set; then :
- $as_echo_n "(cached) " >&6
+- $as_echo_n "(cached) " >&6
++ if test x"$INCLUDE_ico" = xyes; then
++ INCLUDE_ICO_TRUE=
++ INCLUDE_ICO_FALSE='#'
else
- ac_check_lib_save_LIBS=$LIBS
+- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldnet $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+LIBS="-ljasper -ljpeg $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -27923,794 +21701,663 @@
- #ifdef __cplusplus
- extern "C"
- #endif
+-/* end confdefs.h. */
++ INCLUDE_ICO_TRUE='#'
++ INCLUDE_ICO_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 dnet_ntoa ();
-+char jas_init ();
- int
- main ()
- {
+-int
+-main ()
+-{
-return dnet_ntoa ();
-+return jas_init ();
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -29687,151 +29621,47 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_dnet_dnet_ntoa=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_jasper_jas_init=yes
++ if test x"$INCLUDE_ani" = xyes; then
++ INCLUDE_ANI_TRUE=
++ INCLUDE_ANI_FALSE='#'
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ ac_cv_lib_jasper_jas_init=no
++ INCLUDE_ANI_TRUE='#'
++ INCLUDE_ANI_FALSE=
+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jasper_jas_init" >&5
-+$as_echo "$ac_cv_lib_jasper_jas_init" >&6; }
-+if test "x$ac_cv_lib_jasper_jas_init" = x""yes; then :
-+ LIBJASPER=-ljasper
-+fi
-+
-+ fi
-+
-+ if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then
-+ as_fn_error "
-+*** Checks for JPEG2000 loader failed. You can build without it by passing
-+*** --without-libjasper to configure" "$LINENO" 5
-+ fi
-+
-+
-+
-+
-+
-+
-+ if $dynworks; then
-+ BUILD_DYNAMIC_MODULES_TRUE=
-+ BUILD_DYNAMIC_MODULES_FALSE='#'
+
+- ac_cv_lib_dnet_dnet_ntoa=no
++ if test x"$INCLUDE_jpeg" = xyes; then
++ INCLUDE_JPEG_TRUE=
++ INCLUDE_JPEG_FALSE='#'
+else
-+ BUILD_DYNAMIC_MODULES_TRUE='#'
-+ BUILD_DYNAMIC_MODULES_FALSE=
-+fi
-+
-+
-+#
-+# Allow building some or all gdk-pixbuf loaders included
-+#
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pixbuf loaders to build" >&5
-+$as_echo_n "checking pixbuf loaders to build... " >&6; }
-+
-+
-+# Check whether --with-included_loaders was given.
-+if test "${with_included_loaders+set}" = set; then :
-+ withval=$with_included_loaders;
-+fi
-+
-+
-+if $dynworks; then
-+ :
-+else
-+ ## if the option was specified, leave it; otherwise disable included loaders
-+ if test x$with_included_loaders = xno; then
-+ with_included_loaders=yes
-+ fi
-+fi
-+
-+# Use the traditional png loader instead of the GDI+ one on Windows,
-+# because some important apps like GIMP need to read and write
-+# arbitrary tEXt chunks which doesn't seem to be possible through GDI+
-+
-+all_loaders="ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm"
-+if test x$with_libjasper != xno; then
-+ all_loaders="$all_loaders,jasper"
-+fi
-+if test x$os_win32 = xyes && test x$enable_gdiplus != xno; then
-+ # Skip PNG, see comment above
-+ gdip_formats="bmp emf gif ico jpeg tiff wmf"
-+ for f in $gdip_formats; do
-+ all_loaders="$all_loaders,gdip-$f"
-+ done
-+else
-+ all_loaders="$all_loaders,bmp,gif,ico,jpeg,tiff"
-+fi
-+included_loaders=""
-+# If no loaders specified, include all
-+if test "x$with_included_loaders" = xyes ; then
-+ included_loaders="$all_loaders"
-+else
-+ included_loaders="$with_included_loaders"
-+fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $included_loaders" >&5
-+$as_echo "$included_loaders" >&6; }
-+
-+INCLUDED_LOADER_OBJ=
-+INCLUDED_LOADER_DEFINE=
-+
-+IFS="${IFS= }"; gtk_save_ifs="$IFS"; IFS=","
-+for loader in $included_loaders; do
-+ if echo "$all_loaders" | egrep "(^|,)$loader(\$|,)" > /dev/null; then
-+ :
-+ else
-+ as_fn_error "the specified loader $loader does not exist" "$LINENO" 5
-+ fi
-+
-+ loader_underscores=`echo $loader | sed -e 's/-/_/g'`
-+ INCLUDED_LOADER_OBJ="$INCLUDED_LOADER_OBJ libstatic-pixbufloader-$loader.la"
-+
-+ # Don't bother defining separate -DINCLUDE_gdip_foo for each gdip-foo loader
-+ case $loader in
-+ gdip-*) ;;
-+ *) INCLUDED_LOADER_DEFINE="$INCLUDED_LOADER_DEFINE -DINCLUDE_$loader_underscores";;
-+ esac
-+ eval INCLUDE_$loader_underscores=yes
-+done
-+
-+# Just define one -DINCLUDE_gdiplus for all the gdip-foo loaders
-+# (except gdip-png, which isn't built at all)
-+if test x"$INCLUDE_gdip_ico" = xyes; then
-+ INCLUDED_LOADER_DEFINE="$INCLUDED_LOADER_DEFINE -DINCLUDE_gdiplus"
-+fi
-+
-+IFS="$gtk_save_ifs"
-+
-
-- ac_cv_lib_dnet_dnet_ntoa=no
--fi
++ INCLUDE_JPEG_TRUE='#'
++ INCLUDE_JPEG_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
-+ if test x"$INCLUDE_png" = xyes; then
-+ INCLUDE_PNG_TRUE=
-+ INCLUDE_PNG_FALSE='#'
++ if test x"$INCLUDE_pnm" = xyes; then
++ INCLUDE_PNM_TRUE=
++ INCLUDE_PNM_FALSE='#'
+else
-+ INCLUDE_PNG_TRUE='#'
-+ INCLUDE_PNG_FALSE=
++ INCLUDE_PNM_TRUE='#'
++ INCLUDE_PNM_FALSE=
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
-$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then
- X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+
-+ if test x"$INCLUDE_bmp" = xyes; then
-+ INCLUDE_BMP_TRUE=
-+ INCLUDE_BMP_FALSE='#'
++ if test x"$INCLUDE_ras" = xyes; then
++ INCLUDE_RAS_TRUE=
++ INCLUDE_RAS_FALSE='#'
+else
-+ INCLUDE_BMP_TRUE='#'
-+ INCLUDE_BMP_FALSE=
++ INCLUDE_RAS_TRUE='#'
++ INCLUDE_RAS_FALSE=
fi
- if test $ac_cv_lib_dnet_dnet_ntoa = no; then
@@ -29839,9 +29669,9 @@
-$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
-if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
- $as_echo_n "(cached) " >&6
-+ if test x"$INCLUDE_wbmp" = xyes; then
-+ INCLUDE_WBMP_TRUE=
-+ INCLUDE_WBMP_FALSE='#'
++ if test x"$INCLUDE_tiff" = xyes; then
++ INCLUDE_TIFF_TRUE=
++ INCLUDE_TIFF_FALSE='#'
else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldnet_stub $LIBS"
@@ -29851,8 +29681,8 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+ INCLUDE_WBMP_TRUE='#'
-+ INCLUDE_WBMP_FALSE=
++ INCLUDE_TIFF_TRUE='#'
++ INCLUDE_TIFF_FALSE=
+fi
-/* Override any GCC internal prototype to avoid an error.
@@ -29892,68 +29722,68 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_dnet_stub_dnet_ntoa=yes
-+ if test x"$INCLUDE_gif" = xyes; then
-+ INCLUDE_GIF_TRUE=
-+ INCLUDE_GIF_FALSE='#'
++ 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
-+ INCLUDE_GIF_TRUE='#'
-+ INCLUDE_GIF_FALSE=
++ INCLUDE_XPM_TRUE='#'
++ INCLUDE_XPM_FALSE=
+fi
- ac_cv_lib_dnet_stub_dnet_ntoa=no
-+ if test x"$INCLUDE_ico" = xyes; then
-+ INCLUDE_ICO_TRUE=
-+ INCLUDE_ICO_FALSE='#'
++ if test x"$INCLUDE_xbm" = xyes; then
++ INCLUDE_XBM_TRUE=
++ INCLUDE_XBM_FALSE='#'
+else
-+ INCLUDE_ICO_TRUE='#'
-+ INCLUDE_ICO_FALSE=
++ 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
-LIBS=$ac_check_lib_save_LIBS
-+ if test x"$INCLUDE_ani" = xyes; then
-+ INCLUDE_ANI_TRUE=
-+ INCLUDE_ANI_FALSE='#'
++ if test x"$INCLUDE_tga" = xyes; then
++ INCLUDE_TGA_TRUE=
++ INCLUDE_TGA_FALSE='#'
+else
-+ INCLUDE_ANI_TRUE='#'
-+ INCLUDE_ANI_FALSE=
++ INCLUDE_TGA_TRUE='#'
++ INCLUDE_TGA_FALSE=
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
-$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then
- X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+
-+ if test x"$INCLUDE_jpeg" = xyes; then
-+ INCLUDE_JPEG_TRUE=
-+ INCLUDE_JPEG_FALSE='#'
++ if test x"$INCLUDE_pcx" = xyes; then
++ INCLUDE_PCX_TRUE=
++ INCLUDE_PCX_FALSE='#'
+else
-+ INCLUDE_JPEG_TRUE='#'
-+ INCLUDE_JPEG_FALSE=
++ INCLUDE_PCX_TRUE='#'
++ INCLUDE_PCX_FALSE=
fi
- fi
-+ if test x"$INCLUDE_pnm" = xyes; then
-+ INCLUDE_PNM_TRUE=
-+ INCLUDE_PNM_FALSE='#'
++ if test x"$INCLUDE_icns" = xyes; then
++ INCLUDE_ICNS_TRUE=
++ INCLUDE_ICNS_FALSE='#'
+else
-+ INCLUDE_PNM_TRUE='#'
-+ INCLUDE_PNM_FALSE=
++ INCLUDE_ICNS_TRUE='#'
++ INCLUDE_ICNS_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_xsave_LIBS"
-+ if test x"$INCLUDE_ras" = xyes; then
-+ INCLUDE_RAS_TRUE=
-+ INCLUDE_RAS_FALSE='#'
++ if test x"$INCLUDE_jasper" = xyes; then
++ INCLUDE_JASPER_TRUE=
++ INCLUDE_JASPER_FALSE='#'
+else
-+ INCLUDE_RAS_TRUE='#'
-+ INCLUDE_RAS_FALSE=
++ INCLUDE_JASPER_TRUE='#'
++ INCLUDE_JASPER_FALSE=
+fi
- # msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
@@ -29968,9 +29798,11 @@
-$as_echo_n "checking for gethostbyname... " >&6; }
-if test "${ac_cv_func_gethostbyname+set}" = set; then
- $as_echo_n "(cached) " >&6
-+ if test x"$INCLUDE_tiff" = xyes; then
-+ INCLUDE_TIFF_TRUE=
-+ INCLUDE_TIFF_FALSE='#'
++# 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
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -29981,43 +29813,68 @@
-/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define gethostbyname innocuous_gethostbyname
-+ INCLUDE_TIFF_TRUE='#'
-+ INCLUDE_TIFF_FALSE=
++ INCLUDE_GDIPLUS_TRUE='#'
++ INCLUDE_GDIPLUS_FALSE=
+fi
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char gethostbyname (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+ if test x"$INCLUDE_xpm" = xyes; then
-+ INCLUDE_XPM_TRUE=
-+ INCLUDE_XPM_FALSE='#'
-+else
-+ INCLUDE_XPM_TRUE='#'
-+ INCLUDE_XPM_FALSE=
-+fi
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-+ if test x"$INCLUDE_xbm" = xyes; then
-+ INCLUDE_XBM_TRUE=
-+ INCLUDE_XBM_FALSE='#'
++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
-+ INCLUDE_XBM_TRUE='#'
-+ INCLUDE_XBM_FALSE=
-+fi
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
-#undef gethostbyname
-+ if test x"$INCLUDE_tga" = xyes; then
-+ INCLUDE_TGA_TRUE=
-+ INCLUDE_TGA_FALSE='#'
-+else
-+ INCLUDE_TGA_TRUE='#'
-+ INCLUDE_TGA_FALSE=
-+fi
++ #include <gio/gio.h>
++ static const gsize data_size = 159;
++ static const guint8 data[] =
++ {
++ 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
++ 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01,
++ 0x08, 0x02, 0x00, 0x00, 0x00, 0x90, 0x77, 0x53, 0xde, 0x00, 0x00, 0x00,
++ 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
++ 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00,
++ 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74,
++ 0x49, 0x4d, 0x45, 0x07, 0xd8, 0x07, 0x0f, 0x10, 0x08, 0x15, 0x61, 0xd8,
++ 0x35, 0x37, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f,
++ 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
++ 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0x57,
++ 0x81, 0x0e, 0x17, 0x00, 0x00, 0x00, 0x0c, 0x49, 0x44, 0x41, 0x54, 0x08,
++ 0xd7, 0x63, 0xf8, 0xff, 0xff, 0x3f, 0x00, 0x05, 0xfe, 0x02, 0xfe, 0xdc,
++ 0xcc, 0x59, 0xe7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
++ 0x42, 0x60, 0x82
++ };
++ int
++ main (int argc, char **argv)
++ {
++ char *content_type;
++ char *image_png;
++ content_type = g_content_type_guess (NULL, data, data_size, NULL);
++ image_png = g_content_type_from_mime_type ("image/png");
++ return !!strcmp (content_type, image_png);
++ }
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++ gio_can_sniff=yes
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -30032,13 +29889,7 @@
-#if defined __stub_gethostbyname || defined __stub___gethostbyname
-choke me
-#endif
-+ if test x"$INCLUDE_pcx" = xyes; then
-+ INCLUDE_PCX_TRUE=
-+ INCLUDE_PCX_FALSE='#'
-+else
-+ INCLUDE_PCX_TRUE='#'
-+ INCLUDE_PCX_FALSE=
-+fi
++$as_echo "#define GDK_PIXBUF_USE_GIO_MIME 1" >>confdefs.h
-int
-main ()
@@ -30070,36 +29921,36 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_gethostbyname=yes
-+ 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=
++ 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
++
++ { $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; }
- ac_cv_func_gethostbyname=no
-+ if test x"$INCLUDE_jasper" = xyes; then
-+ INCLUDE_JASPER_TRUE=
-+ INCLUDE_JASPER_FALSE='#'
-+else
-+ INCLUDE_JASPER_TRUE='#'
-+ INCLUDE_JASPER_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
-+# 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=
++# Check whether --with-included_immodules was given.
++if test "${with_included_immodules+set}" = set; then :
++ withval=$with_included_immodules;
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-$as_echo "$ac_cv_func_gethostbyname" >&6; }
@@ -30109,20 +29960,7 @@
-$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
- $as_echo_n "(cached) " >&6
-+
-+if test x$gio_can_sniff = x; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if gio can sniff png" >&5
-+$as_echo_n "checking if gio can sniff png... " >&6; }
-+ gtk_save_LIBS="$LIBS"
-+ gtk_save_CFLAGS="$CFLAGS"
-+ LIBS="`$PKG_CONFIG --libs gio-2.0`"
-+ CFLAGS="`$PKG_CONFIG --cflags gio-2.0`"
-+ if test "$cross_compiling" = yes; then :
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot run test program while cross compiling
-+See \`config.log' for more details." "$LINENO" 5; }
- else
+-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnsl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
@@ -30130,8 +29968,7 @@
-_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
@@ -30170,75 +30007,34 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_nsl_gethostbyname=yes
--else
++if $dynworks; then
++ :
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ #include <gio/gio.h>
-+ 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
-
+-
- ac_cv_lib_nsl_gethostbyname=no
-+$as_echo "#define GDK_PIXBUF_USE_GIO_MIME 1" >>confdefs.h
-+
-+else
-+ 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
++ ## 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
-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
-+ { $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"
++all_immodules="am-et,cedilla,cyrillic-translit"
++if test "$gdktarget" = "win32"; then
++ all_immodules="${all_immodules},ime"
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"
-+
-+#
-+# Allow building some or all immodules included
-+#
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking immodules to build" >&5
-+$as_echo_n "checking immodules to build... " >&6; }
-+
-+
-+# Check whether --with-included_immodules was given.
-+if test "${with_included_immodules+set}" = set; then :
-+ withval=$with_included_immodules;
++all_immodules="${all_immodules},inuktitut,ipa,multipress,thai,ti-er,ti-et,viqr"
++if test "$gdktarget" = "x11"; then
++ all_immodules="${all_immodules},xim"
fi
- if test $ac_cv_lib_nsl_gethostbyname = no; then
@@ -30246,7 +30042,11 @@
-$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
++included_immodules=""
++# If the switch specified without listing any specific ones, include all
++if test "x$with_included_immodules" = xyes ; then
++ included_immodules="$all_immodules"
+ else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lbsd $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
@@ -30255,6 +30055,8 @@
-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
@@ -30293,45 +30095,35 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_bsd_gethostbyname=yes
-+if $dynworks; then
-+ :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $included_immodules" >&5
++$as_echo "$included_immodules" >&6; }
++ if test "x$included_immodules" != x; then
++ HAVE_INCLUDED_IMMMODULES_TRUE=
++ HAVE_INCLUDED_IMMMODULES_FALSE='#'
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_bsd_gethostbyname=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
++ HAVE_INCLUDED_IMMMODULES_TRUE='#'
++ HAVE_INCLUDED_IMMMODULES_FALSE=
fi
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-+all_immodules="am-et,cedilla,cyrillic-translit"
-+if test "$gdktarget" = "win32"; then
-+ all_immodules="${all_immodules},ime"
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_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"
-+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
- fi
- fi
-+included_immodules=""
-+# If the switch specified without listing any specific ones, include all
-+if test "x$with_included_immodules" = xyes ; then
-+ included_immodules="$all_immodules"
-+else
-+ included_immodules="$with_included_immodules"
-+fi
++INCLUDED_IMMODULE_OBJ=
++INCLUDED_IMMODULE_DEFINE=
- # lieder at skyler.mavd.honeywell.com says without -lsocket,
- # socket/setsockopt and other routines are undefined under SCO ODT
@@ -30344,12 +30136,7 @@
-$as_echo_n "checking for connect... " >&6; }
-if test "${ac_cv_func_connect+set}" = set; then
- $as_echo_n "(cached) " >&6
-+{ $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
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -30359,24 +30146,6 @@
-/* Define connect to an innocuous variant, in case <limits.h> declares connect.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define connect innocuous_connect
-+ HAVE_INCLUDED_IMMMODULES_TRUE='#'
-+ HAVE_INCLUDED_IMMMODULES_FALSE=
-+fi
-
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char connect (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
-
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-+INCLUDED_IMMODULE_OBJ=
-+INCLUDED_IMMODULE_DEFINE=
-
--#undef connect
+IFS="${IFS= }"; gtk_save_ifs="$IFS"; IFS=","
+for immodule in $included_immodules; do
+ immodule_underscores=`echo $immodule | sed -e 's/-/_/g'`
@@ -30385,6 +30154,24 @@
+ else
+ as_fn_error "the specified input method $immodule does not exist" "$LINENO" 5
+ fi
+
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char connect (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
++ INCLUDED_IMMODULE_OBJ="$INCLUDED_IMMODULE_OBJ ../modules/input/libstatic-im-$immodule.la"
++ INCLUDED_IMMODULE_DEFINE="$INCLUDED_IMMODULE_DEFINE -DINCLUDE_IM_$immodule_underscores"
++ eval INCLUDE_$immodule_underscores=yes
++done
++IFS="$gtk_save_ifs"
+
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+
+-#undef connect
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -30399,11 +30186,13 @@
-#if defined __stub_connect || defined __stub___connect
-choke me
-#endif
-+ 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
-int
-main ()
@@ -30435,30 +30224,17 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_connect=yes
-+
-+
-+ if test x"$INCLUDE_am_et" = xyes; then
-+ INCLUDE_IM_AM_ET_TRUE=
-+ INCLUDE_IM_AM_ET_FALSE='#'
++ if test x"$INCLUDE_cedilla" = xyes; then
++ INCLUDE_IM_CEDILLA_TRUE=
++ INCLUDE_IM_CEDILLA_FALSE='#'
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ INCLUDE_IM_AM_ET_TRUE='#'
-+ INCLUDE_IM_AM_ET_FALSE=
-+fi
-
-- ac_cv_func_connect=no
-+ 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
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
++fi
+
+- ac_cv_func_connect=no
+ if test x"$INCLUDE_cyrillic_translit" = xyes; then
+ INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE=
+ INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE='#'
@@ -30466,6 +30242,17 @@
+ INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE='#'
+ INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE=
fi
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++ if test x"$INCLUDE_ime" = xyes; then
++ INCLUDE_IM_IME_TRUE=
++ INCLUDE_IM_IME_FALSE='#'
++else
++ INCLUDE_IM_IME_TRUE='#'
++ INCLUDE_IM_IME_FALSE=
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-$as_echo "$ac_cv_func_connect" >&6; }
@@ -30474,9 +30261,9 @@
-$as_echo_n "checking for connect in -lsocket... " >&6; }
-if test "${ac_cv_lib_socket_connect+set}" = set; then
- $as_echo_n "(cached) " >&6
-+ if test x"$INCLUDE_ime" = xyes; then
-+ INCLUDE_IM_IME_TRUE=
-+ INCLUDE_IM_IME_FALSE='#'
++ if test x"$INCLUDE_inuktitut" = xyes; then
++ INCLUDE_IM_INUKTITUT_TRUE=
++ INCLUDE_IM_INUKTITUT_FALSE='#'
else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
@@ -30486,8 +30273,8 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+ INCLUDE_IM_IME_TRUE='#'
-+ INCLUDE_IM_IME_FALSE=
++ INCLUDE_IM_INUKTITUT_TRUE='#'
++ INCLUDE_IM_INUKTITUT_FALSE=
+fi
-/* Override any GCC internal prototype to avoid an error.
@@ -30527,16 +30314,6 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_socket_connect=yes
-+ if test x"$INCLUDE_inuktitut" = xyes; then
-+ INCLUDE_IM_INUKTITUT_TRUE=
-+ INCLUDE_IM_INUKTITUT_FALSE='#'
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+ INCLUDE_IM_INUKTITUT_TRUE='#'
-+ INCLUDE_IM_INUKTITUT_FALSE=
-+fi
-+
+ if test x"$INCLUDE_ipa" = xyes; then
+ INCLUDE_IM_IPA_TRUE=
+ INCLUDE_IM_IPA_FALSE='#'
@@ -30556,20 +30333,26 @@
+ if test x"$INCLUDE_thai" = xyes; then
+ INCLUDE_IM_THAI_TRUE=
+ INCLUDE_IM_THAI_FALSE='#'
-+else
+ 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_lib_socket_connect=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
-
-- ac_cv_lib_socket_connect=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
+ if test x"$INCLUDE_ti_et" = xyes; then
+ INCLUDE_IM_TI_ET_TRUE=
+ INCLUDE_IM_TI_ET_FALSE='#'
@@ -30577,11 +30360,11 @@
+ INCLUDE_IM_TI_ET_TRUE='#'
+ INCLUDE_IM_TI_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
--LIBS=$ac_check_lib_save_LIBS
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
+-$as_echo "$ac_cv_lib_socket_connect" >&6; }
+-if test "x$ac_cv_lib_socket_connect" = x""yes; then
+- X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
++
+ if test x"$INCLUDE_viqr" = xyes; then
+ INCLUDE_IM_VIQR_TRUE=
+ INCLUDE_IM_VIQR_FALSE='#'
@@ -30589,25 +30372,21 @@
+ INCLUDE_IM_VIQR_TRUE='#'
+ INCLUDE_IM_VIQR_FALSE=
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
+ if test x"$INCLUDE_xim" = xyes; then
+ INCLUDE_IM_XIM_TRUE=
+ INCLUDE_IM_XIM_FALSE='#'
+else
+ INCLUDE_IM_XIM_TRUE='#'
+ INCLUDE_IM_XIM_FALSE=
- fi
-
-- fi
++fi
- # Guillermo Gomez says -lposix is necessary on A/UX.
- { $as_echo "$as_me:$LINENO: checking for remove" >&5
-$as_echo_n "checking for remove... " >&6; }
-if test "${ac_cv_func_remove+set}" = set; then
++
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
+$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
+if test "${ac_cv_header_sys_wait_h+set}" = set; then :
@@ -30883,9 +30662,10 @@
-# include <assert.h>
-#endif
+$as_echo "#define HAVE_SYS_SYSTEMINFO_H 1" >>confdefs.h
++
++fi
-#undef shmat
-+fi
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -30900,6 +30680,8 @@
-#if defined __stub_shmat || defined __stub___shmat
-choke me
-#endif
++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 :
-int
-main ()
@@ -30934,17 +30716,15 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ac_fn_c_check_header_mongrel "$LINENO" "sys/sysinfo.h" "ac_cv_header_sys_sysinfo_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_sysinfo_h" = x""yes; then :
++$as_echo "#define HAVE_SYS_SYSINFO_H 1" >>confdefs.h
- ac_cv_func_shmat=no
--fi
-+$as_echo "#define HAVE_SYS_SYSINFO_H 1" >>confdefs.h
+ fi
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-$as_echo "$ac_cv_func_shmat" >&6; }
@@ -30952,7 +30732,6 @@
- { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
-$as_echo_n "checking for shmat in -lipc... " >&6; }
-if test "${ac_cv_lib_ipc_shmat+set}" = set; then
-+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mediaLib 2.3" >&5
+$as_echo_n "checking for mediaLib 2.3... " >&6; }
@@ -30990,7 +30769,7 @@
;
return 0;
}
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -31013,6 +30792,7 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_ipc_shmat=yes
++_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_mlib_mlib_ImageSetStruct=yes
else
@@ -31045,10 +30825,6 @@
- fi
- fi
+if test $use_mlib = yes; then
-+
-+$as_echo "#define USE_MEDIALIB 1" >>confdefs.h
-+
-+ MEDIA_LIB=-lmlib
- # Check for libraries that X11R6 Xt/Xaw programs need.
- ac_save_LDFLAGS=$LDFLAGS
@@ -31062,6 +30838,10 @@
- { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
-$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
-if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
++$as_echo "#define USE_MEDIALIB 1" >>confdefs.h
++
++ MEDIA_LIB=-lmlib
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mediaLib 2.5" >&5
+$as_echo_n "checking for mediaLib 2.5... " >&6; }
+ # Check for a mediaLib 2.5 function since that is what is needed for
@@ -31083,7 +30863,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -28800,499 +22418,554 @@
+@@ -28800,499 +22418,582 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -31151,10 +30931,15 @@
- LDFLAGS=$ac_save_LDFLAGS
+ if test $use_mlib25 = yes; then
-+
+
+-fi
+$as_echo "#define USE_MEDIALIB25 1" >>confdefs.h
-+
-+ fi
+
+- if test x$no_x = xyes ; then
+- { { $as_echo "$as_me:$LINENO: error: X development libraries not found" >&5
+-$as_echo "$as_me: error: X development libraries not found" >&2;}
+- { (exit 1); exit 1; }; }
+ fi
+fi
+ if test $use_mlib = yes; then
+ USE_MEDIALIB_TRUE=
@@ -31164,19 +30949,23 @@
+ USE_MEDIALIB_FALSE=
+fi
+- x_cflags="$X_CFLAGS"
+- x_libs_for_checks="$X_LIBS -lXext -lXrender -lX11 $X_EXTRA_LIBS"
+ if test $use_mlib25 = yes; then
+ USE_MEDIALIB25_TRUE=
+ USE_MEDIALIB25_FALSE='#'
+else
+ USE_MEDIALIB25_TRUE='#'
+ USE_MEDIALIB25_FALSE=
- fi
-
-- if test x$no_x = xyes ; then
-- { { $as_echo "$as_me:$LINENO: error: X development libraries not found" >&5
--$as_echo "$as_me: error: X development libraries not found" >&2;}
-- { (exit 1); exit 1; }; }
-+
++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"
+- fi
+
+- # Extra libraries found during checks (-lXinerama, etc), not from pkg-config.
+- x_extra_libs=
+# 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.)
@@ -31194,12 +30983,16 @@
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_x86_asm" >&5
+$as_echo "$use_x86_asm" >&6; }
-+
+
+- gtk_save_cppflags="$CPPFLAGS"
+- CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+use_mmx_asm=no
+if test $use_x86_asm = yes; then
+ save_ac_ext=$ac_ext
+ ac_ext=S
-+
+
+- gtk_save_LIBS=$LIBS
+- LIBS="$x_libs_for_checks $LIBS"
+ { $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
@@ -31209,25 +31002,22 @@
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ use_mmx_asm=yes
- fi
-
-- x_cflags="$X_CFLAGS"
-- x_libs_for_checks="$X_LIBS -lXext -lXrender -lX11 $X_EXTRA_LIBS"
++ fi
+
+- # 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.
+- { $as_echo "$as_me:$LINENO: checking for XOpenDisplay" >&5
+-$as_echo_n "checking for XOpenDisplay... " >&6; }
+-if test "${ac_cv_func_XOpenDisplay+set}" = set; then
+- $as_echo_n "(cached) " >&6
+ rm -rf conftest*
-
-- GDK_PIXBUF_XLIB_EXTRA_CFLAGS="$x_cflags"
-- GDK_PIXBUF_XLIB_EXTRA_LIBS="$X_LIBS -lX11 $X_EXTRA_LIBS"
-- GTK_DEP_LIBS_FOR_X="$X_LIBS -lXrender -lX11 $X_EXTRA_LIBS"
-- fi
++
+ ac_ext=$save_ac_ext
+ if test $use_mmx_asm = yes; then
-
-- # Extra libraries found during checks (-lXinerama, etc), not from pkg-config.
-- x_extra_libs=
++
+$as_echo "#define USE_MMX 1" >>confdefs.h
-
-- gtk_save_cppflags="$CPPFLAGS"
-- CPPFLAGS="$CPPFLAGS $X_CFLAGS"
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ else
@@ -31235,46 +31025,10 @@
+$as_echo "no" >&6; }
+ fi
+fi
-
-- gtk_save_LIBS=$LIBS
-- LIBS="$x_libs_for_checks $LIBS"
++
+ if test x$use_mmx_asm = xyes; then
+ USE_MMX_TRUE=
+ USE_MMX_FALSE='#'
-+else
-+ USE_MMX_TRUE='#'
-+ USE_MMX_FALSE=
-+fi
-
-- # 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.
-- { $as_echo "$as_me:$LINENO: checking for XOpenDisplay" >&5
--$as_echo_n "checking for XOpenDisplay... " >&6; }
--if test "${ac_cv_func_XOpenDisplay+set}" = set; then
-+
-+REBUILD_PNGS=
-+if test -z "$LIBPNG" && test x"$os_win32" = xno -o x$enable_gdiplus = xno; then
-+ REBUILD_PNGS=#
-+fi
-+
-+
-+ if test $cross_compiling = yes; then
-+ CROSS_COMPILING_TRUE=
-+ CROSS_COMPILING_FALSE='#'
-+else
-+ CROSS_COMPILING_TRUE='#'
-+ CROSS_COMPILING_FALSE=
-+fi
-+
-+
-+if test $cross_compiling = yes; then
-+ # Extract the first word of "gdk-pixbuf-csource", so it can be a program name with args.
-+set dummy gdk-pixbuf-csource; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_GDK_PIXBUF_CSOURCE+set}" = set; then :
- $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -31285,6 +31039,70 @@
-/* Define XOpenDisplay to an innocuous variant, in case <limits.h> declares XOpenDisplay.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define XOpenDisplay innocuous_XOpenDisplay
++ USE_MMX_TRUE='#'
++ USE_MMX_FALSE=
++fi
+
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char XOpenDisplay (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++REBUILD_PNGS=
++if test -z "$LIBPNG" && test x"$os_win32" = xno -o x$enable_gdiplus = xno; then
++ REBUILD_PNGS=#
++fi
+
+-#undef XOpenDisplay
+
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char XOpenDisplay ();
+-/* 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_XOpenDisplay || defined __stub___XOpenDisplay
+-choke me
+-#endif
++ if test $cross_compiling = yes; then
++ CROSS_COMPILING_TRUE=
++ CROSS_COMPILING_FALSE='#'
++else
++ CROSS_COMPILING_TRUE='#'
++ CROSS_COMPILING_FALSE=
++fi
+
+-int
+-main ()
+-{
+-return XOpenDisplay ();
+- ;
+- 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;;
++
++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
+ case $GDK_PIXBUF_CSOURCE in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_GDK_PIXBUF_CSOURCE="$GDK_PIXBUF_CSOURCE" # Let the user override the test with a path.
@@ -31304,31 +31122,40 @@
+done
+ done
+IFS=$as_save_IFS
-
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char XOpenDisplay (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
++
+ test -z "$ac_cv_path_GDK_PIXBUF_CSOURCE" && ac_cv_path_GDK_PIXBUF_CSOURCE="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
+- 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_XOpenDisplay=yes
+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
+ 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
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-
--#undef XOpenDisplay
+- ac_cv_func_XOpenDisplay=no
++
+ # 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
@@ -31367,136 +31194,16 @@
+else
+ { $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
+
+ if test x$GTK_UPDATE_ICON_CACHE = xno; then
+ REBUILD_PNGS=#
+ fi
-+fi
-+
-+if test ! -f $srcdir/gtk/gtkbuiltincache.h &&
-+ test "x$REBUILD_PNGS" = "x#" ; then
-+ as_fn_error "
-+*** gtkbuiltincache.h is not in the tree, and cannot be built
-+*** because you don't have libpng, or (when cross-compiling) you
-+*** don't have a prebuilt gtk-update-icon-cache on the build system." "$LINENO" 5
-+fi
-+
-+
-+
-+GDK_PIXBUF_PACKAGES="gmodule-no-export-2.0 gobject-2.0 gio-2.0"
-+GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB $MEDIA_LIB"
-+GDK_PIXBUF_EXTRA_CFLAGS=
-+GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
-+GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
-+
-+########################################
-+# Windowing system checks
-+########################################
-+
-+GDK_PIXBUF_XLIB_PACKAGES=
-+GDK_PIXBUF_XLIB_EXTRA_CFLAGS=
-+GDK_PIXBUF_XLIB_EXTRA_LIBS=
-+
-+GDK_EXTRA_LIBS="$GDK_WLIBS"
-+GDK_EXTRA_CFLAGS=
-+
-+# GTK+ uses some X calls, so needs to link against X directly
-+GTK_DEP_PACKAGES_FOR_X=
-+GTK_DEP_LIBS_FOR_X=
-+
-+if test "x$gdktarget" = "xx11"; then
-+ X_PACKAGES=fontconfig
-+
-+ #
-+ # We use fontconfig very peripherally when decoding the default
-+ # settings.
-+ #
-+ if $PKG_CONFIG --exists fontconfig; then : ; else
-+ as_fn_error "
-+*** fontconfig (http://www.fontconfig.org) is required by the X11 backend." "$LINENO" 5
-+ fi
-+
-+ #
-+ # Check for basic X packages; we use pkg-config if available
-+ #
-+ if $PKG_CONFIG --exists x11 xext xrender; then
-+ have_base_x_pc=true
-+ X_PACKAGES="$X_PACKAGES x11 xext xrender"
-+ x_libs="`$PKG_CONFIG --libs x11 xext xrender`"
-+ X_CFLAGS="`$PKG_CONFIG --cflags x11 xext xrender`"
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char XOpenDisplay ();
--/* 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_XOpenDisplay || defined __stub___XOpenDisplay
--choke me
--#endif
-+ # 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
-
--int
--main ()
--{
--return XOpenDisplay ();
-- ;
-- 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_XOpenDisplay=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+ 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; }
-
-- ac_cv_func_XOpenDisplay=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
+ 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
@@ -31505,103 +31212,50 @@
- { { $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; }; }
-+# Check whether --with-x was given.
-+if test "${with_x+set}" = set; then :
-+ withval=$with_x;
++
++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
- { $as_echo "$as_me:$LINENO: checking for XextFindDisplay" >&5
-$as_echo_n "checking for XextFindDisplay... " >&6; }
-if test "${ac_cv_func_XextFindDisplay+set}" = set; then
-+# $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
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+ # One or both of the vars are not set, and there is no cached value.
-+ac_x_includes=no ac_x_libraries=no
-+rm -f -r conftest.dir
-+if mkdir conftest.dir; then
-+ cd conftest.dir
-+ cat >Imakefile <<'_ACEOF'
-+incroot:
-+ @echo incroot='${INCROOT}'
-+usrlibdir:
-+ @echo usrlibdir='${USRLIBDIR}'
-+libdir:
-+ @echo libdir='${LIBDIR}'
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define XextFindDisplay to an innocuous variant, in case <limits.h> declares XextFindDisplay.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define XextFindDisplay innocuous_XextFindDisplay
-+ if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
-+ # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-+ for ac_var in incroot usrlibdir libdir; do
-+ eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
-+ done
-+ # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-+ for ac_extension in a so sl dylib la dll; do
-+ if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
-+ test -f "$ac_im_libdir/libX11.$ac_extension"; then
-+ ac_im_usrlibdir=$ac_im_libdir; break
-+ fi
-+ done
-+ # Screen out bogus values from the imake configuration. They are
-+ # bogus both because they are the default anyway, and because
-+ # using them would break gcc on systems where it needs fixed includes.
-+ case $ac_im_incroot in
-+ /usr/include) ac_x_includes= ;;
-+ *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
-+ esac
-+ case $ac_im_usrlibdir in
-+ /usr/lib | /usr/lib64 | /lib | /lib64) ;;
-+ *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
-+ esac
-+ fi
-+ cd ..
-+ rm -f -r conftest.dir
-+fi
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char XextFindDisplay (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> 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 <limits.h>
-#else
-# include <assert.h>
-#endif
-+/usr/include/X11
-+/usr/include/X11R7
-+/usr/include/X11R6
-+/usr/include/X11R5
-+/usr/include/X11R4
++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"
-#undef XextFindDisplay
-+/usr/local/X11/include
-+/usr/local/X11R7/include
-+/usr/local/X11R6/include
-+/usr/local/X11R5/include
-+/usr/local/X11R4/include
++########################################
++# Windowing system checks
++########################################
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -31616,11 +31270,9 @@
-#if defined __stub_XextFindDisplay || defined __stub___XextFindDisplay
-choke me
-#endif
-+/usr/local/include/X11
-+/usr/local/include/X11R7
-+/usr/local/include/X11R6
-+/usr/local/include/X11R5
-+/usr/local/include/X11R4
++GDK_PIXBUF_XLIB_PACKAGES=
++GDK_PIXBUF_XLIB_EXTRA_CFLAGS=
++GDK_PIXBUF_XLIB_EXTRA_LIBS=
-int
-main ()
@@ -31655,18 +31307,14 @@
-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
++GDK_EXTRA_LIBS="$GDK_WLIBS"
++GDK_EXTRA_CFLAGS=
- ac_cv_func_XextFindDisplay=no
-fi
-+/usr/include
-+/usr/local/include
-+/usr/unsupported/include
-+/usr/athena/include
-+/usr/local/x11r5/include
-+/usr/lpp/Xamples/include
++# GTK+ uses some X calls, so needs to link against X directly
++GTK_DEP_PACKAGES_FOR_X=
++GTK_DEP_LIBS_FOR_X=
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -31676,68 +31324,147 @@
-$as_echo "$ac_cv_func_XextFindDisplay" >&6; }
-if test "x$ac_cv_func_XextFindDisplay" = x""yes; then
- :
-+/usr/openwin/include
-+/usr/openwin/share/include'
-+
-+if test "$ac_x_includes" = no; then
-+ # Guess where to find include files, by looking for Xlib.h.
-+ # First, try using that file with no special directory specified.
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <X11/Xlib.h>
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+ # We can compile using X headers with no special include directory.
-+ac_x_includes=
- else
+-else
- { { $as_echo "$as_me:$LINENO: error: *** libXext not found. Check 'config.log' for more details." >&5
-$as_echo "$as_me: error: *** libXext not found. Check 'config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
-+ for ac_dir in $ac_x_header_dirs; do
-+ if test -r "$ac_dir/X11/Xlib.h"; then
-+ ac_x_includes=$ac_dir
-+ break
++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
-+done
++
++ #
++ # 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
++ have_base_x_pc=false
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
++$as_echo_n "checking for X... " >&6; }
++
++
++# Check whether --with-x was given.
++if test "${with_x+set}" = set; then :
++ withval=$with_x;
fi
-+rm -f conftest.err conftest.$ac_ext
-+fi # $ac_x_includes = no
- { $as_echo "$as_me:$LINENO: checking for XRenderQueryExtension" >&5
-$as_echo_n "checking for XRenderQueryExtension... " >&6; }
-if test "${ac_cv_func_XRenderQueryExtension+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
++# $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
-+if test "$ac_x_libraries" = no; then
-+ # Check for the libraries.
-+ # See if we find them without any special options.
-+ # Don't add to $LIBS permanently.
-+ ac_save_LIBS=$LIBS
-+ LIBS="-lX11 $LIBS"
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-/* Define XRenderQueryExtension to an innocuous variant, in case <limits.h> declares XRenderQueryExtension.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define XRenderQueryExtension innocuous_XRenderQueryExtension
--
++ 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 XRenderQueryExtension (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> 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 <limits.h>
-#else
-# include <assert.h>
-#endif
--
++/usr/include/X11
++/usr/include/X11R7
++/usr/include/X11R6
++/usr/include/X11R5
++/usr/include/X11R4
+
-#undef XRenderQueryExtension
--
++/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. */
@@ -31751,7 +31478,55 @@
-#if defined __stub_XRenderQueryExtension || defined __stub___XRenderQueryExtension
-choke me
-#endif
--
++/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 <X11/Xlib.h>
++_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 <X11/Xlib.h>
int
main ()
@@ -31760,8 +31535,8 @@
+XrmInitialize ()
;
return 0;
- }
- _ACEOF
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -31784,6 +31559,8 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_XRenderQueryExtension=yes
++}
++_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ LIBS=$ac_save_LIBS
+# We can link X programs with no special library path.
@@ -31995,25 +31772,10 @@
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
- # Check for XConvertCase, XInternAtoms (X11R6 specific)
--
--
+ # Check for system-dependent libraries X programs must link with.
+ # Do this before checking for the system-independent R6 libraries
+ # (-lICE), since we may need -lsocket or whatever for X linking.
--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
-- $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
+ if test "$ISC" = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
+ else
@@ -32022,6 +31784,45 @@
+ # the Alpha needs dnet_stub (dnet does not exist).
+ ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char XOpenDisplay ();
++int
++main ()
++{
++return XOpenDisplay ();
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; 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
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
++$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
++if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
+ $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="-ldnet $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
@@ -32042,7 +31843,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -29300,103 +22973,27 @@
+@@ -29300,103 +23001,40 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -32054,12 +31855,12 @@
-choke me
-#endif
-
-+char XOpenDisplay ();
++char dnet_ntoa ();
int
main ()
{
-return $ac_func ();
-+return XOpenDisplay ();
++return dnet_ntoa ();
;
return 0;
}
@@ -32086,17 +31887,23 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
--else
++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
-
- eval "$as_ac_var=no"
--fi
++ ac_cv_lib_dnet_dnet_ntoa=no
+ fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+ fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -32108,24 +31915,27 @@
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
--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
-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
-+if ac_fn_c_try_link "$LINENO"; then :
-
+-
- 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
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
-+$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
-+if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
++ if test $ac_cv_lib_dnet_dnet_ntoa = no; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
++$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
++if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -32134,7 +31944,7 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldnet $LIBS"
++LIBS="-ldnet_stub $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Define XAddConnectionWatch to an innocuous variant, in case <limits.h> declares XAddConnectionWatch.
@@ -32156,7 +31966,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -29404,118 +23001,40 @@
+@@ -29404,118 +23042,59 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -32230,36 +32040,69 @@
-if $have_x11r6; then
- HAVE_X11R6_TRUE=
- HAVE_X11R6_FALSE='#'
--else
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
- HAVE_X11R6_TRUE='#'
- HAVE_X11R6_FALSE=
--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
+
++ fi
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++ LIBS="$ac_xsave_LIBS"
+
- # Check for XKB support.
-
- if test "x$enable_xkb" = "xyes"; then
- { $as_echo "$as_me:$LINENO: WARNING: XKB support explicitly enabled" >&5
-$as_echo "$as_me: WARNING: XKB support explicitly enabled" >&2;}
--
++ # msh at 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 :
+
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_XKB 1
-_ACEOF
--
++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
-- $as_echo_n "(cached) " >&6
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_dnet_dnet_ntoa=yes
++ if test $ac_cv_func_gethostbyname = no; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
++$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
++if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lnsl $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-/* Define XkbQueryExtension to an innocuous variant, in case <limits.h> declares XkbQueryExtension.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define XkbQueryExtension innocuous_XkbQueryExtension
@@ -32274,33 +32117,12 @@
-#else
-# include <assert.h>
-#endif
-+ ac_cv_lib_dnet_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_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
-
+-
-#undef XkbQueryExtension
-+ if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
-+$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
-+if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldnet_stub $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
-@@ -29523,99 +23042,59 @@
+@@ -29523,99 +23102,40 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -32312,12 +32134,12 @@
-choke me
-#endif
-
-+char dnet_ntoa ();
++char gethostbyname ();
int
main ()
{
-return XkbQueryExtension ();
-+return dnet_ntoa ();
++return gethostbyname ();
;
return 0;
}
@@ -32345,13 +32167,13 @@
- }; then
- ac_cv_func_XkbQueryExtension=yes
+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_dnet_stub_dnet_ntoa=yes
++ ac_cv_lib_nsl_gethostbyname=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_XkbQueryExtension=no
-+ ac_cv_lib_dnet_stub_dnet_ntoa=no
++ ac_cv_lib_nsl_gethostbyname=no
fi
-
-rm -rf conftest.dSYM
@@ -32360,11 +32182,6 @@
+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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XkbQueryExtension" >&5
-$as_echo "$ac_cv_func_XkbQueryExtension" >&6; }
@@ -32373,38 +32190,27 @@
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_XKB 1
-_ACEOF
-
-+ 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
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+ LIBS="$ac_xsave_LIBS"
- else
- { $as_echo "$as_me:$LINENO: WARNING: XKB support explicitly disabled" >&5
-$as_echo "$as_me: WARNING: XKB support explicitly disabled" >&2;}
- fi
-+ # msh at 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 :
-
+-
- # Check for shaped window extension
-+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_gethostbyname = no; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
-+$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
-+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
++ if test $ac_cv_lib_nsl_gethostbyname = no; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
++$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
++if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -32413,7 +32219,7 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lnsl $LIBS"
++LIBS="-lbsd $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Define XShapeCombineMask to an innocuous variant, in case <limits.h> declares XShapeCombineMask.
@@ -32435,7 +32241,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -29623,97 +23102,40 @@
+@@ -29623,97 +23143,55 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -32480,13 +32286,13 @@
- }; then
- ac_cv_func_XShapeCombineMask=yes
+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_nsl_gethostbyname=yes
++ ac_cv_lib_bsd_gethostbyname=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_XShapeCombineMask=no
-+ ac_cv_lib_nsl_gethostbyname=no
++ ac_cv_lib_bsd_gethostbyname=no
fi
-
-rm -rf conftest.dSYM
@@ -32504,24 +32310,37 @@
- { { $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_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_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
+
- # X SYNC check
- gtk_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $x_cflags"
--
++ # lieder at 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 :
+
- { $as_echo "$as_me:$LINENO: checking for XSyncQueryExtension" >&5
-$as_echo_n "checking for XSyncQueryExtension... " >&6; }
-if test "${ac_cv_func_XSyncQueryExtension+set}" = set; then
-+ if test $ac_cv_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 :
++fi
++
++ 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
- cat >conftest.$ac_ext <<_ACEOF
@@ -32530,7 +32349,7 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lbsd $LIBS"
++LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Define XSyncQueryExtension to an innocuous variant, in case <limits.h> declares XSyncQueryExtension.
@@ -32552,7 +32371,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -29721,150 +23143,153 @@
+@@ -29721,150 +23199,97 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -32564,12 +32383,12 @@
-choke me
-#endif
-
-+char gethostbyname ();
++char connect ();
int
main ()
{
-return XSyncQueryExtension ();
-+return gethostbyname ();
++return connect ();
;
return 0;
}
@@ -32597,40 +32416,33 @@
- }; then
- ac_cv_func_XSyncQueryExtension=yes
+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_bsd_gethostbyname=yes
++ ac_cv_lib_socket_connect=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_XSyncQueryExtension=no
-+ ac_cv_lib_bsd_gethostbyname=no
++ 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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
-+$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
-+if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
-+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
- fi
++
++ fi
++
++ # 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 :
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+ fi
-+ fi
-+
-+ # lieder at skyler.mavd.honeywell.com says without -lsocket,
-+ # socket/setsockopt and other routines are undefined under SCO ODT
-+ # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary
-+ # on later versions), says Simon Leinen: it contains gethostby*
-+ # variants that don't use the name server (or something). -lsocket
-+ # must be given before -lnsl if both are needed. We assume that
-+ # if connect needs -lnsl, so does gethostbyname.
-+ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
-+if test "x$ac_cv_func_connect" = x""yes; then :
-+
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XSyncQueryExtension" >&5
-$as_echo "$ac_cv_func_XSyncQueryExtension" >&6; }
@@ -32639,10 +32451,10 @@
-$as_echo_n "checking for X11/extensions/sync.h... " >&6; }
-if test "${ac_cv_header_X11_extensions_sync_h+set}" = set; then
+
-+ if test $ac_cv_func_connect = no; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
-+$as_echo_n "checking for connect in -lsocket... " >&6; }
-+if test "${ac_cv_lib_socket_connect+set}" = set; then :
++ if test $ac_cv_func_remove = no; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
++$as_echo_n "checking for remove in -lposix... " >&6; }
++if test "${ac_cv_lib_posix_remove+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -32651,7 +32463,7 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
++LIBS="-lposix $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <X11/Xlib.h>
@@ -32663,11 +32475,11 @@
+#ifdef __cplusplus
+extern "C"
+#endif
-+char connect ();
++char remove ();
+int
+main ()
+{
-+return connect ();
++return remove ();
+ ;
+ return 0;
+}
@@ -32692,17 +32504,17 @@
- } && test -s conftest.$ac_objext; then
- ac_cv_header_X11_extensions_sync_h=yes
+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_socket_connect=yes
++ ac_cv_lib_posix_remove=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_header_X11_extensions_sync_h=no
++ ac_cv_lib_posix_remove=no
+ fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ ac_cv_lib_socket_connect=no
- 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
@@ -32719,94 +32531,51 @@
fi
-
-
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
-+$as_echo "$ac_cv_lib_socket_connect" >&6; }
-+if test "x$ac_cv_lib_socket_connect" = x""yes; then :
-+ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_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
- CFLAGS="$gtk_save_CFLAGS"
-+ # 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 :
-
+-
- # Xshm checks
-+fi
-
+-
- if test "x$enable_shm" = "xyes"; then
- # Check for the XShm extension, normally in Xext
- { $as_echo "$as_me:$LINENO: checking for XShmAttach" >&5
-$as_echo_n "checking for XShmAttach... " >&6; }
-if test "${ac_cv_func_XShmAttach+set}" = set; then
-+ if test $ac_cv_func_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
+- $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="-lposix $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-/* Define XShmAttach to an innocuous variant, in case <limits.h> declares XShmAttach.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define XShmAttach innocuous_XShmAttach
-
+-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char XShmAttach (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
++ # 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 :
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.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 ()
-+{
-+return remove ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_posix_remove=yes
-+else
-+ ac_cv_lib_posix_remove=no
+-#endif
+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
-#undef XShmAttach
-+ # 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
-+
+ 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; }
@@ -33016,6 +32785,9 @@
-$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
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5
+-$as_echo "$ac_cv_header_sys_ipc_h" >&6; }
+ # Extra libraries found during checks (-lXinerama, etc), not from pkg-config.
+ x_extra_libs=
+
@@ -33030,22 +32802,6 @@
+ # 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
-+
-+ ac_fn_c_check_func "$LINENO" "XextFindDisplay" "ac_cv_func_XextFindDisplay"
-+if test "x$ac_cv_func_XextFindDisplay" = x""yes; then :
-+ :
-+else
-+ as_fn_error "*** libXext not found. Check 'config.log' for more details." "$LINENO" 5
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5
--$as_echo "$ac_cv_header_sys_ipc_h" >&6; }
-+
-+ ac_fn_c_check_func "$LINENO" "XRenderQueryExtension" "ac_cv_func_XRenderQueryExtension"
-+if test "x$ac_cv_func_XRenderQueryExtension" = x""yes; then :
+ :
else
- # Is the header compilable?
@@ -33056,27 +32812,10 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ as_fn_error "*** libXrender not found. Check 'config.log' for more details." "$LINENO" 5
-+fi
-+
-+
-+ # Check for xReply
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if <X11/extensions/XIproto.h> is needed for xReply" >&5
-+$as_echo_n "checking if <X11/extensions/XIproto.h> is needed for xReply... " >&6; }
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-$ac_includes_default
-#include <sys/ipc.h>
-+#include <X11/Xlibint.h>
-+int
-+main ()
-+{
-+xReply *rep;
-+ ;
-+ return 0;
-+}
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -33096,14 +32835,59 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
++ as_fn_error "*** libX11 not found. Check 'config.log' for more details." "$LINENO" 5
++fi
++
++ ac_fn_c_check_func "$LINENO" "XextFindDisplay" "ac_cv_func_XextFindDisplay"
++if test "x$ac_cv_func_XextFindDisplay" = x""yes; then :
++ :
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ as_fn_error "*** libXext not found. Check 'config.log' for more details." "$LINENO" 5
++fi
+
+- ac_header_compiler=no
++ ac_fn_c_check_func "$LINENO" "XRenderQueryExtension" "ac_cv_func_XRenderQueryExtension"
++if test "x$ac_cv_func_XRenderQueryExtension" = x""yes; then :
++ :
++else
++ as_fn_error "*** libXrender not found. Check 'config.log' for more details." "$LINENO" 5
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
+
+-# Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking sys/ipc.h presence" >&5
+-$as_echo_n "checking sys/ipc.h presence... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
++ # Check for xReply
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if <X11/extensions/XIproto.h> is needed for xReply" >&5
++$as_echo_n "checking if <X11/extensions/XIproto.h> is needed for xReply... " >&6; }
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <X11/Xlibint.h>
++int
++main ()
++{
++xReply *rep;
++ ;
++ return 0;
++}
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
+ /* end confdefs.h. */
+-#include <sys/ipc.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+int
@@ -33113,46 +32897,6 @@
+ ;
+ 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; }
-
-- ac_header_compiler=no
--fi
-+$as_echo "#define NEED_XIPROTO_H_FOR_XREPLY 1" >>confdefs.h
-
-+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
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
-
--# Is the header present?
--{ $as_echo "$as_me:$LINENO: checking sys/ipc.h presence" >&5
--$as_echo_n "checking sys/ipc.h presence... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <sys/ipc.h>
-+ # Check for XConvertCase, XInternAtoms (X11R6 specific)
-+
-+ for ac_func in XConvertCase XInternAtoms
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
@@ -33172,6 +32916,35 @@
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
++if ac_fn_c_try_compile "$LINENO"; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++
++$as_echo "#define NEED_XIPROTO_H_FOR_XREPLY 1" >>confdefs.h
++
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
++$as_echo "unknown" >&6; }
++ as_fn_error "xReply type unavailable. X11 is too old" "$LINENO" 5
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+- ac_header_preproc=no
++ # Check for XConvertCase, XInternAtoms (X11R6 specific)
++
++ for ac_func in XConvertCase XInternAtoms
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
+
+fi
+done
@@ -33186,71 +32959,11 @@
+ ac_fn_c_check_func "$LINENO" "XAddConnectionWatch" "ac_cv_func_XAddConnectionWatch"
+if test "x$ac_cv_func_XAddConnectionWatch" = x""yes; then :
+ have_x11r6=true
-+fi
-+
-+
-+ if $have_x11r6; then
-+
-+$as_echo "#define HAVE_X11R6 1" >>confdefs.h
-+
-+ fi
-+ if $have_x11r6; then
-+ HAVE_X11R6_TRUE=
-+ HAVE_X11R6_FALSE='#'
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+ HAVE_X11R6_TRUE='#'
-+ HAVE_X11R6_FALSE=
-+fi
-+
-+
-+ # Check for XKB support.
-+
-+ if test "x$enable_xkb" = "xyes"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: XKB support explicitly enabled" >&5
-+$as_echo "$as_me: WARNING: XKB support explicitly enabled" >&2;}
-+
-+$as_echo "#define HAVE_XKB 1" >>confdefs.h
-+
-+ elif test "x$enable_xkb" = "xmaybe"; then
-+ ac_fn_c_check_func "$LINENO" "XkbQueryExtension" "ac_cv_func_XkbQueryExtension"
-+if test "x$ac_cv_func_XkbQueryExtension" = x""yes; then :
-+
-+$as_echo "#define HAVE_XKB 1" >>confdefs.h
-
-- 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; }
-+ 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_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_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 <X11/Xlib.h>
-+"
-+if test "x$ac_cv_header_X11_extensions_sync_h" = x""yes; then :
-+
-+$as_echo "#define HAVE_XSYNC 1" >>confdefs.h
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -33286,13 +32999,36 @@
-$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 $have_x11r6; then
++
++$as_echo "#define HAVE_X11R6 1" >>confdefs.h
++
++ fi
++ if $have_x11r6; then
++ HAVE_X11R6_TRUE=
++ HAVE_X11R6_FALSE='#'
else
- ac_cv_header_sys_ipc_h=$ac_header_preproc
-+ :
++ HAVE_X11R6_TRUE='#'
++ HAVE_X11R6_FALSE=
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5
-$as_echo "$ac_cv_header_sys_ipc_h" >&6; }
+
++
++ # Check for XKB support.
++
++ if test "x$enable_xkb" = "xyes"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: XKB support explicitly enabled" >&5
++$as_echo "$as_me: WARNING: XKB support explicitly enabled" >&2;}
++
++$as_echo "#define HAVE_XKB 1" >>confdefs.h
++
++ elif test "x$enable_xkb" = "xmaybe"; then
++ ac_fn_c_check_func "$LINENO" "XkbQueryExtension" "ac_cv_func_XkbQueryExtension"
++if test "x$ac_cv_func_XkbQueryExtension" = x""yes; then :
++
++$as_echo "#define HAVE_XKB 1" >>confdefs.h
fi
-if test "x$ac_cv_header_sys_ipc_h" = x""yes; then
@@ -33300,18 +33036,50 @@
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_IPC_H 1
-_ACEOF
-
--else
++ 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
- no_sys_ipc=yes
--fi
-+ CFLAGS="$gtk_save_CFLAGS"
-
-+ # Xshm checks
++ 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_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 <X11/Xlib.h>
++"
++if test "x$ac_cv_header_X11_extensions_sync_h" = x""yes; then :
++
++$as_echo "#define HAVE_XSYNC 1" >>confdefs.h
++
++else
++ :
++fi
++
++
+ fi
+
- if test "${ac_cv_header_sys_shm_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for sys/shm.h" >&5
-$as_echo_n "checking for sys/shm.h... " >&6; }
-if test "${ac_cv_header_sys_shm_h+set}" = set; then
++ 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"
@@ -33990,7 +33758,7 @@
USE_X11_TRUE=
USE_X11_FALSE='#'
else
-@@ -30816,19 +23913,15 @@
+@@ -30816,9 +23913,7 @@
else
XPACKAGES=
@@ -34001,13 +33769,12 @@
XINPUT_XFREE_TRUE=
XINPUT_XFREE_FALSE='#'
else
- XINPUT_XFREE_TRUE='#'
+@@ -30826,9 +23921,7 @@
XINPUT_XFREE_FALSE=
--fi
--
--
-+fi
-
+ fi
+
+-
+-
-if false; then
+ if false; then
USE_X11_TRUE=
@@ -34035,13 +33802,15 @@
USE_WIN32_TRUE=
USE_WIN32_FALSE='#'
else
-@@ -30861,9 +23950,7 @@
+@@ -30860,10 +23949,8 @@
+ USE_WIN32_FALSE=
fi
- else
+-else
-
-
-if false; then
++else
+ if false; then
USE_WIN32_TRUE=
USE_WIN32_FALSE='#'
@@ -34167,7 +33936,7 @@
$DIRECTFB_PKG_ERRORS
-@@ -30988,12 +24064,11 @@
+@@ -30988,22 +24064,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.
@@ -34179,24 +33948,24 @@
+ { { $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 <http://pkg-config.freedesktop.org/>.
+-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.
-@@ -31002,28 +24077,15 @@
+@@ -31012,18 +24077,15 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&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.
--
--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 <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
@@ -34242,13 +34011,13 @@
$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.
--" >&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; }; }
+" "$LINENO" 5
@@ -34812,8 +34581,19 @@
enableval=$enable_cups;
else
enable_cups=auto
-@@ -31707,9 +24504,9 @@
- then
+@@ -31704,9 +24501,7 @@
+
+
+ if test "x$enable_cups" = "xno"; then
+-
+-
+-if false; then
++ if false; then
+ HAVE_CUPS_TRUE=
+ HAVE_CUPS_FALSE='#'
+ else
+@@ -31717,9 +24512,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
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -34824,7 +34604,7 @@
$as_echo_n "(cached) " >&6
else
case $CUPS_CONFIG in
-@@ -31722,14 +24519,14 @@
+@@ -31732,14 +24527,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -34842,7 +34622,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_CUPS_CONFIG" && ac_cv_path_CUPS_CONFIG="no"
-@@ -31738,10 +24535,10 @@
+@@ -31748,19 +24543,17 @@
fi
CUPS_CONFIG=$ac_cv_path_CUPS_CONFIG
if test -n "$CUPS_CONFIG"; then
@@ -34855,7 +34635,33 @@
$as_echo "no" >&6; }
fi
-@@ -31757,9 +24554,7 @@
+
+ if test "x$CUPS_CONFIG" = "xno"; then
+ if test "x$enable_cups" = "xauto"; then
+-
+-
+-if false; then
++ if false; then
+ HAVE_CUPS_TRUE=
+ HAVE_CUPS_FALSE='#'
+ else
+@@ -31769,13 +24562,9 @@
+ fi
+
+ else
+- { { $as_echo "$as_me:$LINENO: error:
++ as_fn_error "
+ *** 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'`
+@@ -31788,9 +24577,7 @@
if test $CUPS_API_MAJOR -gt 1 -o \
$CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then
@@ -34866,7 +34672,7 @@
fi
-@@ -31768,151 +24563,16 @@
+@@ -31799,151 +24586,16 @@
@@ -35000,12 +34806,13 @@
-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 :
-
+-
-fi
-if test "x$ac_cv_header_cups_cups_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 :
++
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;}
@@ -35014,28 +34821,28 @@
fi
- fi
--
--
--if test "x$CUPS_CONFIG" != "xno"; then
-+ if test "x$CUPS_CONFIG" != "xno"; then
+
+-
+-
+-if true; then
++ if true; then
HAVE_CUPS_TRUE=
HAVE_CUPS_FALSE='#'
else
-@@ -31923,11 +24583,7 @@
-
- gtk_save_cflags="$CFLAGS"
- CFLAGS="$CUPS_CFLAGS"
-- cat >conftest.$ac_ext <<_ACEOF
+@@ -31954,11 +24606,7 @@
+
+ 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
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <cups/http.h>
int
-@@ -31938,36 +24594,11 @@
+@@ -31969,36 +24617,11 @@
return 0;
}
_ACEOF
@@ -35072,12 +34879,12 @@
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS="$gtk_save_cflags"
-
-@@ -31975,102 +24606,12 @@
-
- gtk_save_libs="$LIBS"
- LIBS="$CUPS_LIBS"
+ CFLAGS="$gtk_save_cflags"
+
+@@ -32006,102 +24629,12 @@
+
+ gtk_save_libs="$LIBS"
+ LIBS="$CUPS_LIBS"
-
-for ac_func in httpGetAuthString
-do
@@ -35172,7 +34979,7 @@
-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
++ 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 :
@@ -35182,18 +34989,7 @@
_ACEOF
fi
-@@ -32079,9 +24620,7 @@
- LIBS="$gtk_save_libs"
-
- else
--
--
--if false; then
-+ if false; then
- HAVE_CUPS_TRUE=
- HAVE_CUPS_FALSE='#'
- else
-@@ -32095,7 +24634,7 @@
+@@ -32115,7 +24648,7 @@
#
# Check whether --enable-papi was given.
@@ -35202,10 +34998,21 @@
enableval=$enable_papi;
else
enable_papi=auto
-@@ -32104,20 +24643,16 @@
-
- if test "x$enable_papi" = "xauto"
- then
+@@ -32123,9 +24656,7 @@
+
+
+ if test "x$enable_papi" = "xno"; then
+-
+-
+-if false; then
++ if false; then
+ HAVE_PAPI_TRUE=
+ HAVE_PAPI_FALSE='#'
+ else
+@@ -32134,20 +24665,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; }
@@ -35227,7 +35034,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -32135,43 +24670,18 @@
+@@ -32165,43 +24692,18 @@
return 0;
}
_ACEOF
@@ -35277,7 +35084,7 @@
have_papi=yes
else
have_papi=no
-@@ -32179,14 +24689,10 @@
+@@ -32209,14 +24711,10 @@
if test $have_papi = yes; then
@@ -35294,29 +35101,30 @@
HAVE_PAPI_TRUE=
HAVE_PAPI_FALSE='#'
else
-@@ -32195,9 +24701,7 @@
+@@ -32225,19 +24723,13 @@
fi
- else
--
--
--if false; then
-+ if false; then
- HAVE_PAPI_TRUE=
- HAVE_PAPI_FALSE='#'
- else
-@@ -32207,9 +24711,7 @@
-
+ if test "x$enable_papi" = "xyes" -a "x$have_papi" = "xno"; then
+- { { $as_echo "$as_me:$LINENO: error:
++ as_fn_error "
+ *** papi not found.
+-" >&5
+-$as_echo "$as_me: error:
+-*** papi not found.
+-" >&2;}
+- { (exit 1); exit 1; }; }
++" "$LINENO" 5
+ fi
fi
-
-
--if test $have_papi = yes && test "x$CUPS_CONFIG" != "xno"; then
-+ if test $have_papi = yes && test "x$CUPS_CONFIG" != "xno"; then
+-if test "x$have_papi" = "xyes" -a "x$CUPS_CONFIG" != "xno"; then
++ if test "x$have_papi" = "xyes" -a "x$CUPS_CONFIG" != "xno"; then
HAVE_PAPI_CUPS_TRUE=
HAVE_PAPI_CUPS_FALSE='#'
else
-@@ -32221,295 +24723,25 @@
+@@ -32249,295 +24741,25 @@
gtk_save_cppflags="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS $GDK_DEP_CFLAGS"
@@ -35620,7 +35428,7 @@
fi
-@@ -32519,15 +24751,13 @@
+@@ -32547,15 +24769,13 @@
# Check whether --enable-test-print-backend was given.
@@ -35638,7 +35446,7 @@
TEST_PRINT_BACKEND_TRUE=
TEST_PRINT_BACKEND_FALSE='#'
else
-@@ -32567,7 +24797,7 @@
+@@ -32595,7 +24815,7 @@
# Check whether --with-html-dir was given.
@@ -35647,7 +35455,7 @@
withval=$with_html_dir;
else
with_html_dir='${datadir}/gtk-doc/html'
-@@ -32577,7 +24807,7 @@
+@@ -32605,7 +24825,7 @@
# Check whether --enable-gtk-doc was given.
@@ -35656,7 +35464,7 @@
enableval=$enable_gtk_doc;
else
enable_gtk_doc=no
-@@ -32586,31 +24816,29 @@
+@@ -32614,31 +24834,29 @@
if test x$enable_gtk_doc = xyes; then
if test -n "$PKG_CONFIG" && \
@@ -35696,7 +35504,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_CHECK in
-@@ -32623,14 +24851,14 @@
+@@ -32651,14 +24869,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -35714,7 +35522,7 @@
IFS=$as_save_IFS
;;
-@@ -32638,10 +24866,10 @@
+@@ -32666,10 +24884,10 @@
fi
GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
if test -n "$GTKDOC_CHECK"; then
@@ -35727,7 +35535,7 @@
$as_echo "no" >&6; }
fi
-@@ -32650,9 +24878,7 @@
+@@ -32678,9 +24896,7 @@
done
@@ -35738,7 +35546,7 @@
ENABLE_GTK_DOC_TRUE=
ENABLE_GTK_DOC_FALSE='#'
else
-@@ -32660,9 +24886,7 @@
+@@ -32688,9 +24904,7 @@
ENABLE_GTK_DOC_FALSE=
fi
@@ -35749,7 +35557,7 @@
GTK_DOC_USE_LIBTOOL_TRUE=
GTK_DOC_USE_LIBTOOL_FALSE='#'
else
-@@ -32674,9 +24898,9 @@
+@@ -32702,9 +24916,9 @@
# Extract the first word of "db2html", so it can be a program name with args.
set dummy db2html; ac_word=$2
@@ -35761,7 +35569,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DB2HTML"; then
-@@ -32687,14 +24911,14 @@
+@@ -32715,14 +24929,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -35779,7 +35587,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_prog_DB2HTML" && ac_cv_prog_DB2HTML="false"
-@@ -32702,17 +24926,15 @@
+@@ -32730,17 +24944,15 @@
fi
DB2HTML=$ac_cv_prog_DB2HTML
if test -n "$DB2HTML"; then
@@ -35800,7 +35608,7 @@
HAVE_DOCBOOK_TRUE=
HAVE_DOCBOOK_FALSE='#'
else
-@@ -32722,7 +24944,7 @@
+@@ -32750,7 +24962,7 @@
# Check whether --enable-man was given.
@@ -35809,7 +35617,7 @@
enableval=$enable_man; enable_man=yes
else
enable_man=no
-@@ -32732,9 +24954,9 @@
+@@ -32760,9 +24972,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
@@ -35821,7 +35629,7 @@
$as_echo_n "(cached) " >&6
else
case $XSLTPROC in
-@@ -32747,14 +24969,14 @@
+@@ -32775,14 +24987,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -35839,7 +35647,7 @@
IFS=$as_save_IFS
;;
-@@ -32762,10 +24984,10 @@
+@@ -32790,10 +25002,10 @@
fi
XSLTPROC=$ac_cv_path_XSLTPROC
if test -n "$XSLTPROC"; then
@@ -35852,7 +35660,7 @@
$as_echo "no" >&6; }
fi
-@@ -32778,7 +25000,7 @@
+@@ -32806,7 +25018,7 @@
# check for the presence of the XML catalog
# Check whether --with-xml-catalog was given.
@@ -35861,7 +35669,7 @@
withval=$with_xml_catalog;
else
with_xml_catalog=/etc/xml/catalog
-@@ -32787,23 +25009,23 @@
+@@ -32815,23 +25027,23 @@
jh_found_xmlcatalog=true
XML_CATALOG_FILE="$with_xml_catalog"
@@ -35890,7 +35698,7 @@
$as_echo_n "(cached) " >&6
else
case $XMLCATALOG in
-@@ -32816,14 +25038,14 @@
+@@ -32844,14 +25056,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -35908,7 +35716,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_XMLCATALOG" && ac_cv_path_XMLCATALOG="no"
-@@ -32832,10 +25054,10 @@
+@@ -32860,10 +25072,10 @@
fi
XMLCATALOG=$ac_cv_path_XMLCATALOG
if test -n "$XMLCATALOG"; then
@@ -35921,7 +35729,7 @@
$as_echo "no" >&6; }
fi
-@@ -32851,44 +25073,42 @@
+@@ -32879,44 +25091,42 @@
fi
@@ -35979,7 +35787,7 @@
ENABLE_MAN_TRUE=
ENABLE_MAN_FALSE='#'
else
-@@ -32935,13 +25155,13 @@
+@@ -32963,13 +25173,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -35995,7 +35803,7 @@
esac ;;
esac
done
-@@ -32949,8 +25169,8 @@
+@@ -32977,8 +25187,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -36006,7 +35814,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -32973,11 +25193,11 @@
+@@ -33001,11 +25211,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" &&
@@ -36020,7 +35828,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -32997,547 +25217,343 @@
+@@ -33025,554 +25235,347 @@
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.
@@ -36657,6 +36465,15 @@
+ as_fn_error "conditional \"HAVE_CUPS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+ if test -z "${HAVE_CUPS_TRUE}" && test -z "${HAVE_CUPS_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CUPS\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"HAVE_CUPS\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "conditional \"HAVE_CUPS\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
if test -z "${HAVE_PAPI_TRUE}" && test -z "${HAVE_PAPI_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_PAPI\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
@@ -36743,7 +36560,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -33547,17 +25563,18 @@
+@@ -33582,17 +25585,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -36769,7 +36586,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -33565,23 +25582,15 @@
+@@ -33600,23 +25604,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -36798,7 +36615,7 @@
as_nl='
'
export as_nl
-@@ -33589,7 +25598,13 @@
+@@ -33624,7 +25620,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
@@ -36813,7 +36630,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -33600,7 +25615,7 @@
+@@ -33635,7 +25637,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -36822,7 +36639,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -33623,13 +25638,6 @@
+@@ -33658,13 +25660,6 @@
}
fi
@@ -36836,7 +36653,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -33639,15 +25647,15 @@
+@@ -33674,15 +25669,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -36855,7 +36672,7 @@
IFS=$as_save_IFS
;;
-@@ -33659,12 +25667,16 @@
+@@ -33694,12 +25689,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -36876,7 +36693,7 @@
done
PS1='$ '
PS2='> '
-@@ -33676,7 +25688,89 @@
+@@ -33711,7 +25710,89 @@
LANGUAGE=C
export LANGUAGE
@@ -36967,7 +36784,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -33690,8 +25784,12 @@
+@@ -33725,8 +25806,12 @@
as_basename=false
fi
@@ -36981,7 +36798,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -33711,76 +25809,25 @@
+@@ -33746,76 +25831,25 @@
}
s/.*/./; q'`
@@ -37069,7 +36886,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -33809,8 +25856,56 @@
+@@ -33844,8 +25878,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -37127,7 +36944,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -33829,10 +25924,10 @@
+@@ -33864,10 +25946,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -37140,7 +36957,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -33847,13 +25942,19 @@
+@@ -33882,13 +25964,19 @@
exec 6>&1
@@ -37156,13 +36973,13 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
- This file was extended by gtk+ $as_me 2.17.9, which was
+ This file was extended by gtk+ $as_me 2.17.10, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.64. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -33885,10 +25986,11 @@
+@@ -33920,10 +26008,11 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -37177,7 +36994,7 @@
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
-@@ -33910,22 +26012,23 @@
+@@ -33945,22 +26034,23 @@
Configuration commands:
$config_commands
@@ -37187,7 +37004,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
- gtk+ config.status 2.17.9
+ gtk+ config.status 2.17.10
-configured by $0, generated by GNU Autoconf 2.63,
+configured by $0, generated by GNU Autoconf 2.64,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -37204,7 +37021,7 @@
AWK='$AWK'
test -n "\$AWK" || AWK=awk
_ACEOF
-@@ -33961,20 +26064,19 @@
+@@ -33996,20 +26086,19 @@
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -37229,7 +37046,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -33982,11 +26084,10 @@
+@@ -34017,11 +26106,10 @@
ac_cs_silent=: ;;
# This is an error.
@@ -37244,7 +37061,7 @@
ac_need_defaults=false ;;
esac
-@@ -34501,9 +26602,7 @@
+@@ -34536,9 +26624,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" ;;
@@ -37255,7 +37072,7 @@
esac
done
-@@ -34530,7 +26629,7 @@
+@@ -34565,7 +26651,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -37264,7 +37081,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -34541,11 +26640,7 @@
+@@ -34576,11 +26662,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -37277,7 +37094,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -34553,10 +26648,16 @@
+@@ -34588,10 +26670,16 @@
if test -n "$CONFIG_FILES"; then
@@ -37296,7 +37113,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -34570,24 +26671,18 @@
+@@ -34605,24 +26693,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -37324,7 +37141,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -34676,9 +26771,7 @@
+@@ -34711,9 +26793,7 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -37335,7 +37152,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -34719,9 +26812,7 @@
+@@ -34754,9 +26834,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -37346,7 +37163,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -34806,9 +26897,7 @@
+@@ -34841,9 +26919,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -37357,7 +37174,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -34821,9 +26910,7 @@
+@@ -34856,9 +26932,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -37368,7 +37185,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -34851,12 +26938,10 @@
+@@ -34886,12 +26960,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -37383,7 +37200,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -34867,7 +26952,7 @@
+@@ -34902,7 +26974,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -37392,7 +37209,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -34880,9 +26965,7 @@
+@@ -34915,9 +26987,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -37403,7 +37220,7 @@
esac
;;
esac
-@@ -34910,47 +26993,7 @@
+@@ -34945,47 +27015,7 @@
q
}
s/.*/./; q'`
@@ -37452,7 +37269,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -34996,13 +27039,17 @@
+@@ -35031,13 +27061,17 @@
[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
*) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
esac
@@ -37471,7 +37288,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -35012,12 +27059,11 @@
+@@ -35047,12 +27081,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -37486,7 +37303,7 @@
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-@@ -35027,7 +27073,7 @@
+@@ -35062,7 +27095,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -37495,7 +37312,7 @@
esac
_ACEOF
-@@ -35052,17 +27098,16 @@
+@@ -35087,17 +27120,16 @@
s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
@@ -37516,7 +37333,7 @@
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;}
-@@ -35072,9 +27117,7 @@
+@@ -35107,9 +27139,7 @@
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
@@ -37527,7 +37344,7 @@
;;
:H)
#
-@@ -35085,42 +27128,37 @@
+@@ -35120,42 +27150,37 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -37582,7 +37399,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -35140,24 +27178,35 @@
+@@ -35175,24 +27200,35 @@
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -37630,7 +37447,7 @@
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
X"$mf" : 'X\(//\)$' \| \
-@@ -35180,34 +27229,28 @@
+@@ -35215,34 +27251,28 @@
q
}
s/.*/./; q'`
@@ -37687,7 +37504,7 @@
$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$file" : 'X\(//\)[^/]' \| \
X"$file" : 'X\(//\)$' \| \
-@@ -35230,51 +27273,12 @@
+@@ -35265,51 +27295,12 @@
q
}
s/.*/./; q'`
@@ -37743,7 +37560,7 @@
;;
"libtool":C)
-@@ -36132,7 +28136,7 @@
+@@ -36167,7 +28158,7 @@
if cmp -s $outfile gdk/gdkconfig.h; then
@@ -37752,7 +37569,7 @@
$as_echo "$as_me: gdk/gdkconfig.h is unchanged" >&6;}
rm -f $outfile
else
-@@ -36144,15 +28148,12 @@
+@@ -36179,15 +28170,12 @@
done # for ac_tag
@@ -37770,7 +37587,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -36173,10 +28174,10 @@
+@@ -36208,10 +28196,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.
@@ -37783,9 +37600,9 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-diff -Naur gtk+2.0-2.17.9.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.17.9/contrib/gdk-pixbuf-xlib/Makefile.in
---- gtk+2.0-2.17.9.old/contrib/gdk-pixbuf-xlib/Makefile.in 2009-08-24 22:38:46.000000000 +0200
-+++ gtk+2.0-2.17.9/contrib/gdk-pixbuf-xlib/Makefile.in 2009-08-25 18:43:31.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.17.10/contrib/gdk-pixbuf-xlib/Makefile.in
+--- gtk+2.0-2.17.10.old/contrib/gdk-pixbuf-xlib/Makefile.in 2009-09-01 06:02:54.000000000 +0200
++++ gtk+2.0-2.17.10/contrib/gdk-pixbuf-xlib/Makefile.in 2009-09-01 16:11:37.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -38753,9 +38570,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/contrib/Makefile.in gtk+2.0-2.17.9/contrib/Makefile.in
---- gtk+2.0-2.17.9.old/contrib/Makefile.in 2009-08-24 22:38:45.000000000 +0200
-+++ gtk+2.0-2.17.9/contrib/Makefile.in 2009-08-25 18:43:31.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/contrib/Makefile.in gtk+2.0-2.17.10/contrib/Makefile.in
+--- gtk+2.0-2.17.10.old/contrib/Makefile.in 2009-09-01 06:02:54.000000000 +0200
++++ gtk+2.0-2.17.10/contrib/Makefile.in 2009-09-01 16:11:37.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -39579,9 +39396,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/demos/gtk-demo/Makefile.in gtk+2.0-2.17.9/demos/gtk-demo/Makefile.in
---- gtk+2.0-2.17.9.old/demos/gtk-demo/Makefile.in 2009-08-24 22:38:46.000000000 +0200
-+++ gtk+2.0-2.17.9/demos/gtk-demo/Makefile.in 2009-08-25 18:43:32.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/demos/gtk-demo/Makefile.in gtk+2.0-2.17.10/demos/gtk-demo/Makefile.in
+--- gtk+2.0-2.17.10.old/demos/gtk-demo/Makefile.in 2009-09-01 06:02:54.000000000 +0200
++++ gtk+2.0-2.17.10/demos/gtk-demo/Makefile.in 2009-09-01 16:11:37.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -39615,7 +39432,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -37,11 +35,100 @@
+@@ -37,11 +35,102 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
@@ -39644,10 +39461,12 @@
+ entry_completion.$(OBJEXT) expander.$(OBJEXT) \
+ hypertext.$(OBJEXT) iconview.$(OBJEXT) iconview_edit.$(OBJEXT) \
+ images.$(OBJEXT) infobar.$(OBJEXT) links.$(OBJEXT) \
-+ list_store.$(OBJEXT) menus.$(OBJEXT) panes.$(OBJEXT) \
-+ pickers.$(OBJEXT) pixbufs.$(OBJEXT) printing.$(OBJEXT) \
-+ rotated_text.$(OBJEXT) search_entry.$(OBJEXT) \
-+ sizegroup.$(OBJEXT) stock_browser.$(OBJEXT) textview.$(OBJEXT) \
++ list_store.$(OBJEXT) menus.$(OBJEXT) \
++ offscreen_window.$(OBJEXT) offscreen_window2.$(OBJEXT) \
++ panes.$(OBJEXT) pickers.$(OBJEXT) pixbufs.$(OBJEXT) \
++ printing.$(OBJEXT) rotated_text.$(OBJEXT) \
++ search_entry.$(OBJEXT) sizegroup.$(OBJEXT) \
++ stock_browser.$(OBJEXT) textview.$(OBJEXT) \
+ textscroll.$(OBJEXT) tree_store.$(OBJEXT) ui_manager.$(OBJEXT)
+am_gtk_demo_OBJECTS = $(am__objects_1) main.$(OBJEXT)
+gtk_demo_OBJECTS = $(am_gtk_demo_OBJECTS)
@@ -39718,7 +39537,7 @@
AR = @AR@
AS = @AS@
ATK_PREFIX = @ATK_PREFIX@
-@@ -51,10 +138,6 @@
+@@ -51,10 +140,6 @@
AWK = @AWK@
BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
@@ -39729,7 +39548,7 @@
CAIRO_BACKEND_CFLAGS = @CAIRO_BACKEND_CFLAGS@
CAIRO_BACKEND_LIBS = @CAIRO_BACKEND_LIBS@
CAIRO_PREFIX = @CAIRO_PREFIX@
-@@ -62,13 +145,12 @@
+@@ -62,13 +147,12 @@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCAS = @CCAS@
@@ -39744,7 +39563,7 @@
CUPS_API_MAJOR = @CUPS_API_MAJOR@
CUPS_API_MINOR = @CUPS_API_MINOR@
CUPS_CFLAGS = @CUPS_CFLAGS@
-@@ -85,8 +167,6 @@
+@@ -85,8 +169,6 @@
DEPDIR = @DEPDIR@
DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@
DIRECTFB_LIBS = @DIRECTFB_LIBS@
@@ -39753,7 +39572,7 @@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
-@@ -94,10 +174,6 @@
+@@ -94,10 +176,6 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -39764,7 +39583,7 @@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
GAIL_INET_LIBS = @GAIL_INET_LIBS@
-@@ -123,6 +199,7 @@
+@@ -123,6 +201,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@
@@ -39772,7 +39591,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -141,8 +218,6 @@
+@@ -141,8 +220,6 @@
GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
GTK_DEP_LIBS = @GTK_DEP_LIBS@
@@ -39781,7 +39600,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -153,95 +228,14 @@
+@@ -153,95 +230,14 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -39878,7 +39697,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -265,24 +259,15 @@
+@@ -265,24 +261,15 @@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
@@ -39904,7 +39723,7 @@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
-@@ -290,13 +275,12 @@
+@@ -290,13 +277,12 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -39919,7 +39738,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -308,28 +292,10 @@
+@@ -308,28 +294,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -39948,7 +39767,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -338,22 +304,25 @@
+@@ -338,22 +306,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -39978,7 +39797,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -377,6 +346,7 @@
+@@ -377,6 +348,7 @@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
@@ -39986,7 +39805,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -385,17 +355,17 @@
+@@ -385,17 +357,17 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -40009,7 +39828,7 @@
TEST_PROGS =
### testing rules
-@@ -421,9 +391,7 @@
+@@ -421,9 +393,7 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -40019,7 +39838,7 @@
demos = \
appwindow.c \
assistant.c \
-@@ -460,7 +428,6 @@
+@@ -462,7 +432,6 @@
tree_store.c \
ui_manager.c
@@ -40027,7 +39846,7 @@
INCLUDES = \
-DDEMOCODEDIR="\"$(democodedir)\"" \
-I$(top_srcdir) \
-@@ -470,34 +437,26 @@
+@@ -472,34 +441,26 @@
$(GTK_DEBUG_FLAGS) \
$(GTK_DEP_CFLAGS)
@@ -40062,7 +39881,7 @@
IMAGEFILES = alphatest.png \
apple-red.png \
background.jpg \
-@@ -513,121 +472,94 @@
+@@ -515,125 +476,94 @@
gnu-keys.png \
gtk-logo-rgb.gif
@@ -40086,6 +39905,7 @@
- expander.$(OBJEXT) hypertext.$(OBJEXT) iconview.$(OBJEXT) \
- iconview_edit.$(OBJEXT) images.$(OBJEXT) infobar.$(OBJEXT) \
- links.$(OBJEXT) list_store.$(OBJEXT) menus.$(OBJEXT) \
+- offscreen_window.$(OBJEXT) offscreen_window2.$(OBJEXT) \
- panes.$(OBJEXT) pickers.$(OBJEXT) pixbufs.$(OBJEXT) \
- printing.$(OBJEXT) rotated_text.$(OBJEXT) \
- search_entry.$(OBJEXT) sizegroup.$(OBJEXT) \
@@ -40112,9 +39932,12 @@
- at AMDEP_TRUE@ ./$(DEPDIR)/iconview_edit.Po ./$(DEPDIR)/images.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/infobar.Po ./$(DEPDIR)/links.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/list_store.Po ./$(DEPDIR)/main.Po \
-- at AMDEP_TRUE@ ./$(DEPDIR)/menus.Po ./$(DEPDIR)/panes.Po \
-- at AMDEP_TRUE@ ./$(DEPDIR)/pickers.Po ./$(DEPDIR)/pixbufs.Po \
-- at AMDEP_TRUE@ ./$(DEPDIR)/printing.Po ./$(DEPDIR)/rotated_text.Po \
+- at AMDEP_TRUE@ ./$(DEPDIR)/menus.Po \
+- at AMDEP_TRUE@ ./$(DEPDIR)/offscreen_window.Po \
+- at AMDEP_TRUE@ ./$(DEPDIR)/offscreen_window2.Po \
+- at AMDEP_TRUE@ ./$(DEPDIR)/panes.Po ./$(DEPDIR)/pickers.Po \
+- at AMDEP_TRUE@ ./$(DEPDIR)/pixbufs.Po ./$(DEPDIR)/printing.Po \
+- at AMDEP_TRUE@ ./$(DEPDIR)/rotated_text.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/search_entry.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/sizegroup.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/stock_browser.Po \
@@ -40253,7 +40076,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -669,149 +601,134 @@
+@@ -677,149 +607,134 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ui_manager.Po at am__quote@
.c.o:
@@ -40475,7 +40298,7 @@
|| exit 1; \
fi; \
done
-@@ -820,9 +737,10 @@
+@@ -828,9 +743,10 @@
check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
all-am: Makefile $(PROGRAMS) $(DATA)
@@ -40488,7 +40311,7 @@
install: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) install-am
install-exec: install-exec-am
-@@ -843,7 +761,8 @@
+@@ -851,7 +767,8 @@
clean-generic:
distclean-generic:
@@ -40498,7 +40321,7 @@
-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
-@@ -858,24 +777,46 @@
+@@ -866,24 +783,46 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -40546,7 +40369,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -896,21 +837,24 @@
+@@ -904,21 +843,24 @@
ps-am:
@@ -40582,7 +40405,7 @@
# call as: $(XVFB_START) && someprogram
-@@ -970,6 +914,7 @@
+@@ -978,6 +920,7 @@
(here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h
-include $(top_srcdir)/git.mk
@@ -40590,9 +40413,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/demos/Makefile.in gtk+2.0-2.17.9/demos/Makefile.in
---- gtk+2.0-2.17.9.old/demos/Makefile.in 2009-08-24 22:38:46.000000000 +0200
-+++ gtk+2.0-2.17.9/demos/Makefile.in 2009-08-25 18:43:32.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/demos/Makefile.in gtk+2.0-2.17.10/demos/Makefile.in
+--- gtk+2.0-2.17.10.old/demos/Makefile.in 2009-09-01 06:02:54.000000000 +0200
++++ gtk+2.0-2.17.10/demos/Makefile.in 2009-09-01 16:11:37.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -41692,9 +41515,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/depcomp gtk+2.0-2.17.9/depcomp
---- gtk+2.0-2.17.9.old/depcomp 2009-07-24 22:50:53.000000000 +0200
-+++ gtk+2.0-2.17.9/depcomp 2009-08-25 18:43:40.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/depcomp gtk+2.0-2.17.10/depcomp
+--- gtk+2.0-2.17.10.old/depcomp 2009-07-24 22:50:53.000000000 +0200
++++ gtk+2.0-2.17.10/depcomp 2009-09-01 16:11:42.000000000 +0200
@@ -1,7 +1,10 @@
#! /bin/sh
-
@@ -42132,9 +41955,9 @@
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
-diff -Naur gtk+2.0-2.17.9.old/docs/faq/Makefile.in gtk+2.0-2.17.9/docs/faq/Makefile.in
---- gtk+2.0-2.17.9.old/docs/faq/Makefile.in 2009-08-24 22:38:46.000000000 +0200
-+++ gtk+2.0-2.17.9/docs/faq/Makefile.in 2009-08-25 18:43:32.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/docs/faq/Makefile.in gtk+2.0-2.17.10/docs/faq/Makefile.in
+--- gtk+2.0-2.17.10.old/docs/faq/Makefile.in 2009-09-01 06:02:55.000000000 +0200
++++ gtk+2.0-2.17.10/docs/faq/Makefile.in 2009-09-01 16:11:37.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -42724,9 +42547,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/docs/Makefile.in gtk+2.0-2.17.9/docs/Makefile.in
---- gtk+2.0-2.17.9.old/docs/Makefile.in 2009-08-24 22:38:46.000000000 +0200
-+++ gtk+2.0-2.17.9/docs/Makefile.in 2009-08-25 18:43:32.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/docs/Makefile.in gtk+2.0-2.17.10/docs/Makefile.in
+--- gtk+2.0-2.17.10.old/docs/Makefile.in 2009-09-01 06:02:55.000000000 +0200
++++ gtk+2.0-2.17.10/docs/Makefile.in 2009-09-01 16:11:37.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -43575,9 +43398,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/docs/reference/gdk/Makefile.in gtk+2.0-2.17.9/docs/reference/gdk/Makefile.in
---- gtk+2.0-2.17.9.old/docs/reference/gdk/Makefile.in 2009-08-24 22:38:46.000000000 +0200
-+++ gtk+2.0-2.17.9/docs/reference/gdk/Makefile.in 2009-08-25 18:43:33.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/docs/reference/gdk/Makefile.in gtk+2.0-2.17.10/docs/reference/gdk/Makefile.in
+--- gtk+2.0-2.17.10.old/docs/reference/gdk/Makefile.in 2009-09-01 06:02:55.000000000 +0200
++++ gtk+2.0-2.17.10/docs/reference/gdk/Makefile.in 2009-09-01 16:11:37.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -44223,9 +44046,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.17.9/docs/reference/gdk-pixbuf/Makefile.in
---- gtk+2.0-2.17.9.old/docs/reference/gdk-pixbuf/Makefile.in 2009-08-24 22:38:46.000000000 +0200
-+++ gtk+2.0-2.17.9/docs/reference/gdk-pixbuf/Makefile.in 2009-08-25 18:43:32.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.17.10/docs/reference/gdk-pixbuf/Makefile.in
+--- gtk+2.0-2.17.10.old/docs/reference/gdk-pixbuf/Makefile.in 2009-09-01 06:02:55.000000000 +0200
++++ gtk+2.0-2.17.10/docs/reference/gdk-pixbuf/Makefile.in 2009-09-01 16:11:37.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -45020,9 +44843,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/docs/reference/gtk/Makefile.in gtk+2.0-2.17.9/docs/reference/gtk/Makefile.in
---- gtk+2.0-2.17.9.old/docs/reference/gtk/Makefile.in 2009-08-24 22:38:46.000000000 +0200
-+++ gtk+2.0-2.17.9/docs/reference/gtk/Makefile.in 2009-08-25 18:43:33.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/docs/reference/gtk/Makefile.in gtk+2.0-2.17.10/docs/reference/gtk/Makefile.in
+--- gtk+2.0-2.17.10.old/docs/reference/gtk/Makefile.in 2009-09-01 06:30:38.000000000 +0200
++++ gtk+2.0-2.17.10/docs/reference/gtk/Makefile.in 2009-09-01 16:11:37.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -45435,7 +45258,7 @@
GTKDOC_LIBS = \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/$(gdktargetlib) \
-@@ -589,7 +507,6 @@
+@@ -590,7 +508,6 @@
gtk-builder-convert.xml \
visual_index.xml
@@ -45443,7 +45266,7 @@
expand_content_files = \
drawing-model.xml \
glossary.xml \
-@@ -794,7 +711,6 @@
+@@ -796,7 +713,6 @@
--extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo
@GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -45451,7 +45274,7 @@
@GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
@GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-@@ -807,13 +723,10 @@
+@@ -809,13 +725,10 @@
# searched for in VPATH/GPATH.
#
GPATH = $(srcdir)
@@ -45465,7 +45288,7 @@
SCANOBJ_FILES = \
$(DOC_MODULE).args \
$(DOC_MODULE).hierarchy \
-@@ -821,40 +734,50 @@
+@@ -823,40 +736,50 @@
$(DOC_MODULE).prerequisites \
$(DOC_MODULE).signals
@@ -45537,7 +45360,7 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
mostlyclean-libtool:
-@@ -862,93 +785,91 @@
+@@ -864,93 +787,91 @@
clean-libtool:
-rm -rf .libs _libs
@@ -45699,7 +45522,7 @@
|| exit 1; \
fi; \
done
-@@ -959,9 +880,10 @@
+@@ -961,9 +882,10 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile $(MANS) all-local
@@ -45712,7 +45535,7 @@
install: install-am
install-exec: install-exec-am
install-data: install-data-am
-@@ -982,7 +904,8 @@
+@@ -984,7 +906,8 @@
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
@@ -45722,7 +45545,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -993,25 +916,46 @@
+@@ -995,25 +918,46 @@
distclean: distclean-am
-rm -f Makefile
@@ -45771,7 +45594,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -1031,21 +975,25 @@
+@@ -1033,21 +977,25 @@
ps-am:
@@ -45806,7 +45629,7 @@
# call as: $(XVFB_START) && someprogram
-@@ -1252,6 +1200,7 @@
+@@ -1254,6 +1202,7 @@
cp $$d/$$f $(distdir) || exit 1; done
-include $(top_srcdir)/git.mk
@@ -45814,9 +45637,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2.17.9/docs/reference/libgail-util/Makefile.in
---- gtk+2.0-2.17.9.old/docs/reference/libgail-util/Makefile.in 2009-08-24 22:38:46.000000000 +0200
-+++ gtk+2.0-2.17.9/docs/reference/libgail-util/Makefile.in 2009-08-25 18:43:33.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2.17.10/docs/reference/libgail-util/Makefile.in
+--- gtk+2.0-2.17.10.old/docs/reference/libgail-util/Makefile.in 2009-09-01 06:02:55.000000000 +0200
++++ gtk+2.0-2.17.10/docs/reference/libgail-util/Makefile.in 2009-09-01 16:11:38.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -46447,9 +46270,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/docs/reference/Makefile.in gtk+2.0-2.17.9/docs/reference/Makefile.in
---- gtk+2.0-2.17.9.old/docs/reference/Makefile.in 2009-08-24 22:38:46.000000000 +0200
-+++ gtk+2.0-2.17.9/docs/reference/Makefile.in 2009-08-25 18:43:32.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/docs/reference/Makefile.in gtk+2.0-2.17.10/docs/reference/Makefile.in
+--- gtk+2.0-2.17.10.old/docs/reference/Makefile.in 2009-09-01 06:02:55.000000000 +0200
++++ gtk+2.0-2.17.10/docs/reference/Makefile.in 2009-09-01 16:11:37.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -47274,9 +47097,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/docs/tools/Makefile.in gtk+2.0-2.17.9/docs/tools/Makefile.in
---- gtk+2.0-2.17.9.old/docs/tools/Makefile.in 2009-08-24 22:38:47.000000000 +0200
-+++ gtk+2.0-2.17.9/docs/tools/Makefile.in 2009-08-25 18:43:33.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/docs/tools/Makefile.in gtk+2.0-2.17.10/docs/tools/Makefile.in
+--- gtk+2.0-2.17.10.old/docs/tools/Makefile.in 2009-09-01 06:02:56.000000000 +0200
++++ gtk+2.0-2.17.10/docs/tools/Makefile.in 2009-09-01 16:11:38.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -48090,9 +47913,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/docs/tutorial/Makefile.in gtk+2.0-2.17.9/docs/tutorial/Makefile.in
---- gtk+2.0-2.17.9.old/docs/tutorial/Makefile.in 2009-08-24 22:38:47.000000000 +0200
-+++ gtk+2.0-2.17.9/docs/tutorial/Makefile.in 2009-08-25 18:43:33.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/docs/tutorial/Makefile.in gtk+2.0-2.17.10/docs/tutorial/Makefile.in
+--- gtk+2.0-2.17.10.old/docs/tutorial/Makefile.in 2009-09-01 06:02:56.000000000 +0200
++++ gtk+2.0-2.17.10/docs/tutorial/Makefile.in 2009-09-01 16:11:38.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -48723,9 +48546,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/gdk/directfb/Makefile.in gtk+2.0-2.17.9/gdk/directfb/Makefile.in
---- gtk+2.0-2.17.9.old/gdk/directfb/Makefile.in 2009-08-24 22:38:47.000000000 +0200
-+++ gtk+2.0-2.17.9/gdk/directfb/Makefile.in 2009-08-25 18:43:34.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/gdk/directfb/Makefile.in gtk+2.0-2.17.10/gdk/directfb/Makefile.in
+--- gtk+2.0-2.17.10.old/gdk/directfb/Makefile.in 2009-09-01 06:02:57.000000000 +0200
++++ gtk+2.0-2.17.10/gdk/directfb/Makefile.in 2009-09-01 16:11:38.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -49635,9 +49458,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/gdk/Makefile.in gtk+2.0-2.17.9/gdk/Makefile.in
---- gtk+2.0-2.17.9.old/gdk/Makefile.in 2009-08-24 22:38:47.000000000 +0200
-+++ gtk+2.0-2.17.9/gdk/Makefile.in 2009-08-25 18:43:34.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/gdk/Makefile.in gtk+2.0-2.17.10/gdk/Makefile.in
+--- gtk+2.0-2.17.10.old/gdk/Makefile.in 2009-09-01 06:02:56.000000000 +0200
++++ gtk+2.0-2.17.10/gdk/Makefile.in 2009-09-01 16:11:38.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -51138,9 +50961,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/gdk/quartz/Makefile.in gtk+2.0-2.17.9/gdk/quartz/Makefile.in
---- gtk+2.0-2.17.9.old/gdk/quartz/Makefile.in 2009-08-24 22:38:48.000000000 +0200
-+++ gtk+2.0-2.17.9/gdk/quartz/Makefile.in 2009-08-25 18:43:35.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/gdk/quartz/Makefile.in gtk+2.0-2.17.10/gdk/quartz/Makefile.in
+--- gtk+2.0-2.17.10.old/gdk/quartz/Makefile.in 2009-09-01 06:02:57.000000000 +0200
++++ gtk+2.0-2.17.10/gdk/quartz/Makefile.in 2009-09-01 16:11:39.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -52041,9 +51864,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/gdk/tests/Makefile.in gtk+2.0-2.17.9/gdk/tests/Makefile.in
---- gtk+2.0-2.17.9.old/gdk/tests/Makefile.in 2009-08-24 22:38:48.000000000 +0200
-+++ gtk+2.0-2.17.9/gdk/tests/Makefile.in 2009-08-25 18:43:35.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/gdk/tests/Makefile.in gtk+2.0-2.17.10/gdk/tests/Makefile.in
+--- gtk+2.0-2.17.10.old/gdk/tests/Makefile.in 2009-09-01 06:02:57.000000000 +0200
++++ gtk+2.0-2.17.10/gdk/tests/Makefile.in 2009-09-01 16:11:39.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -52781,9 +52604,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/gdk/win32/Makefile.in gtk+2.0-2.17.9/gdk/win32/Makefile.in
---- gtk+2.0-2.17.9.old/gdk/win32/Makefile.in 2009-08-24 22:38:48.000000000 +0200
-+++ gtk+2.0-2.17.9/gdk/win32/Makefile.in 2009-08-25 18:43:35.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/gdk/win32/Makefile.in gtk+2.0-2.17.10/gdk/win32/Makefile.in
+--- gtk+2.0-2.17.10.old/gdk/win32/Makefile.in 2009-09-01 06:02:57.000000000 +0200
++++ gtk+2.0-2.17.10/gdk/win32/Makefile.in 2009-09-01 16:11:39.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -53862,9 +53685,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/gdk/win32/rc/Makefile.in gtk+2.0-2.17.9/gdk/win32/rc/Makefile.in
---- gtk+2.0-2.17.9.old/gdk/win32/rc/Makefile.in 2009-08-24 22:38:48.000000000 +0200
-+++ gtk+2.0-2.17.9/gdk/win32/rc/Makefile.in 2009-08-25 18:43:35.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/gdk/win32/rc/Makefile.in gtk+2.0-2.17.10/gdk/win32/rc/Makefile.in
+--- gtk+2.0-2.17.10.old/gdk/win32/rc/Makefile.in 2009-09-01 06:02:57.000000000 +0200
++++ gtk+2.0-2.17.10/gdk/win32/rc/Makefile.in 2009-09-01 16:11:39.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -54456,9 +54279,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/gdk/x11/Makefile.in gtk+2.0-2.17.9/gdk/x11/Makefile.in
---- gtk+2.0-2.17.9.old/gdk/x11/Makefile.in 2009-08-24 22:38:48.000000000 +0200
-+++ gtk+2.0-2.17.9/gdk/x11/Makefile.in 2009-08-25 18:43:35.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/gdk/x11/Makefile.in gtk+2.0-2.17.10/gdk/x11/Makefile.in
+--- gtk+2.0-2.17.10.old/gdk/x11/Makefile.in 2009-09-01 06:02:57.000000000 +0200
++++ gtk+2.0-2.17.10/gdk/x11/Makefile.in 2009-09-01 16:11:39.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -55619,9 +55442,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/gdk-pixbuf/Makefile.in gtk+2.0-2.17.9/gdk-pixbuf/Makefile.in
---- gtk+2.0-2.17.9.old/gdk-pixbuf/Makefile.in 2009-08-24 22:38:47.000000000 +0200
-+++ gtk+2.0-2.17.9/gdk-pixbuf/Makefile.in 2009-08-25 18:43:33.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/gdk-pixbuf/Makefile.in gtk+2.0-2.17.10/gdk-pixbuf/Makefile.in
+--- gtk+2.0-2.17.10.old/gdk-pixbuf/Makefile.in 2009-09-01 06:02:56.000000000 +0200
++++ gtk+2.0-2.17.10/gdk-pixbuf/Makefile.in 2009-09-01 16:11:38.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -59004,9 +58827,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.17.9/gdk-pixbuf/pixops/Makefile.in
---- gtk+2.0-2.17.9.old/gdk-pixbuf/pixops/Makefile.in 2009-08-24 22:38:47.000000000 +0200
-+++ gtk+2.0-2.17.9/gdk-pixbuf/pixops/Makefile.in 2009-08-25 18:43:33.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.17.10/gdk-pixbuf/pixops/Makefile.in
+--- gtk+2.0-2.17.10.old/gdk-pixbuf/pixops/Makefile.in 2009-09-01 06:02:56.000000000 +0200
++++ gtk+2.0-2.17.10/gdk-pixbuf/pixops/Makefile.in 2009-09-01 16:11:38.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -59897,9 +59720,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/gtk/Makefile.in gtk+2.0-2.17.9/gtk/Makefile.in
---- gtk+2.0-2.17.9.old/gtk/Makefile.in 2009-08-24 22:38:48.000000000 +0200
-+++ gtk+2.0-2.17.9/gtk/Makefile.in 2009-08-25 18:43:36.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/gtk/Makefile.in gtk+2.0-2.17.10/gtk/Makefile.in
+--- gtk+2.0-2.17.10.old/gtk/Makefile.in 2009-09-01 06:02:58.000000000 +0200
++++ gtk+2.0-2.17.10/gtk/Makefile.in 2009-09-01 16:11:39.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -64394,9 +64217,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/gtk/tests/Makefile.in gtk+2.0-2.17.9/gtk/tests/Makefile.in
---- gtk+2.0-2.17.9.old/gtk/tests/Makefile.in 2009-08-24 22:38:49.000000000 +0200
-+++ gtk+2.0-2.17.9/gtk/tests/Makefile.in 2009-08-25 18:43:36.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/gtk/tests/Makefile.in gtk+2.0-2.17.10/gtk/tests/Makefile.in
+--- gtk+2.0-2.17.10.old/gtk/tests/Makefile.in 2009-09-01 06:02:58.000000000 +0200
++++ gtk+2.0-2.17.10/gtk/tests/Makefile.in 2009-09-01 16:11:40.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -65391,9 +65214,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/gtk/theme-bits/Makefile.in gtk+2.0-2.17.9/gtk/theme-bits/Makefile.in
---- gtk+2.0-2.17.9.old/gtk/theme-bits/Makefile.in 2009-08-24 22:38:49.000000000 +0200
-+++ gtk+2.0-2.17.9/gtk/theme-bits/Makefile.in 2009-08-25 18:43:37.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/gtk/theme-bits/Makefile.in gtk+2.0-2.17.10/gtk/theme-bits/Makefile.in
+--- gtk+2.0-2.17.10.old/gtk/theme-bits/Makefile.in 2009-09-01 06:02:58.000000000 +0200
++++ gtk+2.0-2.17.10/gtk/theme-bits/Makefile.in 2009-09-01 16:11:40.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -66187,9 +66010,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/install-sh gtk+2.0-2.17.9/install-sh
---- gtk+2.0-2.17.9.old/install-sh 2009-07-24 22:50:53.000000000 +0200
-+++ gtk+2.0-2.17.9/install-sh 2009-08-25 18:43:31.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/install-sh gtk+2.0-2.17.10/install-sh
+--- gtk+2.0-2.17.10.old/install-sh 2009-07-24 22:50:53.000000000 +0200
++++ gtk+2.0-2.17.10/install-sh 2009-09-01 16:11:36.000000000 +0200
@@ -1,7 +1,8 @@
#!/bin/sh
-#
@@ -66896,9 +66719,9 @@
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
-diff -Naur gtk+2.0-2.17.9.old/ltmain.sh gtk+2.0-2.17.9/ltmain.sh
---- gtk+2.0-2.17.9.old/ltmain.sh 2009-07-27 00:39:21.000000000 +0200
-+++ gtk+2.0-2.17.9/ltmain.sh 2009-08-25 18:43:17.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/ltmain.sh gtk+2.0-2.17.10/ltmain.sh
+--- gtk+2.0-2.17.10.old/ltmain.sh 2009-07-27 00:39:21.000000000 +0200
++++ gtk+2.0-2.17.10/ltmain.sh 2009-09-01 16:11:26.000000000 +0200
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
@@ -66977,9 +66800,9 @@
esac
;;
no)
-diff -Naur gtk+2.0-2.17.9.old/m4macros/Makefile.in gtk+2.0-2.17.9/m4macros/Makefile.in
---- gtk+2.0-2.17.9.old/m4macros/Makefile.in 2009-08-24 22:38:49.000000000 +0200
-+++ gtk+2.0-2.17.9/m4macros/Makefile.in 2009-08-25 18:43:37.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/m4macros/Makefile.in gtk+2.0-2.17.10/m4macros/Makefile.in
+--- gtk+2.0-2.17.10.old/m4macros/Makefile.in 2009-09-01 06:02:58.000000000 +0200
++++ gtk+2.0-2.17.10/m4macros/Makefile.in 2009-09-01 16:11:40.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -67618,9 +67441,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/Makefile.in gtk+2.0-2.17.9/Makefile.in
---- gtk+2.0-2.17.9.old/Makefile.in 2009-08-24 22:38:45.000000000 +0200
-+++ gtk+2.0-2.17.9/Makefile.in 2009-08-25 18:43:41.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/Makefile.in gtk+2.0-2.17.10/Makefile.in
+--- gtk+2.0-2.17.10.old/Makefile.in 2009-09-01 06:02:54.000000000 +0200
++++ gtk+2.0-2.17.10/Makefile.in 2009-09-01 16:11:43.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -68951,9 +68774,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/missing gtk+2.0-2.17.9/missing
---- gtk+2.0-2.17.9.old/missing 2009-07-24 22:50:53.000000000 +0200
-+++ gtk+2.0-2.17.9/missing 2009-08-25 18:43:31.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/missing gtk+2.0-2.17.10/missing
+--- gtk+2.0-2.17.10.old/missing 2009-07-24 22:50:53.000000000 +0200
++++ gtk+2.0-2.17.10/missing 2009-09-01 16:11:36.000000000 +0200
@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
@@ -69374,9 +69197,9 @@
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
-diff -Naur gtk+2.0-2.17.9.old/mkinstalldirs gtk+2.0-2.17.9/mkinstalldirs
---- gtk+2.0-2.17.9.old/mkinstalldirs 2009-07-24 22:50:53.000000000 +0200
-+++ gtk+2.0-2.17.9/mkinstalldirs 2009-08-25 18:43:41.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/mkinstalldirs gtk+2.0-2.17.10/mkinstalldirs
+--- gtk+2.0-2.17.10.old/mkinstalldirs 2009-07-24 22:50:53.000000000 +0200
++++ gtk+2.0-2.17.10/mkinstalldirs 2009-09-01 16:11:42.000000000 +0200
@@ -1,21 +1,36 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
@@ -69538,9 +69361,9 @@
+# time-stamp-end: "; # UTC"
# End:
-# mkinstalldirs ends here
-diff -Naur gtk+2.0-2.17.9.old/modules/engines/Makefile.in gtk+2.0-2.17.9/modules/engines/Makefile.in
---- gtk+2.0-2.17.9.old/modules/engines/Makefile.in 2009-08-24 22:38:49.000000000 +0200
-+++ gtk+2.0-2.17.9/modules/engines/Makefile.in 2009-08-25 18:43:37.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/modules/engines/Makefile.in gtk+2.0-2.17.10/modules/engines/Makefile.in
+--- gtk+2.0-2.17.10.old/modules/engines/Makefile.in 2009-09-01 06:02:58.000000000 +0200
++++ gtk+2.0-2.17.10/modules/engines/Makefile.in 2009-09-01 16:11:40.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -70365,9 +70188,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.17.9/modules/engines/ms-windows/Makefile.in
---- gtk+2.0-2.17.9.old/modules/engines/ms-windows/Makefile.in 2009-08-24 22:38:49.000000000 +0200
-+++ gtk+2.0-2.17.9/modules/engines/ms-windows/Makefile.in 2009-08-25 18:43:37.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.17.10/modules/engines/ms-windows/Makefile.in
+--- gtk+2.0-2.17.10.old/modules/engines/ms-windows/Makefile.in 2009-09-01 06:02:58.000000000 +0200
++++ gtk+2.0-2.17.10/modules/engines/ms-windows/Makefile.in 2009-09-01 16:11:40.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -71416,9 +71239,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.17.9/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
---- gtk+2.0-2.17.9.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2009-08-24 22:38:49.000000000 +0200
-+++ gtk+2.0-2.17.9/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2009-08-25 18:43:37.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.17.10/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
+--- gtk+2.0-2.17.10.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2009-09-01 06:02:58.000000000 +0200
++++ gtk+2.0-2.17.10/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2009-09-01 16:11:40.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -72056,9 +71879,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.17.9/modules/engines/ms-windows/Theme/Makefile.in
---- gtk+2.0-2.17.9.old/modules/engines/ms-windows/Theme/Makefile.in 2009-08-24 22:38:49.000000000 +0200
-+++ gtk+2.0-2.17.9/modules/engines/ms-windows/Theme/Makefile.in 2009-08-25 18:43:37.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.17.10/modules/engines/ms-windows/Theme/Makefile.in
+--- gtk+2.0-2.17.10.old/modules/engines/ms-windows/Theme/Makefile.in 2009-09-01 06:02:58.000000000 +0200
++++ gtk+2.0-2.17.10/modules/engines/ms-windows/Theme/Makefile.in 2009-09-01 16:11:40.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -72881,9 +72704,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.17.9/modules/engines/pixbuf/Makefile.in
---- gtk+2.0-2.17.9.old/modules/engines/pixbuf/Makefile.in 2009-08-24 22:38:49.000000000 +0200
-+++ gtk+2.0-2.17.9/modules/engines/pixbuf/Makefile.in 2009-08-25 18:43:37.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.17.10/modules/engines/pixbuf/Makefile.in
+--- gtk+2.0-2.17.10.old/modules/engines/pixbuf/Makefile.in 2009-09-01 06:02:59.000000000 +0200
++++ gtk+2.0-2.17.10/modules/engines/pixbuf/Makefile.in 2009-09-01 16:11:40.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -73760,9 +73583,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/modules/input/Makefile.in gtk+2.0-2.17.9/modules/input/Makefile.in
---- gtk+2.0-2.17.9.old/modules/input/Makefile.in 2009-08-24 22:38:49.000000000 +0200
-+++ gtk+2.0-2.17.9/modules/input/Makefile.in 2009-08-25 18:43:38.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/modules/input/Makefile.in gtk+2.0-2.17.10/modules/input/Makefile.in
+--- gtk+2.0-2.17.10.old/modules/input/Makefile.in 2009-09-01 06:02:59.000000000 +0200
++++ gtk+2.0-2.17.10/modules/input/Makefile.in 2009-09-01 16:11:41.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -75385,9 +75208,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/modules/Makefile.in gtk+2.0-2.17.9/modules/Makefile.in
---- gtk+2.0-2.17.9.old/modules/Makefile.in 2009-08-24 22:38:49.000000000 +0200
-+++ gtk+2.0-2.17.9/modules/Makefile.in 2009-08-25 18:43:37.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/modules/Makefile.in gtk+2.0-2.17.10/modules/Makefile.in
+--- gtk+2.0-2.17.10.old/modules/Makefile.in 2009-09-01 06:02:58.000000000 +0200
++++ gtk+2.0-2.17.10/modules/Makefile.in 2009-09-01 16:11:40.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -76211,9 +76034,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/modules/other/gail/libgail-util/Makefile.in gtk+2.0-2.17.9/modules/other/gail/libgail-util/Makefile.in
---- gtk+2.0-2.17.9.old/modules/other/gail/libgail-util/Makefile.in 2009-08-24 22:38:50.000000000 +0200
-+++ gtk+2.0-2.17.9/modules/other/gail/libgail-util/Makefile.in 2009-08-25 18:43:39.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/modules/other/gail/libgail-util/Makefile.in gtk+2.0-2.17.10/modules/other/gail/libgail-util/Makefile.in
+--- gtk+2.0-2.17.10.old/modules/other/gail/libgail-util/Makefile.in 2009-09-01 06:03:00.000000000 +0200
++++ gtk+2.0-2.17.10/modules/other/gail/libgail-util/Makefile.in 2009-09-01 16:11:41.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -77224,9 +77047,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/modules/other/gail/Makefile.in gtk+2.0-2.17.9/modules/other/gail/Makefile.in
---- gtk+2.0-2.17.9.old/modules/other/gail/Makefile.in 2009-08-24 22:38:50.000000000 +0200
-+++ gtk+2.0-2.17.9/modules/other/gail/Makefile.in 2009-08-25 18:43:38.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/modules/other/gail/Makefile.in gtk+2.0-2.17.10/modules/other/gail/Makefile.in
+--- gtk+2.0-2.17.10.old/modules/other/gail/Makefile.in 2009-09-01 06:02:59.000000000 +0200
++++ gtk+2.0-2.17.10/modules/other/gail/Makefile.in 2009-09-01 16:11:41.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -80589,9 +80412,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.17.9/modules/other/gail/tests/Makefile.in
---- gtk+2.0-2.17.9.old/modules/other/gail/tests/Makefile.in 2009-08-24 22:38:50.000000000 +0200
-+++ gtk+2.0-2.17.9/modules/other/gail/tests/Makefile.in 2009-08-25 18:43:39.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.17.10/modules/other/gail/tests/Makefile.in
+--- gtk+2.0-2.17.10.old/modules/other/gail/tests/Makefile.in 2009-09-01 06:03:00.000000000 +0200
++++ gtk+2.0-2.17.10/modules/other/gail/tests/Makefile.in 2009-09-01 16:11:41.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -82008,9 +81831,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/modules/other/Makefile.in gtk+2.0-2.17.9/modules/other/Makefile.in
---- gtk+2.0-2.17.9.old/modules/other/Makefile.in 2009-08-24 22:38:50.000000000 +0200
-+++ gtk+2.0-2.17.9/modules/other/Makefile.in 2009-08-25 18:43:38.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/modules/other/Makefile.in gtk+2.0-2.17.10/modules/other/Makefile.in
+--- gtk+2.0-2.17.10.old/modules/other/Makefile.in 2009-09-01 06:02:59.000000000 +0200
++++ gtk+2.0-2.17.10/modules/other/Makefile.in 2009-09-01 16:11:41.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -82833,9 +82656,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.17.9/modules/printbackends/cups/Makefile.in
---- gtk+2.0-2.17.9.old/modules/printbackends/cups/Makefile.in 2009-08-24 22:38:51.000000000 +0200
-+++ gtk+2.0-2.17.9/modules/printbackends/cups/Makefile.in 2009-08-25 18:43:39.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.17.10/modules/printbackends/cups/Makefile.in
+--- gtk+2.0-2.17.10.old/modules/printbackends/cups/Makefile.in 2009-09-01 06:03:00.000000000 +0200
++++ gtk+2.0-2.17.10/modules/printbackends/cups/Makefile.in 2009-09-01 16:11:42.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -83719,9 +83542,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/modules/printbackends/file/Makefile.in gtk+2.0-2.17.9/modules/printbackends/file/Makefile.in
---- gtk+2.0-2.17.9.old/modules/printbackends/file/Makefile.in 2009-08-24 22:38:51.000000000 +0200
-+++ gtk+2.0-2.17.9/modules/printbackends/file/Makefile.in 2009-08-25 18:43:39.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/modules/printbackends/file/Makefile.in gtk+2.0-2.17.10/modules/printbackends/file/Makefile.in
+--- gtk+2.0-2.17.10.old/modules/printbackends/file/Makefile.in 2009-09-01 06:03:00.000000000 +0200
++++ gtk+2.0-2.17.10/modules/printbackends/file/Makefile.in 2009-09-01 16:11:42.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -84643,9 +84466,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.17.9/modules/printbackends/lpr/Makefile.in
---- gtk+2.0-2.17.9.old/modules/printbackends/lpr/Makefile.in 2009-08-24 22:38:51.000000000 +0200
-+++ gtk+2.0-2.17.9/modules/printbackends/lpr/Makefile.in 2009-08-25 18:43:40.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.17.10/modules/printbackends/lpr/Makefile.in
+--- gtk+2.0-2.17.10.old/modules/printbackends/lpr/Makefile.in 2009-09-01 06:03:00.000000000 +0200
++++ gtk+2.0-2.17.10/modules/printbackends/lpr/Makefile.in 2009-09-01 16:11:42.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -85517,9 +85340,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/modules/printbackends/Makefile.in gtk+2.0-2.17.9/modules/printbackends/Makefile.in
---- gtk+2.0-2.17.9.old/modules/printbackends/Makefile.in 2009-08-24 22:38:50.000000000 +0200
-+++ gtk+2.0-2.17.9/modules/printbackends/Makefile.in 2009-08-25 18:43:39.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/modules/printbackends/Makefile.in gtk+2.0-2.17.10/modules/printbackends/Makefile.in
+--- gtk+2.0-2.17.10.old/modules/printbackends/Makefile.in 2009-09-01 06:03:00.000000000 +0200
++++ gtk+2.0-2.17.10/modules/printbackends/Makefile.in 2009-09-01 16:11:41.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -86345,9 +86168,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/modules/printbackends/papi/Makefile.in gtk+2.0-2.17.9/modules/printbackends/papi/Makefile.in
---- gtk+2.0-2.17.9.old/modules/printbackends/papi/Makefile.in 2009-08-24 22:38:51.000000000 +0200
-+++ gtk+2.0-2.17.9/modules/printbackends/papi/Makefile.in 2009-08-25 18:43:40.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/modules/printbackends/papi/Makefile.in gtk+2.0-2.17.10/modules/printbackends/papi/Makefile.in
+--- gtk+2.0-2.17.10.old/modules/printbackends/papi/Makefile.in 2009-09-01 06:03:00.000000000 +0200
++++ gtk+2.0-2.17.10/modules/printbackends/papi/Makefile.in 2009-09-01 16:11:42.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -87209,9 +87032,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/modules/printbackends/test/Makefile.in gtk+2.0-2.17.9/modules/printbackends/test/Makefile.in
---- gtk+2.0-2.17.9.old/modules/printbackends/test/Makefile.in 2009-08-24 22:38:51.000000000 +0200
-+++ gtk+2.0-2.17.9/modules/printbackends/test/Makefile.in 2009-08-25 18:43:40.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/modules/printbackends/test/Makefile.in gtk+2.0-2.17.10/modules/printbackends/test/Makefile.in
+--- gtk+2.0-2.17.10.old/modules/printbackends/test/Makefile.in 2009-09-01 06:03:00.000000000 +0200
++++ gtk+2.0-2.17.10/modules/printbackends/test/Makefile.in 2009-09-01 16:11:42.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -88130,9 +87953,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/perf/Makefile.in gtk+2.0-2.17.9/perf/Makefile.in
---- gtk+2.0-2.17.9.old/perf/Makefile.in 2009-08-24 22:38:51.000000000 +0200
-+++ gtk+2.0-2.17.9/perf/Makefile.in 2009-08-25 18:43:40.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/perf/Makefile.in gtk+2.0-2.17.10/perf/Makefile.in
+--- gtk+2.0-2.17.10.old/perf/Makefile.in 2009-09-01 06:03:01.000000000 +0200
++++ gtk+2.0-2.17.10/perf/Makefile.in 2009-09-01 16:11:42.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -88988,9 +88811,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Naur gtk+2.0-2.17.9.old/po/Makefile.in.in gtk+2.0-2.17.9/po/Makefile.in.in
---- gtk+2.0-2.17.9.old/po/Makefile.in.in 2009-07-20 04:33:49.000000000 +0200
-+++ gtk+2.0-2.17.9/po/Makefile.in.in 2009-08-25 18:43:18.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/po/Makefile.in.in gtk+2.0-2.17.10/po/Makefile.in.in
+--- gtk+2.0-2.17.10.old/po/Makefile.in.in 2009-08-29 18:20:14.000000000 +0200
++++ gtk+2.0-2.17.10/po/Makefile.in.in 2009-09-01 16:11:27.000000000 +0200
@@ -25,6 +25,7 @@
prefix = @prefix@
@@ -89051,9 +88874,9 @@
--files-from=$(srcdir)/POTFILES.in \
&& test ! -f $(GETTEXT_PACKAGE).po \
|| ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \
-diff -Naur gtk+2.0-2.17.9.old/tests/Makefile.in gtk+2.0-2.17.9/tests/Makefile.in
---- gtk+2.0-2.17.9.old/tests/Makefile.in 2009-08-24 22:38:51.000000000 +0200
-+++ gtk+2.0-2.17.9/tests/Makefile.in 2009-08-25 18:43:41.000000000 +0200
+diff -Naur gtk+2.0-2.17.10.old/tests/Makefile.in gtk+2.0-2.17.10/tests/Makefile.in
+--- gtk+2.0-2.17.10.old/tests/Makefile.in 2009-09-01 06:03:01.000000000 +0200
++++ gtk+2.0-2.17.10/tests/Makefile.in 2009-09-01 16:11:42.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
Modified: desktop/experimental/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/rules?rev=21213&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/rules [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/rules [utf-8] Tue Sep 1 14:12:52 2009
@@ -53,7 +53,7 @@
VERSION := $(shell echo $(DEBVERSION) | sed -e 's/-[^-]*$$//')
APIVER := 2.0
SONAME := 0
-SHVER := 2.17.9
+SHVER := 2.17.10
# earliest version that this release has backwards binary compatibility for
GTK_BINARY_VERSION := 2.10.0
More information about the pkg-gnome-commits
mailing list