r25640 - in /desktop/experimental/atk1.0/debian: changelog control control.in gir1.0-atk-1.0.install libatk1.0-0.symbols libatk1.0-dev.install patches/90-relibtoolize.patch patches/series rules source/ source/format
bigon at users.alioth.debian.org
bigon at users.alioth.debian.org
Sun Nov 21 22:47:09 UTC 2010
Author: bigon
Date: Sun Nov 21 22:47:09 2010
New Revision: 25640
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25640
Log:
* New upstream stable release.
- Refresh debian/patches/90-relibtoolize.patch
* debian/control.in:
- Bump Standards-Version to 3.9.1
- Remove duplicate Uploaders
- Remove duplicate Section/Priority to please lintian
* debian/rules: Bump SHLIB_VERSION version
* Switch to dpkg-source 3.0 (quilt) format
* Add libatk1.0-0.symbols file
* Enable introspection support (Closes: #582385)
Added:
desktop/experimental/atk1.0/debian/gir1.0-atk-1.0.install
desktop/experimental/atk1.0/debian/libatk1.0-0.symbols
desktop/experimental/atk1.0/debian/patches/series
desktop/experimental/atk1.0/debian/source/
desktop/experimental/atk1.0/debian/source/format
Modified:
desktop/experimental/atk1.0/debian/changelog
desktop/experimental/atk1.0/debian/control
desktop/experimental/atk1.0/debian/control.in
desktop/experimental/atk1.0/debian/libatk1.0-dev.install
desktop/experimental/atk1.0/debian/patches/90-relibtoolize.patch
desktop/experimental/atk1.0/debian/rules
Modified: desktop/experimental/atk1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/atk1.0/debian/changelog?rev=25640&op=diff
==============================================================================
--- desktop/experimental/atk1.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/atk1.0/debian/changelog [utf-8] Sun Nov 21 22:47:09 2010
@@ -1,9 +1,22 @@
-atk1.0 (1.30.0-2) UNRELEASED; urgency=low
-
+atk1.0 (1.32.0-1) UNRELEASED; urgency=low
+
+ [ Josselin Mouette ]
* Make libatk1.0-0 depend on libatk1.0-data and remove the opposite
dependency. Closes: #599666.
- -- Josselin Mouette <joss at debian.org> Tue, 19 Oct 2010 22:50:35 +0200
+ [ Laurent Bigonville ]
+ * New upstream stable release.
+ - Refresh debian/patches/90-relibtoolize.patch
+ * debian/control.in:
+ - Bump Standards-Version to 3.9.1
+ - Remove duplicate Uploaders
+ - Remove duplicate Section/Priority to please lintian
+ * debian/rules: Bump SHLIB_VERSION version
+ * Switch to dpkg-source 3.0 (quilt) format
+ * Add libatk1.0-0.symbols file
+ * Enable introspection support (Closes: #582385)
+
+ -- Laurent Bigonville <bigon at debian.org> Sun, 21 Nov 2010 23:32:55 +0100
atk1.0 (1.30.0-1) unstable; urgency=low
Modified: desktop/experimental/atk1.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/atk1.0/debian/control?rev=25640&op=diff
==============================================================================
--- desktop/experimental/atk1.0/debian/control [utf-8] (original)
+++ desktop/experimental/atk1.0/debian/control [utf-8] Sun Nov 21 22:47:09 2010
@@ -7,7 +7,7 @@
Section: libs
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: David Weinehall <tao at debian.org>, Josselin Mouette <joss at debian.org>, Mario Lang <mlang at debian.org>, Sebastian Dröge <slomo at debian.org>, David Weinehall <tao at debian.org>
+Uploaders: David Weinehall <tao at debian.org>, Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>, Mario Lang <mlang at debian.org>, Sebastian Dröge <slomo at debian.org>
Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/atk1.0
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/atk1.0
Build-Depends: debhelper (>= 5.0.22),
@@ -17,13 +17,15 @@
cdbs (>= 0.4.41),
gtk-doc-tools,
docbook-xml,
- autotools-dev
+ autotools-dev,
+ gobject-introspection,
+ libgirepository1.0-dev,
+ gir1.0-glib-2.0
Build-Depends-Indep: libglib2.0-doc
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Homepage: http://www.gtk.org/
Package: libatk1.0-0
-Section: libs
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
@@ -39,7 +41,6 @@
Package: libatk1.0-udeb
XC-Package-Type: udeb
Section: debian-installer
-Priority: optional
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends}
@@ -73,7 +74,8 @@
pkg-config,
libglib2.0-dev (>= 2.4.1-2)
Replaces: libatk0-dev,
- libatk-dev
+ libatk-dev,
+ gir-repository-dev
Conflicts: libatk0-dev,
libatk-dev
Description: Development files for the ATK accessibility toolkit
@@ -120,3 +122,17 @@
This contains the HTML documentation for the ATK library in
/usr/share/doc/libatk1.0-doc/ .
+Package: gir1.0-atk-1.0
+Architecture: any
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
+ ${gir:Depends}
+Replaces: gir1.0-gtk-2.0, gobject-introspection-repository
+Description: The ATK accessibility toolkit
+ ATK is a toolkit providing accessibility interfaces for applications or
+ other toolkits. By implementing these interfaces, those other toolkits or
+ applications can be used with tools such as screen readers, magnifiers, and
+ other alternative input devices.
+ .
+ This package can be used by other packages using the GIRepository format to
+ generate dynamic bindings
Modified: desktop/experimental/atk1.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/atk1.0/debian/control.in?rev=25640&op=diff
==============================================================================
--- desktop/experimental/atk1.0/debian/control.in [utf-8] (original)
+++ desktop/experimental/atk1.0/debian/control.in [utf-8] Sun Nov 21 22:47:09 2010
@@ -2,7 +2,7 @@
Section: libs
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: @GNOME_TEAM@, David Weinehall <tao at debian.org>
+Uploaders: @GNOME_TEAM@
Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/atk1.0
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/atk1.0
Build-Depends: debhelper (>= 5.0.22),
@@ -12,13 +12,15 @@
cdbs (>= 0.4.41),
gtk-doc-tools,
docbook-xml,
- autotools-dev
+ autotools-dev,
+ gobject-introspection,
+ libgirepository1.0-dev,
+ gir1.0-glib-2.0
Build-Depends-Indep: libglib2.0-doc
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Homepage: http://www.gtk.org/
Package: libatk1.0-0
-Section: libs
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
@@ -34,7 +36,6 @@
Package: libatk1.0-udeb
XC-Package-Type: udeb
Section: debian-installer
-Priority: optional
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends}
@@ -68,7 +69,8 @@
pkg-config,
libglib2.0-dev (>= 2.4.1-2)
Replaces: libatk0-dev,
- libatk-dev
+ libatk-dev,
+ gir-repository-dev
Conflicts: libatk0-dev,
libatk-dev
Description: Development files for the ATK accessibility toolkit
@@ -115,3 +117,17 @@
This contains the HTML documentation for the ATK library in
/usr/share/doc/libatk1.0-doc/ .
+Package: gir1.0-atk-1.0
+Architecture: any
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
+ ${gir:Depends}
+Replaces: gir1.0-gtk-2.0, gobject-introspection-repository
+Description: The ATK accessibility toolkit (GObject introspection)
+ ATK is a toolkit providing accessibility interfaces for applications or
+ other toolkits. By implementing these interfaces, those other toolkits or
+ applications can be used with tools such as screen readers, magnifiers, and
+ other alternative input devices.
+ .
+ This package can be used by other packages using the GIRepository format to
+ generate dynamic bindings
Added: desktop/experimental/atk1.0/debian/gir1.0-atk-1.0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/atk1.0/debian/gir1.0-atk-1.0.install?rev=25640&op=file
==============================================================================
--- desktop/experimental/atk1.0/debian/gir1.0-atk-1.0.install (added)
+++ desktop/experimental/atk1.0/debian/gir1.0-atk-1.0.install [utf-8] Sun Nov 21 22:47:09 2010
@@ -1,0 +1,1 @@
+debian/tmp/usr/lib/girepository-1.0/
Added: desktop/experimental/atk1.0/debian/libatk1.0-0.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/atk1.0/debian/libatk1.0-0.symbols?rev=25640&op=file
==============================================================================
--- desktop/experimental/atk1.0/debian/libatk1.0-0.symbols (added)
+++ desktop/experimental/atk1.0/debian/libatk1.0-0.symbols [utf-8] Sun Nov 21 22:47:09 2010
@@ -1,0 +1,252 @@
+libatk-1.0.so.0 libatk1.0-0 #MINVER#
+ atk_action_do_action at Base 1.12.4
+ atk_action_get_description at Base 1.12.4
+ atk_action_get_keybinding at Base 1.12.4
+ atk_action_get_localized_name at Base 1.12.4
+ atk_action_get_n_actions at Base 1.12.4
+ atk_action_get_name at Base 1.12.4
+ atk_action_get_type at Base 1.12.4
+ atk_action_set_description at Base 1.12.4
+ atk_add_focus_tracker at Base 1.12.4
+ atk_add_global_event_listener at Base 1.12.4
+ atk_add_key_event_listener at Base 1.12.4
+ atk_attribute_set_free at Base 1.12.4
+ atk_component_add_focus_handler at Base 1.12.4
+ atk_component_contains at Base 1.12.4
+ atk_component_get_alpha at Base 1.12.4
+ atk_component_get_extents at Base 1.12.4
+ atk_component_get_layer at Base 1.12.4
+ atk_component_get_mdi_zorder at Base 1.12.4
+ atk_component_get_position at Base 1.12.4
+ atk_component_get_size at Base 1.12.4
+ atk_component_get_type at Base 1.12.4
+ atk_component_grab_focus at Base 1.12.4
+ atk_component_ref_accessible_at_point at Base 1.12.4
+ atk_component_remove_focus_handler at Base 1.12.4
+ atk_component_set_extents at Base 1.12.4
+ atk_component_set_position at Base 1.12.4
+ atk_component_set_size at Base 1.12.4
+ atk_coord_type_get_type at Base 1.12.4
+ atk_document_get_attribute_value at Base 1.12.4
+ atk_document_get_attributes at Base 1.12.4
+ atk_document_get_document at Base 1.12.4
+ atk_document_get_document_type at Base 1.12.4
+ atk_document_get_locale at Base 1.12.4
+ atk_document_get_type at Base 1.12.4
+ atk_document_set_attribute_value at Base 1.12.4
+ atk_editable_text_copy_text at Base 1.12.4
+ atk_editable_text_cut_text at Base 1.12.4
+ atk_editable_text_delete_text at Base 1.12.4
+ atk_editable_text_get_type at Base 1.12.4
+ atk_editable_text_insert_text at Base 1.12.4
+ atk_editable_text_paste_text at Base 1.12.4
+ atk_editable_text_set_run_attributes at Base 1.12.4
+ atk_editable_text_set_text_contents at Base 1.12.4
+ atk_focus_tracker_init at Base 1.12.4
+ atk_focus_tracker_notify at Base 1.12.4
+ atk_get_default_registry at Base 1.12.4
+ atk_get_focus_object at Base 1.12.4
+ atk_get_root at Base 1.12.4
+ atk_get_toolkit_name at Base 1.12.4
+ atk_get_toolkit_version at Base 1.12.4
+ atk_get_version at Base 1.20.0
+ atk_gobject_accessible_for_object at Base 1.12.4
+ atk_gobject_accessible_get_object at Base 1.12.4
+ atk_gobject_accessible_get_type at Base 1.12.4
+ atk_hyperlink_get_end_index at Base 1.12.4
+ atk_hyperlink_get_n_anchors at Base 1.12.4
+ atk_hyperlink_get_object at Base 1.12.4
+ atk_hyperlink_get_start_index at Base 1.12.4
+ atk_hyperlink_get_type at Base 1.12.4
+ atk_hyperlink_get_uri at Base 1.12.4
+ atk_hyperlink_impl_get_hyperlink at Base 1.12.4
+ atk_hyperlink_impl_get_type at Base 1.12.4
+ atk_hyperlink_is_inline at Base 1.12.4
+ atk_hyperlink_is_selected_link at Base 1.12.4
+ atk_hyperlink_is_valid at Base 1.12.4
+ atk_hyperlink_state_flags_get_type at Base 1.12.4
+ atk_hypertext_get_link at Base 1.12.4
+ atk_hypertext_get_link_index at Base 1.12.4
+ atk_hypertext_get_n_links at Base 1.12.4
+ atk_hypertext_get_type at Base 1.12.4
+ atk_image_get_image_description at Base 1.12.4
+ atk_image_get_image_locale at Base 1.12.4
+ atk_image_get_image_position at Base 1.12.4
+ atk_image_get_image_size at Base 1.12.4
+ atk_image_get_type at Base 1.12.4
+ atk_image_set_image_description at Base 1.12.4
+ atk_implementor_get_type at Base 1.12.4
+ atk_implementor_ref_accessible at Base 1.12.4
+ atk_key_event_type_get_type at Base 1.12.4
+ atk_layer_get_type at Base 1.12.4
+ atk_marshal_VOID__INT_INT at Base 1.12.4
+ atk_marshal_VOID__STRING_BOOLEAN at Base 1.12.4
+ atk_misc_get_instance at Base 1.18.0
+ atk_misc_get_type at Base 1.18.0
+ atk_misc_instance at Base 1.18.0
+ atk_misc_threads_enter at Base 1.18.0
+ atk_misc_threads_leave at Base 1.18.0
+ atk_no_op_object_factory_get_type at Base 1.12.4
+ atk_no_op_object_factory_new at Base 1.12.4
+ atk_no_op_object_get_type at Base 1.12.4
+ atk_no_op_object_new at Base 1.12.4
+ atk_object_add_relationship at Base 1.12.4
+ atk_object_connect_property_change_handler at Base 1.12.4
+ atk_object_factory_create_accessible at Base 1.12.4
+ atk_object_factory_get_accessible_type at Base 1.12.4
+ atk_object_factory_get_type at Base 1.12.4
+ atk_object_factory_invalidate at Base 1.12.4
+ atk_object_get_attributes at Base 1.12.4
+ atk_object_get_description at Base 1.12.4
+ atk_object_get_index_in_parent at Base 1.12.4
+ atk_object_get_layer at Base 1.12.4
+ atk_object_get_mdi_zorder at Base 1.12.4
+ atk_object_get_n_accessible_children at Base 1.12.4
+ atk_object_get_name at Base 1.12.4
+ atk_object_get_parent at Base 1.12.4
+ atk_object_get_role at Base 1.12.4
+ atk_object_get_type at Base 1.12.4
+ atk_object_initialize at Base 1.12.4
+ atk_object_notify_state_change at Base 1.12.4
+ atk_object_ref_accessible_child at Base 1.12.4
+ atk_object_ref_relation_set at Base 1.12.4
+ atk_object_ref_state_set at Base 1.12.4
+ atk_object_remove_property_change_handler at Base 1.12.4
+ atk_object_remove_relationship at Base 1.12.4
+ atk_object_set_description at Base 1.12.4
+ atk_object_set_name at Base 1.12.4
+ atk_object_set_parent at Base 1.12.4
+ atk_object_set_role at Base 1.12.4
+ atk_plug_get_id at Base 1.32.0
+ atk_plug_get_type at Base 1.32.0
+ atk_plug_new at Base 1.32.0
+ atk_rectangle_get_type at Base 1.12.4
+ atk_registry_get_factory at Base 1.12.4
+ atk_registry_get_factory_type at Base 1.12.4
+ atk_registry_get_type at Base 1.12.4
+ atk_registry_set_factory_type at Base 1.12.4
+ atk_relation_add_target at Base 1.12.4
+ atk_relation_get_relation_type at Base 1.12.4
+ atk_relation_get_target at Base 1.12.4
+ atk_relation_get_type at Base 1.12.4
+ atk_relation_new at Base 1.12.4
+ atk_relation_remove_target at Base 1.26.0
+ atk_relation_set_add at Base 1.12.4
+ atk_relation_set_add_relation_by_type at Base 1.12.4
+ atk_relation_set_contains at Base 1.12.4
+ atk_relation_set_get_n_relations at Base 1.12.4
+ atk_relation_set_get_relation at Base 1.12.4
+ atk_relation_set_get_relation_by_type at Base 1.12.4
+ atk_relation_set_get_type at Base 1.12.4
+ atk_relation_set_new at Base 1.12.4
+ atk_relation_set_remove at Base 1.12.4
+ atk_relation_type_for_name at Base 1.12.4
+ atk_relation_type_get_name at Base 1.12.4
+ atk_relation_type_get_type at Base 1.12.4
+ atk_relation_type_register at Base 1.12.4
+ atk_remove_focus_tracker at Base 1.12.4
+ atk_remove_global_event_listener at Base 1.12.4
+ atk_remove_key_event_listener at Base 1.12.4
+ atk_role_for_name at Base 1.12.4
+ atk_role_get_localized_name at Base 1.12.4
+ atk_role_get_name at Base 1.12.4
+ atk_role_get_type at Base 1.12.4
+ atk_role_register at Base 1.12.4
+ atk_selection_add_selection at Base 1.12.4
+ atk_selection_clear_selection at Base 1.12.4
+ atk_selection_get_selection_count at Base 1.12.4
+ atk_selection_get_type at Base 1.12.4
+ atk_selection_is_child_selected at Base 1.12.4
+ atk_selection_ref_selection at Base 1.12.4
+ atk_selection_remove_selection at Base 1.12.4
+ atk_selection_select_all_selection at Base 1.12.4
+ atk_socket_embed at Base 1.32.0
+ atk_socket_get_type at Base 1.32.0
+ atk_socket_is_occupied at Base 1.32.0
+ atk_socket_new at Base 1.32.0
+ atk_state_set_add_state at Base 1.12.4
+ atk_state_set_add_states at Base 1.12.4
+ atk_state_set_and_sets at Base 1.12.4
+ atk_state_set_clear_states at Base 1.12.4
+ atk_state_set_contains_state at Base 1.12.4
+ atk_state_set_contains_states at Base 1.12.4
+ atk_state_set_get_type at Base 1.12.4
+ atk_state_set_is_empty at Base 1.12.4
+ atk_state_set_new at Base 1.12.4
+ atk_state_set_or_sets at Base 1.12.4
+ atk_state_set_remove_state at Base 1.12.4
+ atk_state_set_xor_sets at Base 1.12.4
+ atk_state_type_for_name at Base 1.12.4
+ atk_state_type_get_name at Base 1.12.4
+ atk_state_type_get_type at Base 1.12.4
+ atk_state_type_register at Base 1.12.4
+ atk_streamable_content_get_mime_type at Base 1.12.4
+ atk_streamable_content_get_n_mime_types at Base 1.12.4
+ atk_streamable_content_get_stream at Base 1.12.4
+ atk_streamable_content_get_type at Base 1.12.4
+ atk_streamable_content_get_uri at Base 1.12.4
+ atk_table_add_column_selection at Base 1.12.4
+ atk_table_add_row_selection at Base 1.12.4
+ atk_table_get_caption at Base 1.12.4
+ atk_table_get_column_at_index at Base 1.12.4
+ atk_table_get_column_description at Base 1.12.4
+ atk_table_get_column_extent_at at Base 1.12.4
+ atk_table_get_column_header at Base 1.12.4
+ atk_table_get_index_at at Base 1.12.4
+ atk_table_get_n_columns at Base 1.12.4
+ atk_table_get_n_rows at Base 1.12.4
+ atk_table_get_row_at_index at Base 1.12.4
+ atk_table_get_row_description at Base 1.12.4
+ atk_table_get_row_extent_at at Base 1.12.4
+ atk_table_get_row_header at Base 1.12.4
+ atk_table_get_selected_columns at Base 1.12.4
+ atk_table_get_selected_rows at Base 1.12.4
+ atk_table_get_summary at Base 1.12.4
+ atk_table_get_type at Base 1.12.4
+ atk_table_is_column_selected at Base 1.12.4
+ atk_table_is_row_selected at Base 1.12.4
+ atk_table_is_selected at Base 1.12.4
+ atk_table_ref_at at Base 1.12.4
+ atk_table_remove_column_selection at Base 1.12.4
+ atk_table_remove_row_selection at Base 1.12.4
+ atk_table_set_caption at Base 1.12.4
+ atk_table_set_column_description at Base 1.12.4
+ atk_table_set_column_header at Base 1.12.4
+ atk_table_set_row_description at Base 1.12.4
+ atk_table_set_row_header at Base 1.12.4
+ atk_table_set_summary at Base 1.12.4
+ atk_text_add_selection at Base 1.12.4
+ atk_text_attribute_for_name at Base 1.12.4
+ atk_text_attribute_get_name at Base 1.12.4
+ atk_text_attribute_get_type at Base 1.12.4
+ atk_text_attribute_get_value at Base 1.12.4
+ atk_text_attribute_register at Base 1.12.4
+ atk_text_boundary_get_type at Base 1.12.4
+ atk_text_clip_type_get_type at Base 1.12.4
+ atk_text_free_ranges at Base 1.12.4
+ atk_text_get_bounded_ranges at Base 1.12.4
+ atk_text_get_caret_offset at Base 1.12.4
+ atk_text_get_character_at_offset at Base 1.12.4
+ atk_text_get_character_count at Base 1.12.4
+ atk_text_get_character_extents at Base 1.12.4
+ atk_text_get_default_attributes at Base 1.12.4
+ atk_text_get_n_selections at Base 1.12.4
+ atk_text_get_offset_at_point at Base 1.12.4
+ atk_text_get_range_extents at Base 1.12.4
+ atk_text_get_run_attributes at Base 1.12.4
+ atk_text_get_selection at Base 1.12.4
+ atk_text_get_text at Base 1.12.4
+ atk_text_get_text_after_offset at Base 1.12.4
+ atk_text_get_text_at_offset at Base 1.12.4
+ atk_text_get_text_before_offset at Base 1.12.4
+ atk_text_get_type at Base 1.12.4
+ atk_text_remove_selection at Base 1.12.4
+ atk_text_set_caret_offset at Base 1.12.4
+ atk_text_set_selection at Base 1.12.4
+ atk_util_get_type at Base 1.12.4
+ atk_value_get_current_value at Base 1.12.4
+ atk_value_get_maximum_value at Base 1.12.4
+ atk_value_get_minimum_increment at Base 1.12.4
+ atk_value_get_minimum_value at Base 1.12.4
+ atk_value_get_type at Base 1.12.4
+ atk_value_set_current_value at Base 1.12.4
Modified: desktop/experimental/atk1.0/debian/libatk1.0-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/atk1.0/debian/libatk1.0-dev.install?rev=25640&op=diff
==============================================================================
--- desktop/experimental/atk1.0/debian/libatk1.0-dev.install [utf-8] (original)
+++ desktop/experimental/atk1.0/debian/libatk1.0-dev.install [utf-8] Sun Nov 21 22:47:09 2010
@@ -3,3 +3,4 @@
debian/tmp/usr/lib/*.so
debian/tmp/usr/lib/pkgconfig/
debian/tmp/usr/include
+debian/tmp/usr/share/gir-1.0
Modified: desktop/experimental/atk1.0/debian/patches/90-relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/atk1.0/debian/patches/90-relibtoolize.patch?rev=25640&op=diff
==============================================================================
--- desktop/experimental/atk1.0/debian/patches/90-relibtoolize.patch [utf-8] (original)
+++ desktop/experimental/atk1.0/debian/patches/90-relibtoolize.patch [utf-8] Sun Nov 21 22:47:09 2010
@@ -1,4248 +1,6 @@
-diff -Naur atk1.0-1.30.0.old/aclocal.m4 atk1.0-1.30.0/aclocal.m4
---- atk1.0-1.30.0.old/aclocal.m4 2010-03-30 00:53:46.000000000 +0200
-+++ atk1.0-1.30.0/aclocal.m4 2010-03-31 09:05:40.266315440 +0200
-@@ -1,4 +1,4 @@
--# generated automatically by aclocal 1.11 -*- Autoconf -*-
-+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
-
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-@@ -13,1756 +13,1756 @@
-
- m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
--m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
--[m4_warning([this file was generated for autoconf 2.64.
-+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
-+[m4_warning([this file was generated for autoconf 2.65.
- You have another version of autoconf. It may work, but is not guaranteed to.
- If you have problems, you may need to regenerate the build system entirely.
- To do so, use the procedure documented by the package, typically `autoreconf'.])])
-
--# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# AM_AUTOMAKE_VERSION(VERSION)
--# ----------------------------
--# Automake X.Y traces this macro to ensure aclocal.m4 has been
--# generated from the m4 files accompanying Automake X.Y.
--# (This private macro should not be called outside this file.)
--AC_DEFUN([AM_AUTOMAKE_VERSION],
--[am__api_version='1.11'
--dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
--dnl require some minimum version. Point them to the right macro.
--m4_if([$1], [1.11], [],
-- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
--])
--
--# _AM_AUTOCONF_VERSION(VERSION)
--# -----------------------------
--# aclocal traces this macro to find the Autoconf version.
--# This is a private macro too. Using m4_define simplifies
--# the logic in aclocal, which can simply ignore this definition.
--m4_define([_AM_AUTOCONF_VERSION], [])
--
--# AM_SET_CURRENT_AUTOMAKE_VERSION
--# -------------------------------
--# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
--# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
--AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.11])dnl
--m4_ifndef([AC_AUTOCONF_VERSION],
-- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
--_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
--
--# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-+# Configure paths for GLIB
-+# Owen Taylor 1997-2001
-
--# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject,
-+dnl gthread, or gio is specified in MODULES, pass to pkg-config
-+dnl
-+AC_DEFUN([AM_PATH_GLIB_2_0],
-+[dnl
-+dnl Get the cflags and libraries from pkg-config
-+dnl
-+AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program],
-+ , enable_glibtest=yes)
-
--# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
--# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
--# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
--#
--# Of course, Automake must honor this variable whenever it calls a
--# tool from the auxiliary directory. The problem is that $srcdir (and
--# therefore $ac_aux_dir as well) can be either absolute or relative,
--# depending on how configure is run. This is pretty annoying, since
--# it makes $ac_aux_dir quite unusable in subdirectories: in the top
--# source directory, any form will work fine, but in subdirectories a
--# relative path needs to be adjusted first.
--#
--# $ac_aux_dir/missing
--# fails when called from a subdirectory if $ac_aux_dir is relative
--# $top_srcdir/$ac_aux_dir/missing
--# fails if $ac_aux_dir is absolute,
--# fails when called from a subdirectory in a VPATH build with
--# a relative $ac_aux_dir
--#
--# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
--# are both prefixed by $srcdir. In an in-source build this is usually
--# harmless because $srcdir is `.', but things will broke when you
--# start a VPATH build or use an absolute $srcdir.
--#
--# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
--# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
--# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
--# and then we would define $MISSING as
--# MISSING="\${SHELL} $am_aux_dir/missing"
--# This will work as long as MISSING is not called from configure, because
--# unfortunately $(top_srcdir) has no meaning in configure.
--# However there are other variables, like CC, which are often used in
--# configure, and could therefore not use this "fixed" $ac_aux_dir.
--#
--# Another solution, used here, is to always expand $ac_aux_dir to an
--# absolute PATH. The drawback is that using absolute paths prevent a
--# configured tree to be moved without reconfiguration.
-+ pkg_config_args=glib-2.0
-+ for module in . $4
-+ do
-+ case "$module" in
-+ gmodule)
-+ pkg_config_args="$pkg_config_args gmodule-2.0"
-+ ;;
-+ gmodule-no-export)
-+ pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
-+ ;;
-+ gobject)
-+ pkg_config_args="$pkg_config_args gobject-2.0"
-+ ;;
-+ gthread)
-+ pkg_config_args="$pkg_config_args gthread-2.0"
-+ ;;
-+ gio*)
-+ pkg_config_args="$pkg_config_args $module-2.0"
-+ ;;
-+ esac
-+ done
-
--AC_DEFUN([AM_AUX_DIR_EXPAND],
--[dnl Rely on autoconf to set up CDPATH properly.
--AC_PREREQ([2.50])dnl
--# expand $ac_aux_dir to an absolute path
--am_aux_dir=`cd $ac_aux_dir && pwd`
--])
-+ PKG_PROG_PKG_CONFIG([0.16])
-
--# AM_CONDITIONAL -*- Autoconf -*-
-+ no_glib=""
-
--# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+ if test "x$PKG_CONFIG" = x ; then
-+ no_glib=yes
-+ PKG_CONFIG=no
-+ fi
-
--# serial 9
-+ min_glib_version=ifelse([$1], ,2.0.0,$1)
-+ AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
-
--# AM_CONDITIONAL(NAME, SHELL-CONDITION)
--# -------------------------------------
--# Define a conditional.
--AC_DEFUN([AM_CONDITIONAL],
--[AC_PREREQ(2.52)dnl
-- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
-- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
--AC_SUBST([$1_TRUE])dnl
--AC_SUBST([$1_FALSE])dnl
--_AM_SUBST_NOTMAKE([$1_TRUE])dnl
--_AM_SUBST_NOTMAKE([$1_FALSE])dnl
--m4_define([_AM_COND_VALUE_$1], [$2])dnl
--if $2; then
-- $1_TRUE=
-- $1_FALSE='#'
--else
-- $1_TRUE='#'
-- $1_FALSE=
--fi
--AC_CONFIG_COMMANDS_PRE(
--[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-- AC_MSG_ERROR([[conditional "$1" was never defined.
--Usually this means the macro was only invoked conditionally.]])
--fi])])
-+ if test x$PKG_CONFIG != xno ; then
-+ ## don't try to run the test against uninstalled libtool libs
-+ if $PKG_CONFIG --uninstalled $pkg_config_args; then
-+ echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
-+ enable_glibtest=no
-+ fi
-
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+ if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
-+ :
-+ else
-+ no_glib=yes
-+ fi
-+ fi
-
--# serial 10
-+ if test x"$no_glib" = x ; then
-+ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
-+ GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
-+ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
-
--# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
--# written in clear, in which case automake, when reading aclocal.m4,
--# will think it sees a *use*, and therefore will trigger all it's
--# C support machinery. Also note that it means that autoscan, seeing
--# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-+ 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 | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-+ glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-+ glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-+ if test "x$enable_glibtest" = "xyes" ; then
-+ ac_save_CFLAGS="$CFLAGS"
-+ ac_save_LIBS="$LIBS"
-+ CFLAGS="$CFLAGS $GLIB_CFLAGS"
-+ LIBS="$GLIB_LIBS $LIBS"
-+dnl
-+dnl Now check if the installed GLIB is sufficiently new. (Also sanity
-+dnl checks the results of pkg-config to some extent)
-+dnl
-+ rm -f conf.glibtest
-+ AC_TRY_RUN([
-+#include <glib.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-
-+int
-+main ()
-+{
-+ int major, minor, micro;
-+ char *tmp_version;
-
--# _AM_DEPENDENCIES(NAME)
--# ----------------------
--# See how the compiler implements dependency checking.
--# NAME is "CC", "CXX", "GCJ", or "OBJC".
--# We try a few techniques and use that to set a single cache variable.
--#
--# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
--# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
--# dependency, and given that the user is not expected to run this macro,
--# just rely on AC_PROG_CC.
--AC_DEFUN([_AM_DEPENDENCIES],
--[AC_REQUIRE([AM_SET_DEPDIR])dnl
--AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
--AC_REQUIRE([AM_MAKE_INCLUDE])dnl
--AC_REQUIRE([AM_DEP_TRACK])dnl
-+ fclose (fopen ("conf.glibtest", "w"));
-
--ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
-- [$1], CXX, [depcc="$CXX" am_compiler_list=],
-- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-- [$1], UPC, [depcc="$UPC" am_compiler_list=],
-- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
-- [depcc="$$1" am_compiler_list=])
-+ /* HP/UX 9 (%@#!) writes to sscanf strings */
-+ tmp_version = g_strdup("$min_glib_version");
-+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
-+ printf("%s, bad version string\n", "$min_glib_version");
-+ exit(1);
-+ }
-
--AC_CACHE_CHECK([dependency style of $depcc],
-- [am_cv_$1_dependencies_compiler_type],
--[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
--
-- am_cv_$1_dependencies_compiler_type=none
-- if test "$am_compiler_list" = ""; then
-- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-+ if ((glib_major_version != $glib_config_major_version) ||
-+ (glib_minor_version != $glib_config_minor_version) ||
-+ (glib_micro_version != $glib_config_micro_version))
-+ {
-+ printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
-+ $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
-+ glib_major_version, glib_minor_version, glib_micro_version);
-+ printf ("*** was found! If pkg-config was correct, then it is best\n");
-+ printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
-+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-+ printf("*** required on your system.\n");
-+ printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
-+ printf("*** to point to the correct configuration files\n");
-+ }
-+ else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
-+ (glib_minor_version != GLIB_MINOR_VERSION) ||
-+ (glib_micro_version != GLIB_MICRO_VERSION))
-+ {
-+ printf("*** GLIB header files (version %d.%d.%d) do not match\n",
-+ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
-+ printf("*** library (version %d.%d.%d)\n",
-+ glib_major_version, glib_minor_version, glib_micro_version);
-+ }
-+ else
-+ {
-+ if ((glib_major_version > major) ||
-+ ((glib_major_version == major) && (glib_minor_version > minor)) ||
-+ ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
-+ {
-+ return 0;
-+ }
-+ else
-+ {
-+ printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
-+ glib_major_version, glib_minor_version, glib_micro_version);
-+ printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
-+ major, minor, micro);
-+ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
-+ printf("***\n");
-+ printf("*** If you have already installed a sufficiently new version, this error\n");
-+ printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
-+ printf("*** being found. The easiest way to fix this is to remove the old version\n");
-+ printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
-+ printf("*** correct copy of pkg-config. (In this case, you will have to\n");
-+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-+ printf("*** so that the correct libraries are found at run-time))\n");
-+ }
-+ }
-+ return 1;
-+}
-+],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-+ CFLAGS="$ac_save_CFLAGS"
-+ LIBS="$ac_save_LIBS"
-+ fi
- fi
-- am__universal=false
-- m4_case([$1], [CC],
-- [case " $depcc " in #(
-- *\ -arch\ *\ -arch\ *) am__universal=true ;;
-- esac],
-- [CXX],
-- [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
--
-- # 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
-- # versions had trouble with output in subdirs
-- am__obj=sub/conftest.${OBJEXT-o}
-- am__minus_obj="-o $am__obj"
-- case $depmode in
-- gcc)
-- # This depmode causes a compiler race in universal mode.
-- test "$am__universal" = false || continue
-- ;;
-- nosideeffect)
-- # after this tag, mechanisms are not by side-effect, so they'll
-- # only be used when explicitly requested
-- if test "x$enable_dependency_tracking" = xyes; then
-- continue
-- else
-- break
-- fi
-- ;;
-- msvisualcpp | msvcmsys)
-- # This compiler won't grok `-c -o', but also, the minuso test has
-- # not run yet. These depmodes are late enough in the game, and
-- # so weak that their functioning should not be impacted.
-- am__obj=conftest.${OBJEXT-o}
-- am__minus_obj=
-- ;;
-- none) break ;;
-- esac
-- if depmode=$depmode \
-- source=sub/conftest.c object=$am__obj \
-- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-- >/dev/null 2>conftest.err &&
-- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-- grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-- # icc doesn't choke on unknown options, it will just issue warnings
-- # or remarks (even with -Werror). So we grep stderr for any message
-- # that says an option was ignored or not supported.
-- # When given -MP, icc 7.0 and 7.1 complain thusly:
-- # icc: Command line warning: ignoring option '-M'; no argument required
-- # The diagnosis changed in icc 8.0:
-- # icc: Command line remark: option '-MP' not supported
-- if (grep 'ignoring option' conftest.err ||
-- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-- am_cv_$1_dependencies_compiler_type=$depmode
-- break
-- fi
-- fi
-- done
--
-- cd ..
-- rm -rf conftest.dir
--else
-- am_cv_$1_dependencies_compiler_type=none
--fi
--])
--AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
--AM_CONDITIONAL([am__fastdep$1], [
-- test "x$enable_dependency_tracking" != xno \
-- && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
--])
--
--
--# AM_SET_DEPDIR
--# -------------
--# Choose a directory name for dependency files.
--# This macro is AC_REQUIREd in _AM_DEPENDENCIES
--AC_DEFUN([AM_SET_DEPDIR],
--[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
--AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
--])
--
--
--# AM_DEP_TRACK
--# ------------
--AC_DEFUN([AM_DEP_TRACK],
--[AC_ARG_ENABLE(dependency-tracking,
--[ --disable-dependency-tracking speeds up one-time build
-- --enable-dependency-tracking do not reject slow dependency extractors])
--if test "x$enable_dependency_tracking" != xno; then
-- am_depcomp="$ac_aux_dir/depcomp"
-- AMDEPBACKSLASH='\'
--fi
--AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
--AC_SUBST([AMDEPBACKSLASH])dnl
--_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-+ if test "x$no_glib" = x ; then
-+ AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
-+ ifelse([$2], , :, [$2])
-+ else
-+ AC_MSG_RESULT(no)
-+ if test "$PKG_CONFIG" = "no" ; then
-+ echo "*** A new enough version of pkg-config was not found."
-+ echo "*** See http://www.freedesktop.org/software/pkgconfig/"
-+ else
-+ if test -f conf.glibtest ; then
-+ :
-+ else
-+ echo "*** Could not run GLIB test program, checking why..."
-+ ac_save_CFLAGS="$CFLAGS"
-+ ac_save_LIBS="$LIBS"
-+ CFLAGS="$CFLAGS $GLIB_CFLAGS"
-+ LIBS="$LIBS $GLIB_LIBS"
-+ AC_TRY_LINK([
-+#include <glib.h>
-+#include <stdio.h>
-+], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
-+ [ 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" ],
-+ [ 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."])
-+ CFLAGS="$ac_save_CFLAGS"
-+ LIBS="$ac_save_LIBS"
-+ fi
-+ fi
-+ GLIB_CFLAGS=""
-+ GLIB_LIBS=""
-+ GLIB_GENMARSHAL=""
-+ GOBJECT_QUERY=""
-+ GLIB_MKENUMS=""
-+ ifelse([$3], , :, [$3])
-+ fi
-+ AC_SUBST(GLIB_CFLAGS)
-+ AC_SUBST(GLIB_LIBS)
-+ AC_SUBST(GLIB_GENMARSHAL)
-+ AC_SUBST(GOBJECT_QUERY)
-+ AC_SUBST(GLIB_MKENUMS)
-+ rm -f conf.glibtest
- ])
-
--# Generate code to set up dependency tracking. -*- Autoconf -*-
--
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
--# Free Software Foundation, Inc.
-+# Copyright (C) 1995-2002 Free Software Foundation, Inc.
-+# Copyright (C) 2001-2003,2004 Red Hat, Inc.
- #
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--#serial 5
--
--# _AM_OUTPUT_DEPENDENCY_COMMANDS
--# ------------------------------
--AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
--[{
-- # Autoconf 2.62 quotes --file arguments for eval, but not when files
-- # are listed without --file. Let's play safe and only enable the eval
-- # if we detect the quoting.
-- case $CONFIG_FILES in
-- *\'*) eval set x "$CONFIG_FILES" ;;
-- *) set x $CONFIG_FILES ;;
-- esac
-- shift
-- for mf
-- do
-- # Strip MF so we end up with the name of the file.
-- mf=`echo "$mf" | sed -e 's/:.*$//'`
-- # Check whether this is an Automake generated Makefile or not.
-- # We used to match only the files named `Makefile.in', but
-- # some people rename them; so instead we look at the file content.
-- # Grep'ing the first line is not enough: some people post-process
-- # each Makefile.in and add a new line on top of each file to say so.
-- # Grep'ing the whole file is not good either: AIX grep has a line
-- # limit of 2048, but all sed's we know have understand at least 4000.
-- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-- dirpart=`AS_DIRNAME("$mf")`
-- else
-- continue
-- fi
-- # Extract the definition of DEPDIR, am__include, and am__quote
-- # from the Makefile without running `make'.
-- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-- test -z "$DEPDIR" && continue
-- am__include=`sed -n 's/^am__include = //p' < "$mf"`
-- test -z "am__include" && continue
-- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-- # When using ansi2knr, U may be empty or an underscore; expand it
-- U=`sed -n 's/^U = //p' < "$mf"`
-- # Find all dependency output files, they are included files with
-- # $(DEPDIR) in their names. We invoke sed twice because it is the
-- # simplest approach to changing $(DEPDIR) to its actual value in the
-- # expansion.
-- for file in `sed -n "
-- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-- # Make sure the directory exists.
-- test -f "$dirpart/$file" && continue
-- fdir=`AS_DIRNAME(["$file"])`
-- AS_MKDIR_P([$dirpart/$fdir])
-- # echo "creating $dirpart/$file"
-- echo '# dummy' > "$dirpart/$file"
-- done
-- done
--}
--])# _AM_OUTPUT_DEPENDENCY_COMMANDS
--
--
--# AM_OUTPUT_DEPENDENCY_COMMANDS
--# -----------------------------
--# This macro should only be invoked once -- use via AC_REQUIRE.
-+# This file is free software, distributed under the terms of the GNU
-+# General Public License. As a special exception to the GNU General
-+# Public License, this file may be distributed as part of a program
-+# that contains a configuration script generated by Autoconf, under
-+# the same distribution terms as the rest of that program.
- #
--# This code is only required when automatic dependency tracking
--# is enabled. FIXME. This creates each `.P' file that we will
--# need in order to bootstrap the dependency handling code.
--AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
--[AC_CONFIG_COMMANDS([depfiles],
-- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
--])
--
--# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
--# Free Software Foundation, Inc.
-+# This file can be copied and used freely without restrictions. It can
-+# be used in projects which are not available under the GNU Public License
-+# but which still want to provide support for the GNU gettext functionality.
- #
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# serial 8
--
--# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
--AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
--
--# Do all the work for Automake. -*- Autoconf -*-
--
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
-+# Macro to add for using GNU gettext.
-+# Ulrich Drepper <drepper at cygnus.com>, 1995, 1996
-+#
-+# Modified to never use included libintl.
-+# Owen Taylor <otaylor at redhat.com>, 12/15/1998
-+#
-+# Major rework to remove unused code
-+# Owen Taylor <otaylor at redhat.com>, 12/11/2002
-+#
-+# Added better handling of ALL_LINGUAS from GNU gettext version
-+# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
-+#
-+# Modified to require ngettext
-+# Matthias Clasen <mclasen at redhat.com> 08/06/2004
- #
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# serial 16
-+# We need this here as well, since someone might use autoconf-2.5x
-+# to configure GLib then an older version to configure a package
-+# using AM_GLIB_GNU_GETTEXT
-+AC_PREREQ(2.53)
-
--# This macro actually does too much. Some checks are only needed if
--# your package does certain things. But this isn't really a big deal.
-+dnl
-+dnl We go to great lengths to make sure that aclocal won't
-+dnl try to pull in the installed version of these macros
-+dnl when running aclocal in the glib directory.
-+dnl
-+m4_copy([AC_DEFUN],[glib_DEFUN])
-+m4_copy([AC_REQUIRE],[glib_REQUIRE])
-+dnl
-+dnl At the end, if we're not within glib, we'll define the public
-+dnl definitions in terms of our private definitions.
-+dnl
-
--# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
--# AM_INIT_AUTOMAKE([OPTIONS])
--# -----------------------------------------------
--# The call with PACKAGE and VERSION arguments is the old style
--# call (pre autoconf-2.50), which is being phased out. PACKAGE
--# and VERSION should now be passed to AC_INIT and removed from
--# the call to AM_INIT_AUTOMAKE.
--# We support both call styles for the transition. After
--# the next Automake release, Autoconf can make the AC_INIT
--# arguments mandatory, and then we can depend on a new Autoconf
--# release and drop the old call support.
--AC_DEFUN([AM_INIT_AUTOMAKE],
--[AC_PREREQ([2.62])dnl
--dnl Autoconf wants to disallow AM_ names. We explicitly allow
--dnl the ones we care about.
--m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
--AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
--AC_REQUIRE([AC_PROG_INSTALL])dnl
--if test "`cd $srcdir && pwd`" != "`pwd`"; then
-- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-- # is not polluted with repeated "-I."
-- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-- # test to see if srcdir already configured
-- if test -f $srcdir/config.status; then
-- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-- fi
--fi
-+# GLIB_LC_MESSAGES
-+#--------------------
-+glib_DEFUN([GLIB_LC_MESSAGES],
-+ [AC_CHECK_HEADERS([locale.h])
-+ if test $ac_cv_header_locale_h = yes; then
-+ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-+ [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-+ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-+ if test $am_cv_val_LC_MESSAGES = yes; then
-+ AC_DEFINE(HAVE_LC_MESSAGES, 1,
-+ [Define if your <locale.h> file defines LC_MESSAGES.])
-+ fi
-+ fi])
-
--# test whether we have cygpath
--if test -z "$CYGPATH_W"; then
-- if (cygpath --version) >/dev/null 2>/dev/null; then
-- CYGPATH_W='cygpath -w'
-- else
-- CYGPATH_W=echo
-- fi
-+# GLIB_PATH_PROG_WITH_TEST
-+#----------------------------
-+dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-+dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-+glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
-+[# Extract the first word of "$2", so it can be a program name with args.
-+set dummy $2; ac_word=[$]2
-+AC_MSG_CHECKING([for $ac_word])
-+AC_CACHE_VAL(ac_cv_path_$1,
-+[case "[$]$1" in
-+ /*)
-+ ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-+ for ac_dir in ifelse([$5], , $PATH, [$5]); do
-+ test -z "$ac_dir" && ac_dir=.
-+ if test -f $ac_dir/$ac_word; then
-+ if [$3]; then
-+ ac_cv_path_$1="$ac_dir/$ac_word"
-+ break
-+ fi
-+ fi
-+ done
-+ IFS="$ac_save_ifs"
-+dnl If no 4th arg is given, leave the cache variable unset,
-+dnl so AC_PATH_PROGS will keep looking.
-+ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-+])dnl
-+ ;;
-+esac])dnl
-+$1="$ac_cv_path_$1"
-+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-+ AC_MSG_RESULT([$]$1)
-+else
-+ AC_MSG_RESULT(no)
- fi
--AC_SUBST([CYGPATH_W])
-+AC_SUBST($1)dnl
-+])
-
--# Define the identity of the package.
--dnl Distinguish between old-style and new-style calls.
--m4_ifval([$2],
--[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
-- AC_SUBST([PACKAGE], [$1])dnl
-- AC_SUBST([VERSION], [$2])],
--[_AM_SET_OPTIONS([$1])dnl
--dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
--m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
-- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
-- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-+# GLIB_WITH_NLS
-+#-----------------
-+glib_DEFUN([GLIB_WITH_NLS],
-+ dnl NLS is obligatory
-+ [USE_NLS=yes
-+ AC_SUBST(USE_NLS)
-
--_AM_IF_OPTION([no-define],,
--[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-+ gt_cv_have_gettext=no
-
--# Some tools Automake needs.
--AC_REQUIRE([AM_SANITY_CHECK])dnl
--AC_REQUIRE([AC_ARG_PROGRAM])dnl
--AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
--AM_MISSING_PROG(AUTOCONF, autoconf)
--AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
--AM_MISSING_PROG(AUTOHEADER, autoheader)
--AM_MISSING_PROG(MAKEINFO, makeinfo)
--AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
--AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
--AC_REQUIRE([AM_PROG_MKDIR_P])dnl
--# We need awk for the "check" target. The system "awk" is bad on
--# some platforms.
--AC_REQUIRE([AC_PROG_AWK])dnl
--AC_REQUIRE([AC_PROG_MAKE_SET])dnl
--AC_REQUIRE([AM_SET_LEADING_DOT])dnl
--_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-- [_AM_PROG_TAR([v7])])])
--_AM_IF_OPTION([no-dependencies],,
--[AC_PROVIDE_IFELSE([AC_PROG_CC],
-- [_AM_DEPENDENCIES(CC)],
-- [define([AC_PROG_CC],
-- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
--AC_PROVIDE_IFELSE([AC_PROG_CXX],
-- [_AM_DEPENDENCIES(CXX)],
-- [define([AC_PROG_CXX],
-- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
--AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-- [_AM_DEPENDENCIES(OBJC)],
-- [define([AC_PROG_OBJC],
-- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
--])
--_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
--dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
--dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
--dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
--AC_CONFIG_COMMANDS_PRE(dnl
--[m4_provide_if([_AM_COMPILER_EXEEXT],
-- [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
--])
-+ CATOBJEXT=NONE
-+ XGETTEXT=:
-+ INTLLIBS=
-
--dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
--dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
--dnl mangled by Autoconf and run in a shell conditional statement.
--m4_define([_AC_COMPILER_EXEEXT],
--m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-+ AC_CHECK_HEADER(libintl.h,
-+ [gt_cv_func_dgettext_libintl="no"
-+ libintl_extra_libs=""
-
-+ #
-+ # First check in libc
-+ #
-+ AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
-+ [AC_TRY_LINK([
-+#include <libintl.h>
-+],
-+ [return !ngettext ("","", 1)],
-+ gt_cv_func_ngettext_libc=yes,
-+ gt_cv_func_ngettext_libc=no)
-+ ])
-+
-+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-+ AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
-+ [AC_TRY_LINK([
-+#include <libintl.h>
-+],
-+ [return !dgettext ("","")],
-+ gt_cv_func_dgettext_libc=yes,
-+ gt_cv_func_dgettext_libc=no)
-+ ])
-+ fi
-+
-+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-+ AC_CHECK_FUNCS(bind_textdomain_codeset)
-+ fi
-
--# When config.status generates a header, we must update the stamp-h file.
--# This file resides in the same directory as the config header
--# that is generated. The stamp files are numbered to have different names.
-+ #
-+ # If we don't have everything we want, check in libintl
-+ #
-+ if test "$gt_cv_func_dgettext_libc" != "yes" \
-+ || test "$gt_cv_func_ngettext_libc" != "yes" \
-+ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
-+
-+ AC_CHECK_LIB(intl, bindtextdomain,
-+ [AC_CHECK_LIB(intl, ngettext,
-+ [AC_CHECK_LIB(intl, dgettext,
-+ gt_cv_func_dgettext_libintl=yes)])])
-
--# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
--# loop where config.status creates the headers, so we can generate
--# our stamp files there.
--AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
--[# Compute $1's index in $config_headers.
--_am_arg=$1
--_am_stamp_count=1
--for _am_header in $config_headers :; do
-- case $_am_header in
-- $_am_arg | $_am_arg:* )
-- break ;;
-- * )
-- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-- esac
--done
--echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-+ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-+ AC_MSG_CHECKING([if -liconv is needed to use gettext])
-+ AC_MSG_RESULT([])
-+ AC_CHECK_LIB(intl, ngettext,
-+ [AC_CHECK_LIB(intl, dcgettext,
-+ [gt_cv_func_dgettext_libintl=yes
-+ libintl_extra_libs=-liconv],
-+ :,-liconv)],
-+ :,-liconv)
-+ fi
-
--# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+ #
-+ # 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
-+ AC_CHECK_FUNCS(bind_textdomain_codeset)
-+ LIBS="$glib_save_LIBS"
-
--# AM_PROG_INSTALL_SH
--# ------------------
--# Define $install_sh.
--AC_DEFUN([AM_PROG_INSTALL_SH],
--[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--if test x"${install_sh}" != xset; then
-- case $am_aux_dir in
-- *\ * | *\ *)
-- install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-- *)
-- install_sh="\${SHELL} $am_aux_dir/install-sh"
-- esac
--fi
--AC_SUBST(install_sh)])
-+ 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
-
--# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+ 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
-+ AC_DEFINE(HAVE_GETTEXT,1,
-+ [Define if the GNU gettext() function is already present or preinstalled.])
-+ GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
-+ if test "$MSGFMT" != "no"; then
-+ glib_save_LIBS="$LIBS"
-+ LIBS="$LIBS $INTLLIBS"
-+ AC_CHECK_FUNCS(dcgettext)
-+ MSGFMT_OPTS=
-+ AC_MSG_CHECKING([if msgfmt accepts -c])
-+ GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
-+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"
-+], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
-+ AC_SUBST(MSGFMT_OPTS)
-+ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-+ GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-+ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
-+ return _nl_msg_cat_cntr],
-+ [CATOBJEXT=.gmo
-+ DATADIRNAME=share],
-+ [case $host in
-+ *-*-solaris*)
-+ dnl On Solaris, if bind_textdomain_codeset is in libc,
-+ dnl GNU format message catalog is always supported,
-+ dnl since both are added to the libc all together.
-+ dnl Hence, we'd like to go with DATADIRNAME=share and
-+ dnl and CATOBJEXT=.gmo in this case.
-+ AC_CHECK_FUNC(bind_textdomain_codeset,
-+ [CATOBJEXT=.gmo
-+ DATADIRNAME=share],
-+ [CATOBJEXT=.mo
-+ DATADIRNAME=lib])
-+ ;;
-+ *)
-+ CATOBJEXT=.mo
-+ DATADIRNAME=lib
-+ ;;
-+ esac])
-+ LIBS="$glib_save_LIBS"
-+ INSTOBJEXT=.mo
-+ else
-+ gt_cv_have_gettext=no
-+ fi
-+ fi
-+ ])
-
--# serial 2
-+ if test "$gt_cv_have_gettext" = "yes" ; then
-+ AC_DEFINE(ENABLE_NLS, 1,
-+ [always defined to indicate that i18n is enabled])
-+ fi
-
--# Check whether the underlying file-system supports filenames
--# with a leading dot. For instance MS-DOS doesn't.
--AC_DEFUN([AM_SET_LEADING_DOT],
--[rm -rf .tst 2>/dev/null
--mkdir .tst 2>/dev/null
--if test -d .tst; then
-- am__leading_dot=.
--else
-- am__leading_dot=_
--fi
--rmdir .tst 2>/dev/null
--AC_SUBST([am__leading_dot])])
-+ dnl Test whether we really found GNU xgettext.
-+ if test "$XGETTEXT" != ":"; then
-+ dnl If it is not GNU xgettext we define it as : so that the
-+ dnl Makefiles still can work.
-+ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-+ : ;
-+ else
-+ AC_MSG_RESULT(
-+ [found xgettext program is not GNU xgettext; ignore it])
-+ XGETTEXT=":"
-+ fi
-+ fi
-
--# Check to see how 'make' treats includes. -*- Autoconf -*-
-+ # We need to process the po/ directory.
-+ POSUB=po
-
--# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+ AC_OUTPUT_COMMANDS(
-+ [case "$CONFIG_FILES" in *po/Makefile.in*)
-+ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-+ esac])
-
--# serial 4
-+ dnl These rules are solely for the distribution goal. While doing this
-+ dnl we only have to keep exactly one list of the available catalogs
-+ dnl in configure.in.
-+ for lang in $ALL_LINGUAS; do
-+ GMOFILES="$GMOFILES $lang.gmo"
-+ POFILES="$POFILES $lang.po"
-+ done
-
--# AM_MAKE_INCLUDE()
--# -----------------
--# Check to see how make treats includes.
--AC_DEFUN([AM_MAKE_INCLUDE],
--[am_make=${MAKE-make}
--cat > confinc << 'END'
--am__doit:
-- @echo this is the am__doit target
--.PHONY: am__doit
--END
--# If we don't find an include directive, just comment out the code.
--AC_MSG_CHECKING([for style of include used by $am_make])
--am__include="#"
--am__quote=
--_am_result=none
--# First try GNU make style include.
--echo "include confinc" > confmf
--# Ignore all kinds of additional output from `make'.
--case `$am_make -s -f confmf 2> /dev/null` in #(
--*the\ am__doit\ target*)
-- am__include=include
-- am__quote=
-- _am_result=GNU
-- ;;
--esac
--# Now try BSD make style include.
--if test "$am__include" = "#"; then
-- echo '.include "confinc"' > confmf
-- case `$am_make -s -f confmf 2> /dev/null` in #(
-- *the\ am__doit\ target*)
-- am__include=.include
-- am__quote="\""
-- _am_result=BSD
-- ;;
-- esac
--fi
--AC_SUBST([am__include])
--AC_SUBST([am__quote])
--AC_MSG_RESULT([$_am_result])
--rm -f confinc confmf
--])
-+ dnl Make all variables we use known to autoconf.
-+ AC_SUBST(CATALOGS)
-+ AC_SUBST(CATOBJEXT)
-+ AC_SUBST(DATADIRNAME)
-+ AC_SUBST(GMOFILES)
-+ AC_SUBST(INSTOBJEXT)
-+ AC_SUBST(INTLLIBS)
-+ AC_SUBST(PO_IN_DATADIR_TRUE)
-+ AC_SUBST(PO_IN_DATADIR_FALSE)
-+ AC_SUBST(POFILES)
-+ AC_SUBST(POSUB)
-+ ])
-
--# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-+# AM_GLIB_GNU_GETTEXT
-+# -------------------
-+# Do checks necessary for use of gettext. If a suitable implementation
-+# of gettext is found in either in libintl or in the C library,
-+# it will set INTLLIBS to the libraries needed for use of gettext
-+# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
-+# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
-+# on various variables needed by the Makefile.in.in installed by
-+# glib-gettextize.
-+dnl
-+glib_DEFUN([GLIB_GNU_GETTEXT],
-+ [AC_REQUIRE([AC_PROG_CC])dnl
-+ AC_REQUIRE([AC_HEADER_STDC])dnl
-+
-+ GLIB_LC_MESSAGES
-+ GLIB_WITH_NLS
-
--# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+ if test "$gt_cv_have_gettext" = "yes"; then
-+ if test "x$ALL_LINGUAS" = "x"; then
-+ LINGUAS=
-+ else
-+ AC_MSG_CHECKING(for catalogs to be installed)
-+ NEW_LINGUAS=
-+ for presentlang in $ALL_LINGUAS; do
-+ useit=no
-+ if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
-+ desiredlanguages="$LINGUAS"
-+ else
-+ desiredlanguages="$ALL_LINGUAS"
-+ fi
-+ for desiredlang in $desiredlanguages; do
-+ # Use the presentlang catalog if desiredlang is
-+ # a. equal to presentlang, or
-+ # b. a variant of presentlang (because in this case,
-+ # presentlang can be used as a fallback for messages
-+ # which are not translated in the desiredlang catalog).
-+ case "$desiredlang" in
-+ "$presentlang"*) useit=yes;;
-+ esac
-+ done
-+ if test $useit = yes; then
-+ NEW_LINGUAS="$NEW_LINGUAS $presentlang"
-+ fi
-+ done
-+ LINGUAS=$NEW_LINGUAS
-+ AC_MSG_RESULT($LINGUAS)
-+ fi
-
--# serial 6
-+ dnl Construct list of names of catalog files to be constructed.
-+ if test -n "$LINGUAS"; then
-+ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-+ fi
-+ fi
-
--# AM_MISSING_PROG(NAME, PROGRAM)
--# ------------------------------
--AC_DEFUN([AM_MISSING_PROG],
--[AC_REQUIRE([AM_MISSING_HAS_RUN])
--$1=${$1-"${am_missing_run}$2"}
--AC_SUBST($1)])
-+ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-+ dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
-+ dnl Try to locate is.
-+ MKINSTALLDIRS=
-+ if test -n "$ac_aux_dir"; then
-+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-+ fi
-+ if test -z "$MKINSTALLDIRS"; then
-+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-+ fi
-+ AC_SUBST(MKINSTALLDIRS)
-
-+ dnl Generate list of files to be processed by xgettext which will
-+ dnl be included in po/Makefile.
-+ test -d po || mkdir po
-+ if test "x$srcdir" != "x."; then
-+ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-+ posrcprefix="$srcdir/"
-+ else
-+ posrcprefix="../$srcdir/"
-+ fi
-+ else
-+ posrcprefix="../"
-+ fi
-+ rm -f po/POTFILES
-+ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-+ < $srcdir/po/POTFILES.in > po/POTFILES
-+ ])
-
--# AM_MISSING_HAS_RUN
--# ------------------
--# Define MISSING if not defined so far and test if it supports --run.
--# If it does, set am_missing_run to use it, otherwise, to nothing.
--AC_DEFUN([AM_MISSING_HAS_RUN],
--[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--AC_REQUIRE_AUX_FILE([missing])dnl
--if test x"${MISSING+set}" != xset; then
-- case $am_aux_dir in
-- *\ * | *\ *)
-- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-- *)
-- MISSING="\${SHELL} $am_aux_dir/missing" ;;
-- esac
--fi
--# Use eval to expand $SHELL
--if eval "$MISSING --run true"; then
-- am_missing_run="$MISSING --run "
-+# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
-+# -------------------------------
-+# Define VARIABLE to the location where catalog files will
-+# be installed by po/Makefile.
-+glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
-+[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
-+glib_save_prefix="$prefix"
-+glib_save_exec_prefix="$exec_prefix"
-+glib_save_datarootdir="$datarootdir"
-+test "x$prefix" = xNONE && prefix=$ac_default_prefix
-+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-+datarootdir=`eval echo "${datarootdir}"`
-+if test "x$CATOBJEXT" = "x.mo" ; then
-+ localedir=`eval echo "${libdir}/locale"`
- else
-- am_missing_run=
-- AC_MSG_WARN([`missing' script is too old or missing])
-+ localedir=`eval echo "${datadir}/locale"`
- fi
-+prefix="$glib_save_prefix"
-+exec_prefix="$glib_save_exec_prefix"
-+datarootdir="$glib_save_datarootdir"
-+AC_DEFINE_UNQUOTED($1, "$localedir",
-+ [Define the location where the catalogs will be installed])
- ])
-
--# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+dnl
-+dnl Now the definitions that aclocal will find
-+dnl
-+ifdef(glib_configure_in,[],[
-+AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
-+AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
-+])dnl
-
--# AM_PROG_MKDIR_P
--# ---------------
--# Check for `mkdir -p'.
--AC_DEFUN([AM_PROG_MKDIR_P],
--[AC_PREREQ([2.60])dnl
--AC_REQUIRE([AC_PROG_MKDIR_P])dnl
--dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
--dnl while keeping a definition of mkdir_p for backward compatibility.
--dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
--dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
--dnl Makefile.ins that do not define MKDIR_P, so we do our own
--dnl adjustment using top_builddir (which is defined more often than
--dnl MKDIR_P).
--AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
--case $mkdir_p in
-- [[\\/$]]* | ?:[[\\/]]*) ;;
-- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
--esac
--])
-+# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
-+#
-+# Create a temporary file with TEST-FILE as its contents and pass the
-+# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
-+# 0 and perform ACTION-IF-FAIL for any other exit status.
-+AC_DEFUN([GLIB_RUN_PROG],
-+[cat >conftest.foo <<_ACEOF
-+$2
-+_ACEOF
-+if AC_RUN_LOG([$1 conftest.foo]); then
-+ m4_ifval([$3], [$3], [:])
-+m4_ifvaln([$4], [else $4])dnl
-+echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
-+sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
-+fi])
-
--# Helper functions for option handling. -*- Autoconf -*-
-
--# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
-+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-+#
-+# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
- #
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-
--# serial 4
-+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-+# ----------------------------------
-+AC_DEFUN([PKG_PROG_PKG_CONFIG],
-+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-+fi
-+if test -n "$PKG_CONFIG"; then
-+ _pkg_min_version=m4_default([$1], [0.9.0])
-+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-+ AC_MSG_RESULT([yes])
-+ else
-+ AC_MSG_RESULT([no])
-+ PKG_CONFIG=""
-+ fi
-+
-+fi[]dnl
-+])# PKG_PROG_PKG_CONFIG
-
--# _AM_MANGLE_OPTION(NAME)
--# -----------------------
--AC_DEFUN([_AM_MANGLE_OPTION],
--[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-+#
-+# Check to see whether a particular set of modules exists. Similar
-+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-+#
-+#
-+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-+# this or PKG_CHECK_MODULES is called, or make sure to call
-+# PKG_CHECK_EXISTS manually
-+# --------------------------------------------------------------
-+AC_DEFUN([PKG_CHECK_EXISTS],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+if test -n "$PKG_CONFIG" && \
-+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-+ m4_ifval([$2], [$2], [:])
-+m4_ifvaln([$3], [else
-+ $3])dnl
-+fi])
-
--# _AM_SET_OPTION(NAME)
--# ------------------------------
--# Set option NAME. Presently that only means defining a flag for this option.
--AC_DEFUN([_AM_SET_OPTION],
--[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
--# _AM_SET_OPTIONS(OPTIONS)
--# ----------------------------------
--# OPTIONS is a space-separated list of Automake options.
--AC_DEFUN([_AM_SET_OPTIONS],
--[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-+# ---------------------------------------------
-+m4_define([_PKG_CONFIG],
-+[if test -n "$PKG_CONFIG"; then
-+ if test -n "$$1"; then
-+ pkg_cv_[]$1="$$1"
-+ else
-+ PKG_CHECK_EXISTS([$3],
-+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-+ [pkg_failed=yes])
-+ fi
-+else
-+ pkg_failed=untried
-+fi[]dnl
-+])# _PKG_CONFIG
-
--# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
--# -------------------------------------------
--# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
--AC_DEFUN([_AM_IF_OPTION],
--[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-+# _PKG_SHORT_ERRORS_SUPPORTED
-+# -----------------------------
-+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi[]dnl
-+])# _PKG_SHORT_ERRORS_SUPPORTED
-+
-+
-+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-+# [ACTION-IF-NOT-FOUND])
-+#
-+#
-+# Note that if there is a possibility the first call to
-+# PKG_CHECK_MODULES might not happen, you should be sure to include an
-+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-+#
-+#
-+# --------------------------------------------------------------
-+AC_DEFUN([PKG_CHECK_MODULES],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-+
-+pkg_failed=no
-+AC_MSG_CHECKING([for $1])
-
--# Check to make sure that the build environment is sane. -*- Autoconf -*-
-+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
--# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-+and $1[]_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.])
-
--# serial 5
-+if test $pkg_failed = yes; then
-+ _PKG_SHORT_ERRORS_SUPPORTED
-+ if test $_pkg_short_errors_supported = yes; then
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
-+ else
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
--# AM_SANITY_CHECK
--# ---------------
--AC_DEFUN([AM_SANITY_CHECK],
--[AC_MSG_CHECKING([whether build environment is sane])
--# 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]]*)
-- AC_MSG_ERROR([unsafe absolute working directory name]);;
--esac
--case $srcdir in
-- *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
-- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
--esac
-+ ifelse([$4], , [AC_MSG_ERROR(dnl
-+[Package requirements ($2) were not met:
-
--# 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
-+$$1_PKG_ERRORS
-
-- # 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".
-- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
--alias in your environment])
-- fi
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-
-- test "$[2]" = conftest.file
-- )
--then
-- # Ok.
-- :
--else
-- AC_MSG_ERROR([newly created file is older than distributed files!
--Check your system clock])
--fi
--AC_MSG_RESULT(yes)])
-+_PKG_TEXT
-+])],
-+ [AC_MSG_RESULT([no])
-+ $4])
-+elif test $pkg_failed = untried; then
-+ ifelse([$4], , [AC_MSG_FAILURE(dnl
-+[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.
-
--# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+_PKG_TEXT
-
--# AM_PROG_INSTALL_STRIP
--# ---------------------
--# One issue with vendor `install' (even GNU) is that you can't
--# specify the program used to strip binaries. This is especially
--# annoying in cross-compiling environments, where the build's strip
--# is unlikely to handle the host's binaries.
--# Fortunately install-sh will honor a STRIPPROG variable, so we
--# always use install-sh in `make install-strip', and initialize
--# STRIPPROG with the value of the STRIP variable (set by the user).
--AC_DEFUN([AM_PROG_INSTALL_STRIP],
--[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
--# Installed binaries are usually stripped using `strip' when the user
--# run `make install-strip'. However `strip' might not be the right
--# tool to use in cross-compilation environments, therefore Automake
--# will honor the `STRIP' environment variable to overrule this program.
--dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
--if test "$cross_compiling" != no; then
-- AC_CHECK_TOOL([STRIP], [strip], :)
--fi
--INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
--AC_SUBST([INSTALL_STRIP_PROGRAM])])
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
-+ [$4])
-+else
-+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-+ AC_MSG_RESULT([yes])
-+ ifelse([$3], , :, [$3])
-+fi[]dnl
-+])# PKG_CHECK_MODULES
-
--# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
-+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-
--# serial 2
-+# AM_AUTOMAKE_VERSION(VERSION)
-+# ----------------------------
-+# Automake X.Y traces this macro to ensure aclocal.m4 has been
-+# generated from the m4 files accompanying Automake X.Y.
-+# (This private macro should not be called outside this file.)
-+AC_DEFUN([AM_AUTOMAKE_VERSION],
-+[am__api_version='1.11'
-+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-+dnl require some minimum version. Point them to the right macro.
-+m4_if([$1], [1.11.1], [],
-+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-+])
-
--# _AM_SUBST_NOTMAKE(VARIABLE)
--# ---------------------------
--# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
--# This macro is traced by Automake.
--AC_DEFUN([_AM_SUBST_NOTMAKE])
-+# _AM_AUTOCONF_VERSION(VERSION)
-+# -----------------------------
-+# aclocal traces this macro to find the Autoconf version.
-+# This is a private macro too. Using m4_define simplifies
-+# the logic in aclocal, which can simply ignore this definition.
-+m4_define([_AM_AUTOCONF_VERSION], [])
-
--# AM_SUBST_NOTMAKE(VARIABLE)
--# ---------------------------
--# Public sister of _AM_SUBST_NOTMAKE.
--AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-+# AM_SET_CURRENT_AUTOMAKE_VERSION
-+# -------------------------------
-+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
-+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-+[AM_AUTOMAKE_VERSION([1.11.1])dnl
-+m4_ifndef([AC_AUTOCONF_VERSION],
-+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-
--# Check how to create a tarball. -*- Autoconf -*-
-+# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-
--# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-
--# serial 2
--
--# _AM_PROG_TAR(FORMAT)
--# --------------------
--# Check how to create a tarball in format FORMAT.
--# FORMAT should be one of `v7', `ustar', or `pax'.
--#
--# Substitute a variable $(am__tar) that is a command
--# writing to stdout a FORMAT-tarball containing the directory
--# $tardir.
--# tardir=directory && $(am__tar) > result.tar
-+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-+# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
-+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
- #
--# Substitute a variable $(am__untar) that extract such
--# a tarball read from stdin.
--# $(am__untar) < result.tar
--AC_DEFUN([_AM_PROG_TAR],
--[# Always define AMTAR for backward compatibility.
--AM_MISSING_PROG([AMTAR], [tar])
--m4_if([$1], [v7],
-- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-- [m4_case([$1], [ustar],, [pax],,
-- [m4_fatal([Unknown tar format])])
--AC_MSG_CHECKING([how to create a $1 tar archive])
--# Loop over all known methods to create a tar archive until one works.
--_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
--_am_tools=${am_cv_prog_tar_$1-$_am_tools}
--# Do not fold the above two line into one, because Tru64 sh and
--# Solaris sh will not grok spaces in the rhs of `-'.
--for _am_tool in $_am_tools
--do
-- case $_am_tool in
-- gnutar)
-- for _am_tar in tar gnutar gtar;
-- do
-- AM_RUN_LOG([$_am_tar --version]) && break
-- done
-- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-- am__untar="$_am_tar -xf -"
-- ;;
-- plaintar)
-- # Must skip GNU tar: if it does not support --format= it doesn't create
-- # ustar tarball either.
-- (tar --version) >/dev/null 2>&1 && continue
-- am__tar='tar chf - "$$tardir"'
-- am__tar_='tar chf - "$tardir"'
-- am__untar='tar xf -'
-- ;;
-- pax)
-- am__tar='pax -L -x $1 -w "$$tardir"'
-- am__tar_='pax -L -x $1 -w "$tardir"'
-- am__untar='pax -r'
-- ;;
-- cpio)
-- am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-- am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-- am__untar='cpio -i -H $1 -d'
-- ;;
-- none)
-- am__tar=false
-- am__tar_=false
-- am__untar=false
-- ;;
-- esac
--
-- # If the value was cached, stop now. We just wanted to have am__tar
-- # and am__untar set.
-- test -n "${am_cv_prog_tar_$1}" && break
--
-- # tar/untar a dummy directory, and stop if the command works
-- rm -rf conftest.dir
-- mkdir conftest.dir
-- echo GrepMe > conftest.dir/file
-- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-- rm -rf conftest.dir
-- if test -s conftest.tar; then
-- AM_RUN_LOG([$am__untar <conftest.tar])
-- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-- fi
--done
--rm -rf conftest.dir
--
--AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
--AC_MSG_RESULT([$am_cv_prog_tar_$1])])
--AC_SUBST([am__tar])
--AC_SUBST([am__untar])
--]) # _AM_PROG_TAR
--
--# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
--#
--# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
-+# Of course, Automake must honor this variable whenever it calls a
-+# tool from the auxiliary directory. The problem is that $srcdir (and
-+# therefore $ac_aux_dir as well) can be either absolute or relative,
-+# depending on how configure is run. This is pretty annoying, since
-+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-+# source directory, any form will work fine, but in subdirectories a
-+# relative path needs to be adjusted first.
- #
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2 of the License, or
--# (at your option) any later version.
-+# $ac_aux_dir/missing
-+# fails when called from a subdirectory if $ac_aux_dir is relative
-+# $top_srcdir/$ac_aux_dir/missing
-+# fails if $ac_aux_dir is absolute,
-+# fails when called from a subdirectory in a VPATH build with
-+# a relative $ac_aux_dir
- #
--# This program is distributed in the hope that it will be useful, but
--# WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
--# General Public License for more details.
-+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-+# are both prefixed by $srcdir. In an in-source build this is usually
-+# harmless because $srcdir is `.', but things will broke when you
-+# start a VPATH build or use an absolute $srcdir.
- #
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-+# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
-+# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-+# and then we would define $MISSING as
-+# MISSING="\${SHELL} $am_aux_dir/missing"
-+# This will work as long as MISSING is not called from configure, because
-+# unfortunately $(top_srcdir) has no meaning in configure.
-+# However there are other variables, like CC, which are often used in
-+# configure, and could therefore not use this "fixed" $ac_aux_dir.
- #
--# As a special exception to the GNU General Public License, if you
--# distribute this file as part of a program that contains a
--# configuration script generated by Autoconf, you may include it under
--# the same distribution terms that you use for the rest of that program.
-+# Another solution, used here, is to always expand $ac_aux_dir to an
-+# absolute PATH. The drawback is that using absolute paths prevent a
-+# configured tree to be moved without reconfiguration.
-
--# PKG_PROG_PKG_CONFIG([MIN-VERSION])
--# ----------------------------------
--AC_DEFUN([PKG_PROG_PKG_CONFIG],
--[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
--m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
--AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
--if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-- AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
--fi
--if test -n "$PKG_CONFIG"; then
-- _pkg_min_version=m4_default([$1], [0.9.0])
-- AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-- AC_MSG_RESULT([yes])
-- else
-- AC_MSG_RESULT([no])
-- PKG_CONFIG=""
-- fi
--
--fi[]dnl
--])# PKG_PROG_PKG_CONFIG
-+AC_DEFUN([AM_AUX_DIR_EXPAND],
-+[dnl Rely on autoconf to set up CDPATH properly.
-+AC_PREREQ([2.50])dnl
-+# expand $ac_aux_dir to an absolute path
-+am_aux_dir=`cd $ac_aux_dir && pwd`
-+])
-
--# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-+# AM_CONDITIONAL -*- Autoconf -*-
-+
-+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-+# Free Software Foundation, Inc.
- #
--# Check to see whether a particular set of modules exists. Similar
--# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 9
-+
-+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-+# -------------------------------------
-+# Define a conditional.
-+AC_DEFUN([AM_CONDITIONAL],
-+[AC_PREREQ(2.52)dnl
-+ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
-+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-+AC_SUBST([$1_TRUE])dnl
-+AC_SUBST([$1_FALSE])dnl
-+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-+m4_define([_AM_COND_VALUE_$1], [$2])dnl
-+if $2; then
-+ $1_TRUE=
-+ $1_FALSE='#'
-+else
-+ $1_TRUE='#'
-+ $1_FALSE=
-+fi
-+AC_CONFIG_COMMANDS_PRE(
-+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-+ AC_MSG_ERROR([[conditional "$1" was never defined.
-+Usually this means the macro was only invoked conditionally.]])
-+fi])])
-+
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-+# Free Software Foundation, Inc.
- #
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 10
-+
-+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-+# written in clear, in which case automake, when reading aclocal.m4,
-+# will think it sees a *use*, and therefore will trigger all it's
-+# C support machinery. Also note that it means that autoscan, seeing
-+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-+
-+
-+# _AM_DEPENDENCIES(NAME)
-+# ----------------------
-+# See how the compiler implements dependency checking.
-+# NAME is "CC", "CXX", "GCJ", or "OBJC".
-+# We try a few techniques and use that to set a single cache variable.
- #
--# Similar to PKG_CHECK_MODULES, make sure that the first instance of
--# this or PKG_CHECK_MODULES is called, or make sure to call
--# PKG_CHECK_EXISTS manually
--# --------------------------------------------------------------
--AC_DEFUN([PKG_CHECK_EXISTS],
--[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
--if test -n "$PKG_CONFIG" && \
-- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-- m4_ifval([$2], [$2], [:])
--m4_ifvaln([$3], [else
-- $3])dnl
--fi])
-+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-+# dependency, and given that the user is not expected to run this macro,
-+# just rely on AC_PROG_CC.
-+AC_DEFUN([_AM_DEPENDENCIES],
-+[AC_REQUIRE([AM_SET_DEPDIR])dnl
-+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-+AC_REQUIRE([AM_DEP_TRACK])dnl
-
-+ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
-+ [$1], CXX, [depcc="$CXX" am_compiler_list=],
-+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-+ [$1], UPC, [depcc="$UPC" am_compiler_list=],
-+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
-+ [depcc="$$1" am_compiler_list=])
-
--# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
--# ---------------------------------------------
--m4_define([_PKG_CONFIG],
--[if test -n "$PKG_CONFIG"; then
-- if test -n "$$1"; then
-- pkg_cv_[]$1="$$1"
-- else
-- PKG_CHECK_EXISTS([$3],
-- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-- [pkg_failed=yes])
-+AC_CACHE_CHECK([dependency style of $depcc],
-+ [am_cv_$1_dependencies_compiler_type],
-+[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
-+
-+ am_cv_$1_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
-+ m4_case([$1], [CC],
-+ [case " $depcc " in #(
-+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
-+ esac],
-+ [CXX],
-+ [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
-+
-+ # 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
-+ # versions had trouble with output in subdirs
-+ am__obj=sub/conftest.${OBJEXT-o}
-+ am__minus_obj="-o $am__obj"
-+ case $depmode in
-+ gcc)
-+ # This depmode causes a compiler race in universal mode.
-+ test "$am__universal" = false || continue
-+ ;;
-+ nosideeffect)
-+ # after this tag, mechanisms are not by side-effect, so they'll
-+ # only be used when explicitly requested
-+ if test "x$enable_dependency_tracking" = xyes; then
-+ continue
-+ else
-+ break
-+ fi
-+ ;;
-+ msvisualcpp | msvcmsys)
-+ # This compiler won't grok `-c -o', but also, the minuso test has
-+ # not run yet. These depmodes are late enough in the game, and
-+ # so weak that their functioning should not be impacted.
-+ am__obj=conftest.${OBJEXT-o}
-+ am__minus_obj=
-+ ;;
-+ none) break ;;
-+ esac
-+ if depmode=$depmode \
-+ source=sub/conftest.c object=$am__obj \
-+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-+ >/dev/null 2>conftest.err &&
-+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+ # icc doesn't choke on unknown options, it will just issue warnings
-+ # or remarks (even with -Werror). So we grep stderr for any message
-+ # that says an option was ignored or not supported.
-+ # When given -MP, icc 7.0 and 7.1 complain thusly:
-+ # icc: Command line warning: ignoring option '-M'; no argument required
-+ # The diagnosis changed in icc 8.0:
-+ # icc: Command line remark: option '-MP' not supported
-+ if (grep 'ignoring option' conftest.err ||
-+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+ am_cv_$1_dependencies_compiler_type=$depmode
-+ break
-+ fi
- fi
--else
-- pkg_failed=untried
--fi[]dnl
--])# _PKG_CONFIG
-+ done
-
--# _PKG_SHORT_ERRORS_SUPPORTED
--# -----------------------------
--AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
--[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-- _pkg_short_errors_supported=yes
-+ cd ..
-+ rm -rf conftest.dir
- else
-- _pkg_short_errors_supported=no
--fi[]dnl
--])# _PKG_SHORT_ERRORS_SUPPORTED
-+ am_cv_$1_dependencies_compiler_type=none
-+fi
-+])
-+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-+AM_CONDITIONAL([am__fastdep$1], [
-+ test "x$enable_dependency_tracking" != xno \
-+ && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-+])
-
-
--# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
--# [ACTION-IF-NOT-FOUND])
--#
--#
--# Note that if there is a possibility the first call to
--# PKG_CHECK_MODULES might not happen, you should be sure to include an
--# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
--#
--#
--# --------------------------------------------------------------
--AC_DEFUN([PKG_CHECK_MODULES],
--[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
--AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
--AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-+# AM_SET_DEPDIR
-+# -------------
-+# Choose a directory name for dependency files.
-+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-+AC_DEFUN([AM_SET_DEPDIR],
-+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-+])
-
--pkg_failed=no
--AC_MSG_CHECKING([for $1])
-
--_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
--_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-+# AM_DEP_TRACK
-+# ------------
-+AC_DEFUN([AM_DEP_TRACK],
-+[AC_ARG_ENABLE(dependency-tracking,
-+[ --disable-dependency-tracking speeds up one-time build
-+ --enable-dependency-tracking do not reject slow dependency extractors])
-+if test "x$enable_dependency_tracking" != xno; then
-+ am_depcomp="$ac_aux_dir/depcomp"
-+ AMDEPBACKSLASH='\'
-+fi
-+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-+AC_SUBST([AMDEPBACKSLASH])dnl
-+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-+])
-
--m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
--and $1[]_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.])
-+# Generate code to set up dependency tracking. -*- Autoconf -*-
-
--if test $pkg_failed = yes; then
-- _PKG_SHORT_ERRORS_SUPPORTED
-- if test $_pkg_short_errors_supported = yes; then
-- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
-- else
-- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-- fi
-- # Put the nasty error message in config.log where it belongs
-- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
-- ifelse([$4], , [AC_MSG_ERROR(dnl
--[Package requirements ($2) were not met:
-+#serial 5
-
--$$1_PKG_ERRORS
-+# _AM_OUTPUT_DEPENDENCY_COMMANDS
-+# ------------------------------
-+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-+[{
-+ # Autoconf 2.62 quotes --file arguments for eval, but not when files
-+ # are listed without --file. Let's play safe and only enable the eval
-+ # if we detect the quoting.
-+ case $CONFIG_FILES in
-+ *\'*) eval set x "$CONFIG_FILES" ;;
-+ *) set x $CONFIG_FILES ;;
-+ esac
-+ shift
-+ for mf
-+ do
-+ # Strip MF so we end up with the name of the file.
-+ mf=`echo "$mf" | sed -e 's/:.*$//'`
-+ # Check whether this is an Automake generated Makefile or not.
-+ # We used to match only the files named `Makefile.in', but
-+ # some people rename them; so instead we look at the file content.
-+ # Grep'ing the first line is not enough: some people post-process
-+ # each Makefile.in and add a new line on top of each file to say so.
-+ # Grep'ing the whole file is not good either: AIX grep has a line
-+ # limit of 2048, but all sed's we know have understand at least 4000.
-+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-+ dirpart=`AS_DIRNAME("$mf")`
-+ else
-+ continue
-+ fi
-+ # Extract the definition of DEPDIR, am__include, and am__quote
-+ # from the Makefile without running `make'.
-+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+ test -z "$DEPDIR" && continue
-+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+ test -z "am__include" && continue
-+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+ # When using ansi2knr, U may be empty or an underscore; expand it
-+ U=`sed -n 's/^U = //p' < "$mf"`
-+ # Find all dependency output files, they are included files with
-+ # $(DEPDIR) in their names. We invoke sed twice because it is the
-+ # simplest approach to changing $(DEPDIR) to its actual value in the
-+ # expansion.
-+ for file in `sed -n "
-+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+ # Make sure the directory exists.
-+ test -f "$dirpart/$file" && continue
-+ fdir=`AS_DIRNAME(["$file"])`
-+ AS_MKDIR_P([$dirpart/$fdir])
-+ # echo "creating $dirpart/$file"
-+ echo '# dummy' > "$dirpart/$file"
-+ done
-+ done
-+}
-+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
-
--_PKG_TEXT
--])],
-- [AC_MSG_RESULT([no])
-- $4])
--elif test $pkg_failed = untried; then
-- ifelse([$4], , [AC_MSG_FAILURE(dnl
--[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.
-+# AM_OUTPUT_DEPENDENCY_COMMANDS
-+# -----------------------------
-+# This macro should only be invoked once -- use via AC_REQUIRE.
-+#
-+# This code is only required when automatic dependency tracking
-+# is enabled. FIXME. This creates each `.P' file that we will
-+# need in order to bootstrap the dependency handling code.
-+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-+[AC_CONFIG_COMMANDS([depfiles],
-+ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-+ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-+])
-
--_PKG_TEXT
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
-- [$4])
--else
-- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-- AC_MSG_RESULT([yes])
-- ifelse([$3], , :, [$3])
--fi[]dnl
--])# PKG_CHECK_MODULES
-+# serial 8
-
--# Configure paths for GLIB
--# Owen Taylor 1997-2001
-+# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
-+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
--dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
--dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject,
--dnl gthread, or gio is specified in MODULES, pass to pkg-config
--dnl
--AC_DEFUN([AM_PATH_GLIB_2_0],
--[dnl
--dnl Get the cflags and libraries from pkg-config
--dnl
--AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program],
-- , enable_glibtest=yes)
-+# Do all the work for Automake. -*- Autoconf -*-
-
-- pkg_config_args=glib-2.0
-- for module in . $4
-- do
-- case "$module" in
-- gmodule)
-- pkg_config_args="$pkg_config_args gmodule-2.0"
-- ;;
-- gmodule-no-export)
-- pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
-- ;;
-- gobject)
-- pkg_config_args="$pkg_config_args gobject-2.0"
-- ;;
-- gthread)
-- pkg_config_args="$pkg_config_args gthread-2.0"
-- ;;
-- gio*)
-- pkg_config_args="$pkg_config_args $module-2.0"
-- ;;
-- esac
-- done
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
-- PKG_PROG_PKG_CONFIG([0.16])
-+# serial 16
-
-- no_glib=""
-+# This macro actually does too much. Some checks are only needed if
-+# your package does certain things. But this isn't really a big deal.
-
-- if test "x$PKG_CONFIG" = x ; then
-- no_glib=yes
-- PKG_CONFIG=no
-+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-+# AM_INIT_AUTOMAKE([OPTIONS])
-+# -----------------------------------------------
-+# The call with PACKAGE and VERSION arguments is the old style
-+# call (pre autoconf-2.50), which is being phased out. PACKAGE
-+# and VERSION should now be passed to AC_INIT and removed from
-+# the call to AM_INIT_AUTOMAKE.
-+# We support both call styles for the transition. After
-+# the next Automake release, Autoconf can make the AC_INIT
-+# arguments mandatory, and then we can depend on a new Autoconf
-+# release and drop the old call support.
-+AC_DEFUN([AM_INIT_AUTOMAKE],
-+[AC_PREREQ([2.62])dnl
-+dnl Autoconf wants to disallow AM_ names. We explicitly allow
-+dnl the ones we care about.
-+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-+AC_REQUIRE([AC_PROG_INSTALL])dnl
-+if test "`cd $srcdir && pwd`" != "`pwd`"; then
-+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-+ # is not polluted with repeated "-I."
-+ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-+ # test to see if srcdir already configured
-+ if test -f $srcdir/config.status; then
-+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
- fi
-+fi
-
-- min_glib_version=ifelse([$1], ,2.0.0,$1)
-- AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
--
-- if test x$PKG_CONFIG != xno ; then
-- ## don't try to run the test against uninstalled libtool libs
-- if $PKG_CONFIG --uninstalled $pkg_config_args; then
-- echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
-- enable_glibtest=no
-- fi
--
-- if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
-- :
-- else
-- no_glib=yes
-- fi
-+# test whether we have cygpath
-+if test -z "$CYGPATH_W"; then
-+ if (cygpath --version) >/dev/null 2>/dev/null; then
-+ CYGPATH_W='cygpath -w'
-+ else
-+ CYGPATH_W=echo
- fi
-+fi
-+AC_SUBST([CYGPATH_W])
-
-- if test x"$no_glib" = x ; then
-- GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
-- GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
-- GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
-+# Define the identity of the package.
-+dnl Distinguish between old-style and new-style calls.
-+m4_ifval([$2],
-+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
-+ AC_SUBST([PACKAGE], [$1])dnl
-+ AC_SUBST([VERSION], [$2])],
-+[_AM_SET_OPTIONS([$1])dnl
-+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
-+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
-+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-- 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 | \
-- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-- glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
-- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-- glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
-- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-- if test "x$enable_glibtest" = "xyes" ; then
-- ac_save_CFLAGS="$CFLAGS"
-- ac_save_LIBS="$LIBS"
-- CFLAGS="$CFLAGS $GLIB_CFLAGS"
-- LIBS="$GLIB_LIBS $LIBS"
--dnl
--dnl Now check if the installed GLIB is sufficiently new. (Also sanity
--dnl checks the results of pkg-config to some extent)
--dnl
-- rm -f conf.glibtest
-- AC_TRY_RUN([
--#include <glib.h>
--#include <stdio.h>
--#include <stdlib.h>
-+_AM_IF_OPTION([no-define],,
-+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
--int
--main ()
--{
-- int major, minor, micro;
-- char *tmp_version;
-+# Some tools Automake needs.
-+AC_REQUIRE([AM_SANITY_CHECK])dnl
-+AC_REQUIRE([AC_ARG_PROGRAM])dnl
-+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-+AM_MISSING_PROG(AUTOCONF, autoconf)
-+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-+AM_MISSING_PROG(AUTOHEADER, autoheader)
-+AM_MISSING_PROG(MAKEINFO, makeinfo)
-+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-+# We need awk for the "check" target. The system "awk" is bad on
-+# some platforms.
-+AC_REQUIRE([AC_PROG_AWK])dnl
-+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-+ [_AM_PROG_TAR([v7])])])
-+_AM_IF_OPTION([no-dependencies],,
-+[AC_PROVIDE_IFELSE([AC_PROG_CC],
-+ [_AM_DEPENDENCIES(CC)],
-+ [define([AC_PROG_CC],
-+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-+AC_PROVIDE_IFELSE([AC_PROG_CXX],
-+ [_AM_DEPENDENCIES(CXX)],
-+ [define([AC_PROG_CXX],
-+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-+ [_AM_DEPENDENCIES(OBJC)],
-+ [define([AC_PROG_OBJC],
-+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-+])
-+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
-+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
-+AC_CONFIG_COMMANDS_PRE(dnl
-+[m4_provide_if([_AM_COMPILER_EXEEXT],
-+ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-+])
-
-- fclose (fopen ("conf.glibtest", "w"));
-+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
-+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-+dnl mangled by Autoconf and run in a shell conditional statement.
-+m4_define([_AC_COMPILER_EXEEXT],
-+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-
-- /* HP/UX 9 (%@#!) writes to sscanf strings */
-- tmp_version = g_strdup("$min_glib_version");
-- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
-- printf("%s, bad version string\n", "$min_glib_version");
-- exit(1);
-- }
-
-- if ((glib_major_version != $glib_config_major_version) ||
-- (glib_minor_version != $glib_config_minor_version) ||
-- (glib_micro_version != $glib_config_micro_version))
-- {
-- printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
-- $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
-- glib_major_version, glib_minor_version, glib_micro_version);
-- printf ("*** was found! If pkg-config was correct, then it is best\n");
-- printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
-- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-- printf("*** required on your system.\n");
-- printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
-- printf("*** to point to the correct configuration files\n");
-- }
-- else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
-- (glib_minor_version != GLIB_MINOR_VERSION) ||
-- (glib_micro_version != GLIB_MICRO_VERSION))
-- {
-- printf("*** GLIB header files (version %d.%d.%d) do not match\n",
-- GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
-- printf("*** library (version %d.%d.%d)\n",
-- glib_major_version, glib_minor_version, glib_micro_version);
-- }
-- else
-- {
-- if ((glib_major_version > major) ||
-- ((glib_major_version == major) && (glib_minor_version > minor)) ||
-- ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
-- {
-- return 0;
-- }
-- else
-- {
-- printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
-- glib_major_version, glib_minor_version, glib_micro_version);
-- printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
-- major, minor, micro);
-- printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
-- printf("***\n");
-- printf("*** If you have already installed a sufficiently new version, this error\n");
-- printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
-- printf("*** being found. The easiest way to fix this is to remove the old version\n");
-- printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
-- printf("*** correct copy of pkg-config. (In this case, you will have to\n");
-- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-- printf("*** so that the correct libraries are found at run-time))\n");
-- }
-- }
-- return 1;
--}
--],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-- CFLAGS="$ac_save_CFLAGS"
-- LIBS="$ac_save_LIBS"
-- fi
-- fi
-- if test "x$no_glib" = x ; then
-- AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
-- ifelse([$2], , :, [$2])
-- else
-- AC_MSG_RESULT(no)
-- if test "$PKG_CONFIG" = "no" ; then
-- echo "*** A new enough version of pkg-config was not found."
-- echo "*** See http://www.freedesktop.org/software/pkgconfig/"
-- else
-- if test -f conf.glibtest ; then
-- :
-- else
-- echo "*** Could not run GLIB test program, checking why..."
-- ac_save_CFLAGS="$CFLAGS"
-- ac_save_LIBS="$LIBS"
-- CFLAGS="$CFLAGS $GLIB_CFLAGS"
-- LIBS="$LIBS $GLIB_LIBS"
-- AC_TRY_LINK([
--#include <glib.h>
--#include <stdio.h>
--], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
-- [ 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" ],
-- [ 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."])
-- CFLAGS="$ac_save_CFLAGS"
-- LIBS="$ac_save_LIBS"
-- fi
-- fi
-- GLIB_CFLAGS=""
-- GLIB_LIBS=""
-- GLIB_GENMARSHAL=""
-- GOBJECT_QUERY=""
-- GLIB_MKENUMS=""
-- ifelse([$3], , :, [$3])
-- fi
-- AC_SUBST(GLIB_CFLAGS)
-- AC_SUBST(GLIB_LIBS)
-- AC_SUBST(GLIB_GENMARSHAL)
-- AC_SUBST(GOBJECT_QUERY)
-- AC_SUBST(GLIB_MKENUMS)
-- rm -f conf.glibtest
--])
-+# When config.status generates a header, we must update the stamp-h file.
-+# This file resides in the same directory as the config header
-+# that is generated. The stamp files are numbered to have different names.
-+
-+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-+# loop where config.status creates the headers, so we can generate
-+# our stamp files there.
-+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-+[# Compute $1's index in $config_headers.
-+_am_arg=$1
-+_am_stamp_count=1
-+for _am_header in $config_headers :; do
-+ case $_am_header in
-+ $_am_arg | $_am_arg:* )
-+ break ;;
-+ * )
-+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-+ esac
-+done
-+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-
--# Copyright (C) 1995-2002 Free Software Foundation, Inc.
--# Copyright (C) 2001-2003,2004 Red Hat, Inc.
--#
--# This file is free software, distributed under the terms of the GNU
--# General Public License. As a special exception to the GNU General
--# Public License, this file may be distributed as part of a program
--# that contains a configuration script generated by Autoconf, under
--# the same distribution terms as the rest of that program.
--#
--# This file can be copied and used freely without restrictions. It can
--# be used in projects which are not available under the GNU Public License
--# but which still want to provide support for the GNU gettext functionality.
--#
--# Macro to add for using GNU gettext.
--# Ulrich Drepper <drepper at cygnus.com>, 1995, 1996
--#
--# Modified to never use included libintl.
--# Owen Taylor <otaylor at redhat.com>, 12/15/1998
-+# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
- #
--# Major rework to remove unused code
--# Owen Taylor <otaylor at redhat.com>, 12/11/2002
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_PROG_INSTALL_SH
-+# ------------------
-+# Define $install_sh.
-+AC_DEFUN([AM_PROG_INSTALL_SH],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+if test x"${install_sh}" != xset; then
-+ case $am_aux_dir in
-+ *\ * | *\ *)
-+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-+ *)
-+ install_sh="\${SHELL} $am_aux_dir/install-sh"
-+ esac
-+fi
-+AC_SUBST(install_sh)])
-+
-+# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
- #
--# Added better handling of ALL_LINGUAS from GNU gettext version
--# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 2
-+
-+# Check whether the underlying file-system supports filenames
-+# with a leading dot. For instance MS-DOS doesn't.
-+AC_DEFUN([AM_SET_LEADING_DOT],
-+[rm -rf .tst 2>/dev/null
-+mkdir .tst 2>/dev/null
-+if test -d .tst; then
-+ am__leading_dot=.
-+else
-+ am__leading_dot=_
-+fi
-+rmdir .tst 2>/dev/null
-+AC_SUBST([am__leading_dot])])
-+
-+# Check to see how 'make' treats includes. -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
- #
--# Modified to require ngettext
--# Matthias Clasen <mclasen at redhat.com> 08/06/2004
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 4
-+
-+# AM_MAKE_INCLUDE()
-+# -----------------
-+# Check to see how make treats includes.
-+AC_DEFUN([AM_MAKE_INCLUDE],
-+[am_make=${MAKE-make}
-+cat > confinc << 'END'
-+am__doit:
-+ @echo this is the am__doit target
-+.PHONY: am__doit
-+END
-+# If we don't find an include directive, just comment out the code.
-+AC_MSG_CHECKING([for style of include used by $am_make])
-+am__include="#"
-+am__quote=
-+_am_result=none
-+# First try GNU make style include.
-+echo "include confinc" > confmf
-+# Ignore all kinds of additional output from `make'.
-+case `$am_make -s -f confmf 2> /dev/null` in #(
-+*the\ am__doit\ target*)
-+ am__include=include
-+ am__quote=
-+ _am_result=GNU
-+ ;;
-+esac
-+# Now try BSD make style include.
-+if test "$am__include" = "#"; then
-+ echo '.include "confinc"' > confmf
-+ case `$am_make -s -f confmf 2> /dev/null` in #(
-+ *the\ am__doit\ target*)
-+ am__include=.include
-+ am__quote="\""
-+ _am_result=BSD
-+ ;;
-+ esac
-+fi
-+AC_SUBST([am__include])
-+AC_SUBST([am__quote])
-+AC_MSG_RESULT([$_am_result])
-+rm -f confinc confmf
-+])
-+
-+# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-+
-+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-+# Free Software Foundation, Inc.
- #
--# We need this here as well, since someone might use autoconf-2.5x
--# to configure GLib then an older version to configure a package
--# using AM_GLIB_GNU_GETTEXT
--AC_PREREQ(2.53)
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--dnl
--dnl We go to great lengths to make sure that aclocal won't
--dnl try to pull in the installed version of these macros
--dnl when running aclocal in the glib directory.
--dnl
--m4_copy([AC_DEFUN],[glib_DEFUN])
--m4_copy([AC_REQUIRE],[glib_REQUIRE])
--dnl
--dnl At the end, if we're not within glib, we'll define the public
--dnl definitions in terms of our private definitions.
--dnl
-+# serial 6
-
--# GLIB_LC_MESSAGES
--#--------------------
--glib_DEFUN([GLIB_LC_MESSAGES],
-- [AC_CHECK_HEADERS([locale.h])
-- if test $ac_cv_header_locale_h = yes; then
-- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-- [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-- if test $am_cv_val_LC_MESSAGES = yes; then
-- AC_DEFINE(HAVE_LC_MESSAGES, 1,
-- [Define if your <locale.h> file defines LC_MESSAGES.])
-- fi
-- fi])
-+# AM_MISSING_PROG(NAME, PROGRAM)
-+# ------------------------------
-+AC_DEFUN([AM_MISSING_PROG],
-+[AC_REQUIRE([AM_MISSING_HAS_RUN])
-+$1=${$1-"${am_missing_run}$2"}
-+AC_SUBST($1)])
-
--# GLIB_PATH_PROG_WITH_TEST
--#----------------------------
--dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
--dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
--glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
--[# Extract the first word of "$2", so it can be a program name with args.
--set dummy $2; ac_word=[$]2
--AC_MSG_CHECKING([for $ac_word])
--AC_CACHE_VAL(ac_cv_path_$1,
--[case "[$]$1" in
-- /*)
-- ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-- ;;
-+
-+# AM_MISSING_HAS_RUN
-+# ------------------
-+# Define MISSING if not defined so far and test if it supports --run.
-+# If it does, set am_missing_run to use it, otherwise, to nothing.
-+AC_DEFUN([AM_MISSING_HAS_RUN],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+AC_REQUIRE_AUX_FILE([missing])dnl
-+if test x"${MISSING+set}" != xset; then
-+ case $am_aux_dir in
-+ *\ * | *\ *)
-+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
- *)
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-- for ac_dir in ifelse([$5], , $PATH, [$5]); do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- if [$3]; then
-- ac_cv_path_$1="$ac_dir/$ac_word"
-- break
-- fi
-- fi
-- done
-- IFS="$ac_save_ifs"
--dnl If no 4th arg is given, leave the cache variable unset,
--dnl so AC_PATH_PROGS will keep looking.
--ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
--])dnl
-- ;;
--esac])dnl
--$1="$ac_cv_path_$1"
--if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-- AC_MSG_RESULT([$]$1)
-+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
-+ esac
-+fi
-+# Use eval to expand $SHELL
-+if eval "$MISSING --run true"; then
-+ am_missing_run="$MISSING --run "
- else
-- AC_MSG_RESULT(no)
-+ am_missing_run=
-+ AC_MSG_WARN([`missing' script is too old or missing])
- fi
--AC_SUBST($1)dnl
- ])
-
--# GLIB_WITH_NLS
--#-----------------
--glib_DEFUN([GLIB_WITH_NLS],
-- dnl NLS is obligatory
-- [USE_NLS=yes
-- AC_SUBST(USE_NLS)
-+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_PROG_MKDIR_P
-+# ---------------
-+# Check for `mkdir -p'.
-+AC_DEFUN([AM_PROG_MKDIR_P],
-+[AC_PREREQ([2.60])dnl
-+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-+dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
-+dnl while keeping a definition of mkdir_p for backward compatibility.
-+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-+dnl Makefile.ins that do not define MKDIR_P, so we do our own
-+dnl adjustment using top_builddir (which is defined more often than
-+dnl MKDIR_P).
-+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-+case $mkdir_p in
-+ [[\\/$]]* | ?:[[\\/]]*) ;;
-+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-+esac
-+])
-+
-+# Helper functions for option handling. -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
-- gt_cv_have_gettext=no
-+# serial 4
-
-- CATOBJEXT=NONE
-- XGETTEXT=:
-- INTLLIBS=
-+# _AM_MANGLE_OPTION(NAME)
-+# -----------------------
-+AC_DEFUN([_AM_MANGLE_OPTION],
-+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-- AC_CHECK_HEADER(libintl.h,
-- [gt_cv_func_dgettext_libintl="no"
-- libintl_extra_libs=""
-+# _AM_SET_OPTION(NAME)
-+# ------------------------------
-+# Set option NAME. Presently that only means defining a flag for this option.
-+AC_DEFUN([_AM_SET_OPTION],
-+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-- #
-- # First check in libc
-- #
-- AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
-- [AC_TRY_LINK([
--#include <libintl.h>
--],
-- [return !ngettext ("","", 1)],
-- gt_cv_func_ngettext_libc=yes,
-- gt_cv_func_ngettext_libc=no)
-- ])
--
-- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-- AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
-- [AC_TRY_LINK([
--#include <libintl.h>
--],
-- [return !dgettext ("","")],
-- gt_cv_func_dgettext_libc=yes,
-- gt_cv_func_dgettext_libc=no)
-- ])
-- fi
--
-- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-- AC_CHECK_FUNCS(bind_textdomain_codeset)
-- fi
-+# _AM_SET_OPTIONS(OPTIONS)
-+# ----------------------------------
-+# OPTIONS is a space-separated list of Automake options.
-+AC_DEFUN([_AM_SET_OPTIONS],
-+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-- #
-- # If we don't have everything we want, check in libintl
-- #
-- if test "$gt_cv_func_dgettext_libc" != "yes" \
-- || test "$gt_cv_func_ngettext_libc" != "yes" \
-- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
--
-- AC_CHECK_LIB(intl, bindtextdomain,
-- [AC_CHECK_LIB(intl, ngettext,
-- [AC_CHECK_LIB(intl, dgettext,
-- gt_cv_func_dgettext_libintl=yes)])])
-+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-+# -------------------------------------------
-+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-+AC_DEFUN([_AM_IF_OPTION],
-+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-- AC_MSG_CHECKING([if -liconv is needed to use gettext])
-- AC_MSG_RESULT([])
-- AC_CHECK_LIB(intl, ngettext,
-- [AC_CHECK_LIB(intl, dcgettext,
-- [gt_cv_func_dgettext_libintl=yes
-- libintl_extra_libs=-liconv],
-- :,-liconv)],
-- :,-liconv)
-- fi
-+# Check to make sure that the build environment is sane. -*- Autoconf -*-
-
-- #
-- # 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
-- AC_CHECK_FUNCS(bind_textdomain_codeset)
-- LIBS="$glib_save_LIBS"
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
-- 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
-+# serial 5
-
-- 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
-- AC_DEFINE(HAVE_GETTEXT,1,
-- [Define if the GNU gettext() function is already present or preinstalled.])
-- GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
-- if test "$MSGFMT" != "no"; then
-- glib_save_LIBS="$LIBS"
-- LIBS="$LIBS $INTLLIBS"
-- AC_CHECK_FUNCS(dcgettext)
-- MSGFMT_OPTS=
-- AC_MSG_CHECKING([if msgfmt accepts -c])
-- GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
--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"
--], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
-- AC_SUBST(MSGFMT_OPTS)
-- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-- GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
-- return _nl_msg_cat_cntr],
-- [CATOBJEXT=.gmo
-- DATADIRNAME=share],
-- [case $host in
-- *-*-solaris*)
-- dnl On Solaris, if bind_textdomain_codeset is in libc,
-- dnl GNU format message catalog is always supported,
-- dnl since both are added to the libc all together.
-- dnl Hence, we'd like to go with DATADIRNAME=share and
-- dnl and CATOBJEXT=.gmo in this case.
-- AC_CHECK_FUNC(bind_textdomain_codeset,
-- [CATOBJEXT=.gmo
-- DATADIRNAME=share],
-- [CATOBJEXT=.mo
-- DATADIRNAME=lib])
-- ;;
-- *)
-- CATOBJEXT=.mo
-- DATADIRNAME=lib
-- ;;
-- esac])
-- LIBS="$glib_save_LIBS"
-- INSTOBJEXT=.mo
-- else
-- gt_cv_have_gettext=no
-- fi
-- fi
-- ])
-+# AM_SANITY_CHECK
-+# ---------------
-+AC_DEFUN([AM_SANITY_CHECK],
-+[AC_MSG_CHECKING([whether build environment is sane])
-+# 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]]*)
-+ AC_MSG_ERROR([unsafe absolute working directory name]);;
-+esac
-+case $srcdir in
-+ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
-+ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
-+esac
-
-- if test "$gt_cv_have_gettext" = "yes" ; then
-- AC_DEFINE(ENABLE_NLS, 1,
-- [always defined to indicate that i18n is enabled])
-- fi
-+# 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
-
-- dnl Test whether we really found GNU xgettext.
-- if test "$XGETTEXT" != ":"; then
-- dnl If it is not GNU xgettext we define it as : so that the
-- dnl Makefiles still can work.
-- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-- : ;
-- else
-- AC_MSG_RESULT(
-- [found xgettext program is not GNU xgettext; ignore it])
-- XGETTEXT=":"
-- fi
-- fi
-+ # 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".
-+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
-+alias in your environment])
-+ fi
-
-- # We need to process the po/ directory.
-- POSUB=po
-+ test "$[2]" = conftest.file
-+ )
-+then
-+ # Ok.
-+ :
-+else
-+ AC_MSG_ERROR([newly created file is older than distributed files!
-+Check your system clock])
-+fi
-+AC_MSG_RESULT(yes)])
-
-- AC_OUTPUT_COMMANDS(
-- [case "$CONFIG_FILES" in *po/Makefile.in*)
-- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-- esac])
-+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_PROG_INSTALL_STRIP
-+# ---------------------
-+# One issue with vendor `install' (even GNU) is that you can't
-+# specify the program used to strip binaries. This is especially
-+# annoying in cross-compiling environments, where the build's strip
-+# is unlikely to handle the host's binaries.
-+# Fortunately install-sh will honor a STRIPPROG variable, so we
-+# always use install-sh in `make install-strip', and initialize
-+# STRIPPROG with the value of the STRIP variable (set by the user).
-+AC_DEFUN([AM_PROG_INSTALL_STRIP],
-+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-+# Installed binaries are usually stripped using `strip' when the user
-+# run `make install-strip'. However `strip' might not be the right
-+# tool to use in cross-compilation environments, therefore Automake
-+# will honor the `STRIP' environment variable to overrule this program.
-+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-+if test "$cross_compiling" != no; then
-+ AC_CHECK_TOOL([STRIP], [strip], :)
-+fi
-+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-+AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-- dnl These rules are solely for the distribution goal. While doing this
-- dnl we only have to keep exactly one list of the available catalogs
-- dnl in configure.in.
-- for lang in $ALL_LINGUAS; do
-- GMOFILES="$GMOFILES $lang.gmo"
-- POFILES="$POFILES $lang.po"
-- done
-+# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
-- dnl Make all variables we use known to autoconf.
-- AC_SUBST(CATALOGS)
-- AC_SUBST(CATOBJEXT)
-- AC_SUBST(DATADIRNAME)
-- AC_SUBST(GMOFILES)
-- AC_SUBST(INSTOBJEXT)
-- AC_SUBST(INTLLIBS)
-- AC_SUBST(PO_IN_DATADIR_TRUE)
-- AC_SUBST(PO_IN_DATADIR_FALSE)
-- AC_SUBST(POFILES)
-- AC_SUBST(POSUB)
-- ])
-+# serial 2
-
--# AM_GLIB_GNU_GETTEXT
--# -------------------
--# Do checks necessary for use of gettext. If a suitable implementation
--# of gettext is found in either in libintl or in the C library,
--# it will set INTLLIBS to the libraries needed for use of gettext
--# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
--# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
--# on various variables needed by the Makefile.in.in installed by
--# glib-gettextize.
--dnl
--glib_DEFUN([GLIB_GNU_GETTEXT],
-- [AC_REQUIRE([AC_PROG_CC])dnl
-- AC_REQUIRE([AC_HEADER_STDC])dnl
--
-- GLIB_LC_MESSAGES
-- GLIB_WITH_NLS
-+# _AM_SUBST_NOTMAKE(VARIABLE)
-+# ---------------------------
-+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-+# This macro is traced by Automake.
-+AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-- if test "$gt_cv_have_gettext" = "yes"; then
-- if test "x$ALL_LINGUAS" = "x"; then
-- LINGUAS=
-- else
-- AC_MSG_CHECKING(for catalogs to be installed)
-- NEW_LINGUAS=
-- for presentlang in $ALL_LINGUAS; do
-- useit=no
-- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
-- desiredlanguages="$LINGUAS"
-- else
-- desiredlanguages="$ALL_LINGUAS"
-- fi
-- for desiredlang in $desiredlanguages; do
-- # Use the presentlang catalog if desiredlang is
-- # a. equal to presentlang, or
-- # b. a variant of presentlang (because in this case,
-- # presentlang can be used as a fallback for messages
-- # which are not translated in the desiredlang catalog).
-- case "$desiredlang" in
-- "$presentlang"*) useit=yes;;
-- esac
-- done
-- if test $useit = yes; then
-- NEW_LINGUAS="$NEW_LINGUAS $presentlang"
-- fi
-- done
-- LINGUAS=$NEW_LINGUAS
-- AC_MSG_RESULT($LINGUAS)
-- fi
-+# AM_SUBST_NOTMAKE(VARIABLE)
-+# ---------------------------
-+# Public sister of _AM_SUBST_NOTMAKE.
-+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-
-- dnl Construct list of names of catalog files to be constructed.
-- if test -n "$LINGUAS"; then
-- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-- fi
-- fi
-+# Check how to create a tarball. -*- Autoconf -*-
-
-- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-- dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
-- dnl Try to locate is.
-- MKINSTALLDIRS=
-- if test -n "$ac_aux_dir"; then
-- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-- fi
-- if test -z "$MKINSTALLDIRS"; then
-- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-- fi
-- AC_SUBST(MKINSTALLDIRS)
-+# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
-- dnl Generate list of files to be processed by xgettext which will
-- dnl be included in po/Makefile.
-- test -d po || mkdir po
-- if test "x$srcdir" != "x."; then
-- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-- posrcprefix="$srcdir/"
-- else
-- posrcprefix="../$srcdir/"
-- fi
-- else
-- posrcprefix="../"
-- fi
-- rm -f po/POTFILES
-- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-- < $srcdir/po/POTFILES.in > po/POTFILES
-- ])
-+# serial 2
-
--# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
--# -------------------------------
--# Define VARIABLE to the location where catalog files will
--# be installed by po/Makefile.
--glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
--[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
--glib_save_prefix="$prefix"
--glib_save_exec_prefix="$exec_prefix"
--glib_save_datarootdir="$datarootdir"
--test "x$prefix" = xNONE && prefix=$ac_default_prefix
--test "x$exec_prefix" = xNONE && exec_prefix=$prefix
--datarootdir=`eval echo "${datarootdir}"`
--if test "x$CATOBJEXT" = "x.mo" ; then
-- localedir=`eval echo "${libdir}/locale"`
--else
-- localedir=`eval echo "${datadir}/locale"`
--fi
--prefix="$glib_save_prefix"
--exec_prefix="$glib_save_exec_prefix"
--datarootdir="$glib_save_datarootdir"
--AC_DEFINE_UNQUOTED($1, "$localedir",
-- [Define the location where the catalogs will be installed])
--])
-+# _AM_PROG_TAR(FORMAT)
-+# --------------------
-+# Check how to create a tarball in format FORMAT.
-+# FORMAT should be one of `v7', `ustar', or `pax'.
-+#
-+# Substitute a variable $(am__tar) that is a command
-+# writing to stdout a FORMAT-tarball containing the directory
-+# $tardir.
-+# tardir=directory && $(am__tar) > result.tar
-+#
-+# Substitute a variable $(am__untar) that extract such
-+# a tarball read from stdin.
-+# $(am__untar) < result.tar
-+AC_DEFUN([_AM_PROG_TAR],
-+[# Always define AMTAR for backward compatibility.
-+AM_MISSING_PROG([AMTAR], [tar])
-+m4_if([$1], [v7],
-+ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-+ [m4_case([$1], [ustar],, [pax],,
-+ [m4_fatal([Unknown tar format])])
-+AC_MSG_CHECKING([how to create a $1 tar archive])
-+# Loop over all known methods to create a tar archive until one works.
-+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-+# Do not fold the above two line into one, because Tru64 sh and
-+# Solaris sh will not grok spaces in the rhs of `-'.
-+for _am_tool in $_am_tools
-+do
-+ case $_am_tool in
-+ gnutar)
-+ for _am_tar in tar gnutar gtar;
-+ do
-+ AM_RUN_LOG([$_am_tar --version]) && break
-+ done
-+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-+ am__untar="$_am_tar -xf -"
-+ ;;
-+ plaintar)
-+ # Must skip GNU tar: if it does not support --format= it doesn't create
-+ # ustar tarball either.
-+ (tar --version) >/dev/null 2>&1 && continue
-+ am__tar='tar chf - "$$tardir"'
-+ am__tar_='tar chf - "$tardir"'
-+ am__untar='tar xf -'
-+ ;;
-+ pax)
-+ am__tar='pax -L -x $1 -w "$$tardir"'
-+ am__tar_='pax -L -x $1 -w "$tardir"'
-+ am__untar='pax -r'
-+ ;;
-+ cpio)
-+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-+ am__untar='cpio -i -H $1 -d'
-+ ;;
-+ none)
-+ am__tar=false
-+ am__tar_=false
-+ am__untar=false
-+ ;;
-+ esac
-
--dnl
--dnl Now the definitions that aclocal will find
--dnl
--ifdef(glib_configure_in,[],[
--AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
--AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
--])dnl
-+ # If the value was cached, stop now. We just wanted to have am__tar
-+ # and am__untar set.
-+ test -n "${am_cv_prog_tar_$1}" && break
-
--# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
--#
--# Create a temporary file with TEST-FILE as its contents and pass the
--# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
--# 0 and perform ACTION-IF-FAIL for any other exit status.
--AC_DEFUN([GLIB_RUN_PROG],
--[cat >conftest.foo <<_ACEOF
--$2
--_ACEOF
--if AC_RUN_LOG([$1 conftest.foo]); then
-- m4_ifval([$3], [$3], [:])
--m4_ifvaln([$4], [else $4])dnl
--echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
--sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
--fi])
-+ # tar/untar a dummy directory, and stop if the command works
-+ rm -rf conftest.dir
-+ mkdir conftest.dir
-+ echo GrepMe > conftest.dir/file
-+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-+ rm -rf conftest.dir
-+ if test -s conftest.tar; then
-+ AM_RUN_LOG([$am__untar <conftest.tar])
-+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-+ fi
-+done
-+rm -rf conftest.dir
-
-+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-+AC_SUBST([am__tar])
-+AC_SUBST([am__untar])
-+]) # _AM_PROG_TAR
-
- m4_include([m4/gtk-doc.m4])
- m4_include([m4/introspection.m4])
-diff -Naur atk1.0-1.30.0.old/atk/Makefile.in atk1.0-1.30.0/atk/Makefile.in
---- atk1.0-1.30.0.old/atk/Makefile.in 2010-03-30 00:53:48.000000000 +0200
-+++ atk1.0-1.30.0/atk/Makefile.in 2010-03-31 09:05:42.238286460 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -166,6 +166,8 @@
- GOBJECT_QUERY = @GOBJECT_QUERY@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
-+GTKDOC_MKPDF = @GTKDOC_MKPDF@
-+GTKDOC_REBASE = @GTKDOC_REBASE@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
-diff -Naur atk1.0-1.30.0.old/config.guess atk1.0-1.30.0/config.guess
-diff -Naur atk1.0-1.30.0.old/config.sub atk1.0-1.30.0/config.sub
-diff -Naur atk1.0-1.30.0.old/configure atk1.0-1.30.0/configure
---- atk1.0-1.30.0.old/configure 2010-03-30 00:53:47.000000000 +0200
-+++ atk1.0-1.30.0/configure 2010-03-31 09:05:41.049285773 +0200
-@@ -1,12 +1,14 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.64 for atk 1.30.0.
-+# Generated by GNU Autoconf 2.65 for atk 1.30.0.
- #
- # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=atk>.
- #
-+#
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
--# Foundation, Inc.
-+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-+# Inc.
-+#
- #
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
-@@ -677,7 +679,8 @@
-
-
-
--exec 7<&0 </dev/null 6>&1
-+test -n "$DJDIR" || exec 7<&0 </dev/null
-+exec 6>&1
-
- # Name of the host.
- # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-@@ -747,12 +750,20 @@
- LIBOBJS
- REBUILD
- PERL
-+GTK_DOC_USE_REBASE_FALSE
-+GTK_DOC_USE_REBASE_TRUE
- GTK_DOC_USE_LIBTOOL_FALSE
- GTK_DOC_USE_LIBTOOL_TRUE
-+GTK_DOC_BUILD_PDF_FALSE
-+GTK_DOC_BUILD_PDF_TRUE
-+GTK_DOC_BUILD_HTML_FALSE
-+GTK_DOC_BUILD_HTML_TRUE
- ENABLE_GTK_DOC_FALSE
- ENABLE_GTK_DOC_TRUE
--GTKDOC_CHECK
- HTML_DIR
-+GTKDOC_MKPDF
-+GTKDOC_REBASE
-+GTKDOC_CHECK
- HAVE_INTROSPECTION_FALSE
- HAVE_INTROSPECTION_TRUE
- INTROSPECTION_MAKEFILE
-@@ -930,6 +941,8 @@
- enable_introspection
- with_html_dir
- enable_gtk_doc
-+enable_gtk_doc_html
-+enable_gtk_doc_pdf
- '
- ac_precious_vars='build_alias
- host_alias
-@@ -1573,7 +1586,9 @@
- --disable-glibtest do not try to compile and run a test GLIB program
- --enable-introspection=[no/auto/yes]
- Enable introspection for this build
-- --enable-gtk-doc use gtk-doc to build documentation [default=no]
-+ --enable-gtk-doc use gtk-doc to build documentation [[default=no]]
-+ --enable-gtk-doc-html build documentation in html format [[default=yes]]
-+ --enable-gtk-doc-pdf build documentation in pdf format [[default=no]]
-
- Optional Packages:
- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
-@@ -1589,7 +1604,7 @@
- LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
- nonstandard directory <lib dir>
- LIBS libraries to pass to the linker, e.g. -l<library>
-- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
- you have headers in a nonstandard directory <include dir>
- CPP C preprocessor
- PKG_CONFIG path to pkg-config utility
-@@ -1663,7 +1678,7 @@
- if $ac_init_version; then
- cat <<\_ACEOF
- atk configure 1.30.0
--generated by GNU Autoconf 2.64
-+generated by GNU Autoconf 2.65
-
- Copyright (C) 2009 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
-@@ -1710,7 +1725,7 @@
- ac_retval=1
- fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-- return $ac_retval
-+ as_fn_set_status $ac_retval
-
- } # ac_fn_c_try_compile
-
-@@ -1756,7 +1771,7 @@
- # left behind by Apple's compiler. We do this before executing the actions.
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-- return $ac_retval
-+ as_fn_set_status $ac_retval
-
- } # ac_fn_c_try_link
-
-@@ -1824,7 +1839,7 @@
- ac_retval=1
- fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-- return $ac_retval
-+ as_fn_set_status $ac_retval
-
- } # ac_fn_c_try_cpp
-
-@@ -1866,7 +1881,7 @@
- fi
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-- return $ac_retval
-+ as_fn_set_status $ac_retval
-
- } # ac_fn_c_try_run
-
-@@ -2034,7 +2049,7 @@
- running configure, to aid debugging if configure makes a mistake.
-
- It was created by atk $as_me 1.30.0, which was
--generated by GNU Autoconf 2.64. Invocation command line was
-+generated by GNU Autoconf 2.65. Invocation command line was
-
- $ $0 $@
-
-@@ -2287,7 +2302,7 @@
- for ac_site_file in "$ac_site_file1" "$ac_site_file2"
- do
- test "x$ac_site_file" = xNONE && continue
-- if test -r "$ac_site_file"; then
-+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
- $as_echo "$as_me: loading site script $ac_site_file" >&6;}
- sed 's/^/| /' "$ac_site_file" >&5
-@@ -2296,9 +2311,9 @@
- done
-
- if test -r "$cache_file"; then
-- # Some versions of bash will fail to source /dev/null (special
-- # files actually), so we avoid doing that.
-- if test -f "$cache_file"; then
-+ # Some versions of bash will fail to source /dev/null (special files
-+ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
-+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
- $as_echo "$as_me: loading cache $cache_file" >&6;}
- case $cache_file in
-@@ -2724,6 +2739,7 @@
-
- fi
-
-+ test -d ./--version && rmdir ./--version
- if test "${ac_cv_path_mkdir+set}" = set; then
- MKDIR_P="$ac_cv_path_mkdir -p"
- else
-@@ -2731,7 +2747,6 @@
- # value for MKDIR_P within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the value is a relative name.
-- test -d ./--version && rmdir ./--version
- MKDIR_P="$ac_install_sh -d"
- fi
- fi
-@@ -3242,32 +3257,30 @@
- ... rest of stderr output deleted ...
- 10q' conftest.err >conftest.er1
- cat conftest.er1 >&5
-- rm -f conftest.er1 conftest.err
- fi
-+ rm -f conftest.er1 conftest.err
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
- done
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--#include <stdio.h>
-+
- int
- main ()
- {
--FILE *f = fopen ("conftest.out", "w");
-- return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
- }
- _ACEOF
- ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
-+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
--$as_echo_n "checking for C compiler default output file name... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-+$as_echo_n "checking whether the C compiler works... " >&6; }
- ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
- # The possible output files:
-@@ -3329,10 +3342,10 @@
- else
- ac_file=''
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
--$as_echo "$ac_file" >&6; }
- if test -z "$ac_file"; then :
-- $as_echo "$as_me: failed program was:" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-@@ -3340,51 +3353,18 @@
- { as_fn_set_status 77
- as_fn_error "C compiler cannot create executables
- See \`config.log' for more details." "$LINENO" 5; }; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-+$as_echo_n "checking for C compiler default output file name... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-+$as_echo "$ac_file" >&6; }
- ac_exeext=$ac_cv_exeext
-
--# Check that the compiler produces executables we can run. If not, either
--# the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
--$as_echo_n "checking whether the C compiler works... " >&6; }
--# If not cross compiling, check that we can run a simple program.
--if test "$cross_compiling" != yes; then
-- if { ac_try='./$ac_file'
-- { { case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
--$as_echo "$ac_try_echo"; } >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; }; }; then
-- cross_compiling=no
-- else
-- if test "$cross_compiling" = maybe; then
-- cross_compiling=yes
-- else
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run C compiled programs.
--If you meant to cross compile, use \`--host'.
--See \`config.log' for more details." "$LINENO" 5; }
-- fi
-- fi
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--
--rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
-+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
- ac_clean_files=$ac_clean_files_save
--# Check that the compiler produces executables we can run. If not, either
--# the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
--$as_echo_n "checking whether we are cross compiling... " >&6; }
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
--$as_echo "$cross_compiling" >&6; }
--
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
- $as_echo_n "checking for suffix of executables... " >&6; }
- if { { ac_try="$ac_link"
-@@ -3417,13 +3397,72 @@
- as_fn_error "cannot compute suffix of executables: cannot compile and link
- See \`config.log' for more details." "$LINENO" 5; }
- fi
--rm -f conftest$ac_cv_exeext
-+rm -f conftest conftest$ac_cv_exeext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
- $as_echo "$ac_cv_exeext" >&6; }
-
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <stdio.h>
-+int
-+main ()
-+{
-+FILE *f = fopen ("conftest.out", "w");
-+ return ferror (f) || fclose (f) != 0;
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+ac_clean_files="$ac_clean_files conftest.out"
-+# Check that the compiler produces executables we can run. If not, either
-+# the compiler is broken, or we cross compile.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-+$as_echo_n "checking whether we are cross compiling... " >&6; }
-+if test "$cross_compiling" != yes; then
-+ { { ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+ (eval "$ac_link") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }
-+ if { ac_try='./conftest$ac_cv_exeext'
-+ { { case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+ (eval "$ac_try") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; }; then
-+ cross_compiling=no
-+ else
-+ if test "$cross_compiling" = maybe; then
-+ cross_compiling=yes
-+ else
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot run C compiled programs.
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." "$LINENO" 5; }
-+ fi
-+ fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-+$as_echo "$cross_compiling" >&6; }
-+
-+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-+ac_clean_files=$ac_clean_files_save
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
- $as_echo_n "checking for suffix of object files... " >&6; }
- if test "${ac_cv_objext+set}" = set; then :
-@@ -4289,8 +4328,8 @@
-
-
-
--macro_version='2.2.6'
--macro_revision='1.3012'
-+macro_version='2.2.6b'
-+macro_revision='1.3017'
-
-
-
-@@ -4890,13 +4929,13 @@
- else
- lt_cv_nm_interface="BSD nm"
- echo "int some_variable = 0;" > conftest.$ac_ext
-- (eval echo "\"\$as_me:4893: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:4932: $ac_compile\"" >&5)
- (eval "$ac_compile" 2>conftest.err)
- cat conftest.err >&5
-- (eval echo "\"\$as_me:4896: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:4935: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
- (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
- cat conftest.err >&5
-- (eval echo "\"\$as_me:4899: output\"" >&5)
-+ (eval echo "\"\$as_me:4938: output\"" >&5)
- cat conftest.out >&5
- if $GREP 'External.*some_variable' conftest.out > /dev/null; then
- lt_cv_nm_interface="MS dumpbin"
-@@ -5359,7 +5398,7 @@
- ;;
-
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-@@ -6099,7 +6138,7 @@
- ;;
- *-*-irix6*)
- # Find out which ABI we are using.
-- echo '#line 6102 "configure"' > conftest.$ac_ext
-+ echo '#line 6141 "configure"' > conftest.$ac_ext
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-@@ -7597,11 +7636,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:7600: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7639: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:7604: \$? = $ac_status" >&5
-+ echo "$as_me:7643: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -7766,7 +7805,7 @@
- lt_prog_compiler_static='-non_shared'
- ;;
-
-- linux* | k*bsd*-gnu)
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
- case $cc_basename in
- # old Intel for x86_64 which still supported -KPIC.
- ecc*)
-@@ -7936,11 +7975,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:7939: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7978: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:7943: \$? = $ac_status" >&5
-+ echo "$as_me:7982: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -8041,11 +8080,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8044: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8083: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:8048: \$? = $ac_status" >&5
-+ echo "$as_me:8087: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -8096,11 +8135,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8099: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8138: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:8103: \$? = $ac_status" >&5
-+ echo "$as_me:8142: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -8239,6 +8278,7 @@
- fi
- supports_anon_versioning=no
- case `$LD -v 2>&1` in
-+ *GNU\ gold*) supports_anon_versioning=yes ;;
- *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -8330,7 +8370,7 @@
- archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-
-- gnu* | linux* | tpf* | k*bsd*-gnu)
-+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
- tmp_diet=no
- if test "$host_os" = linux-dietlibc; then
- case $cc_basename in
-@@ -9792,7 +9832,7 @@
- ;;
-
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -10479,7 +10519,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
--#line 10482 "configure"
-+#line 10522 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -10575,7 +10615,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
--#line 10578 "configure"
-+#line 10618 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -12284,54 +12324,58 @@
-
-
-
--# Check whether --with-html-dir was given.
--if test "${with_html_dir+set}" = set; then :
-- withval=$with_html_dir;
-+ # Extract the first word of "gtkdoc-check", so it can be a program name with args.
-+set dummy gtkdoc-check; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
- else
-- with_html_dir='${datadir}/gtk-doc/html'
--fi
--
-- HTML_DIR="$with_html_dir"
--
-+ case $GTKDOC_CHECK in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
-
-- # Check whether --enable-gtk-doc was given.
--if test "${enable_gtk_doc+set}" = set; then :
-- enableval=$enable_gtk_doc;
--else
-- enable_gtk_doc=no
-+ ;;
-+esac
- fi
--
--
-- if test x$enable_gtk_doc = xyes; then
-- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.0\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.0") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; }; then
-- :
-+GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
-+if test -n "$GTKDOC_CHECK"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
-+$as_echo "$GTKDOC_CHECK" >&6; }
- else
-- as_fn_error "You need to have gtk-doc >= 1.0 installed to build gtk-doc" "$LINENO" 5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
-- fi
-
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5
--$as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
--$as_echo "$enable_gtk_doc" >&6; }
-
-- for ac_prog in gtkdoc-check
-+ for ac_prog in gtkdoc-rebase
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then :
-+if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
-- case $GTKDOC_CHECK in
-+ case $GTKDOC_REBASE in
- [\\/]* | ?:[\\/]*)
-- ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path.
-+ ac_cv_path_GTKDOC_REBASE="$GTKDOC_REBASE" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -12341,7 +12385,7 @@
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
-+ ac_cv_path_GTKDOC_REBASE="$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
-@@ -12352,18 +12396,116 @@
- ;;
- esac
- fi
--GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
--if test -n "$GTKDOC_CHECK"; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
--$as_echo "$GTKDOC_CHECK" >&6; }
-+GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
-+if test -n "$GTKDOC_REBASE"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_REBASE" >&5
-+$as_echo "$GTKDOC_REBASE" >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
-- test -n "$GTKDOC_CHECK" && break
-+ test -n "$GTKDOC_REBASE" && break
-+done
-+test -n "$GTKDOC_REBASE" || GTKDOC_REBASE="true"
-+
-+ # Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args.
-+set dummy gtkdoc-mkpdf; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ case $GTKDOC_MKPDF in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_GTKDOC_MKPDF="$GTKDOC_MKPDF" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
- done
-+ done
-+IFS=$as_save_IFS
-+
-+ ;;
-+esac
-+fi
-+GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
-+if test -n "$GTKDOC_MKPDF"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_MKPDF" >&5
-+$as_echo "$GTKDOC_MKPDF" >&6; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+
-+
-+# Check whether --with-html-dir was given.
-+if test "${with_html_dir+set}" = set; then :
-+ withval=$with_html_dir;
-+else
-+ with_html_dir='${datadir}/gtk-doc/html'
-+fi
-+
-+ HTML_DIR="$with_html_dir"
-+
-+
-+ # Check whether --enable-gtk-doc was given.
-+if test "${enable_gtk_doc+set}" = set; then :
-+ enableval=$enable_gtk_doc;
-+else
-+ enable_gtk_doc=no
-+fi
-+
-+
-+ if test x$enable_gtk_doc = xyes; then
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.0\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.0") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ :
-+else
-+ as_fn_error "You need to have gtk-doc >= 1.0 installed to build $PACKAGE_NAME" "$LINENO" 5
-+fi
-+ fi
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5
-+$as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
-+$as_echo "$enable_gtk_doc" >&6; }
-+
-+ # Check whether --enable-gtk-doc-html was given.
-+if test "${enable_gtk_doc_html+set}" = set; then :
-+ enableval=$enable_gtk_doc_html;
-+else
-+ enable_gtk_doc_html=yes
-+fi
-+
-+ # Check whether --enable-gtk-doc-pdf was given.
-+if test "${enable_gtk_doc_pdf+set}" = set; then :
-+ enableval=$enable_gtk_doc_pdf;
-+else
-+ enable_gtk_doc_pdf=no
-+fi
-+
-+
-+ if test -z "$GTKDOC_MKPDF"; then
-+ enable_gtk_doc_pdf=no
-+ fi
-
-
- if test x$enable_gtk_doc = xyes; then
-@@ -12374,6 +12516,22 @@
- ENABLE_GTK_DOC_FALSE=
- fi
-
-+ if test x$enable_gtk_doc_html = xyes; then
-+ GTK_DOC_BUILD_HTML_TRUE=
-+ GTK_DOC_BUILD_HTML_FALSE='#'
-+else
-+ GTK_DOC_BUILD_HTML_TRUE='#'
-+ GTK_DOC_BUILD_HTML_FALSE=
-+fi
-+
-+ if test x$enable_gtk_doc_pdf = xyes; then
-+ GTK_DOC_BUILD_PDF_TRUE=
-+ GTK_DOC_BUILD_PDF_FALSE='#'
-+else
-+ GTK_DOC_BUILD_PDF_TRUE='#'
-+ GTK_DOC_BUILD_PDF_FALSE=
-+fi
-+
- if test -n "$LIBTOOL"; then
- GTK_DOC_USE_LIBTOOL_TRUE=
- GTK_DOC_USE_LIBTOOL_FALSE='#'
-@@ -12382,6 +12540,14 @@
- GTK_DOC_USE_LIBTOOL_FALSE=
- fi
-
-+ if test -n "$GTKDOC_REBASE"; then
-+ GTK_DOC_USE_REBASE_TRUE=
-+ GTK_DOC_USE_REBASE_FALSE='#'
-+else
-+ GTK_DOC_USE_REBASE_TRUE='#'
-+ GTK_DOC_USE_REBASE_FALSE=
-+fi
-+
-
-
- # define a MAINT-like variable REBUILD which is set if Perl
-@@ -12617,10 +12783,22 @@
- as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
-+if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then
-+ as_fn_error "conditional \"GTK_DOC_BUILD_HTML\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
-+if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then
-+ as_fn_error "conditional \"GTK_DOC_BUILD_PDF\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
- if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
- as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
-+if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then
-+ as_fn_error "conditional \"GTK_DOC_USE_REBASE\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
-
- : ${CONFIG_STATUS=./config.status}
- ac_write_fail=0
-@@ -13030,7 +13208,7 @@
- # values after options handling.
- ac_log="
- This file was extended by atk $as_me 1.30.0, which was
--generated by GNU Autoconf 2.64. Invocation command line was
-+generated by GNU Autoconf 2.65. Invocation command line was
-
- CONFIG_FILES = $CONFIG_FILES
- CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -13070,6 +13248,7 @@
-
- -h, --help print this help, then exit
- -V, --version print version number and configuration settings, then exit
-+ --config print configuration, then exit
- -q, --quiet, --silent
- do not print progress messages
- -d, --debug don't remove temporary files
-@@ -13092,10 +13271,11 @@
-
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
- ac_cs_version="\\
- atk config.status 1.30.0
--configured by $0, generated by GNU Autoconf 2.64,
-- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.65,
-+ with options \\"\$ac_cs_config\\"
-
- Copyright (C) 2009 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
-@@ -13133,6 +13313,8 @@
- ac_cs_recheck=: ;;
- --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
- $as_echo "$ac_cs_version"; exit ;;
-+ --config | --confi | --conf | --con | --co | --c )
-+ $as_echo "$ac_cs_config"; exit ;;
- --debug | --debu | --deb | --de | --d | -d )
- debug=: ;;
- --file | --fil | --fi | --f )
-@@ -13589,7 +13771,7 @@
- t delim
- :nl
- h
--s/\(.\{148\}\).*/\1/
-+s/\(.\{148\}\)..*/\1/
- t more1
- s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
- p
-@@ -13603,7 +13785,7 @@
- t nl
- :delim
- h
--s/\(.\{148\}\).*/\1/
-+s/\(.\{148\}\)..*/\1/
- t more2
- s/["\\]/\\&/g; s/^/"/; s/$/"/
- p
-diff -Naur atk1.0-1.30.0.old/docs/Makefile.in atk1.0-1.30.0/docs/Makefile.in
---- atk1.0-1.30.0.old/docs/Makefile.in 2010-03-30 00:53:48.000000000 +0200
-+++ atk1.0-1.30.0/docs/Makefile.in 2010-03-31 09:05:42.294286032 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -106,6 +106,8 @@
- GOBJECT_QUERY = @GOBJECT_QUERY@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
-+GTKDOC_MKPDF = @GTKDOC_MKPDF@
-+GTKDOC_REBASE = @GTKDOC_REBASE@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -246,7 +248,7 @@
+--- a/docs/Makefile.in
++++ b/docs/Makefile.in
+@@ -250,7 +250,7 @@
-I$(top_builddir) \
$(DEP_CFLAGS)
@@ -4251,661 +9,3 @@
# gtkdoc-mkdb related varaibles
MKDB_OPTIONS =
-@@ -255,10 +257,10 @@
-
- HTML_IMAGES =
- @GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-- at GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+ at GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --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)
-- at GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-- at GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = sh -c
-+ at GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-+ at GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN =
- @GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_RUN = $(LIBTOOL) --mode=execute
-
- # We set GPATH here; this gives us semantics for GNU make
-@@ -274,7 +276,9 @@
- $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt \
- version.xml.in
- DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
-- $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
-+ pdf-build.stamp \
-+ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
-+ $(srcdir)/pdf.stamp
-
- SCANOBJ_FILES = \
- $(DOC_MODULE).args \
-@@ -289,6 +293,10 @@
- $(DOC_MODULE)-unused.txt
-
- CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
-+ at ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE at HTML_BUILD_STAMP =
-+ at ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE at HTML_BUILD_STAMP = html-build.stamp
-+ at ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE at PDF_BUILD_STAMP =
-+ at ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE at PDF_BUILD_STAMP = pdf-build.stamp
- all: all-am
-
- .SUFFIXES:
-@@ -484,10 +492,10 @@
- uninstall-local
-
-
-- at ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp
-+ at ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
- @ENABLE_GTK_DOC_FALSE at all-local:
-
--docs: html-build.stamp
-+docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
-
- $(REPORT_FILES): sgml-build.stamp
-
-@@ -496,9 +504,9 @@
- scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
- @echo 'gtk-doc: Scanning header files'
- @-chmod -R u+w $(srcdir)
-- cd $(srcdir) && \
-+ @cd $(srcdir) && \
- gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
-- if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
-+ @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
- else \
- cd $(srcdir) ; \
-@@ -506,7 +514,7 @@
- test -f $$i || touch $$i ; \
- done \
- fi
-- touch scan-build.stamp
-+ @touch scan-build.stamp
-
- $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
- @true
-@@ -516,23 +524,23 @@
- tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
- @echo 'gtk-doc: Rebuilding template files'
- @-chmod -R u+w $(srcdir)
-- cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-- touch tmpl-build.stamp
-+ @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-+ @touch tmpl-build.stamp
-
- tmpl.stamp: tmpl-build.stamp
- @true
-
--tmpl/*.sgml:
-+$(srcdir)/tmpl/*.sgml:
- @true
-
- #### xml ####
-
--sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
-+sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
- @echo 'gtk-doc: Building XML'
- @-chmod -R u+w $(srcdir)
-- cd $(srcdir) && \
-+ @cd $(srcdir) && \
- gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
-- touch sgml-build.stamp
-+ @touch sgml-build.stamp
-
- sgml.stamp: sgml-build.stamp
- @true
-@@ -542,18 +550,37 @@
- html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
- @echo 'gtk-doc: Building HTML'
- @-chmod -R u+w $(srcdir)
-- rm -rf $(srcdir)/html
-- mkdir $(srcdir)/html
-- mkhtml_options=""; \
-+ @rm -rf $(srcdir)/html
-+ @mkdir $(srcdir)/html
-+ @mkhtml_options=""; \
- gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
- if test "$(?)" = "0"; then \
- mkhtml_options=--path="$(srcdir)"; \
-- fi
-- cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-- test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
-+ fi; \
-+ cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-+ @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
- @echo 'gtk-doc: Fixing cross-references'
-- cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-- touch html-build.stamp
-+ @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-+ @touch html-build.stamp
-+
-+#### pdf ####
-+
-+pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-+ @echo 'gtk-doc: Building PDF'
-+ @-chmod -R u+w $(srcdir)
-+ @rm -rf $(srcdir)/$(DOC_MODULE).pdf
-+ @mkpdf_imgdirs=""; \
-+ if test "x$(HTML_IMAGES)" != "x"; then \
-+ for img in $(HTML_IMAGES); do \
-+ part=`dirname $$img`; \
-+ echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
-+ if test $$? != 0; then \
-+ mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
-+ fi; \
-+ done; \
-+ fi; \
-+ cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
-+ @touch pdf-build.stamp
-
- ##############
-
-@@ -563,14 +590,14 @@
-
- distclean-local:
- cd $(srcdir) && \
-- rm -rf xml $(REPORT_FILES) \
-+ rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
- $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
- maintainer-clean-local: clean
- cd $(srcdir) && rm -rf xml html
-
- install-data-local:
-- installfiles=`echo $(srcdir)/html/*`; \
-+ @installfiles=`echo $(srcdir)/html/*`; \
- if test "$$installfiles" = '$(srcdir)/html/*'; \
- then echo '-- Nothing to install' ; \
- else \
-@@ -590,12 +617,11 @@
- mv -f $${installdir}/$(DOC_MODULE).devhelp \
- $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
- fi; \
-- ! which gtkdoc-rebase >/dev/null 2>&1 || \
-- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
-+ $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
- fi
-
- uninstall-local:
-- if test -n "$(DOC_MODULE_VERSION)"; then \
-+ @if test -n "$(DOC_MODULE_VERSION)"; then \
- installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
- else \
- installdir="$(DESTDIR)$(TARGET_DIR)"; \
-@@ -612,16 +638,14 @@
-
- dist-hook: dist-check-gtkdoc dist-hook-local
- mkdir $(distdir)/tmpl
-- mkdir $(distdir)/xml
- mkdir $(distdir)/html
- -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-- -cp $(srcdir)/xml/*.xml $(distdir)/xml
- cp $(srcdir)/html/* $(distdir)/html
-+ -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
- -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
- -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
- cd $(distdir) && rm -f $(DISTCLEANFILES)
-- ! which gtkdoc-rebase >/dev/null 2>&1 || \
-- gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
-+ $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
-
- .PHONY : dist-hook-local docs
-
-diff -Naur atk1.0-1.30.0.old/gtk-doc.make atk1.0-1.30.0/gtk-doc.make
---- atk1.0-1.30.0.old/gtk-doc.make 2010-03-30 00:53:44.000000000 +0200
-+++ atk1.0-1.30.0/gtk-doc.make 2010-03-31 09:05:37.909289896 +0200
-@@ -5,13 +5,13 @@
- ####################################
-
- if GTK_DOC_USE_LIBTOOL
--GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-+GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
- GTKDOC_RUN = $(LIBTOOL) --mode=execute
- else
- GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
--GTKDOC_RUN = sh -c
-+GTKDOC_RUN =
- endif
-
- # We set GPATH here; this gives us semantics for GNU make
-@@ -31,7 +31,9 @@
- $(DOC_MODULE)-overrides.txt
-
- DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
-- $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
-+ pdf-build.stamp \
-+ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
-+ $(srcdir)/pdf.stamp
-
- SCANOBJ_FILES = \
- $(DOC_MODULE).args \
-@@ -48,12 +50,23 @@
- CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
-
- if ENABLE_GTK_DOC
--all-local: html-build.stamp
-+if GTK_DOC_BUILD_HTML
-+HTML_BUILD_STAMP=html-build.stamp
-+else
-+HTML_BUILD_STAMP=
-+endif
-+if GTK_DOC_BUILD_PDF
-+PDF_BUILD_STAMP=pdf-build.stamp
-+else
-+PDF_BUILD_STAMP=
-+endif
-+
-+all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
- else
- all-local:
- endif
-
--docs: html-build.stamp
-+docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
-
- $(REPORT_FILES): sgml-build.stamp
-
-@@ -62,9 +75,9 @@
- scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
- @echo 'gtk-doc: Scanning header files'
- @-chmod -R u+w $(srcdir)
-- cd $(srcdir) && \
-+ @cd $(srcdir) && \
- gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
-- if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
-+ @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
- else \
- cd $(srcdir) ; \
-@@ -72,7 +85,7 @@
- test -f $$i || touch $$i ; \
- done \
- fi
-- touch scan-build.stamp
-+ @touch scan-build.stamp
-
- $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
- @true
-@@ -82,24 +95,23 @@
- tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
- @echo 'gtk-doc: Rebuilding template files'
- @-chmod -R u+w $(srcdir)
-- cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-- touch tmpl-build.stamp
-+ @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-+ @touch tmpl-build.stamp
-
- tmpl.stamp: tmpl-build.stamp
- @true
-
--tmpl/*.sgml:
-+$(srcdir)/tmpl/*.sgml:
- @true
-
--
- #### xml ####
-
--sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
-+sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
- @echo 'gtk-doc: Building XML'
- @-chmod -R u+w $(srcdir)
-- cd $(srcdir) && \
-+ @cd $(srcdir) && \
- gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
-- touch sgml-build.stamp
-+ @touch sgml-build.stamp
-
- sgml.stamp: sgml-build.stamp
- @true
-@@ -109,18 +121,37 @@
- html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
- @echo 'gtk-doc: Building HTML'
- @-chmod -R u+w $(srcdir)
-- rm -rf $(srcdir)/html
-- mkdir $(srcdir)/html
-- mkhtml_options=""; \
-+ @rm -rf $(srcdir)/html
-+ @mkdir $(srcdir)/html
-+ @mkhtml_options=""; \
- gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
- if test "$(?)" = "0"; then \
- mkhtml_options=--path="$(srcdir)"; \
-- fi
-- cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-- test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
-+ fi; \
-+ cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-+ @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
- @echo 'gtk-doc: Fixing cross-references'
-- cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-- touch html-build.stamp
-+ @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-+ @touch html-build.stamp
-+
-+#### pdf ####
-+
-+pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-+ @echo 'gtk-doc: Building PDF'
-+ @-chmod -R u+w $(srcdir)
-+ @rm -rf $(srcdir)/$(DOC_MODULE).pdf
-+ @mkpdf_imgdirs=""; \
-+ if test "x$(HTML_IMAGES)" != "x"; then \
-+ for img in $(HTML_IMAGES); do \
-+ part=`dirname $$img`; \
-+ echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
-+ if test $$? != 0; then \
-+ mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
-+ fi; \
-+ done; \
-+ fi; \
-+ cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
-+ @touch pdf-build.stamp
-
- ##############
-
-@@ -130,14 +161,14 @@
-
- distclean-local:
- cd $(srcdir) && \
-- rm -rf xml $(REPORT_FILES) \
-+ rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
- $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
- maintainer-clean-local: clean
- cd $(srcdir) && rm -rf xml html
-
- install-data-local:
-- installfiles=`echo $(srcdir)/html/*`; \
-+ @installfiles=`echo $(srcdir)/html/*`; \
- if test "$$installfiles" = '$(srcdir)/html/*'; \
- then echo '-- Nothing to install' ; \
- else \
-@@ -157,12 +188,11 @@
- mv -f $${installdir}/$(DOC_MODULE).devhelp \
- $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
- fi; \
-- ! which gtkdoc-rebase >/dev/null 2>&1 || \
-- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
-+ $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
- fi
-
- uninstall-local:
-- if test -n "$(DOC_MODULE_VERSION)"; then \
-+ @if test -n "$(DOC_MODULE_VERSION)"; then \
- installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
- else \
- installdir="$(DESTDIR)$(TARGET_DIR)"; \
-@@ -182,15 +212,13 @@
-
- dist-hook: dist-check-gtkdoc dist-hook-local
- mkdir $(distdir)/tmpl
-- mkdir $(distdir)/xml
- mkdir $(distdir)/html
- -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-- -cp $(srcdir)/xml/*.xml $(distdir)/xml
- cp $(srcdir)/html/* $(distdir)/html
-+ -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
- -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
- -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
- cd $(distdir) && rm -f $(DISTCLEANFILES)
-- ! which gtkdoc-rebase >/dev/null 2>&1 || \
-- gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
-+ $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
-
- .PHONY : dist-hook-local docs
-diff -Naur atk1.0-1.30.0.old/ltmain.sh atk1.0-1.30.0/ltmain.sh
---- atk1.0-1.30.0.old/ltmain.sh 2010-03-30 00:53:43.000000000 +0200
-+++ atk1.0-1.30.0/ltmain.sh 2010-03-31 09:05:37.397286554 +0200
-@@ -1,6 +1,6 @@
- # Generated from ltmain.m4sh.
-
--# ltmain.sh (GNU libtool) 2.2.6
-+# ltmain.sh (GNU libtool) 2.2.6b
- # Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
-
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
-@@ -65,7 +65,7 @@
- # compiler: $LTCC
- # compiler flags: $LTCFLAGS
- # linker: $LD (gnu? $with_gnu_ld)
--# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4
-+# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2
- # automake: $automake_version
- # autoconf: $autoconf_version
- #
-@@ -73,9 +73,9 @@
-
- PROGRAM=ltmain.sh
- PACKAGE=libtool
--VERSION="2.2.6 Debian-2.2.6a-4"
-+VERSION="2.2.6b Debian-2.2.6b-2"
- TIMESTAMP=""
--package_revision=1.3012
-+package_revision=1.3017
-
- # Be Bourne compatible
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-diff -Naur atk1.0-1.30.0.old/m4/gtk-doc.m4 atk1.0-1.30.0/m4/gtk-doc.m4
---- atk1.0-1.30.0.old/m4/gtk-doc.m4 2010-03-30 00:53:44.000000000 +0200
-+++ atk1.0-1.30.0/m4/gtk-doc.m4 2010-03-31 09:05:37.893288840 +0200
-@@ -8,6 +8,12 @@
- [
- AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
- AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-+
-+ dnl check for tools we added during development
-+ AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
-+ AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
-+ AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
-+
- dnl for overriding the documentation installation directory
- AC_ARG_WITH([html-dir],
- AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
-@@ -26,14 +32,30 @@
- [PKG_CHECK_EXISTS([gtk-doc],,
- AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
- [PKG_CHECK_EXISTS([gtk-doc >= $1],,
-- AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))])
-+ AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
- fi
-
- AC_MSG_CHECKING([whether to build gtk-doc documentation])
- AC_MSG_RESULT($enable_gtk_doc)
-
-- AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,)
-+ dnl enable/disable output formats
-+ AC_ARG_ENABLE([gtk-doc-html],
-+ AS_HELP_STRING([--enable-gtk-doc-html],
-+ [build documentation in html format [[default=yes]]]),,
-+ [enable_gtk_doc_html=yes])
-+ AC_ARG_ENABLE([gtk-doc-pdf],
-+ AS_HELP_STRING([--enable-gtk-doc-pdf],
-+ [build documentation in pdf format [[default=no]]]),,
-+ [enable_gtk_doc_pdf=no])
-+
-+ if test -z "$GTKDOC_MKPDF"; then
-+ enable_gtk_doc_pdf=no
-+ fi
-+
-
- AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
-+ AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
-+ AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
- AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
-+ AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
- ])
-diff -Naur atk1.0-1.30.0.old/m4/libtool.m4 atk1.0-1.30.0/m4/libtool.m4
---- atk1.0-1.30.0.old/m4/libtool.m4 2010-03-30 00:53:43.000000000 +0200
-+++ atk1.0-1.30.0/m4/libtool.m4 2010-03-31 09:05:37.441287539 +0200
-@@ -2445,7 +2445,7 @@
- ;;
-
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -3084,7 +3084,7 @@
- ;;
-
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-@@ -3705,7 +3705,7 @@
- ;;
- esac
- ;;
-- linux* | k*bsd*-gnu)
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
- case $cc_basename in
- KCC*)
- # KAI C++ Compiler
-@@ -3989,7 +3989,7 @@
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-
-- linux* | k*bsd*-gnu)
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
- case $cc_basename in
- # old Intel for x86_64 which still supported -KPIC.
- ecc*)
-@@ -4285,6 +4285,7 @@
- fi
- supports_anon_versioning=no
- case `$LD -v 2>&1` in
-+ *GNU\ gold*) supports_anon_versioning=yes ;;
- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -4376,7 +4377,7 @@
- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-
-- gnu* | linux* | tpf* | k*bsd*-gnu)
-+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
- tmp_diet=no
- if test "$host_os" = linux-dietlibc; then
- case $cc_basename in
-@@ -5860,7 +5861,7 @@
- _LT_TAGVAR(inherit_rpath, $1)=yes
- ;;
-
-- linux* | k*bsd*-gnu)
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
- case $cc_basename in
- KCC*)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
-diff -Naur atk1.0-1.30.0.old/m4/ltversion.m4 atk1.0-1.30.0/m4/ltversion.m4
---- atk1.0-1.30.0.old/m4/ltversion.m4 2010-03-30 00:53:44.000000000 +0200
-+++ atk1.0-1.30.0/m4/ltversion.m4 2010-03-31 09:05:37.621315178 +0200
-@@ -9,15 +9,15 @@
-
- # Generated from ltversion.in.
-
--# serial 3012 ltversion.m4
-+# serial 3017 ltversion.m4
- # This file is part of GNU Libtool
-
--m4_define([LT_PACKAGE_VERSION], [2.2.6])
--m4_define([LT_PACKAGE_REVISION], [1.3012])
-+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
-+m4_define([LT_PACKAGE_REVISION], [1.3017])
-
- AC_DEFUN([LTVERSION_VERSION],
--[macro_version='2.2.6'
--macro_revision='1.3012'
-+[macro_version='2.2.6b'
-+macro_revision='1.3017'
- _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
- _LT_DECL(, macro_revision, 0)
- ])
-diff -Naur atk1.0-1.30.0.old/Makefile.in atk1.0-1.30.0/Makefile.in
---- atk1.0-1.30.0.old/Makefile.in 2010-03-30 00:53:48.000000000 +0200
-+++ atk1.0-1.30.0/Makefile.in 2010-03-31 09:05:42.490286369 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -181,6 +181,8 @@
- GOBJECT_QUERY = @GOBJECT_QUERY@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
-+GTKDOC_MKPDF = @GTKDOC_MKPDF@
-+GTKDOC_REBASE = @GTKDOC_REBASE@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -418,7 +420,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-+ @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -443,7 +445,7 @@
- fi; test -z "$$fail"
-
- $(RECURSIVE_CLEAN_TARGETS):
-- @failcom='exit 1'; \
-+ @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -607,7 +609,8 @@
- fi; \
- done
- -test -n "$(am__skip_mode_fix)" \
-- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-+ || find "$(distdir)" -type d ! -perm -755 \
-+ -exec chmod u+rwx,go+rx {} \; -o \
- ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-@@ -651,17 +654,17 @@
- distcheck: dist
- case '$(DIST_ARCHIVES)' in \
- *.tar.gz*) \
-- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
- *.tar.bz2*) \
-- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
-- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
-+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
- *.tar.xz*) \
- xz -dc $(distdir).tar.xz | $(am__untar) ;;\
- *.tar.Z*) \
- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- *.shar.gz*) \
-- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
- *.zip*) \
- unzip $(distdir).zip ;;\
- esac
-diff -Naur atk1.0-1.30.0.old/tests/Makefile.in atk1.0-1.30.0/tests/Makefile.in
---- atk1.0-1.30.0.old/tests/Makefile.in 2010-03-30 00:53:48.000000000 +0200
-+++ atk1.0-1.30.0/tests/Makefile.in 2010-03-31 09:05:42.358286417 +0200
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -130,6 +130,8 @@
- GOBJECT_QUERY = @GOBJECT_QUERY@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
-+GTKDOC_MKPDF = @GTKDOC_MKPDF@
-+GTKDOC_REBASE = @GTKDOC_REBASE@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
Added: desktop/experimental/atk1.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/atk1.0/debian/patches/series?rev=25640&op=file
==============================================================================
--- desktop/experimental/atk1.0/debian/patches/series (added)
+++ desktop/experimental/atk1.0/debian/patches/series [utf-8] Sun Nov 21 22:47:09 2010
@@ -1,0 +1,2 @@
+01-docs_libs.patch
+90-relibtoolize.patch
Modified: desktop/experimental/atk1.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/atk1.0/debian/rules?rev=25640&op=diff
==============================================================================
--- desktop/experimental/atk1.0/debian/rules [utf-8] (original)
+++ desktop/experimental/atk1.0/debian/rules [utf-8] Sun Nov 21 22:47:09 2010
@@ -1,7 +1,6 @@
#! /usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
@@ -12,10 +11,13 @@
LDFLAGS += -Wl,-O1 -Wl,-z,defs -Wl,--as-needed
# build static stuff:
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc --enable-static
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc --enable-static --enable-introspection
-SHLIB_VERSION := 1.29.3
+SHLIB_VERSION := 1.32.0
DEB_DH_MAKESHLIBS_ARGS_libatk1.0-0 += -V"libatk1.0-0 (>= $(SHLIB_VERSION))" --add-udeb="libatk1.0-udeb"
DEB_DBG_PACKAGE_ALL := libatk1.0-dbg
+$(patsubst %,binary-predeb/%,$(DEB_ALL_PACKAGES)) ::
+ dh_girepository -p$(cdbs_curpkg)
+
Added: desktop/experimental/atk1.0/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/atk1.0/debian/source/format?rev=25640&op=file
==============================================================================
--- desktop/experimental/atk1.0/debian/source/format (added)
+++ desktop/experimental/atk1.0/debian/source/format [utf-8] Sun Nov 21 22:47:09 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)
More information about the pkg-gnome-commits
mailing list