Conflicts:
	milena/mln/io/magick/load.hh
	milena/mln/io/magick/save.hh
	milena/tests/io/magick/save.cc
	scribo/src/Makefile.am

	* mln/value/qt/rgb32.hh: Here.
	(name()): Change the returned string value.

	* m4/swig.m4: Here.

	* tests/accu/Makefile.am (tuple): Add conditions.

	* tests/unit_test/cond_tests_boost-preprocessor_boost-tuple: New.

	* tests/unit_test/unit-tests.mk: Regen.

	* mln/fun/v2v/saturate.hh: Add mln:: namespace prefix.

	* mln/value/rgb.hh: Add a missing include.

	* mln/accu/tuple.hh: Update include directive syntax.

	* configure.ac: Improve configure output.

	* m4/oln-with-lib.m4: Always set oln_have_* variable.

	* configure.ac: Add tests.

	* m4/boost.m4: New.

	* scribo/preprocessing/rotate_90.hh
	(out_next_offset, out_next_p_offset): Fix a wrong type leading to
	overflows.
	(output): Add an assertion checking its validity.

	* mln/convert/impl/from_float_to_value.hh: Add an overload for
	short int.

	* mln/io/fld/load.hh: Use convert::from_to.

	* mln/io/fld/max_components.hh: Explicitly cast values to unsigned.

	* mln/fun/v2v/saturate.hh: Add a missing include.

	* mln/subsampling/antialiased.hh: Increment pointer after the call
	to convert::from_to.

	* tests/subsampling/antialiased.cc: Fix references according to
	last changes on 'round factor'.

	* mln/fun/v2v/saturate.hh,
	* mln/subsampling/antialiased.hh,
	* mln/value/rgb.hh: Use convert::from_to for type conversions.

	* scribo/binarization/internal/first_pass_functor.hh,
	* scribo/binarization/sauvola_ms.hh,
	* scribo/binarization/sauvola_threshold_image.hh,
	* scribo/binarization/sauvola_threshold_image_debug.hh,
	* scribo/postprocessing/fill_object_holes.hh,
	* scribo/preprocessing/deskew.hh,
	* scribo/primitive/extract/lines_pattern.hh,
	* scribo/subsampling/bilinear.hh,
	* scribo/subsampling/integral_single_image.hh,
	* scribo/text/clean_inplace.hh,
	* src/debug/show_links_several_right_overlap.cc,
	* src/debug/show_links_single_down.cc,
	* src/debug/show_links_single_down_left_aligned.cc,
	* src/debug/show_links_single_down_right_aligned.cc,
	* src/debug/show_links_single_left.cc,
	* src/debug/show_links_single_right.cc,
	* src/debug/show_links_single_up.cc,
	* src/debug/show_links_single_up_left_aligned.cc,
	* src/debug/show_links_single_up_right_aligned.cc: explicitly
	convert to a specific type when necessary.

	* mln/draw/dashed_line.hh,
	* mln/fun/n2v/white_gaussian.hh,
	* mln/fun/v2v/rgb_to_int_u.hh,
	* mln/io/dump/get_header.hh,
	* mln/io/raw/get_header.hh: Add missing includes.

	* tests/topo/skeleton/crest.cc: Fix reference results since a bug
	have been fixed.

	* tests/unit_test/cond_tests_qt: Add conditional tests.

	* tests/unit_test/unit-tests.mk: Regen.

	* mln/convert/to_qimage.hh,
	* mln/convert/to_qimage_nocopy.hh: Here.

	* configure.ac: Pass more libraries to OLN_WITH_LIB when searching
	for libgdcmCommon.

	* headers.mk,
	* tests/unit_test/unit-tests.mk: Regen.

	* tests/geom/rotate.cc: Fix test.

	* mln/labeling/blobs_and_compute.hh: Add comments.

	* mln/labeling/flat_zones.hh: Add missing members to functors.

	* tests/labeling/blobs_and_compute.cc: Fix return type.

	* tests/labeling/flat_zones.cc,
	* tests/labeling/foreground.cc: Fix functor template parameters.

	* tests/labeling/relabel.cc: The number of components is not
	updated anymore.

	* tests/labeling/colorize.cc: Fix reference according to last
	changes in labeling::colorize routine

	* mln/core/point.hh: Add mln:: namespace prefix.

	* README,
	* src/README: Add few details about the content.

	* Makefile.am,
	* tests/unit_test/Makefile.am: Fix path of generated header list.

	* src/text_in_picture.cc,
	* src/text_recognition_in_picture.cc,
	* tests/filter/objects_with_holes.cc,
	* tests/filter/small_and_large_bboxes.cc,
	* tests/preprocessing/crop.cc,
	* tests/preprocessing/crop_without_localization.cc,
	* tests/preprocessing/deskew.cc,
	* tests/preprocessing/rotate_90.cc,
	* tests/table/extract_lines_with_rank.cc,
	* tests/table/repair_lines.cc,
	* tests/toolchain/nepomuk/text_extraction.cc: Fix path to data.hh.

	* demo/demat/demat.pro,
	* demo/wizard/wizard.pro,
	* scribo.mk,
	* tests/tests.mk: Set correct path to Scribo includes.

	* headers.mk,
	* tests/unit_test/unit-tests.mk: Regen.

	* scribo/all.hh,
	* scribo/binarization/all.hh,
	* scribo/binarization/global_threshold.hh,
	* scribo/binarization/global_threshold_auto.hh,
	* scribo/binarization/internal/first_pass_functor.hh,
	* scribo/binarization/local_threshold.hh,
	* scribo/binarization/sauvola.hh,
	* scribo/binarization/sauvola_ms.hh,
	* scribo/binarization/sauvola_ms_split.hh,
	* scribo/binarization/sauvola_threshold_image.hh,
	* scribo/binarization/sauvola_threshold_image_debug.hh,
	* scribo/canvas/integral_browsing.hh,
	* scribo/convert/from_qimage.hh,
	* scribo/core/all.hh,
	* scribo/core/central_sites.hh,
	* scribo/core/component_info.hh,
	* scribo/core/component_set.hh,
	* scribo/core/concept/dmax_functor.hh,
	* scribo/core/concept/link_functor.hh,
	* scribo/core/def/lbl_type.hh,
	* scribo/core/erase_objects.hh,
	* scribo/core/init_integral_image.hh,
	* scribo/core/line_info.hh,
	* scribo/core/line_set.hh,
	* scribo/core/macros.hh,
	* scribo/core/object_groups.hh,
	* scribo/core/object_links.hh,
	* scribo/core/tag/anchor.hh,
	* scribo/core/tag/component.hh,
	* scribo/core/tag/line.hh,
	* scribo/debug/alignment_decision_image.hh,
	* scribo/debug/all.hh,
	* scribo/debug/bboxes_enlarged_image.hh,
	* scribo/debug/char_space_image.hh,
	* scribo/debug/decision_image.hh,
	* scribo/debug/highlight_text_area.hh,
	* scribo/debug/line_info_image.hh,
	* scribo/debug/links_decision_image.hh,
	* scribo/debug/looks_like_a_text_line_image.hh,
	* scribo/debug/mean_and_base_lines_image.hh,
	* scribo/debug/save_bboxes_image.hh,
	* scribo/debug/save_comp_diff.hh,
	* scribo/debug/save_label_image.hh,
	* scribo/debug/save_linked_bboxes_image.hh,
	* scribo/debug/save_table_image.hh,
	* scribo/debug/several_links_decision_image.hh,
	* scribo/debug/text_areas_image.hh,
	* scribo/debug/usage.hh,
	* scribo/draw/all.hh,
	* scribo/draw/bounding_box_links.hh,
	* scribo/draw/bounding_boxes.hh,
	* scribo/draw/groups_bboxes.hh,
	* scribo/estim/object_groups_v_thickness.hh,
	* scribo/filter/all.hh,
	* scribo/filter/common/objects_photo.hh,
	* scribo/filter/internal/alignment_angle.hh,
	* scribo/filter/internal/component_aligned.hh,
	* scribo/filter/internal/compute.hh,
	* scribo/filter/object_groups_size_ratio.hh,
	* scribo/filter/object_groups_small.hh,
	* scribo/filter/object_groups_v_thickness.hh,
	* scribo/filter/object_groups_with_holes.hh,
	* scribo/filter/object_links_bbox_h_ratio.hh,
	* scribo/filter/object_links_bbox_overlap.hh,
	* scribo/filter/object_links_bbox_ratio.hh,
	* scribo/filter/object_links_bbox_w_ratio.hh,
	* scribo/filter/object_links_bottom_aligned.hh,
	* scribo/filter/object_links_center_aligned.hh,
	* scribo/filter/object_links_left_aligned.hh,
	* scribo/filter/object_links_non_aligned_simple.hh,
	* scribo/filter/object_links_right_aligned.hh,
	* scribo/filter/object_links_top_aligned.hh,
	* scribo/filter/objects_h_thick.hh,
	* scribo/filter/objects_h_thin.hh,
	* scribo/filter/objects_large.hh,
	* scribo/filter/objects_size_ratio.hh,
	* scribo/filter/objects_small.hh,
	* scribo/filter/objects_thick.hh,
	* scribo/filter/objects_thin.hh,
	* scribo/filter/objects_v_thick.hh,
	* scribo/filter/objects_v_thin.hh,
	* scribo/filter/objects_with_holes.hh,
	* scribo/fun/v2b/label_to_bool.hh,
	* scribo/fun/v2b/objects_large_filter.hh,
	* scribo/fun/v2b/objects_small_filter.hh,
	* scribo/io/text_boxes/save.hh,
	* scribo/io/xml/save.hh,
	* scribo/make/all.hh,
	* scribo/make/debug_filename.hh,
	* scribo/make/influence_zone_graph.hh,
	* scribo/postprocessing/all.hh,
	* scribo/postprocessing/fill_object_holes.hh,
	* scribo/preprocessing/all.hh,
	* scribo/preprocessing/crop.hh,
	* scribo/preprocessing/crop_without_localization.hh,
	* scribo/preprocessing/denoise.hh,
	* scribo/preprocessing/denoise_bg.hh,
	* scribo/preprocessing/denoise_fg.hh,
	* scribo/preprocessing/deskew.hh,
	* scribo/preprocessing/deskew_crop.hh,
	* scribo/preprocessing/homogeneous_contrast.hh,
	* scribo/preprocessing/rotate_90.hh,
	* scribo/preprocessing/split_bg_fg.hh,
	* scribo/primitive/all.hh,
	* scribo/primitive/extract/all.hh,
	* scribo/primitive/extract/canvas.hh,
	* scribo/primitive/extract/cells.hh,
	* scribo/primitive/extract/components.hh,
	* scribo/primitive/extract/horizontal_separators.hh,
	* scribo/primitive/extract/lines_discontinued.hh,
	* scribo/primitive/extract/lines_h_discontinued.hh,
	* scribo/primitive/extract/lines_h_pattern.hh,
	* scribo/primitive/extract/lines_h_single.hh,
	* scribo/primitive/extract/lines_h_thick.hh,
	* scribo/primitive/extract/lines_h_thick_and_single.hh,
	* scribo/primitive/extract/lines_pattern.hh,
	* scribo/primitive/extract/lines_thick.hh,
	* scribo/primitive/extract/lines_v_discontinued.hh,
	* scribo/primitive/extract/lines_v_pattern.hh,
	* scribo/primitive/extract/lines_v_single.hh,
	* scribo/primitive/extract/lines_v_thick.hh,
	* scribo/primitive/extract/lines_v_thick_and_single.hh,
	* scribo/primitive/extract/separators.hh,
	* scribo/primitive/extract/vertical_separators.hh,
	* scribo/primitive/group/all.hh,
	* scribo/primitive/group/apply.hh,
	* scribo/primitive/group/from_double_link.hh,
	* scribo/primitive/group/from_graph.hh,
	* scribo/primitive/group/from_single_link.hh,
	* scribo/primitive/internal/all.hh,
	* scribo/primitive/internal/find_graph_link.hh,
	* scribo/primitive/internal/find_root.hh,
	* scribo/primitive/internal/have_link_valid.hh,
	* scribo/primitive/internal/is_link_valid.hh,
	* scribo/primitive/internal/rd.hh,
	* scribo/primitive/internal/update_graph_link.hh,
	* scribo/primitive/link/all.hh,
	* scribo/primitive/link/compute.hh,
	* scribo/primitive/link/compute_several.hh,
	* scribo/primitive/link/internal/compute_anchor.hh,
	* scribo/primitive/link/internal/dmax_default.hh,
	* scribo/primitive/link/internal/dmax_functor_base.hh,
	* scribo/primitive/link/internal/dmax_width_and_height.hh,
	* scribo/primitive/link/internal/dmax_width_only.hh,
	* scribo/primitive/link/internal/find_link.hh,
	* scribo/primitive/link/internal/find_several_links.hh,
	* scribo/primitive/link/internal/link_functor_base.hh,
	* scribo/primitive/link/internal/link_several_dmax_base.hh,
	* scribo/primitive/link/internal/link_single_dmax_base.hh,
	* scribo/primitive/link/internal/link_single_dmax_ratio_base.hh,
	* scribo/primitive/link/merge_double_link.hh,
	* scribo/primitive/link/with_graph.hh,
	* scribo/primitive/link/with_rag.hh,
	* scribo/primitive/link/with_several_graphes.hh,
	* scribo/primitive/link/with_several_left_links.hh,
	* scribo/primitive/link/with_several_right_closest_links.hh,
	* scribo/primitive/link/with_several_right_links.hh,
	* scribo/primitive/link/with_several_right_links_overlap.hh,
	* scribo/primitive/link/with_single_down_link.hh,
	* scribo/primitive/link/with_single_left_link.hh,
	* scribo/primitive/link/with_single_left_link_dmax_ratio.hh,
	* scribo/primitive/link/with_single_right_link.hh,
	* scribo/primitive/link/with_single_right_link_bottom.hh,
	* scribo/primitive/link/with_single_right_link_dmax_ratio.hh,
	* scribo/primitive/link/with_single_right_link_top.hh,
	* scribo/primitive/link/with_single_up_link.hh,
	* scribo/primitive/regroup/from_single_left_link.hh,
	* scribo/primitive/regroup/from_single_left_link_wrt_h_ratio.hh,
	* scribo/primitive/remove/separators.hh,
	* scribo/subsampling/bilinear.hh,
	* scribo/subsampling/integral.hh,
	* scribo/subsampling/integral_single_image.hh,
	* scribo/table/align_lines_horizontaly.hh,
	* scribo/table/align_lines_verticaly.hh,
	* scribo/table/all.hh,
	* scribo/table/connect_horizontal_lines.hh,
	* scribo/table/connect_vertical_lines.hh,
	* scribo/table/erase.hh,
	* scribo/table/extract.hh,
	* scribo/table/internal/align_lines.hh,
	* scribo/table/internal/all.hh,
	* scribo/table/internal/connect_lines.hh,
	* scribo/table/internal/repair_lines.hh,
	* scribo/table/rebuild.hh,
	* scribo/table/repair_horizontal_lines.hh,
	* scribo/table/repair_vertical_lines.hh,
	* scribo/text/all.hh,
	* scribo/text/clean.hh,
	* scribo/text/clean_inplace.hh,
	* scribo/text/extract_lines.hh,
	* scribo/text/look_like_text_lines.hh,
	* scribo/text/merging.hh,
	* scribo/text/recognition.hh,
	* scribo/toolchain/nepomuk/text_extraction.hh,
	* scribo/toolchain/text_in_doc.hh,
	* scribo/upsampling/bs2x.hh,
	* scribo/upsampling/eagle.hh: Move...

	* scribo/scribo/all.hh,
	* scribo/scribo/binarization/all.hh,
	* scribo/scribo/binarization/global_threshold.hh,
	* scribo/scribo/binarization/global_threshold_auto.hh,
	* scribo/scribo/binarization/internal/first_pass_functor.hh,
	* scribo/scribo/binarization/local_threshold.hh,
	* scribo/scribo/binarization/sauvola.hh,
	* scribo/scribo/binarization/sauvola_ms.hh,
	* scribo/scribo/binarization/sauvola_ms_split.hh,
	* scribo/scribo/binarization/sauvola_threshold_image.hh,
	* scribo/scribo/binarization/sauvola_threshold_image_debug.hh,
	* scribo/scribo/canvas/integral_browsing.hh,
	* scribo/scribo/convert/from_qimage.hh,
	* scribo/scribo/core/all.hh,
	* scribo/scribo/core/central_sites.hh,
	* scribo/scribo/core/component_info.hh,
	* scribo/scribo/core/component_set.hh,
	* scribo/scribo/core/concept/dmax_functor.hh,
	* scribo/scribo/core/concept/link_functor.hh,
	* scribo/scribo/core/def/lbl_type.hh,
	* scribo/scribo/core/erase_objects.hh,
	* scribo/scribo/core/init_integral_image.hh,
	* scribo/scribo/core/line_info.hh,
	* scribo/scribo/core/line_set.hh,
	* scribo/scribo/core/macros.hh,
	* scribo/scribo/core/object_groups.hh,
	* scribo/scribo/core/object_links.hh,
	* scribo/scribo/core/tag/anchor.hh,
	* scribo/scribo/core/tag/component.hh,
	* scribo/scribo/core/tag/line.hh,
	* scribo/scribo/debug/alignment_decision_image.hh,
	* scribo/scribo/debug/all.hh,
	* scribo/scribo/debug/bboxes_enlarged_image.hh,
	* scribo/scribo/debug/char_space_image.hh,
	* scribo/scribo/debug/decision_image.hh,
	* scribo/scribo/debug/highlight_text_area.hh,
	* scribo/scribo/debug/line_info_image.hh,
	* scribo/scribo/debug/links_decision_image.hh,
	* scribo/scribo/debug/looks_like_a_text_line_image.hh,
	* scribo/scribo/debug/mean_and_base_lines_image.hh,
	* scribo/scribo/debug/save_bboxes_image.hh,
	* scribo/scribo/debug/save_comp_diff.hh,
	* scribo/scribo/debug/save_label_image.hh,
	* scribo/scribo/debug/save_linked_bboxes_image.hh,
	* scribo/scribo/debug/save_table_image.hh,
	* scribo/scribo/debug/several_links_decision_image.hh,
	* scribo/scribo/debug/text_areas_image.hh,
	* scribo/scribo/debug/usage.hh,
	* scribo/scribo/draw/all.hh,
	* scribo/scribo/draw/bounding_box_links.hh,
	* scribo/scribo/draw/bounding_boxes.hh,
	* scribo/scribo/draw/groups_bboxes.hh,
	* scribo/scribo/estim/object_groups_v_thickness.hh,
	* scribo/scribo/filter/all.hh,
	* scribo/scribo/filter/common/objects_photo.hh,
	* scribo/scribo/filter/internal/alignment_angle.hh,
	* scribo/scribo/filter/internal/component_aligned.hh,
	* scribo/scribo/filter/internal/compute.hh,
	* scribo/scribo/filter/object_groups_size_ratio.hh,
	* scribo/scribo/filter/object_groups_small.hh,
	* scribo/scribo/filter/object_groups_v_thickness.hh,
	* scribo/scribo/filter/object_groups_with_holes.hh,
	* scribo/scribo/filter/object_links_bbox_h_ratio.hh,
	* scribo/scribo/filter/object_links_bbox_overlap.hh,
	* scribo/scribo/filter/object_links_bbox_ratio.hh,
	* scribo/scribo/filter/object_links_bbox_w_ratio.hh,
	* scribo/scribo/filter/object_links_bottom_aligned.hh,
	* scribo/scribo/filter/object_links_center_aligned.hh,
	* scribo/scribo/filter/object_links_left_aligned.hh,
	* scribo/scribo/filter/object_links_non_aligned_simple.hh,
	* scribo/scribo/filter/object_links_right_aligned.hh,
	* scribo/scribo/filter/object_links_top_aligned.hh,
	* scribo/scribo/filter/objects_h_thick.hh,
	* scribo/scribo/filter/objects_h_thin.hh,
	* scribo/scribo/filter/objects_large.hh,
	* scribo/scribo/filter/objects_size_ratio.hh,
	* scribo/scribo/filter/objects_small.hh,
	* scribo/scribo/filter/objects_thick.hh,
	* scribo/scribo/filter/objects_thin.hh,
	* scribo/scribo/filter/objects_v_thick.hh,
	* scribo/scribo/filter/objects_v_thin.hh,
	* scribo/scribo/filter/objects_with_holes.hh,
	* scribo/scribo/fun/v2b/label_to_bool.hh,
	* scribo/scribo/fun/v2b/objects_large_filter.hh,
	* scribo/scribo/fun/v2b/objects_small_filter.hh,
	* scribo/scribo/io/text_boxes/save.hh,
	* scribo/scribo/io/xml/save.hh,
	* scribo/scribo/make/all.hh,
	* scribo/scribo/make/debug_filename.hh,
	* scribo/scribo/make/influence_zone_graph.hh,
	* scribo/scribo/postprocessing/all.hh,
	* scribo/scribo/postprocessing/fill_object_holes.hh,
	* scribo/scribo/preprocessing/all.hh,
	* scribo/scribo/preprocessing/crop.hh,
	* scribo/scribo/preprocessing/crop_without_localization.hh,
	* scribo/scribo/preprocessing/denoise.hh,
	* scribo/scribo/preprocessing/denoise_bg.hh,
	* scribo/scribo/preprocessing/denoise_fg.hh,
	* scribo/scribo/preprocessing/deskew.hh,
	* scribo/scribo/preprocessing/deskew_crop.hh,
	* scribo/scribo/preprocessing/homogeneous_contrast.hh,
	* scribo/scribo/preprocessing/rotate_90.hh,
	* scribo/scribo/preprocessing/split_bg_fg.hh,
	* scribo/scribo/primitive/all.hh,
	* scribo/scribo/primitive/extract/all.hh,
	* scribo/scribo/primitive/extract/canvas.hh,
	* scribo/scribo/primitive/extract/cells.hh,
	* scribo/scribo/primitive/extract/components.hh,
	* scribo/scribo/primitive/extract/horizontal_separators.hh,
	* scribo/scribo/primitive/extract/lines_discontinued.hh,
	* scribo/scribo/primitive/extract/lines_h_discontinued.hh,
	* scribo/scribo/primitive/extract/lines_h_pattern.hh,
	* scribo/scribo/primitive/extract/lines_h_single.hh,
	* scribo/scribo/primitive/extract/lines_h_thick.hh,
	* scribo/scribo/primitive/extract/lines_h_thick_and_single.hh,
	* scribo/scribo/primitive/extract/lines_pattern.hh,
	* scribo/scribo/primitive/extract/lines_thick.hh,
	* scribo/scribo/primitive/extract/lines_v_discontinued.hh,
	* scribo/scribo/primitive/extract/lines_v_pattern.hh,
	* scribo/scribo/primitive/extract/lines_v_single.hh,
	* scribo/scribo/primitive/extract/lines_v_thick.hh,
	* scribo/scribo/primitive/extract/lines_v_thick_and_single.hh,
	* scribo/scribo/primitive/extract/separators.hh,
	* scribo/scribo/primitive/extract/vertical_separators.hh,
	* scribo/scribo/primitive/group/all.hh,
	* scribo/scribo/primitive/group/apply.hh,
	* scribo/scribo/primitive/group/from_double_link.hh,
	* scribo/scribo/primitive/group/from_graph.hh,
	* scribo/scribo/primitive/group/from_single_link.hh,
	* scribo/scribo/primitive/internal/all.hh,
	* scribo/scribo/primitive/internal/find_graph_link.hh,
	* scribo/scribo/primitive/internal/find_root.hh,
	* scribo/scribo/primitive/internal/have_link_valid.hh,
	* scribo/scribo/primitive/internal/is_link_valid.hh,
	* scribo/scribo/primitive/internal/rd.hh,
	* scribo/scribo/primitive/internal/update_graph_link.hh,
	* scribo/scribo/primitive/link/all.hh,
	* scribo/scribo/primitive/link/compute.hh,
	* scribo/scribo/primitive/link/compute_several.hh,
	* scribo/scribo/primitive/link/internal/compute_anchor.hh,
	* scribo/scribo/primitive/link/internal/dmax_default.hh,
	* scribo/scribo/primitive/link/internal/dmax_functor_base.hh,
	* scribo/scribo/primitive/link/internal/dmax_width_and_height.hh,
	* scribo/scribo/primitive/link/internal/dmax_width_only.hh,
	* scribo/scribo/primitive/link/internal/find_link.hh,
	* scribo/scribo/primitive/link/internal/find_several_links.hh,
	* scribo/scribo/primitive/link/internal/link_functor_base.hh,
	* scribo/scribo/primitive/link/internal/link_several_dmax_base.hh,
	* scribo/scribo/primitive/link/internal/link_single_dmax_base.hh,
	* scribo/scribo/primitive/link/internal/link_single_dmax_ratio_base.hh,
	* scribo/scribo/primitive/link/merge_double_link.hh,
	* scribo/scribo/primitive/link/with_graph.hh,
	* scribo/scribo/primitive/link/with_rag.hh,
	* scribo/scribo/primitive/link/with_several_graphes.hh,
	* scribo/scribo/primitive/link/with_several_left_links.hh,
	* scribo/scribo/primitive/link/with_several_right_closest_links.hh,
	* scribo/scribo/primitive/link/with_several_right_links.hh,
	* scribo/scribo/primitive/link/with_several_right_links_overlap.hh,
	* scribo/scribo/primitive/link/with_single_down_link.hh,
	* scribo/scribo/primitive/link/with_single_left_link.hh,
	* scribo/scribo/primitive/link/with_single_left_link_dmax_ratio.hh,
	* scribo/scribo/primitive/link/with_single_right_link.hh,
	* scribo/scribo/primitive/link/with_single_right_link_bottom.hh,
	* scribo/scribo/primitive/link/with_single_right_link_dmax_ratio.hh,
	* scribo/scribo/primitive/link/with_single_right_link_top.hh,
	* scribo/scribo/primitive/link/with_single_up_link.hh,
	* scribo/scribo/primitive/regroup/from_single_left_link.hh,
	* scribo/scribo/primitive/regroup/from_single_left_link_wrt_h_ratio.hh,
	* scribo/scribo/primitive/remove/separators.hh,
	* scribo/scribo/subsampling/bilinear.hh,
	* scribo/scribo/subsampling/integral.hh,
	* scribo/scribo/subsampling/integral_single_image.hh,
	* scribo/scribo/table/align_lines_horizontaly.hh,
	* scribo/scribo/table/align_lines_verticaly.hh,
	* scribo/scribo/table/all.hh,
	* scribo/scribo/table/connect_horizontal_lines.hh,
	* scribo/scribo/table/connect_vertical_lines.hh,
	* scribo/scribo/table/erase.hh,
	* scribo/scribo/table/extract.hh,
	* scribo/scribo/table/internal/align_lines.hh,
	* scribo/scribo/table/internal/all.hh,
	* scribo/scribo/table/internal/connect_lines.hh,
	* scribo/scribo/table/internal/repair_lines.hh,
	* scribo/scribo/table/rebuild.hh,
	* scribo/scribo/table/repair_horizontal_lines.hh,
	* scribo/scribo/table/repair_vertical_lines.hh,
	* scribo/scribo/text/all.hh,
	* scribo/scribo/text/clean.hh,
	* scribo/scribo/text/clean_inplace.hh,
	* scribo/scribo/text/extract_lines.hh,
	* scribo/scribo/text/look_like_text_lines.hh,
	* scribo/scribo/text/merging.hh,
	* scribo/scribo/text/recognition.hh,
	* scribo/scribo/toolchain/nepomuk/text_extraction.hh,
	* scribo/scribo/toolchain/text_in_doc.hh,
	* scribo/scribo/upsampling/bs2x.hh,
	* scribo/scribo/upsampling/eagle.hh: ... here.

	* tests/tests.mk: Add specific flags for external dependencies.

	* tests/unit_test/Makefile.am
	(EXTRA_DIST): Add const_tests_* files.
	(regen-am): Use build-aux/build_unit_test.sh.
	(scribo_*FLAGS): Remove specific flags for conditional unit-tests.

	* tests/unit_test/build_unit_test.sh: Remove. Useless since
	build-aux/build_unit_test.sh is used instead.

	* tests/unit_test/cond_tests_qt,
	* tests/unit_test/cond_tests_qt_tesseract_tiff,
	* tests/unit_test/cond_tests_tesseract_tiff: New.

	* tests/unit_test/unit-tests.mk: Regen.

	* tests/unit_test/Makefile.am
	(regen-am): Update the use of build_unit_test.sh.
	(EXTRA_DIST): Add cond_tests_* files.

	* tests/unit_test/cond_tests_cfitsio,
	* tests/unit_test/cond_tests_gdcm,
	* tests/unit_test/cond_tests_magickxx,
	* tests/unit_test/cond_tests_tiff: New.

	* tests/unit_test/disabled_tests: Remove some conditional tests.

	* tests/unit_test/unit-tests.mk: Regen.