diff -Nru gtk-doc-1.14/aclocal.m4 gtk-doc-1.17/aclocal.m4 --- gtk-doc-1.14/aclocal.m4 2010-01-03 12:15:07.000000000 +0000 +++ gtk-doc-1.17/aclocal.m4 2011-02-26 12:26:02.000000000 +0000 @@ -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,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, -[m4_warning([this file was generated for autoconf 2.63. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.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'.])]) @@ -190,7 +190,7 @@ [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], [], +m4_if([$1], [1.11.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -206,7 +206,7 @@ # 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 +[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]))]) @@ -1062,6 +1062,14 @@ am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` ;; + *) + case $am_py_prefix in + /usr|/System*) ;; + *) + am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages + ;; + esac + ;; esac ]) AC_SUBST([pythondir], [$am_cv_python_pythondir]) @@ -1092,6 +1100,14 @@ am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` ;; + *) + case $am_py_exec_prefix in + /usr|/System*) ;; + *) + am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages + ;; + esac + ;; esac ]) AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir]) diff -Nru gtk-doc-1.14/ChangeLog gtk-doc-1.17/ChangeLog --- gtk-doc-1.14/ChangeLog 2010-03-28 17:28:08.000000000 +0000 +++ gtk-doc-1.17/ChangeLog 2011-02-26 12:26:24.000000000 +0000 @@ -1,5 +1,1501 @@ # Generated by Makefile. Do not edit. +commit 2ad157dd2197d592e110ba367838e67a6f182770 +Author: Stefan Kost +Date: Sat Feb 26 14:25:54 2011 +0200 + + release: update news and date in manual + + NEWS | 14 ++++++++++++++ + configure.ac | 2 +- + help/manual/C/gtk-doc-manual.xml | 6 +++--- + 3 files changed, 18 insertions(+), 4 deletions(-) + +commit 145510fe584800d6e8582174d9579cba696e9458 +Author: Stefan Kost +Date: Tue Feb 22 16:00:26 2011 +0200 + + docs: add a section with gtk-doc related tools + + help/manual/C/gtk-doc-manual.xml | 53 ++++++++++++++++++++++++------------- + 1 files changed, 34 insertions(+), 19 deletions(-) + +commit 57c841cfa6fd49b5e9f914a54fedb0dca10910f1 +Author: Stefan Kost +Date: Tue Feb 1 16:44:45 2011 +0200 + + TODO: more planning + + TODO | 8 ++++++++ + 1 files changed, 8 insertions(+), 0 deletions(-) + +commit 7d083dacd622d061d12fc60046135897fc2102fc +Author: Stefan Kost +Date: Thu Feb 3 00:11:58 2011 +0200 + + make: fix handling of HTML_IMAGES + + We don't copy them in setup. When copying them we need to handle that some file + have been created and thus are in builddir already. For extra joy people have + them eventually in subdirs too. + + gtk-doc.make | 11 +++++++++-- + gtk-doc.notmpl.make | 11 +++++++++-- + 2 files changed, 18 insertions(+), 4 deletions(-) + +commit 2347c227868cd1d08cad681d9fc531db22ce2bd7 +Author: Stefan Kost +Date: Wed Feb 2 23:35:21 2011 +0200 + + make: fix leftover files in build-dir. + + Especially in the tmpl build case we build in builddir, but we need to copy + the files back to allow them to be checked in. + + gtk-doc.make | 15 ++++++++++++--- + gtk-doc.notmpl.make | 5 +++-- + 2 files changed, 15 insertions(+), 5 deletions(-) + +commit 362e534c1002de9413af4c9705b29a3cee09f37e +Author: Stefan Kost +Date: Wed Feb 2 01:40:10 2011 +0200 + + make: use stamp-files to avoid rebuilding during make check + + gtk-doc.make | 3 ++- + gtk-doc.notmpl.make | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +commit 514c524ffda9d316d054143d36bd559b3e417034 +Author: Stefan Kost +Date: Mon Jan 31 22:46:45 2011 +0200 + + make: stop using a wildcard for the setup files + + Use an explicit list. With the wildcar we e.g. also copy gio-xxx.1 in glib + and breaking the build as the file would be already present. Properly clean + all copied files using the new list var. + + gtk-doc.make | 14 ++++++++------ + gtk-doc.notmpl.make | 14 ++++++++------ + 2 files changed, 16 insertions(+), 12 deletions(-) + +commit 70096cab10079a4b6c6d0b6ee829ef1ec004f502 +Author: Stefan Kost +Date: Mon Jan 31 10:27:11 2011 +0200 + + TODO: planning + + TODO | 59 ++++++++++++++++++++++++++++++++++------------------------- + 1 files changed, 34 insertions(+), 25 deletions(-) + +commit 2d4d03f8b93e3d0e01eb619da43106ea29e5b493 +Author: Stefan Kost +Date: Sat Jan 29 00:46:06 2011 +0200 + + make: fix dependency to setup stamp + + gtk-doc.make | 4 ++-- + gtk-doc.notmpl.make | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit f56f32234d70b4df50073c0764ecf5bc79de4a81 +Author: Stefan Kost +Date: Fri Jan 28 22:29:25 2011 +0200 + + gtk-doc.mak: use cp -p instead of cp -a + + Fixes issues on macosx + + gtk-doc.make | 6 +++--- + gtk-doc.notmpl.make | 8 ++++---- + 2 files changed, 7 insertions(+), 7 deletions(-) + +commit b19bee782925023574df28db778e9411a6cc891b +Author: Daniel Mustieles +Date: Thu Jan 27 21:31:24 2011 +0100 + + Updated Spanish translation + + help/manual/es/es.po | 531 ++++++++++++++++++++++++++------------------------ + 1 files changed, 275 insertions(+), 256 deletions(-) + +commit 54ce2841cc2b1cdc4afd34c66ac1654b0f3ef1c4 +Author: Stefan Kost +Date: Thu Jan 27 17:18:18 2011 +0200 + + make: dist files form builddir + + gtk-doc.make | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +commit b3debfa020f8d72dc3a6b3c10e970ebadfb4679d +Author: Stefan Kost +Date: Thu Jan 27 17:08:54 2011 +0200 + + make: fix setup.stamp logic + + We need to copy all files that exist. Also include expand_content_files. + + gtk-doc.make | 6 +++--- + gtk-doc.notmpl.make | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit 0c29fb4216bd0064845b9e46a5902d8913b496eb +Author: Javier Jardón +Date: Mon Jan 17 23:09:29 2011 +0200 + + configure.ac: Fix typo + + configure.ac | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 7bf28c2a73aa684d6dcea235f9f7e9ce7df84349 +Author: Stefan Kost +Date: Mon Jan 17 22:51:17 2011 +0200 + + release: bump versions and back to development + + configure.ac | 2 +- + help/manual/C/gtk-doc-manual.xml | 6 ++++++ + 2 files changed, 7 insertions(+), 1 deletions(-) + +commit 2b06d253a5b6445d733e6f68153b7376fd0481d0 +Author: Stefan Kost +Date: Fri Jan 14 23:48:05 2011 +0200 + + release: update news and date in manual + + NEWS | 52 +++++++++++++++++++++++++++++++++++++- + configure.ac | 2 +- + help/manual/C/gtk-doc-manual.xml | 6 ++-- + 3 files changed, 55 insertions(+), 5 deletions(-) + +commit 8f27127dfb393726895259a8d951288835b47606 +Author: Matthias Clasen +Date: Thu Jan 6 09:29:07 2011 -0500 + + Support GTK+ 3 cell properties + + This commit adds minimal support for the cell properties that + GTK+ 3 introduces on GtkCellArea subclasses, by treating them + the same as child properties. + + gtkdoc-scangobj.in | 8 ++++++++ + 1 files changed, 8 insertions(+), 0 deletions(-) + +commit af667b04c9fed8151b38afdbb1cc6b669f0a4ee9 +Author: Javier Jardón +Date: Thu Jan 13 20:43:12 2011 +0000 + + autogen.sh: Use autoreconf + + Makefile.am | 2 +- + autogen.sh | 100 +++++++--------------------------------------------------- + configure.ac | 8 ++--- + 3 files changed, 16 insertions(+), 94 deletions(-) + +commit dcf604f9b26397f9779e183f23dfd62b0a7ba645 +Author: Stefan Kost +Date: Thu Jan 13 17:53:13 2011 +0200 + + scnobj: fix spelling and trailing whitespaces + + gtkdoc-scangobj.in | 14 +++++++------- + 1 files changed, 7 insertions(+), 7 deletions(-) + +commit 4cfc71cd836d73b15254f73f58d8fd5f85fcc1f6 +Author: Maarten Bosmans +Date: Mon Jan 10 14:35:16 2011 +0200 + + parsing: improve parsing of arguments + + The 'const' in a 'const unsigned char *xxx' parameter was dropped. Add test-case + as well. Fixes #638330. + + gtkdoc-common.pl.in | 28 ++++++++++++++-------------- + tests/bugs/docs/tester-sections.txt | 1 + + tests/bugs/src/tester.c | 26 +++++++++++++++++++------- + tests/bugs/src/tester.h | 10 +++++++--- + 4 files changed, 41 insertions(+), 24 deletions(-) + +commit 7cbb5311fcbfcb2541e840cea459d637bff0d9ec +Author: Stefan Kost +Date: Fri Jan 7 16:39:32 2011 +0200 + + pkg-config: add datadir as a pkg-config var + + Allow other modules to query the gtk-doc datadir location with + pkg-config --variable=data_dir gtk-doc + + gtk-doc.pc.in | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit af310ffef435c107427bdc980b339b965bfa438f +Author: Stefan Kost +Date: Fri Dec 17 09:50:52 2010 +0200 + + gtkdoc.make: fix out of srcdir builds + + Instead of making the srcdir writable, copy the needed files to builddir. + + Fixes #127049 + + gtk-doc.make | 79 ++++++++++++++++++++++++++------------------ + gtk-doc.notmpl.make | 90 ++++++++++++++++++++++++++++++--------------------- + 2 files changed, 100 insertions(+), 69 deletions(-) + +commit 7b38b9de8f26e526967ee4a0ff08454a794508fb +Author: Stefan Kost +Date: Wed Dec 15 10:09:54 2010 +0200 + + tests: disable pararrel make for bootstrap test + + This should fix the signle test failure on build.gnome.org, as long as we have + no better idea how to handle make dependencies for generated files. + + tests/empty/docs/Makefile.am | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletions(-) + +commit 836f653025803ca8e26b2069f9b665debbd7c5eb +Author: Stefan Kost +Date: Thu Oct 28 04:01:06 2010 +0300 + + scangobj: figure out additional root types + + Discover root types besides GObject and GInterface. + + gtkdoc-scangobj.in | 25 ++++++++++++++++++------- + 1 files changed, 18 insertions(+), 7 deletions(-) + +commit 2a9498decafe070c6512af36e9589b6c05442d23 +Author: Stefan Kost +Date: Fri Nov 26 12:02:28 2010 +0200 + + Makefile.am,scan: clarify --igrnore-headers + + Aparently ignore-headers can be used to skip whole dirs as well. + + examples/Makefile.am | 4 ++-- + gtkdoc-scan.in | 3 ++- + 2 files changed, 4 insertions(+), 3 deletions(-) + +commit 763d0ab96678db8d83bb59155b0c246efdea3196 +Author: Mario Blättermann +Date: Sat Nov 6 19:33:06 2010 +0100 + + [l10n] Updated German doc translation, fixed some XML errors + + help/manual/de/de.po | 20 ++++++++++---------- + 1 files changed, 10 insertions(+), 10 deletions(-) + +commit c704150ee7ea7f83bc601449673c6f4273829594 +Author: Stefan Kost +Date: Thu Nov 4 22:53:01 2010 +0200 + + docs: fix the configure.ac suggestion for gtk-doc less setups + + We need to define the automake conditional regardless to avoid automake failure + during autogen phase. + + help/manual/C/gtk-doc-manual.xml | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +commit 0f823987820f1b15a07b2464149c9221b360033a +Author: Stefan Kost +Date: Wed Oct 20 12:00:25 2010 +0300 + + mkdb: add support for "closure" annotation + + Fixes #632587. + + gtkdoc-mkdb.in | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit 23e5c3c5c7b80e27321925507e089fa9b3f7a364 +Author: Stefan Kost +Date: Wed Oct 20 11:51:43 2010 +0300 + + scan(g)obj: remove special case handling for GdkEvent + + Remove get_gdk_event() as those things should be just properly documented in the + library. Fixes #631336 + + gtkdoc-scangobj.in | 64 +--------------------------------------------------- + gtkdoc-scanobj.in | 64 +--------------------------------------------------- + 2 files changed, 2 insertions(+), 126 deletions(-) + +commit 97302d742938145bb57d725f0cd119835bfb7333 +Author: Stefan Kost +Date: Wed Oct 20 11:50:54 2010 +0300 + + mkdb: purge more whitespaces from the generated xml/sgml + + gtkdoc-mkdb.in | 21 ++++++++++++++++----- + 1 files changed, 16 insertions(+), 5 deletions(-) + +commit de48a13ee2d2e3855218596a68c699bbb42b9e2f +Author: Stefan Kost +Date: Wed Oct 20 11:18:49 2010 +0300 + + mkdb: again purge empty para tags when merging tmpl docs + + gtkdoc-mkdb.in | 7 +++++++ + 1 files changed, 7 insertions(+), 0 deletions(-) + +commit aa153dd670d00ffcf98d985c8c06664125edbef0 +Author: Claude Paroz +Date: Wed Oct 20 08:51:59 2010 +0200 + + [help] Fix XML validity of French translation + + help/manual/fr/fr.po | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit 58f1ade7065fb90a0942a93f860db45b3cfc36a3 +Author: Stefan Kost +Date: Tue Oct 19 22:05:20 2010 +0300 + + tests: add an example for hiding an enum value + + tests/gobject/src/gtypes.c | 1 + + tests/gobject/src/gtypes.h | 4 +++- + 2 files changed, 4 insertions(+), 1 deletions(-) + +commit 521767f0aded5c3beb75b3c11911e0df123069cb +Author: Stefan Kost +Date: Tue Oct 19 10:34:12 2010 +0300 + + mkdb: do strip all tags when checking for empty docs, but don't reset tmpl docs + + We were resetting the tmpl-docs, but we need if for the merge. If we don't strip + all tags we end up with more warnings. + + gtkdoc-mkdb.in | 15 ++++++--------- + 1 files changed, 6 insertions(+), 9 deletions(-) + +commit 6db2ce6b1e39e1d7f04a7b4a47e89c98625aa483 +Author: Stefan Kost +Date: Thu Sep 23 09:46:39 2010 +0300 + + design: add links to wikicreole for new syntax ideas + + doc/design-2.x.txt | 7 +++++++ + 1 files changed, 7 insertions(+), 0 deletions(-) + +commit f9a864f8bf403464a948fd8f56cd1dbe88b7fa37 +Author: Matej Urbančič +Date: Sun Oct 17 21:04:51 2010 +0200 + + Added sl for Slovenian translation + + help/manual/Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 2a8dd4cc9f2a2c604e8164747629158427817584 +Author: Matej Urbančič +Date: Sun Oct 17 21:04:32 2010 +0200 + + Updated Slovenian translation + + help/manual/sl/sl.po | 1460 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 1460 insertions(+), 0 deletions(-) + +commit c42c99bfb823d7c78bf4de5e925029232a171998 +Author: Rodrigo Aliste +Date: Sat Oct 16 15:36:51 2010 -0300 + + css: Don't hide anchor links when navigating. + + Fixes bug #618379. + + style-classic.css | 3 ++- + style.css | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +commit 35bbf7adb7a7c0071a6c74ebff141c84a18962e7 +Author: Stefan Kost +Date: Mon Oct 4 21:10:59 2010 +0300 + + scanobj,scangobj: remove signal argument table. + + This table is practically unmaintained and now even causes problems with + refactorings in gtk+-3.X. Gtk+ should document signals like any other library. + + Fixes #631336. + + gtkdoc-scangobj.in | 334 +++++++-------------------------------------------- + gtkdoc-scanobj.in | 323 ++++++-------------------------------------------- + 2 files changed, 86 insertions(+), 571 deletions(-) + +commit 8506e3b61dca2861b594c3cea2dc4e0470aad4fc +Author: Gilles Dartiguelongue +Date: Sun Sep 26 18:48:04 2010 +0200 + + Allow selection of a specific syntax highlighter, bug #628611. + + configure.ac | 53 +++++++++++++++++++++++++++++++++++++++++++---------- + 1 files changed, 43 insertions(+), 10 deletions(-) + +commit 280c2d0654be3f39bd357c1dee9919ef1c34be21 +Author: Tim-Philipp Müller +Date: Mon Oct 4 12:08:47 2010 +0300 + + gtkdoc-scangobj: serialise doubles and floats always with a decimal dot + + Make sure floats and double property values are output with a decimal dot (and + not e.g. a comma) irrespective of the current locale. g_ascii_formatd() is used + here instead of g_ascii_dtostr() because we want nice human-readable numbers and + do not need the exact same bit representation when deserialising. + + Other parts of gtk-doc may need fixing as well to make sure to always + deserialise floats and doubles in C locale. + + gtkdoc-scangobj.in | 23 +++++++++++++++++++---- + 1 files changed, 19 insertions(+), 4 deletions(-) + +commit 8688e1d689d498f541d0f64ca141b503c9620837 +Author: P. F. Chimento +Date: Mon Oct 4 11:54:27 2010 +0300 + + Fix functions with function pointer arguments + + This patch fixes bug #597937 and adds a test case. + + gtkdoc-common.pl.in | 7 +++---- + tests/bugs/docs/tester-sections.txt | 1 + + tests/bugs/src/tester.c | 7 +++++++ + tests/bugs/src/tester.h | 1 + + 4 files changed, 12 insertions(+), 4 deletions(-) + +commit f24b78e8082e9bce65e988bd8004ecbace42a608 +Author: Stefan Kost +Date: Mon Oct 4 11:48:26 2010 +0300 + + NEWS: start collecting news + + NEWS | 7 +++++++ + 1 files changed, 7 insertions(+), 0 deletions(-) + +commit 4fbfeef8d01ebe10f2bb873a436a9874fd75da5b +Author: Vasilis Tsivikis +Date: Sat Oct 2 21:32:10 2010 +0300 + + l10n: Updated Greek translation for gtk-doc help + + help/manual/el/el.po | 3097 ++++++++++++++++++++++++++++++++++++++++---------- + 1 files changed, 2476 insertions(+), 621 deletions(-) + +commit a900d4a349bf29316bb72211005ec01217ac5669 +Author: Bruno Brouard +Date: Fri Sep 24 12:46:02 2010 +0200 + + Updated French doc translation + + help/manual/fr/fr.po | 427 +++++++++++++++++++++++++++----------------------- + 1 files changed, 229 insertions(+), 198 deletions(-) + +commit 50636742ee71fabd6fc306c4da53d2c431497f44 +Author: Simón Pena +Date: Tue Sep 21 21:47:55 2010 +0200 + + Fix 'scope notified' annotation + + https://bugzilla.gnome.org/show_bug.cgi?id=630288 + + gtkdoc-mkdb.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit eb70b07faab9b863cd70ee0d4e3b5566e214ec01 +Author: Stefan Kost +Date: Tue Sep 21 17:17:12 2010 +0300 + + check: fix check invocation with env-vars + + We need to first cd and then set env-vars so that the vars are active for the + process. Also pick the chance and pass srcdir + builddir (needed for transition + of building in builddir). + + examples/Makefile.am | 4 ++-- + gtkdoc-check.in | 22 +++++++++++++++++----- + 2 files changed, 19 insertions(+), 7 deletions(-) + +commit a04d755fcc19f780623f3b1bc30cf9e9915bd5fa +Author: Stefan Kost +Date: Tue Sep 21 10:12:27 2010 +0300 + + check: use the right comparision operator for strings + + gtkdoc-check.in | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit 6689f85421d54949effafb1164f18257927234c1 +Author: Stefan Kost +Date: Mon Sep 20 12:05:13 2010 +0300 + + scan: track forward decls and thus allow skipping duplicate symbols + + gtkdoc-scan.in | 31 ++++++++++++++++++++----------- + 1 files changed, 20 insertions(+), 11 deletions(-) + +commit 2761bb733487415e277fa18e4ea1d9cce6bdaeb0 +Author: Stefan Kost +Date: Mon Sep 20 12:03:42 2010 +0300 + + scan: use var for match to avoid invalidating it befroe later access + + gtkdoc-scan.in | 5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) + +commit 460e72183338efad84b08e5069176920a92a3f1e +Author: Stefan Kost +Date: Mon Sep 20 10:55:20 2010 +0300 + + scan: attempt to handle skipping redeclarations of symbols + + This unfortunately does not work yet. If a header has multiple different + declarations of a symbol, we would like to only use the first. + + gtkdoc-scan.in | 74 +++++++++++++++++++++++++++++++++---------------------- + 1 files changed, 44 insertions(+), 30 deletions(-) + +commit 7810dcbf594a4debd8d414ff7dccc2399ea6b529 +Author: Stefan Kost +Date: Mon Sep 20 10:54:05 2010 +0300 + + mkdb,tests: fix the tests + + mkdb should also output the deprecated xi:include on first run. Add a few of the + missing xi:inlcudes in the tests. + + gtkdoc-mkdb.in | 4 ++++ + tests/annotations/docs/tester-docs.xml | 9 ++++++--- + tests/bugs/docs/tester-docs.xml | 4 ++++ + 3 files changed, 14 insertions(+), 3 deletions(-) + +commit 618986836167d279992433f461678df5c47b8f88 +Author: Jorge González +Date: Thu Sep 16 18:50:26 2010 +0200 + + Updated Spanish translation + + help/manual/es/es.po | 426 ++++++++++++++++++++++++++------------------------ + 1 files changed, 220 insertions(+), 206 deletions(-) + +commit fb06cef480903fcfef7eb366de3b7dfd2fd9fd2d +Author: Philip Withnall +Date: Wed Sep 8 22:36:53 2010 +0100 + + gtkdoc-check: Add a test checking if all XML files are included in main file + + Add a test to gtkdoc-check which checks if all XML files in the xml directory + are included in $DOC_MAIN_SGML_FILE. Closes: bgo#627920 + + gtkdoc-check.in | 44 ++++++++++++++++++++++++++++++++++++++++++-- + 1 files changed, 42 insertions(+), 2 deletions(-) + +commit 51b5397e622ad1ee3075101339de73f8979ee145 +Author: Stefan Kost +Date: Wed Sep 15 21:43:06 2010 +0300 + + tests: put some Makefile.am vars to test environment for gtkdoc-check + + Put DOC_MODULE and DOC_MAIN_SGML_FILE to test environmet. + + examples/Makefile.am | 7 +++++-- + gtkdoc-check.in | 8 ++++++-- + tests/annotations/docs/Makefile.am | 1 + + tests/bugs/docs/Makefile.am | 1 + + tests/empty/docs/Makefile.am | 1 + + tests/fail/docs/Makefile.am | 1 + + tests/gobject/docs-tmpl/Makefile.am | 1 + + tests/gobject/docs/Makefile.am | 1 + + 8 files changed, 17 insertions(+), 4 deletions(-) + +commit f57c90e125679a2bcadf739ca894e68c9f7af3f4 +Author: Stefan Kost +Date: Mon Sep 13 14:52:52 2010 +0300 + + docs: share a trick about gtk-doc dependecy + + help/manual/C/gtk-doc-manual.xml | 17 +++++++++++++++++ + 1 files changed, 17 insertions(+), 0 deletions(-) + +commit 2ae6867592017bb83b39c3be201e842cf77fc1f7 +Author: Stefan Kost +Date: Mon Sep 13 14:14:08 2010 +0300 + + scan: provide a way to skip unparsable code + + Allow to use #ifndef __GTK_DOC_IGNORE__ to mark unparseable code. + Fixes #512565. + + gtkdoc-scan.in | 16 ++++++++++++++++ + help/manual/C/gtk-doc-manual.xml | 15 +++++++++++++++ + tests/bugs/src/tester.h | 3 +++ + 3 files changed, 34 insertions(+), 0 deletions(-) + +commit af40937eace98440e5f75b2ff9496111b6ef61e8 +Author: Claude Paroz +Date: Fri Sep 10 09:04:23 2010 +0200 + + [help] Update French translation + + Contributed by Claude Paroz and Bruno Brouard + + help/manual/fr/fr.po | 758 +++++++++++++++++++++++++++++--------------------- + 1 files changed, 444 insertions(+), 314 deletions(-) + +commit 1d5b2a2ebf39b78080b4b5700aee7ff90283162d +Author: Jorge González +Date: Thu Sep 9 21:17:20 2010 +0200 + + Updated Spanish translation + + help/manual/es/es.po | 522 +++++++++++++++++++++++--------------------------- + 1 files changed, 243 insertions(+), 279 deletions(-) + +commit 6f7b75d23c3a8402095a07701a6fb750fcac23bc +Author: Stefan Kost +Date: Thu Sep 9 00:21:37 2010 +0300 + + mkdb: xref signal flags + + Xref signal flags to gobject docs. Fixes #627269. + + gtkdoc-mkdb.in | 15 ++++++++------- + 1 files changed, 8 insertions(+), 7 deletions(-) + +commit 70abe37062ace247e8941afc73f2dba0da39a431 +Author: Stefan Kost +Date: Wed Sep 8 23:01:40 2010 +0300 + + docs: small doc update + + Mention in more places that tmpl-files and sgml support is legacy. + + README | 7 +++++-- + help/manual/C/gtk-doc-manual.xml | 17 +++++++++-------- + 2 files changed, 14 insertions(+), 10 deletions(-) + +commit 2190c4fd213dd5849f6ea04708ac3fb1bb6a5c1b +Author: Stefan Kost +Date: Wed Sep 8 22:51:57 2010 +0300 + + mkdb: add a --xml-mode alias for --sgml-mode + + Also mention xml-mode in the docs first and change it in examples/Makefile.am. + Switch it in the tests. One day we can kill sgml support. + + examples/Makefile.am | 4 ++-- + gtkdoc-mkdb.in | 17 +++++++++-------- + help/manual/C/gtk-doc-manual.xml | 5 +++-- + tests/annotations/docs/Makefile.am | 2 +- + tests/bugs/docs/Makefile.am | 2 +- + tests/empty/docs/Makefile.am | 2 +- + tests/fail/docs/Makefile.am | 2 +- + tests/gobject/docs-tmpl/Makefile.am | 2 +- + tests/gobject/docs/Makefile.am | 2 +- + 9 files changed, 20 insertions(+), 18 deletions(-) + +commit 0fb5c13ffc107811762554fc4aa067afdfbe11c9 +Author: Stefan Kost +Date: Wed Sep 8 21:30:22 2010 +0300 + + mkman: fix command invocation. + + Add missing \ and space. Fixes #628794 + + gtkdoc-mkman.in | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit 8071b82a6d033f72e1ef0dacb8f9ab8e0b6c9ece +Author: Stefan Kost +Date: Wed Sep 8 21:25:38 2010 +0300 + + mkdb: fix parsing of multiple annotations + + Tweak the regexp to support multiple annotations per comment. Reset var to + prevent extra parts of aanotations to be repeated. + + gtkdoc-mkdb.in | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +commit 8269b0efd0d41f6f5f3ab9e70c50399da7444748 +Author: Stefan Kost +Date: Wed Sep 8 21:24:37 2010 +0300 + + tests: add a multi-annotation test + + Add an example where multiple annotations are use for one parameter. + + tests/annotations/docs/tester-sections.txt | 1 + + tests/annotations/src/tester.c | 14 ++++++++++++++ + tests/annotations/src/tester.h | 1 + + 3 files changed, 16 insertions(+), 0 deletions(-) + +commit 2bffebcf9c125f5610b8fb660d42c3c5b9dfd4f0 +Author: Stefan Kost +Date: Thu Aug 19 17:45:54 2010 +0300 + + fixxref: tweak the vim invocation + + Use specific output-filename to ensure we get what we'll late use. Use "-u NONE" + instead of -u /dev/null. + Fixes #627223 + + gtkdoc-fixxref.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit f493de05d4ae4b4ffea02e5c821488dcc971aacd +Author: Stefan Kost +Date: Thu Aug 19 13:36:39 2010 +0300 + + todo: update + + TODO | 10 ++++++++-- + 1 files changed, 8 insertions(+), 2 deletions(-) + +commit bc311575bfe254af57e8de0c78614b0743f37d1a +Author: Stefan Kost +Date: Thu Jul 15 10:07:15 2010 +0300 + + mkdb: add comment pointing to where annotations are defined + + gtkdoc-mkdb.in | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +commit 0c372123a5d23dfb1bca5f69afb5826dc162c3e4 +Author: Stefan Kost +Date: Thu Jul 15 10:05:59 2010 +0300 + + mkdb: add 'type' annotation (used in glib + + gtkdoc-mkdb.in | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +commit 779009ed3a2f3cb276be93db5e7906f6ba673951 +Author: Stefan Kost +Date: Thu Jul 15 09:58:14 2010 +0300 + + mkdb: only look for annotations at the start of docs + + Fixes gtk-doc picking up e.g. "bla (shadows ...) bla" in the middle of docs. + + gtkdoc-mkdb.in | 5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) + +commit a5abcfe6d4a99fb313bf32fe12c718a286e3b489 +Author: Pablo Castellano +Date: Tue Aug 3 19:58:22 2010 +0200 + + Update git.mk from pango + + git.mk | 15 +++++++++------ + 1 files changed, 9 insertions(+), 6 deletions(-) + +commit fb48efce458f26c6860c7729c481abd545985f7f +Author: Jorge González +Date: Sat Jul 31 15:23:15 2010 +0200 + + Updated Spanish translation + + help/manual/es/es.po | 121 ++++++++++++-------------------------------------- + 1 files changed, 29 insertions(+), 92 deletions(-) + +commit 88c17f85a34b02656c2567e946da8fa0944517d7 +Author: Mario Blättermann +Date: Tue Jul 27 23:43:46 2010 +0200 + + [i18n] Updated German doc translation + + help/manual/de/de.po | 501 ++++++++++++++++++++++++++++--------------------- + 1 files changed, 286 insertions(+), 215 deletions(-) + +commit d6a4858f016266bfa87554e24986b03845195801 +Author: Stefan Kost +Date: Wed Jul 14 10:37:33 2010 +0300 + + scan: improve handling of internal symbols + + We need to fully parse them, but omit them from the docs. We did that for + macros, but we also need to handle functions that way. Use an extra flag-var + instead of extra '-skip' states. Add tests. + + gtkdoc-scan.in | 51 ++++++++++++++++++++++++++-------------------- + tests/bugs/src/tester.c | 9 ++++++++ + tests/bugs/src/tester.h | 6 +++++ + 3 files changed, 44 insertions(+), 22 deletions(-) + +commit 604afb04bf6b450d1949f3f300bdc933f7f5fee8 +Author: Stefan Kost +Date: Tue Jul 13 18:44:38 2010 +0300 + + mkdb: actually commit the right file + + gtkdoc-mkdb.in | 9 +++++---- + 1 files changed, 5 insertions(+), 4 deletions(-) + +commit 6344e90d674ca4299e7858cddfa55546bc5938dc +Author: Stefan Kost +Date: Tue Jul 13 18:42:51 2010 +0300 + + mkdb: revert the xml fixups + + Those were to naiive. Add one more test. People have to take into account that + blank are turned into . + + gtkdoc-mkhtml.in | 4 ++++ + tests/bugs/docs/tester-sections.txt | 1 + + tests/bugs/src/tester.c | 10 ++++++++++ + tests/bugs/src/tester.h | 1 + + 4 files changed, 16 insertions(+), 0 deletions(-) + +commit 9569daae7fbf4f542050034191cc0798dc53dda5 +Author: Stefan Kost +Date: Tue Jul 13 16:44:18 2010 +0300 + + scan: allow static inline functions in headers. Fixes #481811 + + Also fix the test case - G_INLINE_FUNC != static inline + + gtkdoc-scan.in | 17 ++++++++++++++--- + tests/bugs/src/tester.c | 2 ++ + tests/bugs/src/tester.h | 2 +- + 3 files changed, 17 insertions(+), 4 deletions(-) + +commit 5fdb82a4b7e71a4801bffc62fc3cb2937b7c7e79 +Author: Stefan Kost +Date: Tue Jul 13 16:31:41 2010 +0300 + + tests: add test case for Bug #481811 + + tests/bugs/docs/tester-sections.txt | 1 + + tests/bugs/src/tester.h | 14 ++++++++++++++ + 2 files changed, 15 insertions(+), 0 deletions(-) + +commit 364ba12a0b147f8b0186c970efeb786e36c2879a +Author: Stefan Kost +Date: Tue Jul 13 16:06:28 2010 +0300 + + scan: correctly skip internal macros. Fixes #624199 + + If we come across an internal macro (starting with a '_') we still need to read + over it to not confuse the macro body with new declarations. Add a test. + + gtkdoc-scan.in | 12 ++++++++++-- + tests/bugs/src/tester.h | 16 ++++++++++++++++ + 2 files changed, 26 insertions(+), 2 deletions(-) + +commit 57a650d9d950315f79d9345a3a6149044b6badea +Author: Stefan Kost +Date: Tue Jul 13 15:47:38 2010 +0300 + + scan: improve the inline function parsing further + + Add the full prototype (args) before starting to skip. Reset skip mode when function got parsed. + + gtkdoc-scan.in | 12 ++++++++++-- + 1 files changed, 10 insertions(+), 2 deletions(-) + +commit b59ab07e93f7e66f5804cc68f1aebe882842403c +Author: Stefan Kost +Date: Tue Jul 13 12:57:44 2010 +0300 + + scan: refine regexp and {} block skipping + + This should help parsing inline functions and macros. It should also fix scanner + regression from previous commit. + + gtkdoc-scan.in | 68 +++++++++++++++++++++++++++++++++----------------------- + 1 files changed, 40 insertions(+), 28 deletions(-) + +commit 745285f85a39e6fc2ef3fab741fc996e1ea5a829 +Author: Stefan Kost +Date: Tue Jul 13 11:34:02 2010 +0300 + + tests: add dummy docs for last two tests. + + tests/bugs/src/tester.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +commit 62342d006e225c43a7cc1ec64c09c18487d7c392 +Author: Stefan Kost +Date: Tue Jul 13 11:17:47 2010 +0300 + + mkpdf: eat some of the dblatex warnings + + There are plenty of warnings about markup in screen/programmlisting tags. Filter + them out until dblatex handles those tags. + + gtkdoc-mkpdf.in | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +commit 2085444674726557e45b251a4768d08e72623598 +Author: Stefan Kost +Date: Tue Jul 13 11:13:51 2010 +0300 + + scan: improve reexps to handle more * const * variants. Fixes #624200 + + We were handling that correctly for the case of split line declarations. Take + the same route if all is one one line. Add tests. + + gtkdoc-scan.in | 16 ++++++++-------- + tests/bugs/docs/tester-sections.txt | 2 ++ + tests/bugs/src/tester.c | 24 +++++++++++++++++++++++- + tests/bugs/src/tester.h | 4 ++++ + 4 files changed, 37 insertions(+), 9 deletions(-) + +commit ec1f3cc6c43884409ab7850952270f86b3d5e363 +Author: Stefan Kost +Date: Tue Jul 13 10:40:53 2010 +0300 + + mkdb: tune last xml fixup change + + Add anotehr variant to the tests. Don't check for a newline after . + + gtkdoc-mkdb.in | 2 +- + tests/bugs/docs/tester-sections.txt | 1 + + tests/bugs/src/tester.c | 23 +++++++++++++++++------ + tests/bugs/src/tester.h | 1 + + 4 files changed, 20 insertions(+), 7 deletions(-) + +commit 32fe933cc767c7d1555a1873d6b2fcc2cbb5e1e5 +Author: Stefan Kost +Date: Mon Jul 12 23:42:49 2010 +0300 + + mkdb: fix perl warning from accesing undefined hash entries + + We don't have type declarations for everything. Accessing the hash will cause + a warning in that case. Check if it is defined. + + gtkdoc-mkdb.in | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +commit d45a4e60e173c6c734f2ae6cbbe2c9f28e2c22cb +Author: Stefan Kost +Date: Mon Jul 12 23:31:39 2010 +0300 + + mkdb: handle yet unknown annotations + + For now just skip uknown annotations. + + gtkdoc-mkdb.in | 38 +++++++++++++++++++++----------------- + 1 files changed, 21 insertions(+), 17 deletions(-) + +commit 235669e75846078b78580e90332f6d55296f8110 +Author: Stefan Kost +Date: Mon Jul 12 13:00:59 2010 +0300 + + mkdb: better xml fixup after blank line expansion + + Our previous heuristics have been a bit too simple. Make it works for different + refsect level and also docs starting with a para. + + Fixes #623968 + + gtkdoc-mkdb.in | 5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) + +commit af84db8455e3db55341ed0921d1083209a06c851 +Author: Stefan Kost +Date: Mon Jul 12 12:59:58 2010 +0300 + + tests: new test for bug #623968 + + tests/bugs/docs/tester-sections.txt | 1 + + tests/bugs/src/tester.c | 22 +++++++++++++++++++++- + tests/bugs/src/tester.h | 2 ++ + 3 files changed, 24 insertions(+), 1 deletions(-) + +commit cbda8b721baf218e57c23062d153d6a684773d9a +Author: Jorge González +Date: Sun Jul 11 10:10:37 2010 +0200 + + Updated Spanish translation + + help/manual/es/es.po | 641 +++++++++++++++++++++++++++++++++----------------- + 1 files changed, 425 insertions(+), 216 deletions(-) + +commit 32aef97855bad03b8ca47e6dc396bd7d8dbad9e3 +Author: Christian Persch +Date: Wed Jul 7 21:54:12 2010 +0200 + + scan: Fix GStrv boxed types in signal handlers + + Output "GStrv" as the argument type, not "GStrv*". + Fixes: #623777. + + gtkdoc-scangobj.in | 4 +++- + tests/gobject/src/gobject.c | 30 ++++++++++++++++++++++++++++++ + 2 files changed, 33 insertions(+), 1 deletions(-) + +commit 92ae5fc857f11611080205d27c8e26dce93d7e49 +Author: Stefan Kost +Date: Mon Jul 5 10:24:23 2010 +0300 + + manual: fix spelling and make small clarifications. + + Correct typos and spelling as pointed out by Alexander Saprykin. Fixes #622971. + + help/manual/C/gtk-doc-manual.xml | 64 +++++++++++++++++++------------------ + 1 files changed, 33 insertions(+), 31 deletions(-) + +commit 3371616807bbaf35a8e1a81ac13d35f8a8fccc6d +Author: Stefan Kost +Date: Fri Jun 25 22:49:24 2010 +0300 + + mkdb: add an idea for rewriting path of system entities in the doctype_header + + Also do a small cleanup to only rewrite the doctype_heqader if we read it from the main file. + + gtkdoc-mkdb.in | 7 +++++-- + 1 files changed, 5 insertions(+), 2 deletions(-) + +commit d23206a494d7814c1605ae202290351b60065cef +Author: Stefan Kost +Date: Tue Jun 22 13:22:52 2010 +0300 + + TODO: cleanup brain dump + + TODO | 95 +++++++++++++++++++++++++++-------------------------------------- + 1 files changed, 40 insertions(+), 55 deletions(-) + +commit ffcf37402aafb277ddd120192a4ef3f72991fd23 +Author: Stefan Kost +Date: Mon Jun 21 22:50:26 2010 +0300 + + planning: write down ideas and add FIXME: comments + + TODO | 12 +++++++----- + gtkdoc-fixxref.in | 3 +++ + gtkdoc-mkdb.in | 1 + + 3 files changed, 11 insertions(+), 5 deletions(-) + +commit ab8cde85947c60b8d58cc9514703ceb1194a861f +Author: Christian Persch +Date: Thu Jun 17 22:54:36 2010 +0200 + + scan: Support GType and GVariant types. Fixes #621931. + + Conditionaly handle new fundamental GTypes. + + gtkdoc-scangobj.in | 39 ++++++++++++++++++++++++++++++++++++++- + 1 files changed, 38 insertions(+), 1 deletions(-) + +commit 33d908964619c9408cbce2e9d9794e45b6209d3f +Author: Stefan Kost +Date: Tue Jun 15 12:20:13 2010 +0300 + + mkdb: just xml-tags in tmpl docs does not mean its empty. + + We lost tmpl docs that e.g. consist of a x:include. + + gtkdoc-mkdb.in | 5 ++--- + 1 files changed, 2 insertions(+), 3 deletions(-) + +commit 728b77acb9b3e06238d570b0d0cce296918132c2 +Author: Stefan Kost +Date: Sun Jun 13 14:56:22 2010 +0300 + + help: tell how to build man-pages. Fixes #467488 + + Start a new section telling how to document other interfaces. Describe how to + build man-pages. + + help/manual/C/gtk-doc-manual.xml | 89 ++++++++++++++++++++++++++++++++++++++ + 1 files changed, 89 insertions(+), 0 deletions(-) + +commit 2905a797cd428545dcbbc2ccc45ff63830c695a6 +Author: Stefan Kost +Date: Fri Jun 11 12:01:01 2010 +0300 + + xsl: work-around for bug #617478 + + gtk-doc.xsl | 14 ++++++++------ + 1 files changed, 8 insertions(+), 6 deletions(-) + +commit ccb5f52aedb3d5bf1dfb51e1701aef8c57b9cb83 +Author: Stefan Kost +Date: Fri Jun 11 11:43:45 2010 +0300 + + tests: fix gobject warnings + + Need to override the iface property in GtkdocObject2. + + tests/gobject/src/gobject.c | 30 ++++++++++++++++++++++-------- + 1 files changed, 22 insertions(+), 8 deletions(-) + +commit 8716ce6972ce7444a28496c0782c8c0facb6aed3 +Author: Stefan Kost +Date: Thu Jun 10 14:21:02 2010 +0300 + + makefiles: add two flavours for flat makefiles. Fixes #501107 + + When using non recursive Makefile, we currently get warnings aboutr EXTRA_DIST + being overridden. Make variants of the makefiles that use EXTRA_DIST += instead. + + Makefile.am | 18 ++++++++++++++---- + gtkdocize.in | 6 +++--- + 2 files changed, 17 insertions(+), 7 deletions(-) + +commit 73cded364959ffe54a5bb91f7578fa8c249a0ef9 +Author: Stefan Kost +Date: Wed Jun 9 18:10:17 2010 +0300 + + docs: document more what should be docuemnted and what not + + Give better advice for GObject instance and class structs. + + help/manual/C/gtk-doc-manual.xml | 13 +++++++++++++ + 1 files changed, 13 insertions(+), 0 deletions(-) + +commit 1dd102dbf5adf1df5dcb756116fe49c89a0754db +Author: Stefan Kost +Date: Thu Jun 3 10:03:52 2010 +0300 + + tests: use /bin/sh for the scripts + + Run 'checkbashism' on the scripts and use /bin/sh as they seem to be clean. + + tests/fail.sh | 2 +- + tests/sanity.sh | 2 +- + tests/tools.sh.in | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit ee14f7999de7b987481f8db94dd1467ae0aaa0a9 +Author: Stefan Kost +Date: Thu Jun 3 09:50:28 2010 +0300 + + maintenance: remove generated file + + tests/gobject/docs/tester.types | 4 ---- + 1 files changed, 0 insertions(+), 4 deletions(-) + +commit 3c58f4a587220aa0f38b2163d208612aff11b498 +Author: Stefan Kost +Date: Wed Jun 2 12:52:15 2010 +0300 + + tests: test the generated sgml files too + + tests/sanity.sh | 12 ++++++++++++ + 1 files changed, 12 insertions(+), 0 deletions(-) + +commit 26901ca27fb053c2d9eda1dc80d5cb8eb9bee91b +Author: Stefan Kost +Date: Wed Jun 2 23:43:47 2010 +0300 + + mkdb: fix object_index for n_object % 3, FIxes #620249 + + Don't output the closing row tag twice in this case. Add tests for it. + + gtkdoc-mkdb.in | 4 ++- + tests/gobject/docs-tmpl/tester-docs.xml | 9 ++++++- + tests/gobject/docs-tmpl/tester-sections.txt | 17 +++++++++++++ + tests/gobject/docs-tmpl/tester.types | 2 + + tests/gobject/docs/tester-docs.xml | 7 +++++ + tests/gobject/docs/tester-sections.txt | 17 +++++++++++++ + tests/gobject/src/giface.c | 29 ++++++++++++++++++++++ + tests/gobject/src/giface.h | 10 +++++++ + tests/gobject/src/gobject.c | 35 +++++++++++++++++++++++++++ + tests/gobject/src/gobject.h | 26 ++++++++++++++++++++ + 10 files changed, 154 insertions(+), 2 deletions(-) + +commit 3740512a5c13e4d7b86fa2202003e6fe3434d25f +Author: Stefan Kost +Date: Wed Jun 2 22:32:58 2010 +0300 + + docs: improve release instructions + + HACKING | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +commit f112b8d3abf8efe395e6cd0fc5ea7b3497153b1d +Author: Stefan Kost +Date: Wed Jun 2 12:24:37 2010 +0300 + + tests: unity output and extend sanity checks + + tests/sanity.sh | 15 +++++++++++++++ + tests/tools.sh.in | 23 ++++++++--------------- + 2 files changed, 23 insertions(+), 15 deletions(-) + +commit a73a4450d3eebef51e7a1b3a0c93bb7acae76e15 +Author: Mario Blättermann +Date: Mon May 31 18:35:49 2010 +0200 + + Updated German doc translation + + help/manual/de/de.po | 549 ++++++++++++++++++++++++++++---------------------- + 1 files changed, 304 insertions(+), 245 deletions(-) + +commit b9fea1d921ea8a4dc7ad838e5e98b6c7ba42fa58 +Author: Jorge González +Date: Tue May 25 08:49:20 2010 +0200 + + Updated Spanish translation + + help/manual/es/es.po | 502 ++++++++++++++++++++++++++------------------------ + 1 files changed, 261 insertions(+), 241 deletions(-) + +commit f5ef9530f60b7f4bdd1da06c6ded2f838490ecee +Author: Stefan Kost +Date: Mon May 24 14:43:23 2010 +0300 + + release: bump versions and back to development + + configure.ac | 2 +- + help/manual/C/gtk-doc-manual.xml | 8 +++++++- + 2 files changed, 8 insertions(+), 2 deletions(-) + +commit 37aa15cfd3531dbc464dc4cfbfe95e219091e5ee +Author: Stefan Kost +Date: Fri May 21 10:50:26 2010 +0300 + + release: update news and date in manual + + HACKING | 14 ++++++++++++-- + NEWS | 16 ++++++++++++++++ + configure.ac | 2 +- + help/manual/C/gtk-doc-manual.xml | 6 +++--- + 4 files changed, 32 insertions(+), 6 deletions(-) + +commit 50309cfbbb15a5dc1ae56577a5f71aa5fc0b5f6e +Author: Stefan Kost +Date: Fri May 21 11:47:10 2010 +0300 + + distcheck: don't copy same file twice + + We wanted to use an exiting image as an example. But make distcheck creates + files readonly and make distcehck failes when trying to overwrite the file. + Instead only use the image we use to the image-tag test. + + tests/empty/docs/Makefile.am | 2 +- + tests/gobject/docs-tmpl/Makefile.am | 3 ++- + tests/gobject/docs-tmpl/images/object.png | Bin 0 -> 4101 bytes + tests/gobject/docs/Makefile.am | 1 - + 4 files changed, 3 insertions(+), 3 deletions(-) + +commit 89922f1fab12b83fadfc6de37b151e07c35f506c +Author: Stefan Kost +Date: Fri May 21 11:52:04 2010 +0300 + + distcheck: pass and use ABS_TOP_SRCDIR to be able to find data files. + + Relying on the dirname of gtkdoc-mkhtml is not working as it is generated and thus + in builddir, datafiles are in srcdir. + + gtkdoc-mkhtml.in | 14 +++++++++----- + tests/gtk-doc.make | 6 +++--- + tests/gtk-doc.notmpl.make | 6 +++--- + 3 files changed, 15 insertions(+), 11 deletions(-) + +commit ade641d3512047fac47b9b95b37a90d36d8ff1ad +Author: Stefan Kost +Date: Fri May 21 10:55:35 2010 +0300 + + tests: add new test to EXTRA_DIST + + tests/Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit d8ea880a3d05219300f038ef280de45446f96eb2 +Author: Stefan Kost +Date: Wed May 12 15:13:00 2010 +0300 + + xsl: fixing a regression that was breaking the ONLINE tags in index.sgml + + Adding a sanity check test, that verify some basics (certain files are generated + and non empty). Add a content check for index.sgml. + + gtk-doc.xsl | 6 +++--- + tests/Makefile.am | 2 +- + tests/sanity.sh | 36 ++++++++++++++++++++++++++++++++++++ + 3 files changed, 40 insertions(+), 4 deletions(-) + +commit 038257110b31546ab7a0b03e314e56e494499b6f +Author: Stefan Kost +Date: Sun May 9 23:11:27 2010 +0300 + + scanners: reorder again and add work-around for --as-needed brokeness + + We want to have the objects first, then the libs and the target last. For + historic reasons ldflags and libs are merged :/. Ideally we'd like to turn + off as-needed in the docs (won't help here anyway), but I am not sure + wheter its a good idea to add "-Wl,--no-as-needed" to the linker command + (in regard to platform compat). + + gtkdoc-scangobj.in | 4 +++- + gtkdoc-scanobj.in | 4 +++- + 2 files changed, 6 insertions(+), 2 deletions(-) + +commit 57620e655df0d325f88db12a8d6d51fc017844fd +Author: Stefan Kost +Date: Sun May 9 22:24:57 2010 +0300 + + i18n: fix leftover placeholder in translation + + help/manual/ta/ta.po | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 340b385a82936fe220ab3c4fdafdddaeb48c32f0 +Author: Stefan Kost +Date: Sun May 9 22:11:38 2010 +0300 + + scanners: move LDFLAGS to up in commandline. + + FIxes some issues when building using s --as-needed + + gtkdoc-scangobj.in | 2 +- + gtkdoc-scanobj.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 9768ce5d65640ecf4ea04004503053977880f340 +Author: Stefan Kost +Date: Wed Apr 28 23:44:32 2010 +0300 + + Revert "scope: make protected fields visible in the docs" + + This reverts commit 8708b09401327af314d4f4af5656ef4ae6222ef7. + + gtkdoc-common.pl.in | 6 +++--- + gtkdoc-mkdb.in | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 7c8d70231ae2b7db619ebe85c8748ddd39a1067b +Author: Stefan Kost +Date: Wed Apr 28 23:42:31 2010 +0300 + + common: strip // comment properly before parsing + + gtkdoc-common.pl.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 22e002ce0dee8982e7c469bbbf1429cd07710557 +Author: Stefan Kost +Date: Mon Apr 26 16:00:11 2010 +0300 + + mkdb: avoid double '.' at the end of phrase. + + gtkdoc-mkdb.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 8708b09401327af314d4f4af5656ef4ae6222ef7 +Author: Stefan Kost +Date: Fri Apr 16 11:44:46 2010 +0300 + + scope: make protected fields visible in the docs + + gtkdoc-common.pl.in | 6 +++--- + gtkdoc-mkdb.in | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 506fa23e75550fe3aa9a022fcc37e94346ea4aae +Author: Stefan Kost +Date: Wed Apr 21 22:29:16 2010 +0300 + + annotation: allow to style annotations with css + + Format the annotation using [] and style them using css. Hopefully + fixes #615860. + + gtkdoc-mkdb.in | 9 ++++++--- + style-classic.css | 8 ++++++++ + style.css | 8 ++++++++ + 3 files changed, 22 insertions(+), 3 deletions(-) + +commit 680fec7b34c3de0e9d36865db1b1136c9e836bc1 +Author: Stefan Kost +Date: Fri Apr 16 11:25:59 2010 +0300 + + tests: add examples that need and don't need escaping. + + tests/bugs/src/tester.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +commit 59fe16c234baa2c32707648088403871316a4d7f +Author: Nicola Fontana +Date: Wed Mar 31 19:50:51 2010 +0200 + + Support for multiple DOC_SOURCE_DIR directories + + gtkdoc-scan and gtkdoc-mkdb are yet able to accept more than one source + directory but gtk-doc.make and gtk-doc.notmpl.make do not support this + feature. + + The implementation uses an helper shell variable ($_source_dir) that + prepends --source-dir to every item in DOC_SOURCE_DIR and passes it + to gtkdoc-scan and gtkdoc-mkdb. This also means if DOC_SOURCE_DIR + contains only one item, the makefiles behave as before. + + examples/Makefile.am | 8 ++++---- + gtk-doc.make | 14 ++++++++++---- + gtk-doc.notmpl.make | 14 ++++++++++---- + 3 files changed, 24 insertions(+), 12 deletions(-) + +commit 0a874b3a2d97476caf8100386ceed5070a2d065e +Author: Andreas Rottmann +Date: Tue Apr 13 11:31:03 2010 +0300 + + Add support for `scope' and `skip' annotations + + See . + + gtkdoc-mkdb.in | 7 +++++-- + tests/annotations/docs/tester-sections.txt | 2 ++ + tests/annotations/src/tester.c | 22 ++++++++++++++++++++++ + tests/annotations/src/tester.h | 4 ++++ + 4 files changed, 33 insertions(+), 2 deletions(-) + +commit f099e17bc1047c504cb09f21786eb384ce546ef6 +Author: Stefan Kost +Date: Fri Apr 9 10:58:18 2010 +0300 + + gitignore: tune ignore files + + Makefile.am | 4 ++++ + git.mk | 2 ++ + tests/empty/docs/Makefile.am | 4 ++++ + tests/gobject/docs-tmpl/Makefile.am | 3 +++ + 4 files changed, 13 insertions(+), 0 deletions(-) + +commit 456f361b20b859e36d7e74bf64c5ad319302f95b +Author: Jorge González +Date: Tue Apr 6 14:51:14 2010 +0200 + + Updated Spanish translation + + help/manual/es/es.po | 487 ++++++++++++++++++++++++++------------------------ + 1 files changed, 249 insertions(+), 238 deletions(-) + +commit 13ff17ca5acb086a922aa912d7074d604591472a +Author: Stefan Kost +Date: Tue Apr 6 09:48:42 2010 +0300 + + release: bump versions and back to development + + configure.ac | 4 +++- + help/manual/C/gtk-doc-manual.xml | 6 ++++++ + 2 files changed, 9 insertions(+), 1 deletions(-) + +commit 33b7245d3446f5c044126b951433bef94f47e213 +Author: Jorge González +Date: Mon Mar 29 20:53:29 2010 +0200 + + Updated Spanish translation + + help/manual/es/es.po | 126 +++++-------------------------------------------- + 1 files changed, 13 insertions(+), 113 deletions(-) + +commit 0a90bf47fdac21bf583bb595a5f2fb118872e43c +Author: Nikos Bakaoukas +Date: Mon Mar 29 01:39:27 2010 +0300 + + Updated Greek translation for gtk-doc documentation + + help/manual/el/el.po | 2543 ++++++++------------------------------------------ + 1 files changed, 384 insertions(+), 2159 deletions(-) + commit 42e0c5952ce5af7ced9171d6c5493ab025d0aa54 Author: Stefan Kost Date: Sun Mar 28 20:27:19 2010 +0300 diff -Nru gtk-doc-1.14/config.guess gtk-doc-1.17/config.guess --- gtk-doc-1.14/config.guess 2009-10-24 00:21:47.000000000 +0000 +++ gtk-doc-1.17/config.guess 2011-01-23 11:34:04.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 # Free Software Foundation, Inc. -timestamp='2009-04-27' +timestamp='2009-11-20' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -27,16 +27,16 @@ # the same distribution terms that you use for the rest of that program. -# Originally written by Per Bothner . -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. +# Originally written by Per Bothner. Please send patches (context +# diff format) to and include a ChangeLog +# entry. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and # exits with 0. Otherwise, it exits with 1. # -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD me=`echo "$0" | sed -e 's,.*/,,'` @@ -180,7 +180,7 @@ arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null + | grep -q __ELF__ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? @@ -213,19 +213,19 @@ exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + echo ${UNAME_MACHINE_ARCH}-${VENDOR}-openbsd${UNAME_RELEASE} exit ;; *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + echo ${UNAME_MACHINE}-${VENDOR}-ekkobsd${UNAME_RELEASE} exit ;; *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + echo ${UNAME_MACHINE}-${VENDOR}-solidbsd${UNAME_RELEASE} exit ;; macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-${VENDOR}-mirbsd${UNAME_RELEASE} exit ;; *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + echo ${UNAME_MACHINE}-${VENDOR}-mirbsd${UNAME_RELEASE} exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in @@ -290,13 +290,13 @@ echo alpha-dec-winnt3.5 exit ;; Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 + echo m68k-${VENDOR}-sysv4 exit ;; *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos + echo ${UNAME_MACHINE}-${VENDOR}-amigaos exit ;; *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos + echo ${UNAME_MACHINE}-${VENDOR}-morphos exit ;; *:OS/390:*:*) echo i370-ibm-openedition @@ -311,7 +311,7 @@ echo arm-acorn-riscix${UNAME_RELEASE} exit ;; arm:riscos:*:*|arm:RISCOS:*:*) - echo arm-unknown-riscos + echo arm-${VENDOR}-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp @@ -343,6 +343,9 @@ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) + echo i386-pc-auroraux${UNAME_RELEASE} + exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) eval $set_cc_for_build SUN_ARCH="i386" @@ -416,7 +419,7 @@ echo m68k-hades-mint${UNAME_RELEASE} exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} + echo m68k-${VENDOR}-mint${UNAME_RELEASE} exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} @@ -666,7 +669,7 @@ # => hppa64-hp-hpux11.23 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep __LP64__ >/dev/null + grep -q __LP64__ then HP_ARCH="hppa2.0w" else @@ -727,9 +730,9 @@ exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk + echo ${UNAME_MACHINE}-${VENDOR}-osf1mk else - echo ${UNAME_MACHINE}-unknown-osf1 + echo ${UNAME_MACHINE}-${VENDOR}-osf1 fi exit ;; parisc*:Lites*:*:*) @@ -789,19 +792,19 @@ echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit ;; sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} + echo sparc-${VENDOR}-bsdi${UNAME_RELEASE} exit ;; *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + echo ${UNAME_MACHINE}-${VENDOR}-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) case ${UNAME_MACHINE} in pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo i386-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo x86_64-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_MACHINE}-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) @@ -817,21 +820,24 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - *:Interix*:[3456]*) + *:Interix*:*) case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; - EM64T | authenticamd | genuineintel) - echo x86_64-unknown-interix${UNAME_RELEASE} + authenticamd | genuineintel | EM64T) + echo x86_64-${VENDOR}-interix${UNAME_RELEASE} exit ;; IA64) - echo ia64-unknown-interix${UNAME_RELEASE} + echo ia64-${VENDOR}-interix${UNAME_RELEASE} exit ;; esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we @@ -842,25 +848,39 @@ echo ${UNAME_MACHINE}-pc-uwin exit ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin + echo x86_64-${VENDOR}-cygwin exit ;; p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin + echo powerpcle-${VENDOR}-cygwin exit ;; prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo powerpcle-${VENDOR}-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-${VENDOR}-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-${VENDOR}-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC} + exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ @@ -883,6 +903,17 @@ frv:Linux:*:*) echo frv-${VENDOR}-linux-gnu exit ;; + i*86:Linux:*:*) + LIBC=gnu + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #ifdef __dietlibc__ + LIBC=dietlibc + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}" + exit ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu exit ;; @@ -892,77 +923,33 @@ m68*:Linux:*:*) echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu exit ;; - mips:Linux:*:*) + mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU - #undef mips - #undef mipsel + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel + CPU=${UNAME_MACHINE}el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips + CPU=${UNAME_MACHINE} #else CPU= #endif #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; } - ;; - mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips64 - #undef mips64el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; } ;; or32:Linux:*:*) echo or32-${VENDOR}-linux-gnu exit ;; - ppc:Linux:*:*) - echo powerpc-${VENDOR}-linux-gnu - exit ;; - ppc64:Linux:*:*) - echo powerpc64-${VENDOR}-linux-gnu - exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC} - exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-${VENDOR}-linux-gnu + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-${VENDOR}-linux-gnu exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level @@ -972,8 +959,11 @@ *) echo hppa-${VENDOR}-linux-gnu ;; esac exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-${VENDOR}-linux-gnu + ppc64:Linux:*:*) + echo powerpc64-${VENDOR}-linux-gnu + exit ;; + ppc:Linux:*:*) + echo powerpc-${VENDOR}-linux-gnu exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux @@ -996,66 +986,6 @@ xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux-gnu" - ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuaout" - exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuoldld" - exit ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^LIBC/{ - s: ::g - p - }'`" - test x"${LIBC}" != x && { - echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}" - exit - } - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } - ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both @@ -1084,7 +1014,7 @@ i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) echo i386-${VENDOR}-lynxos${UNAME_RELEASE} exit ;; i*86:*DOS:*:*) @@ -1192,7 +1122,7 @@ rs6000:LynxOS:2.*:*) echo rs6000-${VENDOR}-lynxos${UNAME_RELEASE} exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) echo powerpc-${VENDOR}-lynxos${UNAME_RELEASE} exit ;; SM[BE]S:UNIX_SV:*:*) @@ -1285,6 +1215,16 @@ *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in + i386) + eval $set_cc_for_build + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + UNAME_PROCESSOR="x86_64" + fi + fi ;; unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} diff -Nru gtk-doc-1.14/config.sub gtk-doc-1.17/config.sub --- gtk-doc-1.14/config.sub 2009-10-24 00:21:47.000000000 +0000 +++ gtk-doc-1.17/config.sub 2011-01-23 11:34:04.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 # Free Software Foundation, Inc. -timestamp='2009-04-17' +timestamp='2009-11-20' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -32,13 +32,16 @@ # Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. +# diff and a properly formatted GNU ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. # If it is invalid, we print an error message on stderr and exit with code 1. # Otherwise, we print the canonical config type on stdout and succeed. +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases # that are meaningful with *any* GNU software. @@ -149,10 +152,13 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray) + -apple | -axis | -knuth | -cray | -microblaze) os= basic_machine=$1 ;; + -bluegene*) + os=-cnk + ;; -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 @@ -281,6 +287,7 @@ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ + | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ @@ -288,13 +295,14 @@ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ + | ubicom32 \ | v850 | v850e \ | we32k \ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12) + m6811 | m68hc11 | m6812 | m68hc12 | picochip) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown os=-none @@ -337,7 +345,7 @@ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -365,7 +373,7 @@ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ - | romp-* | rs6000-* \ + | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ @@ -374,6 +382,7 @@ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ | tron-* \ + | ubicom32-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ @@ -467,6 +476,10 @@ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` os=-linux ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; c90) basic_machine=c90-cray os=-unicos @@ -719,6 +732,9 @@ basic_machine=ns32k-utek os=-sysv ;; + microblaze) + basic_machine=microblaze-xilinx + ;; mingw32) basic_machine=i386-pc os=-mingw32 @@ -1240,6 +1256,9 @@ # First match some system type aliases # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. + -auroraux) + os=-auroraux + ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; @@ -1260,9 +1279,9 @@ # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ - | -kopensolaris* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ @@ -1283,7 +1302,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1613,7 +1632,7 @@ -sunos*) vendor=sun ;; - -aix*) + -cnk*|-aix*) vendor=ibm ;; -beos*) diff -Nru gtk-doc-1.14/configure gtk-doc-1.17/configure --- gtk-doc-1.14/configure 2010-01-03 12:15:13.000000000 +0000 +++ gtk-doc-1.17/configure 2011-02-26 12:26:04.000000000 +0000 @@ -1,20 +1,24 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for gtk-doc 1.14. +# Generated by GNU Autoconf 2.65 for gtk-doc 1.17. # # Report bugs to . # +# # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# +# # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which @@ -22,23 +26,15 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - as_nl=' ' export as_nl @@ -46,7 +42,13 @@ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then as_echo='printf %s\n' as_echo_n='printf %s' else @@ -57,7 +59,7 @@ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; - case $arg in + case $arg in #( *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; @@ -80,13 +82,6 @@ } fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - # IFS # We need space, tab and new line, in precisely that order. Quoting is @@ -96,15 +91,15 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -116,12 +111,16 @@ fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' @@ -133,330 +132,301 @@ LANGUAGE=C export LANGUAGE -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - # CDPATH. -$as_unset CDPATH - +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST else - as_have_required=no + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac fi - - if test $as_have_required = yes && (eval ": -(as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +else + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. + as_have_required=no fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : else - exitcode=1 - echo positional parameters were not saved. -fi - -test \$exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=\$LINENO - as_lineno_2=\$LINENO - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -") 2> /dev/null; then - : -else - as_candidate_shells= - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - case $as_dir in + as_found=: + case $as_dir in #( /*) for as_base in sh bash ksh sh5; do - as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 +fi +fi done;; esac + as_found=false done +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi; } IFS=$as_save_IFS - for as_shell in $as_candidate_shells $SHELL; do - # Try only shells that exist, to save several forks. - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { ("$as_shell") 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -_ASEOF -}; then - CONFIG_SHELL=$as_shell - as_have_required=yes - if { "$as_shell" 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -(as_func_return () { - (exit $1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = "$1" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test $exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } - -_ASEOF -}; then - break -fi - -fi - - done - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done + if test "x$CONFIG_SHELL" != x; then : + # We cannot yet assume a decent shell, so we have to provide a + # neutralization value for shells without unset; and this also + # works around shells that cannot unset nonexistent variables. + BASH_ENV=/dev/null + ENV=/dev/null + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV export CONFIG_SHELL exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} fi - - if test $as_have_required = no; then - echo This script requires a shell more modern than all the - echo shells that I found on your system. Please install a - echo modern shell, or manually run the script under such a - echo shell if you do have one. - { (exit 1); exit 1; } + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else + $as_echo "$0: Please tell bug-autoconf@gnu.org and +$0: http://bugzilla.gnome.org/enter_bug.cgi?product=gtk-doc +$0: about your system, including any error possibly output +$0: before this message. Then install a modern shell, or +$0: manually run the script under such a shell if you do +$0: have one." + fi + exit 1 fi - - fi - fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" -(eval "as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} -exitcode=0 -if as_func_success; then - : +} # as_fn_mkdir_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' else - exitcode=1 - echo as_func_success failed. -fi + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith -if as_func_ret_success; then - : + +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with status $?, using 1 if that was 0. +as_fn_error () +{ + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + fi + $as_echo "$as_me: error: $1" >&2 + as_fn_exit $as_status +} # as_fn_error + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr else - exitcode=1 - echo as_func_ret_success failed. + as_expr=false fi -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false fi -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname else - exitcode=1 - echo positional parameters were not saved. + as_dirname=false fi -test \$exitcode = 0") || { - echo No shell found that supports shell functions. - echo Please tell bug-autoconf@gnu.org about your system, - echo including any error possibly output before this message. - echo This can help us improve future autoconf versions. - echo Configuration will now proceed without shell functions. -} +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO as_lineno_2a=$LINENO + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) sed -n ' p /[$]LINENO/= @@ -473,8 +443,7 @@ s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the @@ -484,29 +453,18 @@ exit } - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; esac;; *) ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then @@ -536,7 +494,7 @@ rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -555,10 +513,10 @@ if test -d "$1"; then test -d "$1/."; else - case $1 in + case $1 in #( -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -573,7 +531,6 @@ - # Check that we are running under the correct shell. SHELL=${CONFIG_SHELL-/bin/sh} @@ -722,7 +679,8 @@ -exec 7<&0 &1 +test -n "$DJDIR" || exec 7<&0 &1 # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, @@ -740,14 +698,14 @@ subdirs= MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='gtk-doc' PACKAGE_TARNAME='gtk-doc' -PACKAGE_VERSION='1.14' -PACKAGE_STRING='gtk-doc 1.14' +PACKAGE_VERSION='1.17' +PACKAGE_STRING='gtk-doc 1.17' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gtk-doc' +PACKAGE_URL='' ac_unique_file="gtkdoc-common.pl.in" # Factoring default headers for most tests. @@ -863,7 +821,6 @@ LDFLAGS CFLAGS CC -ACLOCAL_AMFLAGS HAVE_GNOME_DOC_UTILS_FALSE HAVE_GNOME_DOC_UTILS_TRUE DISTCHECK_CONFIGURE_FLAGS @@ -932,6 +889,7 @@ program_transform_name prefix exec_prefix +PACKAGE_URL PACKAGE_BUGREPORT PACKAGE_STRING PACKAGE_VERSION @@ -956,6 +914,7 @@ with_gnu_ld enable_libtool_lock with_xml_catalog +with_highlight enable_debug ' ac_precious_vars='build_alias @@ -1078,8 +1037,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1105,8 +1063,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1310,8 +1267,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1327,8 +1283,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1358,17 +1313,17 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { $as_echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } + -*) as_fn_error "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information." ;; *=*) ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error "invalid variable name: \`$ac_envvar'" ;; + esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1385,15 +1340,13 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { $as_echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } + as_fn_error "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 - { (exit 1); exit 1; }; } ;; + fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1416,8 +1369,7 @@ [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } + as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1447,11 +1399,9 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { $as_echo "$as_me: error: working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } + as_fn_error "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } + as_fn_error "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1490,13 +1440,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } + as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1522,7 +1470,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gtk-doc 1.14 to adapt to many kinds of systems. +\`configure' configures gtk-doc 1.17 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1592,7 +1540,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gtk-doc 1.14:";; + short | recursive ) echo "Configuration of gtk-doc 1.17:";; esac cat <<\_ACEOF @@ -1600,7 +1548,7 @@ --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-maintainer-mode enable make rules and dependencies not useful + --disable-maintainer-mode disable make rules and dependencies not useful (and sometimes confusing) to the casual installer --enable-silent-rules less verbose build output (undo: `make V=1') --disable-silent-rules verbose build output (undo: `make V=0') @@ -1626,6 +1574,8 @@ --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-xml-catalog=CATALOG path to xml catalog to use + --with-highlight Select source code syntax highlighter + (no|source-highlight|highlight|vim|auto) Some influential environment variables: PKG_CONFIG path to pkg-config utility @@ -1634,7 +1584,7 @@ LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor TEST_DEPS_CFLAGS @@ -1708,22 +1658,286 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gtk-doc configure 1.14 -generated by GNU Autoconf 2.63 +gtk-doc configure 1.17 +generated by GNU Autoconf 2.65 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF exit fi + +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## + +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_compile + +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # 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;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link + +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_header_compile + +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp + +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${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; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${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 : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run + +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $2 + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif + +int +main () +{ +return $2 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_func cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gtk-doc $as_me 1.14, which was -generated by GNU Autoconf 2.63. Invocation command line was +It was created by gtk-doc $as_me 1.17, which was +generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -1759,8 +1973,8 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" -done + $as_echo "PATH: $as_dir" + done IFS=$as_save_IFS } >&5 @@ -1797,9 +2011,9 @@ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" + as_fn_append ac_configure_args1 " '$ac_arg'" if test $ac_must_keep_next = true; then ac_must_keep_next=false # Got value, back to normal. else @@ -1815,13 +2029,13 @@ -* ) ac_must_keep_next=true ;; esac fi - ac_configure_args="$ac_configure_args '$ac_arg'" + as_fn_append ac_configure_args " '$ac_arg'" ;; esac done done -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there @@ -1846,13 +2060,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $as_unset $ac_var ;; + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -1924,39 +2138,41 @@ exit $exit_status ' 0 for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal done ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h +$as_echo "/* confdefs.h */" > confdefs.h + # Predefined preprocessor variables. cat >>confdefs.h <<_ACEOF #define PACKAGE_NAME "$PACKAGE_NAME" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_TARNAME "$PACKAGE_TARNAME" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION "$PACKAGE_VERSION" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_STRING "$PACKAGE_STRING" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" _ACEOF +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF + # Let the site file select an alternate cache file if it wants to. # Prefer an explicitly selected file to automatically selected ones. @@ -1974,8 +2190,8 @@ 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 - { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 + 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 . "$ac_site_file" @@ -1983,10 +2199,10 @@ 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 - { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 + # 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 [\\/]* | ?:[\\/]* ) . "$cache_file";; @@ -1994,7 +2210,7 @@ esac fi else - { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 $as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -2009,11 +2225,11 @@ eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; @@ -2023,17 +2239,17 @@ ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 $as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac @@ -2045,43 +2261,20 @@ esac case " $ac_configure_args " in *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; + *) as_fn_append ac_configure_args " '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then - { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi - - - - - - - - - - - - - - - - - - - - - - - - +## -------------------- ## +## Main body of script. ## +## -------------------- ## ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -2098,24 +2291,16 @@ ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi + for ac_t in install-sh install.sh shtool; do + if test -f "$ac_dir/$ac_t"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/$ac_t -c" + break 2 + fi + done done if test -z "$ac_aux_dir"; then - { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2141,10 +2326,10 @@ # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. # Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then +if test "${ac_cv_path_install+set}" = set; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2152,11 +2337,11 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. @@ -2193,7 +2378,7 @@ ;; esac -done + done IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir @@ -2209,7 +2394,7 @@ INSTALL=$ac_install_sh fi fi -{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 $as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2220,7 +2405,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } # Just in case sleep 1 @@ -2231,15 +2416,11 @@ ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5 -$as_echo "$as_me: error: unsafe absolute working directory name" >&2;} - { (exit 1); exit 1; }; };; + as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5 -$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;} - { (exit 1); exit 1; }; };; + as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; esac # Do `set' in a subshell so we don't clobber the current shell's @@ -2261,11 +2442,8 @@ # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&5 -$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "ls -t appears to fail. Make sure there is not a broken +alias in your environment" "$LINENO" 5 fi test "$2" = conftest.file @@ -2274,13 +2452,10 @@ # Ok. : else - { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! -Check your system clock" >&5 -$as_echo "$as_me: error: newly created file is older than distributed files! -Check your system clock" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "newly created file is older than distributed files! +Check your system clock" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: result: yes" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" @@ -2308,7 +2483,7 @@ am_missing_run="$MISSING --run " else am_missing_run= - { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi @@ -2329,9 +2504,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then +if test "${ac_cv_prog_STRIP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -2342,24 +2517,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 $as_echo "$STRIP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2369,9 +2544,9 @@ ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -2382,24 +2557,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 $as_echo "$ac_ct_STRIP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2408,7 +2583,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -2421,10 +2596,10 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if test "${ac_cv_path_mkdir+set}" = set; then + if test "${ac_cv_path_mkdir+set}" = set; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2432,7 +2607,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in mkdir gmkdir; do + for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( @@ -2444,11 +2619,12 @@ esac done done -done + done IFS=$as_save_IFS fi + test -d ./--version && rmdir ./--version if test "${ac_cv_path_mkdir+set}" = set; then MKDIR_P="$ac_cv_path_mkdir -p" else @@ -2456,11 +2632,10 @@ # value for MKDIR_P within a source directory, because that will # break other packages using the cache if that directory is # removed, or if the value is a relative name. - test -d ./--version && rmdir ./--version MKDIR_P="$ac_install_sh -d" fi fi -{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } mkdir_p="$MKDIR_P" @@ -2473,9 +2648,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then +if test "${ac_cv_prog_AWK+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then @@ -2486,24 +2661,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { $as_echo "$as_me:$LINENO: result: $AWK" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 $as_echo "$AWK" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2511,11 +2686,11 @@ test -n "$AWK" && break done -{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2533,11 +2708,11 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } SET_MAKE= else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -2557,9 +2732,7 @@ am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -2575,7 +2748,7 @@ # Define the identity of the package. PACKAGE='gtk-doc' - VERSION='1.14' + VERSION='1.17' cat >>confdefs.h <<_ACEOF @@ -2616,16 +2789,16 @@ -{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 -$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to disable maintainer-specific portions of Makefiles" >&5 +$as_echo_n "checking whether to disable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. -if test "${enable_maintainer_mode+set}" = set; then +if test "${enable_maintainer_mode+set}" = set; then : enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval else - USE_MAINTAINER_MODE=no + USE_MAINTAINER_MODE=yes fi - { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 $as_echo "$USE_MAINTAINER_MODE" >&6; } if test $USE_MAINTAINER_MODE = yes; then MAINTAINER_MODE_TRUE= @@ -2643,7 +2816,7 @@ # by either passing --disable-silent-rules to configure or passing V=1 # to make # Check whether --enable-silent-rules was given. -if test "${enable_silent_rules+set}" = set; then +if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; fi @@ -2655,14 +2828,14 @@ AM_BACKSLASH='\' -{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 $as_echo_n "checking whether ln -s works... " >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 $as_echo "no, using $LN_S" >&6; } fi @@ -2672,9 +2845,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -2687,14 +2860,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -2702,10 +2875,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 $as_echo "$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2715,9 +2888,9 @@ ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in @@ -2730,14 +2903,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -2745,10 +2918,10 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 $as_echo "$ac_pt_PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2757,7 +2930,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -2770,13 +2943,13 @@ fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.9.0 - { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } PKG_CONFIG="" fi @@ -2785,25 +2958,25 @@ gdu_cv_version_required=0.3.2 -{ $as_echo "$as_me:$LINENO: checking gnome-doc-utils >= $gdu_cv_version_required" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5 $as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; } if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\""; } >&5 ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then gdu_cv_have_gdu=yes else gdu_cv_have_gdu=no fi if test "$gdu_cv_have_gdu" = "yes"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } : else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } enable_scrollkeeper=no fi @@ -2811,7 +2984,7 @@ # Check whether --with-help-dir was given. -if test "${with_help_dir+set}" = set; then +if test "${with_help_dir+set}" = set; then : withval=$with_help_dir; else with_help_dir='${datadir}/gnome/help' @@ -2822,7 +2995,7 @@ # Check whether --with-omf-dir was given. -if test "${with_omf_dir+set}" = set; then +if test "${with_omf_dir+set}" = set; then : withval=$with_omf_dir; else with_omf_dir='${datadir}/omf' @@ -2833,7 +3006,7 @@ # Check whether --with-help-formats was given. -if test "${with_help_formats+set}" = set; then +if test "${with_help_formats+set}" = set; then : withval=$with_help_formats; else with_help_formats='' @@ -2843,7 +3016,7 @@ # Check whether --enable-scrollkeeper was given. -if test "${enable_scrollkeeper+set}" = set; then +if test "${enable_scrollkeeper+set}" = set; then : enableval=$enable_scrollkeeper; else enable_scrollkeeper=yes @@ -2872,9 +3045,7 @@ -ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" - - +# Check for programs DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -2887,7 +3058,7 @@ .PHONY: am__doit END # If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 $as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= @@ -2915,12 +3086,12 @@ fi -{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 $as_echo "$_am_result" >&6; } rm -f confinc confmf # Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then +if test "${enable_dependency_tracking+set}" = set; then : enableval=$enable_dependency_tracking; fi @@ -2945,9 +3116,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2958,24 +3129,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2985,9 +3156,9 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2998,24 +3169,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3024,7 +3195,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -3038,9 +3209,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3051,24 +3222,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3078,9 +3249,9 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3092,18 +3263,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS if test $ac_prog_rejected = yes; then @@ -3122,10 +3293,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3137,9 +3308,9 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3150,24 +3321,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3181,9 +3352,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3194,24 +3365,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -3224,7 +3395,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -3235,57 +3406,37 @@ fi -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error "no acceptable C compiler found in \$PATH +See \`config.log' for more details." "$LINENO" 5; } # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3301,8 +3452,8 @@ # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -$as_echo_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: @@ -3318,17 +3469,17 @@ done rm -f $ac_rmfiles -if { (ac_try="$ac_link_default" +if { { ac_try="$ac_link_default" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -3345,7 +3496,7 @@ # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -3364,84 +3515,42 @@ else ac_file='' fi - -{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } -if test -z "$ac_file"; then - $as_echo "$as_me: failed program was:" >&5 +if test -z "$ac_file"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } +{ 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:$LINENO: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } - fi - fi -fi -{ $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } -{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } - -{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 $as_echo_n "checking for suffix of executables... " >&6; } -if { (ac_try="$ac_link" +if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval ac_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:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -3456,32 +3565,83 @@ esac done else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +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 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +rm -f conftest conftest$ac_cv_exeext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 $as_echo "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." "$LINENO" 5; } + fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then +if test "${ac_cv_objext+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3493,17 +3653,17 @@ } _ACEOF rm -f conftest.o conftest.obj -if { (ac_try="$ac_compile" +if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in @@ -3516,31 +3676,23 @@ $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error "cannot compute suffix of object files: cannot compile +See \`config.log' for more details." "$LINENO" 5; } fi - rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 $as_echo "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then +if test "${ac_cv_c_compiler_gnu+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3554,37 +3706,16 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + ac_compiler_gnu=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 $as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes @@ -3593,20 +3724,16 @@ fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then +if test "${ac_cv_prog_cc_g+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3617,35 +3744,11 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3656,36 +3759,12 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_compile "$LINENO"; then : - ac_c_werror_flag=$ac_save_c_werror_flag +else + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3696,42 +3775,17 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -3748,18 +3802,14 @@ CFLAGS= fi fi -{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then +if test "${ac_cv_prog_cc_c89+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -3816,32 +3866,9 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_c89=$ac_arg -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done @@ -3852,17 +3879,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { $as_echo "$as_me:$LINENO: result: none needed" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 $as_echo "none needed" >&6; } ;; xno) - { $as_echo "$as_me:$LINENO: result: unsupported" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 $as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac +if test "x$ac_cv_prog_cc_c89" != xno; then : +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -3872,9 +3901,9 @@ depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -3982,7 +4011,7 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type @@ -3998,17 +4027,13 @@ -{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5 $as_echo_n "checking for library containing strerror... " >&6; } -if test "${ac_cv_search_strerror+set}" = set; then +if test "${ac_cv_search_strerror+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -4031,56 +4056,29 @@ ac_res="none required" else ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_strerror=$ac_res -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_strerror+set}" = set; then +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_strerror+set}" = set; then : break fi done -if test "${ac_cv_search_strerror+set}" = set; then - : +if test "${ac_cv_search_strerror+set}" = set; then : + else ac_cv_search_strerror=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5 $as_echo "$ac_cv_search_strerror" >&6; } ac_res=$ac_cv_search_strerror -if test "$ac_res" != no; then +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi @@ -4093,9 +4091,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -4106,24 +4104,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -4133,9 +4131,9 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -4146,24 +4144,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -4172,7 +4170,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -4186,9 +4184,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -4199,24 +4197,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -4226,9 +4224,9 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -4240,18 +4238,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS if test $ac_prog_rejected = yes; then @@ -4270,10 +4268,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -4285,9 +4283,9 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -4298,24 +4296,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -4329,9 +4327,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -4342,24 +4340,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -4372,7 +4370,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -4383,62 +4381,42 @@ fi -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error "no acceptable C compiler found in \$PATH +See \`config.log' for more details." "$LINENO" 5; } # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then +if test "${ac_cv_c_compiler_gnu+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4452,37 +4430,16 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + ac_compiler_gnu=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 $as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes @@ -4491,20 +4448,16 @@ fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then +if test "${ac_cv_prog_cc_g+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4515,35 +4468,11 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4554,36 +4483,12 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_compile "$LINENO"; then : - ac_c_werror_flag=$ac_save_c_werror_flag +else + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4594,42 +4499,17 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -4646,18 +4526,14 @@ CFLAGS= fi fi -{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then +if test "${ac_cv_prog_cc_c89+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -4714,32 +4590,9 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_c89=$ac_arg -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done @@ -4750,17 +4603,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { $as_echo "$as_me:$LINENO: result: none needed" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 $as_echo "none needed" >&6; } ;; xno) - { $as_echo "$as_me:$LINENO: result: unsupported" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 $as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac +if test "x$ac_cv_prog_cc_c89" != xno; then : +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -4770,9 +4625,9 @@ depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -4880,7 +4735,7 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type @@ -4897,14 +4752,14 @@ case `pwd` in *\ * | *\ *) - { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; esac -macro_version='2.2.6' -macro_revision='1.3012' +macro_version='2.2.6b' +macro_revision='1.3017' @@ -4922,35 +4777,27 @@ # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 -{ $as_echo "$as_me:$LINENO: checking build system type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then +if test "${ac_cv_build+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -$as_echo "$as_me: error: invalid value of canonical build" >&2;} - { (exit 1); exit 1; }; };; +*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -4966,28 +4813,24 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:$LINENO: checking host system type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then +if test "${ac_cv_host+set}" = set; then : $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -$as_echo "$as_me: error: invalid value of canonical host" >&2;} - { (exit 1); exit 1; }; };; +*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -5003,9 +4846,9 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 $as_echo_n "checking for a sed that does not truncate output... " >&6; } -if test "${ac_cv_path_SED+set}" = set; then +if test "${ac_cv_path_SED+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ @@ -5013,7 +4856,7 @@ ac_script="$ac_script$as_nl$ac_script" done echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed - $as_unset ac_script || ac_script= + { ac_script=; unset ac_script;} if test -z "$SED"; then ac_path_SED_found=false # Loop through the user's path and test for each of PROGNAME-LIST @@ -5022,7 +4865,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do + for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue @@ -5042,7 +4885,7 @@ $as_echo '' >> "conftest.nl" "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_SED_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_SED="$ac_path_SED" @@ -5057,19 +4900,17 @@ $ac_path_SED_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_SED"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5 -$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 fi else ac_cv_path_SED=$SED fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 $as_echo "$ac_cv_path_SED" >&6; } SED="$ac_cv_path_SED" rm -f conftest.sed @@ -5087,9 +4928,9 @@ -{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if test "${ac_cv_path_GREP+set}" = set; then +if test "${ac_cv_path_GREP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -5100,7 +4941,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do + for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue @@ -5120,7 +4961,7 @@ $as_echo 'GREP' >> "conftest.nl" "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_GREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_GREP="$ac_path_GREP" @@ -5135,26 +4976,24 @@ $ac_path_GREP_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 $as_echo "$ac_cv_path_GREP" >&6; } GREP="$ac_cv_path_GREP" -{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then +if test "${ac_cv_path_EGREP+set}" = set; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -5168,7 +5007,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do + for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue @@ -5188,7 +5027,7 @@ $as_echo 'EGREP' >> "conftest.nl" "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_EGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_EGREP="$ac_path_EGREP" @@ -5203,12 +5042,10 @@ $ac_path_EGREP_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -5216,14 +5053,14 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 $as_echo "$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" -{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 $as_echo_n "checking for fgrep... " >&6; } -if test "${ac_cv_path_FGREP+set}" = set; then +if test "${ac_cv_path_FGREP+set}" = set; then : $as_echo_n "(cached) " >&6 else if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 @@ -5237,7 +5074,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in fgrep; do + for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue @@ -5257,7 +5094,7 @@ $as_echo 'FGREP' >> "conftest.nl" "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_FGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_FGREP="$ac_path_FGREP" @@ -5272,12 +5109,10 @@ $ac_path_FGREP_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_FGREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_FGREP=$FGREP @@ -5285,7 +5120,7 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 $as_echo "$ac_cv_path_FGREP" >&6; } FGREP="$ac_cv_path_FGREP" @@ -5311,7 +5146,7 @@ # Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then +if test "${with_gnu_ld+set}" = set; then : withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no @@ -5320,7 +5155,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) @@ -5350,13 +5185,13 @@ ;; esac elif test "$with_gnu_ld" = yes; then - { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } else - { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 $as_echo_n "checking for non-GNU ld... " >&6; } fi -if test "${lt_cv_path_LD+set}" = set; then +if test "${lt_cv_path_LD+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$LD"; then @@ -5387,18 +5222,16 @@ LD="$lt_cv_path_LD" if test -n "$LD"; then - { $as_echo "$as_me:$LINENO: result: $LD" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 $as_echo "$LD" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if test "${lt_cv_prog_gnu_ld+set}" = set; then +if test "${lt_cv_prog_gnu_ld+set}" = set; then : $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. @@ -5411,7 +5244,7 @@ ;; esac fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 $as_echo "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -5423,9 +5256,9 @@ -{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } -if test "${lt_cv_path_NM+set}" = set; then +if test "${lt_cv_path_NM+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$NM"; then @@ -5472,7 +5305,7 @@ : ${lt_cv_path_NM=no} fi fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 $as_echo "$lt_cv_path_NM" >&6; } if test "$lt_cv_path_NM" != "no"; then NM="$lt_cv_path_NM" @@ -5483,9 +5316,9 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_DUMPBIN+set}" = set; then +if test "${ac_cv_prog_DUMPBIN+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$DUMPBIN"; then @@ -5496,24 +5329,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi DUMPBIN=$ac_cv_prog_DUMPBIN if test -n "$DUMPBIN"; then - { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 $as_echo "$DUMPBIN" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5527,9 +5360,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then +if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DUMPBIN"; then @@ -5540,24 +5373,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN if test -n "$ac_ct_DUMPBIN"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 $as_echo "$ac_ct_DUMPBIN" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5570,7 +5403,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -5590,33 +5423,33 @@ -{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 $as_echo_n "checking the name lister ($NM) interface... " >&6; } -if test "${lt_cv_nm_interface+set}" = set; then +if test "${lt_cv_nm_interface+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5600: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5433: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5603: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5436: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5606: output\"" >&5) + (eval echo "\"\$as_me:5439: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" fi rm -f conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 $as_echo "$lt_cv_nm_interface" >&6; } # find the maximum length of command line arguments -{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 $as_echo_n "checking the maximum length of command line arguments... " >&6; } -if test "${lt_cv_sys_max_cmd_len+set}" = set; then +if test "${lt_cv_sys_max_cmd_len+set}" = set; then : $as_echo_n "(cached) " >&6 else i=0 @@ -5734,10 +5567,10 @@ fi if test -n $lt_cv_sys_max_cmd_len ; then - { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 $as_echo "$lt_cv_sys_max_cmd_len" >&6; } else - { $as_echo "$as_me:$LINENO: result: none" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 $as_echo "none" >&6; } fi max_cmd_len=$lt_cv_sys_max_cmd_len @@ -5751,7 +5584,7 @@ : ${MV="mv -f"} : ${RM="rm -f"} -{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } # Try some XSI features xsi_shell=no @@ -5761,17 +5594,17 @@ && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 $as_echo "$xsi_shell" >&6; } -{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 $as_echo_n "checking whether the shell understands \"+=\"... " >&6; } lt_shell_append=no ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ >/dev/null 2>&1 \ && lt_shell_append=yes -{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 $as_echo "$lt_shell_append" >&6; } @@ -5806,14 +5639,14 @@ -{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } -if test "${lt_cv_ld_reload_flag+set}" = set; then +if test "${lt_cv_ld_reload_flag+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_ld_reload_flag='-r' fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 $as_echo "$lt_cv_ld_reload_flag" >&6; } reload_flag=$lt_cv_ld_reload_flag case $reload_flag in @@ -5842,9 +5675,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OBJDUMP+set}" = set; then +if test "${ac_cv_prog_OBJDUMP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$OBJDUMP"; then @@ -5855,24 +5688,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi OBJDUMP=$ac_cv_prog_OBJDUMP if test -n "$OBJDUMP"; then - { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 $as_echo "$OBJDUMP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5882,9 +5715,9 @@ ac_ct_OBJDUMP=$OBJDUMP # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then +if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OBJDUMP"; then @@ -5895,24 +5728,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_OBJDUMP="objdump" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP if test -n "$ac_ct_OBJDUMP"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 $as_echo "$ac_ct_OBJDUMP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5921,7 +5754,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -5941,9 +5774,9 @@ -{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 $as_echo_n "checking how to recognize dependent libraries... " >&6; } -if test "${lt_cv_deplibs_check_method+set}" = set; then +if test "${lt_cv_deplibs_check_method+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_file_magic_cmd='$MAGIC_CMD' @@ -6137,7 +5970,7 @@ esac fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method @@ -6157,9 +5990,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AR+set}" = set; then +if test "${ac_cv_prog_AR+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$AR"; then @@ -6170,24 +6003,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AR="${ac_tool_prefix}ar" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - { $as_echo "$as_me:$LINENO: result: $AR" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 $as_echo "$AR" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6197,9 +6030,9 @@ ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AR"; then @@ -6210,24 +6043,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_AR="ar" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 $as_echo "$ac_ct_AR" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6236,7 +6069,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -6262,9 +6095,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then +if test "${ac_cv_prog_STRIP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -6275,24 +6108,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 $as_echo "$STRIP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6302,9 +6135,9 @@ ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -6315,24 +6148,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 $as_echo "$ac_ct_STRIP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6341,7 +6174,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -6361,9 +6194,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_RANLIB+set}" = set; then +if test "${ac_cv_prog_RANLIB+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then @@ -6374,24 +6207,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 $as_echo "$RANLIB" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6401,9 +6234,9 @@ ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then @@ -6414,24 +6247,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 $as_echo "$ac_ct_RANLIB" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6440,7 +6273,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -6518,9 +6351,9 @@ # Check for command to grab the raw symbol name followed by C symbol from nm. -{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } -if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then +if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then : $as_echo_n "(cached) " >&6 else @@ -6636,18 +6469,18 @@ int main(){nm_test_var='a';nm_test_func();return(0);} _LT_EOF - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then # Now try to grab the symbols. nlist=conftest.nm - if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5 (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s "$nlist"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -6700,11 +6533,11 @@ lt_save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext}; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi LIBS="$lt_save_LIBS" @@ -6738,10 +6571,10 @@ lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - { $as_echo "$as_me:$LINENO: result: failed" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 $as_echo "failed" >&6; } else - { $as_echo "$as_me:$LINENO: result: ok" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 $as_echo "ok" >&6; } fi @@ -6767,7 +6600,7 @@ # Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then +if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; fi @@ -6779,11 +6612,11 @@ ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE="32" @@ -6797,12 +6630,12 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6800 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + echo '#line 6633 "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) @@ -6836,11 +6669,11 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then case `/usr/bin/file conftest.o` in *32-bit*) case $host in @@ -6889,9 +6722,9 @@ # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" - { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 $as_echo_n "checking whether the C compiler needs -belf... " >&6; } -if test "${lt_cv_cc_needs_belf+set}" = set; then +if test "${lt_cv_cc_needs_belf+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_ext=c @@ -6900,11 +6733,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -6915,38 +6744,13 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : lt_cv_cc_needs_belf=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - lt_cv_cc_needs_belf=no + lt_cv_cc_needs_belf=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6954,7 +6758,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 $as_echo "$lt_cv_cc_needs_belf" >&6; } if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf @@ -6964,11 +6768,11 @@ sparc*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in @@ -6994,9 +6798,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_DSYMUTIL+set}" = set; then +if test "${ac_cv_prog_DSYMUTIL+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$DSYMUTIL"; then @@ -7007,24 +6811,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi DSYMUTIL=$ac_cv_prog_DSYMUTIL if test -n "$DSYMUTIL"; then - { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 $as_echo "$DSYMUTIL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7034,9 +6838,9 @@ ac_ct_DSYMUTIL=$DSYMUTIL # Extract the first word of "dsymutil", so it can be a program name with args. set dummy dsymutil; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then +if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DSYMUTIL"; then @@ -7047,24 +6851,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL if test -n "$ac_ct_DSYMUTIL"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 $as_echo "$ac_ct_DSYMUTIL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7073,7 +6877,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -7086,9 +6890,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_NMEDIT+set}" = set; then +if test "${ac_cv_prog_NMEDIT+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$NMEDIT"; then @@ -7099,24 +6903,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi NMEDIT=$ac_cv_prog_NMEDIT if test -n "$NMEDIT"; then - { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 $as_echo "$NMEDIT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7126,9 +6930,9 @@ ac_ct_NMEDIT=$NMEDIT # Extract the first word of "nmedit", so it can be a program name with args. set dummy nmedit; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then +if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_NMEDIT"; then @@ -7139,24 +6943,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_NMEDIT="nmedit" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT if test -n "$ac_ct_NMEDIT"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 $as_echo "$ac_ct_NMEDIT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7165,7 +6969,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -7178,9 +6982,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. set dummy ${ac_tool_prefix}lipo; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_LIPO+set}" = set; then +if test "${ac_cv_prog_LIPO+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$LIPO"; then @@ -7191,24 +6995,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi LIPO=$ac_cv_prog_LIPO if test -n "$LIPO"; then - { $as_echo "$as_me:$LINENO: result: $LIPO" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 $as_echo "$LIPO" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7218,9 +7022,9 @@ ac_ct_LIPO=$LIPO # Extract the first word of "lipo", so it can be a program name with args. set dummy lipo; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then +if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_LIPO"; then @@ -7231,24 +7035,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_LIPO="lipo" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO if test -n "$ac_ct_LIPO"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 $as_echo "$ac_ct_LIPO" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7257,7 +7061,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -7270,9 +7074,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. set dummy ${ac_tool_prefix}otool; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OTOOL+set}" = set; then +if test "${ac_cv_prog_OTOOL+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$OTOOL"; then @@ -7283,24 +7087,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi OTOOL=$ac_cv_prog_OTOOL if test -n "$OTOOL"; then - { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 $as_echo "$OTOOL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7310,9 +7114,9 @@ ac_ct_OTOOL=$OTOOL # Extract the first word of "otool", so it can be a program name with args. set dummy otool; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then +if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL"; then @@ -7323,24 +7127,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_OTOOL="otool" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL if test -n "$ac_ct_OTOOL"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 $as_echo "$ac_ct_OTOOL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7349,7 +7153,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -7362,9 +7166,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. set dummy ${ac_tool_prefix}otool64; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OTOOL64+set}" = set; then +if test "${ac_cv_prog_OTOOL64+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$OTOOL64"; then @@ -7375,24 +7179,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi OTOOL64=$ac_cv_prog_OTOOL64 if test -n "$OTOOL64"; then - { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 $as_echo "$OTOOL64" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7402,9 +7206,9 @@ ac_ct_OTOOL64=$OTOOL64 # Extract the first word of "otool64", so it can be a program name with args. set dummy otool64; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then +if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL64"; then @@ -7415,24 +7219,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_OTOOL64="otool64" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 if test -n "$ac_ct_OTOOL64"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 $as_echo "$ac_ct_OTOOL64" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -7441,7 +7245,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -7477,9 +7281,9 @@ - { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 $as_echo_n "checking for -single_module linker flag... " >&6; } -if test "${lt_cv_apple_cc_single_mod+set}" = set; then +if test "${lt_cv_apple_cc_single_mod+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no @@ -7504,22 +7308,18 @@ rm -f conftest.* fi fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 $as_echo "$lt_cv_apple_cc_single_mod" >&6; } - { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } -if test "${lt_cv_ld_exported_symbols_list+set}" = set; then +if test "${lt_cv_ld_exported_symbols_list+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_ld_exported_symbols_list=no save_LDFLAGS=$LDFLAGS echo "_main" > conftest.sym LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -7530,42 +7330,17 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : lt_cv_ld_exported_symbols_list=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - lt_cv_ld_exported_symbols_list=no + lt_cv_ld_exported_symbols_list=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } case $host_os in rhapsody* | darwin1.[012]) @@ -7607,14 +7382,14 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 $as_echo_n "checking how to run the C preprocessor... " >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then + if test "${ac_cv_prog_CPP+set}" = set; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -7629,11 +7404,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -7642,78 +7413,34 @@ #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then +if $ac_preproc_ok; then : break fi @@ -7725,7 +7452,7 @@ else ac_cv_prog_CPP=$CPP fi -{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 $as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -7736,11 +7463,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -7749,87 +7472,40 @@ #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : +if $ac_preproc_ok; then : + else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." "$LINENO" 5; } fi ac_ext=c @@ -7839,16 +7515,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then +if test "${ac_cv_header_stdc+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -7863,48 +7535,23 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdc=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no + ac_cv_header_stdc=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : + $EGREP "memchr" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -7914,18 +7561,14 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : + $EGREP "free" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -7935,14 +7578,10 @@ if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : : else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -7969,118 +7608,34 @@ return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_run "$LINENO"; then : -( exit $ac_status ) -ac_cv_header_stdc=no +else + ac_cv_header_stdc=no fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 $as_echo "$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF +$as_echo "#define STDC_HEADERS 1" >>confdefs.h fi # On IRIX 5.3, sys/types and inttypes.h are conflicting. - - - - - - - - - for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -8090,62 +7645,13 @@ done - for ac_header in dlfcn.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +do : + ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default +" +if test "x$ac_cv_header_dlfcn_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_DLFCN_H 1 _ACEOF fi @@ -8165,7 +7671,7 @@ # Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then +if test "${enable_shared+set}" = set; then : enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; @@ -8196,7 +7702,7 @@ # Check whether --enable-static was given. -if test "${enable_static+set}" = set; then +if test "${enable_static+set}" = set; then : enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; @@ -8228,7 +7734,7 @@ # Check whether --with-pic was given. -if test "${with_pic+set}" = set; then +if test "${with_pic+set}" = set; then : withval=$with_pic; pic_mode="$withval" else pic_mode=default @@ -8244,7 +7750,7 @@ # Check whether --enable-fast-install was given. -if test "${enable_fast_install+set}" = set; then +if test "${enable_fast_install+set}" = set; then : enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; @@ -8325,9 +7831,9 @@ setopt NO_GLOB_SUBST fi -{ $as_echo "$as_me:$LINENO: checking for objdir" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 $as_echo_n "checking for objdir... " >&6; } -if test "${lt_cv_objdir+set}" = set; then +if test "${lt_cv_objdir+set}" = set; then : $as_echo_n "(cached) " >&6 else rm -f .libs 2>/dev/null @@ -8340,7 +7846,7 @@ fi rmdir .libs 2>/dev/null fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 $as_echo "$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir @@ -8433,9 +7939,9 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in @@ -8486,10 +7992,10 @@ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -8499,9 +8005,9 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - { $as_echo "$as_me:$LINENO: checking for file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 $as_echo_n "checking for file... " >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in @@ -8552,10 +8058,10 @@ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -8636,9 +8142,9 @@ if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag=' -fno-builtin' - { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then +if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_rtti_exceptions=no @@ -8654,11 +8160,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:8657: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8163: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8661: \$? = $ac_status" >&5 + echo "$as_me:8167: \$? = $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. @@ -8671,7 +8177,7 @@ $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then @@ -8691,7 +8197,7 @@ lt_prog_compiler_pic= lt_prog_compiler_static= -{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 $as_echo_n "checking for $compiler option to produce PIC... " >&6; } if test "$GCC" = yes; then @@ -8963,7 +8469,7 @@ lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac -{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 $as_echo "$lt_prog_compiler_pic" >&6; } @@ -8975,9 +8481,9 @@ # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then - { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -if test "${lt_cv_prog_compiler_pic_works+set}" = set; then +if test "${lt_cv_prog_compiler_pic_works+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works=no @@ -8993,11 +8499,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:8996: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8502: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9000: \$? = $ac_status" >&5 + echo "$as_me:8506: \$? = $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. @@ -9010,7 +8516,7 @@ $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } if test x"$lt_cv_prog_compiler_pic_works" = xyes; then @@ -9034,9 +8540,9 @@ # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if test "${lt_cv_prog_compiler_static_works+set}" = set; then +if test "${lt_cv_prog_compiler_static_works+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no @@ -9062,7 +8568,7 @@ LDFLAGS="$save_LDFLAGS" fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 $as_echo "$lt_cv_prog_compiler_static_works" >&6; } if test x"$lt_cv_prog_compiler_static_works" = xyes; then @@ -9077,9 +8583,9 @@ - { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then +if test "${lt_cv_prog_compiler_c_o+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no @@ -9098,11 +8604,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:9101: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8607: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9105: \$? = $ac_status" >&5 + echo "$as_me:8611: \$? = $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 @@ -9124,7 +8630,7 @@ $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 $as_echo "$lt_cv_prog_compiler_c_o" >&6; } @@ -9132,9 +8638,9 @@ - { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then +if test "${lt_cv_prog_compiler_c_o+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no @@ -9153,11 +8659,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:9156: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8662: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9160: \$? = $ac_status" >&5 + echo "$as_me:8666: \$? = $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 @@ -9179,7 +8685,7 @@ $RM conftest* fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 $as_echo "$lt_cv_prog_compiler_c_o" >&6; } @@ -9188,7 +8694,7 @@ hard_links="nottested" if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes $RM conftest* @@ -9196,10 +8702,10 @@ touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 $as_echo "$hard_links" >&6; } if test "$hard_links" = no; then - { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi @@ -9212,7 +8718,7 @@ - { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } runpath_var= @@ -9654,11 +9160,7 @@ allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -9669,27 +9171,7 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -9703,16 +9185,9 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -9725,11 +9200,7 @@ else # Determine the default libpath from the value encoded in an # empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -9740,27 +9211,7 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -9774,16 +9225,9 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -9995,42 +9439,16 @@ # implicitly export all symbols. save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - cat >conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ int foo(void) {} _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' @@ -10286,7 +9704,7 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 $as_echo "$ld_shlibs" >&6; } test "$ld_shlibs" = no && can_build_shared=no @@ -10323,16 +9741,16 @@ # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } $RM conftest* echo "$lt_simple_compile_test_code" > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } 2>conftest.err; then soname=conftest lib=conftest libobjs=conftest.$ac_objext @@ -10346,11 +9764,11 @@ libname=conftest lt_save_allow_undefined_flag=$allow_undefined_flag allow_undefined_flag= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } then archive_cmds_need_lc=no else @@ -10361,7 +9779,7 @@ cat conftest.err 1>&5 fi $RM conftest* - { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5 $as_echo "$archive_cmds_need_lc" >&6; } ;; esac @@ -10525,7 +9943,7 @@ - { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } if test "$GCC" = yes; then @@ -10947,11 +10365,7 @@ save_libdir=$libdir eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -10962,41 +10376,13 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then +if ac_fn_c_try_link "$LINENO"; then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : shlibpath_overrides_runpath=yes fi - -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LDFLAGS=$save_LDFLAGS libdir=$save_libdir @@ -11208,7 +10594,7 @@ dynamic_linker=no ;; esac -{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 $as_echo "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no @@ -11310,7 +10696,7 @@ - { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 $as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || @@ -11335,7 +10721,7 @@ # directories. hardcode_action=unsupported fi -{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 $as_echo "$hardcode_action" >&6; } if test "$hardcode_action" = relink || @@ -11363,128 +10749,32 @@ case $host_os in beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - - mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; - - darwin*) - # if libdl is installed we need to link against it - { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_dl_dlopen=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dl_dlopen=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - - lt_cv_dlopen="dyld" + lt_cv_dlopen="load_add_on" lt_cv_dlopen_libs= lt_cv_dlopen_self=yes + ;; -fi + mingw* | pw32* | cegcc*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= + ;; + cygwin*) + lt_cv_dlopen="dlopen" + lt_cv_dlopen_libs= ;; - *) - { $as_echo "$as_me:$LINENO: checking for shl_load" >&5 -$as_echo_n "checking for shl_load... " >&6; } -if test "${ac_cv_func_shl_load+set}" = set; then + darwin*) + # if libdl is installed we need to link against it + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if test "${ac_cv_lib_dl_dlopen+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Define shl_load to an innocuous variant, in case declares shl_load. - For example, HP-UX 11i declares gettimeofday. */ -#define shl_load innocuous_shl_load - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef shl_load /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -11492,72 +10782,51 @@ #ifdef __cplusplus extern "C" #endif -char shl_load (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_shl_load || defined __stub___shl_load -choke me -#endif - +char dlopen (); int main () { -return shl_load (); +return dlopen (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_shl_load=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_shl_load=no + ac_cv_lib_dl_dlopen=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else + + lt_cv_dlopen="dyld" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -$as_echo "$ac_cv_func_shl_load" >&6; } -if test "x$ac_cv_func_shl_load" = x""yes; then + + ;; + + *) + ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" +if test "x$ac_cv_func_shl_load" = x""yes; then : lt_cv_dlopen="shl_load" else - { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 $as_echo_n "checking for shl_load in -ldld... " >&6; } -if test "${ac_cv_lib_dld_shl_load+set}" = set; then +if test "${ac_cv_lib_dld_shl_load+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -11575,145 +10844,32 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dld_shl_load=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dld_shl_load=no + ac_cv_lib_dld_shl_load=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 $as_echo "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = x""yes; then +if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" else - { $as_echo "$as_me:$LINENO: checking for dlopen" >&5 -$as_echo_n "checking for dlopen... " >&6; } -if test "${ac_cv_func_dlopen+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define dlopen to an innocuous variant, in case declares dlopen. - For example, HP-UX 11i declares gettimeofday. */ -#define dlopen innocuous_dlopen - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef dlopen - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_dlopen || defined __stub___dlopen -choke me -#endif - -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_dlopen=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_dlopen=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -$as_echo "$ac_cv_func_dlopen" >&6; } -if test "x$ac_cv_func_dlopen" = x""yes; then + ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" +if test "x$ac_cv_func_dlopen" = x""yes; then : lt_cv_dlopen="dlopen" else - { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then +if test "${ac_cv_lib_dl_dlopen+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -11731,57 +10887,28 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dl_dlopen=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dl_dlopen=no + ac_cv_lib_dl_dlopen=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else - { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 $as_echo_n "checking for dlopen in -lsvld... " >&6; } -if test "${ac_cv_lib_svld_dlopen+set}" = set; then +if test "${ac_cv_lib_svld_dlopen+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -11799,57 +10926,28 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_svld_dlopen=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_svld_dlopen=no + ac_cv_lib_svld_dlopen=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 $as_echo "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = x""yes; then +if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else - { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 $as_echo_n "checking for dld_link in -ldld... " >&6; } -if test "${ac_cv_lib_dld_dld_link+set}" = set; then +if test "${ac_cv_lib_dld_dld_link+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -11867,43 +10965,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dld_dld_link=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dld_dld_link=no + ac_cv_lib_dld_dld_link=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 $as_echo "$ac_cv_lib_dld_dld_link" >&6; } -if test "x$ac_cv_lib_dld_dld_link" = x""yes; then +if test "x$ac_cv_lib_dld_dld_link" = x""yes; then : lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi @@ -11942,9 +11015,9 @@ save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" - { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 $as_echo_n "checking whether a program can dlopen itself... " >&6; } -if test "${lt_cv_dlopen_self+set}" = set; then +if test "${lt_cv_dlopen_self+set}" = set; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -11953,7 +11026,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11956 "configure" +#line 11029 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12012,11 +11085,11 @@ return status; } _LT_EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -12033,14 +11106,14 @@ fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 $as_echo "$lt_cv_dlopen_self" >&6; } if test "x$lt_cv_dlopen_self" = xyes; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } -if test "${lt_cv_dlopen_self_static+set}" = set; then +if test "${lt_cv_dlopen_self_static+set}" = set; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -12049,7 +11122,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12052 "configure" +#line 11125 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12108,11 +11181,11 @@ return status; } _LT_EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -12129,7 +11202,7 @@ fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 $as_echo "$lt_cv_dlopen_self_static" >&6; } fi @@ -12168,12 +11241,12 @@ striplib= old_striplib= -{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 $as_echo_n "checking whether stripping libraries is possible... " >&6; } if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else # FIXME - insert some real tests, host_os isn't really good enough @@ -12182,15 +11255,15 @@ if test -n "$STRIP" ; then striplib="$STRIP -x" old_striplib="$STRIP -S" - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi ;; *) - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } ;; esac @@ -12208,12 +11281,12 @@ # Report which library types will actually be built - { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 $as_echo_n "checking if libtool supports shared libraries... " >&6; } - { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 $as_echo "$can_build_shared" >&6; } - { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 $as_echo_n "checking whether to build shared libraries... " >&6; } test "$can_build_shared" = "no" && enable_shared=no @@ -12234,14 +11307,14 @@ fi ;; esac - { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 $as_echo "$enable_shared" >&6; } - { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 $as_echo_n "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes - { $as_echo "$as_me:$LINENO: result: $enable_static" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 $as_echo "$enable_static" >&6; } @@ -12283,9 +11356,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -12298,14 +11371,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -12313,10 +11386,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 $as_echo "$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -12326,9 +11399,9 @@ ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in @@ -12341,14 +11414,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -12356,10 +11429,10 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 $as_echo "$ac_pt_PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -12368,7 +11441,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -12381,13 +11454,13 @@ fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.19 - { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } PKG_CONFIG="" fi @@ -12396,9 +11469,9 @@ # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PERL+set}" = set; then +if test "${ac_cv_path_PERL+set}" = set; then : $as_echo_n "(cached) " >&6 else case $PERL in @@ -12411,14 +11484,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -12426,31 +11499,27 @@ fi PERL=$ac_cv_path_PERL if test -n "$PERL"; then - { $as_echo "$as_me:$LINENO: result: $PERL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 $as_echo "$PERL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi if test -z "$PERL"; then - { { $as_echo "$as_me:$LINENO: error: perl not found" >&5 -$as_echo "$as_me: error: perl not found" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "perl not found" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: checking if Perl version >= 5.6.0" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if Perl version >= 5.6.0" >&5 $as_echo_n "checking if Perl version >= 5.6.0... " >&6; } if "$PERL" -e "require v5.6.0"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { { $as_echo "$as_me:$LINENO: error: perl >= 5.6.0 is required for gtk-doc" >&5 -$as_echo "$as_me: error: perl >= 5.6.0 is required for gtk-doc" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "perl >= 5.6.0 is required for gtk-doc" "$LINENO" 5 fi @@ -12459,7 +11528,7 @@ if test -n "$PYTHON"; then # If the user set $PYTHON, use it and don't search something else. - { $as_echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.3" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version >= 2.3" >&5 $as_echo_n "checking whether $PYTHON version >= 2.3... " >&6; } prog="import sys # split strings by '.' and convert to numeric. Append some zeros @@ -12474,22 +11543,19 @@ ($PYTHON -c "$prog") >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + (exit $ac_status); }; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { { $as_echo "$as_me:$LINENO: error: too old" >&5 -$as_echo "$as_me: error: too old" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "too old" "$LINENO" 5 fi - am_display_PYTHON=$PYTHON else # Otherwise, try each interpreter until we find one that satisfies # VERSION. - { $as_echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.3" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 2.3" >&5 $as_echo_n "checking for a Python interpreter with version >= 2.3... " >&6; } -if test "${am_cv_pathless_PYTHON+set}" = set; then +if test "${am_cv_pathless_PYTHON+set}" = set; then : $as_echo_n "(cached) " >&6 else @@ -12508,13 +11574,12 @@ ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + (exit $ac_status); }; then : break fi - done fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5 $as_echo "$am_cv_pathless_PYTHON" >&6; } # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. if test "$am_cv_pathless_PYTHON" = none; then @@ -12522,9 +11587,9 @@ else # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args. set dummy $am_cv_pathless_PYTHON; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PYTHON+set}" = set; then +if test "${ac_cv_path_PYTHON+set}" = set; then : $as_echo_n "(cached) " >&6 else case $PYTHON in @@ -12537,14 +11602,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -12552,10 +11617,10 @@ fi PYTHON=$ac_cv_path_PYTHON if test -n "$PYTHON"; then - { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 $as_echo "$PYTHON" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -12570,14 +11635,14 @@ else - { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5 $as_echo_n "checking for $am_display_PYTHON version... " >&6; } -if test "${am_cv_python_version+set}" = set; then +if test "${am_cv_python_version+set}" = set; then : $as_echo_n "(cached) " >&6 else am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_python_version" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 $as_echo "$am_cv_python_version" >&6; } PYTHON_VERSION=$am_cv_python_version @@ -12589,23 +11654,23 @@ - { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5 $as_echo_n "checking for $am_display_PYTHON platform... " >&6; } -if test "${am_cv_python_platform+set}" = set; then +if test "${am_cv_python_platform+set}" = set; then : $as_echo_n "(cached) " >&6 else am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"` fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5 $as_echo "$am_cv_python_platform" >&6; } PYTHON_PLATFORM=$am_cv_python_platform - { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 $as_echo_n "checking for $am_display_PYTHON script directory... " >&6; } -if test "${am_cv_python_pythondir+set}" = set; then +if test "${am_cv_python_pythondir+set}" = set; then : $as_echo_n "(cached) " >&6 else if test "x$prefix" = xNONE @@ -12621,10 +11686,18 @@ am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` ;; + *) + case $am_py_prefix in + /usr|/System*) ;; + *) + am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages + ;; + esac + ;; esac fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 $as_echo "$am_cv_python_pythondir" >&6; } pythondir=$am_cv_python_pythondir @@ -12633,9 +11706,9 @@ pkgpythondir=\${pythondir}/$PACKAGE - { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5 $as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; } -if test "${am_cv_python_pyexecdir+set}" = set; then +if test "${am_cv_python_pyexecdir+set}" = set; then : $as_echo_n "(cached) " >&6 else if test "x$exec_prefix" = xNONE @@ -12651,10 +11724,18 @@ am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` ;; + *) + case $am_py_exec_prefix in + /usr|/System*) ;; + *) + am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages + ;; + esac + ;; esac fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 $as_echo "$am_cv_python_pyexecdir" >&6; } pyexecdir=$am_cv_python_pyexecdir @@ -12679,9 +11760,9 @@ SGML_FORMAT_TYPE=sgml-raw # Extract the first word of "openjade", so it can be a program name with args. set dummy openjade; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_JADE+set}" = set; then +if test "${ac_cv_path_JADE+set}" = set; then : $as_echo_n "(cached) " >&6 else case $JADE in @@ -12694,14 +11775,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_JADE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -12709,10 +11790,10 @@ fi JADE=$ac_cv_path_JADE if test -n "$JADE"; then - { $as_echo "$as_me:$LINENO: result: $JADE" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JADE" >&5 $as_echo "$JADE" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -12721,9 +11802,9 @@ SGML_FORMAT_TYPE=sgml # Extract the first word of "jade", so it can be a program name with args. set dummy jade; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_JADE+set}" = set; then +if test "${ac_cv_path_JADE+set}" = set; then : $as_echo_n "(cached) " >&6 else case $JADE in @@ -12736,14 +11817,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_JADE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -12751,16 +11832,16 @@ fi JADE=$ac_cv_path_JADE if test -n "$JADE"; then - { $as_echo "$as_me:$LINENO: result: $JADE" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JADE" >&5 $as_echo "$JADE" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi if test -z "$JADE"; then - { $as_echo "$as_me:$LINENO: WARNING: Could not find openjade or jade, so SGML is not supported" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find openjade or jade, so SGML is not supported" >&5 $as_echo "$as_me: WARNING: Could not find openjade or jade, so SGML is not supported" >&2;} fi fi @@ -12768,9 +11849,9 @@ # Extract the first word of "xsltproc", so it can be a program name with args. set dummy xsltproc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_XSLTPROC+set}" = set; then +if test "${ac_cv_path_XSLTPROC+set}" = set; then : $as_echo_n "(cached) " >&6 else case $XSLTPROC in @@ -12783,14 +11864,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -12798,25 +11879,23 @@ fi XSLTPROC=$ac_cv_path_XSLTPROC if test -n "$XSLTPROC"; then - { $as_echo "$as_me:$LINENO: result: $XSLTPROC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5 $as_echo "$XSLTPROC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi if test -z "$XSLTPROC"; then - { { $as_echo "$as_me:$LINENO: error: xsltproc not found" >&5 -$as_echo "$as_me: error: xsltproc not found" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "xsltproc not found" "$LINENO" 5 fi # Extract the first word of "dblatex", so it can be a program name with args. set dummy dblatex; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_DBLATEX+set}" = set; then +if test "${ac_cv_path_DBLATEX+set}" = set; then : $as_echo_n "(cached) " >&6 else case $DBLATEX in @@ -12829,14 +11908,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_DBLATEX="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -12844,10 +11923,10 @@ fi DBLATEX=$ac_cv_path_DBLATEX if test -n "$DBLATEX"; then - { $as_echo "$as_me:$LINENO: result: $DBLATEX" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBLATEX" >&5 $as_echo "$DBLATEX" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -12855,9 +11934,9 @@ if test -z "$DBLATEX"; then # Extract the first word of "fop", so it can be a program name with args. set dummy fop; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_FOP+set}" = set; then +if test "${ac_cv_path_FOP+set}" = set; then : $as_echo_n "(cached) " >&6 else case $FOP in @@ -12870,14 +11949,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_FOP="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -12885,16 +11964,16 @@ fi FOP=$ac_cv_path_FOP if test -n "$FOP"; then - { $as_echo "$as_me:$LINENO: result: $FOP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FOP" >&5 $as_echo "$FOP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi if test -z "$FOP"; then - { $as_echo "$as_me:$LINENO: WARNING: neither dblatex nor fop found, so no pdf output from xml" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: neither dblatex nor fop found, so no pdf output from xml" >&5 $as_echo "$as_me: WARNING: neither dblatex nor fop found, so no pdf output from xml" >&2;} fi fi @@ -12903,7 +11982,7 @@ # check for the presence of the XML catalog # Check whether --with-xml-catalog was given. -if test "${with_xml_catalog+set}" = set; then +if test "${with_xml_catalog+set}" = set; then : withval=$with_xml_catalog; else with_xml_catalog=/etc/xml/catalog @@ -12912,23 +11991,23 @@ jh_found_xmlcatalog=true XML_CATALOG_FILE="$with_xml_catalog" - { $as_echo "$as_me:$LINENO: checking for XML catalog ($XML_CATALOG_FILE)" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML catalog ($XML_CATALOG_FILE)" >&5 $as_echo_n "checking for XML catalog ($XML_CATALOG_FILE)... " >&6; } if test -f "$XML_CATALOG_FILE"; then - { $as_echo "$as_me:$LINENO: result: found" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 $as_echo "found" >&6; } else jh_found_xmlcatalog=false - { $as_echo "$as_me:$LINENO: result: not found" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } fi # check for the xmlcatalog program # Extract the first word of "xmlcatalog", so it can be a program name with args. set dummy xmlcatalog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_XMLCATALOG+set}" = set; then +if test "${ac_cv_path_XMLCATALOG+set}" = set; then : $as_echo_n "(cached) " >&6 else case $XMLCATALOG in @@ -12941,14 +12020,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_XMLCATALOG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_XMLCATALOG" && ac_cv_path_XMLCATALOG="no" @@ -12957,10 +12036,10 @@ fi XMLCATALOG=$ac_cv_path_XMLCATALOG if test -n "$XMLCATALOG"; then - { $as_echo "$as_me:$LINENO: result: $XMLCATALOG" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLCATALOG" >&5 $as_echo "$XMLCATALOG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -12976,50 +12055,104 @@ fi - { $as_echo "$as_me:$LINENO: checking for DocBook XML DTD V4.3 in XML catalog" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DocBook XML DTD V4.3 in XML catalog" >&5 $as_echo_n "checking for DocBook XML DTD V4.3 in XML catalog... " >&6; } if $jh_found_xmlcatalog && \ - { ($as_echo "$as_me:$LINENO: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"-//OASIS//DTD DocBook XML V4.3//EN\" >&2") >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"-//OASIS//DTD DocBook XML V4.3//EN\" >&2"; } >&5 ($XMLCATALOG --noout "$XML_CATALOG_FILE" "-//OASIS//DTD DocBook XML V4.3//EN" >&2) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - { $as_echo "$as_me:$LINENO: result: found" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 $as_echo "found" >&6; } else - { $as_echo "$as_me:$LINENO: result: not found" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } - { { $as_echo "$as_me:$LINENO: error: could not find DocBook XML DTD V4.3 in XML catalog" >&5 -$as_echo "$as_me: error: could not find DocBook XML DTD V4.3 in XML catalog" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "could not find DocBook XML DTD V4.3 in XML catalog" "$LINENO" 5 fi - { $as_echo "$as_me:$LINENO: checking for DocBook XSL Stylesheets in XML catalog" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DocBook XSL Stylesheets in XML catalog" >&5 $as_echo_n "checking for DocBook XSL Stylesheets in XML catalog... " >&6; } if $jh_found_xmlcatalog && \ - { ($as_echo "$as_me:$LINENO: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl\" >&2") >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl\" >&2"; } >&5 ($XMLCATALOG --noout "$XML_CATALOG_FILE" "http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl" >&2) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - { $as_echo "$as_me:$LINENO: result: found" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 $as_echo "found" >&6; } else - { $as_echo "$as_me:$LINENO: result: not found" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } - { { $as_echo "$as_me:$LINENO: error: could not find DocBook XSL Stylesheets in XML catalog" >&5 -$as_echo "$as_me: error: could not find DocBook XSL Stylesheets in XML catalog" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "could not find DocBook XSL Stylesheets in XML catalog" "$LINENO" 5 fi -HIGHLIGHT_OPTIONS="" -# Extract the first word of "source-highlight", so it can be a program name with args. -set dummy source-highlight; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + +# Check whether --with-highlight was given. +if test "${with_highlight+set}" = set; then : + withval=$with_highlight; +else + with_highlight=auto +fi + + +case $with_highlight in + no|source-highlight|highlight|vim|auto) ;; + *) as_fn_error "Invalid value for syntax highlighting option." "$LINENO" 5 ;; +esac + +HIGHLIGHT_OPTIONS="" +if test "$with_highlight" = "auto"; then + # Extract the first word of "source-highlight", so it can be a program name with args. +set dummy source-highlight; 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_HIGHLIGHT+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $HIGHLIGHT in + [\\/]* | ?:[\\/]*) + ac_cv_path_HIGHLIGHT="$HIGHLIGHT" # 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_HIGHLIGHT="$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 +HIGHLIGHT=$ac_cv_path_HIGHLIGHT +if test -n "$HIGHLIGHT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HIGHLIGHT" >&5 +$as_echo "$HIGHLIGHT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test -n "$HIGHLIGHT"; then + HIGHLIGHT_OPTIONS="-t4 -sc -cstyle.css --no-doc -i" + else + # Extract the first word of "highlight", so it can be a program name with args. +set dummy highlight; 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_HIGHLIGHT+set}" = set; then +if test "${ac_cv_path_HIGHLIGHT+set}" = set; then : $as_echo_n "(cached) " >&6 else case $HIGHLIGHT in @@ -13032,14 +12165,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_HIGHLIGHT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -13047,22 +12180,22 @@ fi HIGHLIGHT=$ac_cv_path_HIGHLIGHT if test -n "$HIGHLIGHT"; then - { $as_echo "$as_me:$LINENO: result: $HIGHLIGHT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HIGHLIGHT" >&5 $as_echo "$HIGHLIGHT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -if test -n "$HIGHLIGHT"; then - HIGHLIGHT_OPTIONS="-t4 -sc -cstyle.css --no-doc -i" -else - # Extract the first word of "highlight", so it can be a program name with args. -set dummy highlight; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + if test -n "$HIGHLIGHT"; then + HIGHLIGHT_OPTIONS="-X -f --class-name=gtkdoc " + else + # Extract the first word of "vim", so it can be a program name with args. +set dummy vim; 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_HIGHLIGHT+set}" = set; then +if test "${ac_cv_path_HIGHLIGHT+set}" = set; then : $as_echo_n "(cached) " >&6 else case $HIGHLIGHT in @@ -13075,14 +12208,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_HIGHLIGHT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -13090,22 +12223,35 @@ fi HIGHLIGHT=$ac_cv_path_HIGHLIGHT if test -n "$HIGHLIGHT"; then - { $as_echo "$as_me:$LINENO: result: $HIGHLIGHT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HIGHLIGHT" >&5 $as_echo "$HIGHLIGHT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test -n "$HIGHLIGHT"; then - HIGHLIGHT_OPTIONS="-X -f --class-name=gtkdoc " - else - # Extract the first word of "vim", so it can be a program name with args. -set dummy vim; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + if test -n "$HIGHLIGHT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether vim has +syntax feature" >&5 +$as_echo_n "checking whether vim has +syntax feature... " >&6; } + if $HIGHLIGHT --version | grep '+syntax' >/dev/null; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + HIGHLIGHT= + fi + fi + fi + fi +else + if test "$with_highlight" != "no"; then + # Extract the first word of "$with_highlight", so it can be a program name with args. +set dummy $with_highlight; 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_HIGHLIGHT+set}" = set; then +if test "${ac_cv_path_HIGHLIGHT+set}" = set; then : $as_echo_n "(cached) " >&6 else case $HIGHLIGHT in @@ -13118,41 +12264,51 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_HIGHLIGHT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS + test -z "$ac_cv_path_HIGHLIGHT" && ac_cv_path_HIGHLIGHT="no" ;; esac fi HIGHLIGHT=$ac_cv_path_HIGHLIGHT if test -n "$HIGHLIGHT"; then - { $as_echo "$as_me:$LINENO: result: $HIGHLIGHT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HIGHLIGHT" >&5 $as_echo "$HIGHLIGHT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test -n "$HIGHLIGHT"; then - { $as_echo "$as_me:$LINENO: checking whether vim has +syntax feature" >&5 + fi + + case $with_highlight in + source-highlight) HIGHLIGHT_OPTIONS="-t4 -sc -cstyle.css --no-doc -i";; + highlight) HIGHLIGHT_OPTIONS="-X -f --class-name=gtkdoc ";; + vim) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether vim has +syntax feature" >&5 $as_echo_n "checking whether vim has +syntax feature... " >&6; } if $HIGHLIGHT --version | grep '+syntax' >/dev/null; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - HIGHLIGHT= + HIGHLIGHT=no fi - fi + ;; + esac + + if test "$HIGHLIGHT" = "no" && test "$with_highlight" != "no"; then + as_fn_error "Could not find requested syntax highlighter" "$LINENO" 5 fi fi @@ -13180,18 +12336,18 @@ pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for TEST_DEPS" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TEST_DEPS" >&5 $as_echo_n "checking for TEST_DEPS... " >&6; } if test -n "$TEST_DEPS_CFLAGS"; then pkg_cv_TEST_DEPS_CFLAGS="$TEST_DEPS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0\"") >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_TEST_DEPS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0" 2>/dev/null` else pkg_failed=yes @@ -13203,11 +12359,11 @@ pkg_cv_TEST_DEPS_LIBS="$TEST_DEPS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0\"") >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_TEST_DEPS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0" 2>/dev/null` else pkg_failed=yes @@ -13233,7 +12389,7 @@ # Put the nasty error message in config.log where it belongs echo "$TEST_DEPS_PKG_ERRORS" >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } gtk_doc_use_libtool="no" build_tests="no" @@ -13247,7 +12403,7 @@ else TEST_DEPS_CFLAGS=$pkg_cv_TEST_DEPS_CFLAGS TEST_DEPS_LIBS=$pkg_cv_TEST_DEPS_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } glib_prefix="`$PKG_CONFIG --variable=prefix glib-2.0`" gtk_doc_use_libtool="yes" @@ -13272,16 +12428,16 @@ -{ $as_echo "$as_me:$LINENO: checking whether to enable runtime debugging code" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable runtime debugging code" >&5 $as_echo_n "checking whether to enable runtime debugging code... " >&6; } # Check whether --enable-debug was given. -if test "${enable_debug+set}" = set; then +if test "${enable_debug+set}" = set; then : enableval=$enable_debug; else enable_debug="no" fi -{ $as_echo "$as_me:$LINENO: result: $enable_debug" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_debug" >&5 $as_echo "$enable_debug" >&6; } if test "$enable_debug" = "yes"; then @@ -13349,13 +12505,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $as_unset $ac_var ;; + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -13363,8 +12519,8 @@ (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). + # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" @@ -13387,11 +12543,11 @@ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then test "x$cache_file" != "x/dev/null" && - { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} cat confcache >$cache_file else - { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi @@ -13447,8 +12603,8 @@ ac_i=`$as_echo "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs @@ -13464,76 +12620,50 @@ fi if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"ENABLE_SK\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"ENABLE_SK\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_PYTHON_TRUE}" && test -z "${HAVE_PYTHON_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_PYTHON\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"HAVE_PYTHON\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"HAVE_PYTHON\" 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_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + 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 "${BUILD_TESTS_TRUE}" && test -z "${BUILD_TESTS_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_TESTS\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"BUILD_TESTS\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"BUILD_TESTS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi : ${CONFIG_STATUS=./config.status} ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. @@ -13543,17 +12673,18 @@ debug=false ac_cs_recheck=false ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which @@ -13561,23 +12692,15 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - as_nl=' ' export as_nl @@ -13585,7 +12708,13 @@ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then as_echo='printf %s\n' as_echo_n='printf %s' else @@ -13596,7 +12725,7 @@ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; - case $arg in + case $arg in #( *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; @@ -13619,13 +12748,6 @@ } fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - # IFS # We need space, tab and new line, in precisely that order. Quoting is @@ -13635,15 +12757,15 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -13655,12 +12777,16 @@ fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' @@ -13672,7 +12798,89 @@ LANGUAGE=C export LANGUAGE -# Required to use basename. +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with status $?, using 1 if that was 0. +as_fn_error () +{ + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + fi + $as_echo "$as_me: error: $1" >&2 + as_fn_exit $as_status +} # as_fn_error + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -13686,8 +12894,12 @@ as_basename=false fi +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi -# Name of the executable. as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ @@ -13707,76 +12919,25 @@ } s/.*/./; q'` -# CDPATH. -$as_unset CDPATH - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; esac;; *) ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then @@ -13805,8 +12966,56 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + + +} # as_fn_mkdir_p if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -13825,10 +13034,10 @@ if test -d "$1"; then test -d "$1/."; else - case $1 in + case $1 in #( -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -13843,13 +13052,19 @@ exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 -# Save the log message, to keep $[0] and so on meaningful, and to +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gtk-doc $as_me 1.14, which was -generated by GNU Autoconf 2.63. Invocation command line was +This file was extended by gtk-doc $as_me 1.17, which was +generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -13877,13 +13092,15 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. -Usage: $0 [OPTION]... [FILE]... +Usage: $0 [OPTION]... [TAG]... -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 @@ -13897,16 +13114,17 @@ Configuration commands: $config_commands -Report bugs to ." +Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gtk-doc config.status 1.14 -configured by $0, generated by GNU Autoconf 2.63, - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +gtk-doc config.status 1.17 +configured by $0, generated by GNU Autoconf 2.65, + with options \\"\$ac_cs_config\\" -Copyright (C) 2008 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -13942,6 +13160,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 ) @@ -13949,7 +13169,7 @@ case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac - CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" + as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; --he | --h | --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; @@ -13958,11 +13178,10 @@ ac_cs_silent=: ;; # This is an error. - -*) { $as_echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; + -*) as_fn_error "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; - *) ac_config_targets="$ac_config_targets $1" + *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; esac @@ -14310,9 +13529,7 @@ "gtkdocize") CONFIG_FILES="$CONFIG_FILES gtkdocize" ;; "tests/tools.sh") CONFIG_FILES="$CONFIG_FILES tests/tools.sh" ;; - *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; + *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -14338,7 +13555,7 @@ trap 'exit_status=$? { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 + trap 'as_fn_exit 1' 1 2 13 15 } # Create a (secure) tmp directory for tmp files. @@ -14349,11 +13566,7 @@ { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || -{ - $as_echo "$as_me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} +} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -14361,10 +13574,16 @@ if test -n "$CONFIG_FILES"; then -ac_cr=' ' +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\\r' + ac_cs_awk_cr='\r' else ac_cs_awk_cr=$ac_cr fi @@ -14378,24 +13597,18 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -14417,7 +13630,7 @@ t delim :nl h -s/\(.\{148\}\).*/\1/ +s/\(.\{148\}\)..*/\1/ t more1 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ p @@ -14431,7 +13644,7 @@ t nl :delim h -s/\(.\{148\}\).*/\1/ +s/\(.\{148\}\)..*/\1/ t more2 s/["\\]/\\&/g; s/^/"/; s/$/"/ p @@ -14484,9 +13697,7 @@ else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 -$as_echo "$as_me: error: could not setup config files machinery" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error "could not setup config files machinery" "$LINENO" 5 _ACEOF # VPATH may cause trouble with some makes, so we remove $(srcdir), @@ -14517,9 +13728,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 -$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} - { (exit 1); exit 1; }; };; + :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -14547,12 +13756,10 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; + as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac - ac_file_inputs="$ac_file_inputs '$ac_f'" + as_fn_append ac_file_inputs " '$ac_f'" done # Let's still pretend it is `configure' which instantiates (i.e., don't @@ -14563,7 +13770,7 @@ `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 $as_echo "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. @@ -14576,9 +13783,7 @@ case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } ;; + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -14606,47 +13811,7 @@ q } s/.*/./; q'` - { as_dir="$ac_dir" - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } + as_dir="$ac_dir"; as_fn_mkdir_p ac_builddir=. case "$ac_dir" in @@ -14703,7 +13868,6 @@ # If the template does not know about datarootdir, expand it. # FIXME: This hack should be removed a few years after 2.60. ac_datarootdir_hack=; ac_datarootdir_seen= - ac_sed_dataroot=' /datarootdir/ { p @@ -14713,12 +13877,11 @@ /@docdir@/p /@infodir@/p /@localedir@/p -/@mandir@/p -' +/@mandir@/p' case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -14728,7 +13891,7 @@ s&@infodir@&$infodir&g s&@localedir@&$localedir&g s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; + s&\\\${datarootdir}&$datarootdir&g' ;; esac _ACEOF @@ -14757,14 +13920,12 @@ $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&2;} @@ -14774,13 +13935,11 @@ -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; - :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 $as_echo "$as_me: executing $ac_file commands" >&6;} ;; esac @@ -14875,47 +14034,7 @@ q } s/.*/./; q'` - { as_dir=$dirpart/$fdir - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } + as_dir=$dirpart/$fdir; as_fn_mkdir_p # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done @@ -14939,7 +14058,6 @@ # `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. # Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -15576,15 +14694,12 @@ done # for ac_tag -{ (exit 0); exit 0; } +as_fn_exit 0 _ACEOF -chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -15605,15 +14720,15 @@ exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } + $ac_cs_success || as_fn_exit $? fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi -{ $as_echo "$as_me:$LINENO: +{ $as_echo "$as_me:${as_lineno-$LINENO}: gtk-doc was configured with the following options: ==================================================" >&5 $as_echo "$as_me: @@ -15621,37 +14736,37 @@ ==================================================" >&6;} test "$PYTHON" != : \ - && { $as_echo "$as_me:$LINENO: ** Python based tools enabled, using $PYTHON" >&5 + && { $as_echo "$as_me:${as_lineno-$LINENO}: ** Python based tools enabled, using $PYTHON" >&5 $as_echo "$as_me: ** Python based tools enabled, using $PYTHON" >&6;} \ - || { $as_echo "$as_me:$LINENO: Python based tools disabled" >&5 + || { $as_echo "$as_me:${as_lineno-$LINENO}: Python based tools disabled" >&5 $as_echo "$as_me: Python based tools disabled" >&6;} test -n "$JADE" \ - && { $as_echo "$as_me:$LINENO: ** SGML support enabled, using $JADE" >&5 + && { $as_echo "$as_me:${as_lineno-$LINENO}: ** SGML support enabled, using $JADE" >&5 $as_echo "$as_me: ** SGML support enabled, using $JADE" >&6;} \ - || { $as_echo "$as_me:$LINENO: SGML support disabled, no jade processor available" >&5 + || { $as_echo "$as_me:${as_lineno-$LINENO}: SGML support disabled, no jade processor available" >&5 $as_echo "$as_me: SGML support disabled, no jade processor available" >&6;} test -n "$DBLATEX$FOP" \ - && { $as_echo "$as_me:$LINENO: ** XML PDF support enabled, using $DBLATEX$FOP" >&5 + && { $as_echo "$as_me:${as_lineno-$LINENO}: ** XML PDF support enabled, using $DBLATEX$FOP" >&5 $as_echo "$as_me: ** XML PDF support enabled, using $DBLATEX$FOP" >&6;} \ - || { $as_echo "$as_me:$LINENO: XML PDF support disabled, no fop available" >&5 + || { $as_echo "$as_me:${as_lineno-$LINENO}: XML PDF support disabled, no fop available" >&5 $as_echo "$as_me: XML PDF support disabled, no fop available" >&6;} test "x$gdu_cv_have_gdu" = "xyes" \ - && { $as_echo "$as_me:$LINENO: ** Gnome-doc-utils support enabled" >&5 + && { $as_echo "$as_me:${as_lineno-$LINENO}: ** Gnome-doc-utils support enabled" >&5 $as_echo "$as_me: ** Gnome-doc-utils support enabled" >&6;} \ - || { $as_echo "$as_me:$LINENO: Gnome-doc-utils support disabled" >&5 + || { $as_echo "$as_me:${as_lineno-$LINENO}: Gnome-doc-utils support disabled" >&5 $as_echo "$as_me: Gnome-doc-utils support disabled" >&6;} test "x$enable_scrollkeeper" = "xyes" \ - && { $as_echo "$as_me:$LINENO: ** Scrollkeeper support enabled" >&5 + && { $as_echo "$as_me:${as_lineno-$LINENO}: ** Scrollkeeper support enabled" >&5 $as_echo "$as_me: ** Scrollkeeper support enabled" >&6;} \ - || { $as_echo "$as_me:$LINENO: Scrollkeeper support disabled" >&5 + || { $as_echo "$as_me:${as_lineno-$LINENO}: Scrollkeeper support disabled" >&5 $as_echo "$as_me: Scrollkeeper support disabled" >&6;} test -n "$HIGHLIGHT" \ - && { $as_echo "$as_me:$LINENO: ** Syntax highlighting of examples enabled, using $HIGHLIGHT" >&5 + && { $as_echo "$as_me:${as_lineno-$LINENO}: ** Syntax highlighting of examples enabled, using $HIGHLIGHT" >&5 $as_echo "$as_me: ** Syntax highlighting of examples enabled, using $HIGHLIGHT" >&6;} \ - || { $as_echo "$as_me:$LINENO: Syntax highlighting of examples disabled" >&5 + || { $as_echo "$as_me:${as_lineno-$LINENO}: Syntax highlighting of examples disabled" >&5 $as_echo "$as_me: Syntax highlighting of examples disabled" >&6;} test "x$build_tests" != "xno" \ - && { $as_echo "$as_me:$LINENO: ** Building regression tests" >&5 + && { $as_echo "$as_me:${as_lineno-$LINENO}: ** Building regression tests" >&5 $as_echo "$as_me: ** Building regression tests" >&6;} \ - || { $as_echo "$as_me:$LINENO: Skipping regression tests" >&5 + || { $as_echo "$as_me:${as_lineno-$LINENO}: Skipping regression tests" >&5 $as_echo "$as_me: Skipping regression tests" >&6;} diff -Nru gtk-doc-1.14/configure.ac gtk-doc-1.17/configure.ac --- gtk-doc-1.14/configure.ac 2010-01-03 12:11:00.000000000 +0000 +++ gtk-doc-1.17/configure.ac 2011-02-26 12:24:01.000000000 +0000 @@ -3,15 +3,17 @@ dnl Use a simple 2-digit version number for a while, since our old example dnl Makefile can only cope with that, i.e. use 1.1, 1.2, 1.3 ... 9.9. -m4_define(gtk_doc_version, 1.14) +dnl FIXME: I can't see anything failing (1.14.1), lets try to use a three digit +dnl number for the development version +m4_define(gtk_doc_version, 1.17) AC_INIT([gtk-doc], [gtk_doc_version], [http://bugzilla.gnome.org/enter_bug.cgi?product=gtk-doc]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([gtkdoc-common.pl.in]) -AM_INIT_AUTOMAKE([check-news std-options]) -AM_MAINTAINER_MODE +AM_INIT_AUTOMAKE([check-news std-options -Wno-portability]) +AM_MAINTAINER_MODE([enable]) # Support silent build rules, requires at least automake-1.11. Disable # by either passing --disable-silent-rules to configure or passing V=1 @@ -22,9 +24,7 @@ dnl gnome-doc-utils is not found but does not invalidate the build. GNOME_DOC_INIT([],[],enable_scrollkeeper=no) -dnl make sure $ACLOCAL_FLAGS are used during a rebuild. -AC_SUBST([ACLOCAL_AMFLAGS], ["\${ACLOCAL_FLAGS}"]) - +# Check for programs AC_ISC_POSIX AC_PROG_CC AC_PROG_LIBTOOL @@ -98,26 +98,59 @@ dnl dnl Check for syntax highlighters dnl +AC_ARG_WITH([highlight], + AS_HELP_STRING([--with-highlight], [Select source code syntax highlighter (no|source-highlight|highlight|vim|auto)]), + , [with_highlight=auto]) + +case $with_highlight in + no|source-highlight|highlight|vim|auto) ;; + *) AC_MSG_ERROR([Invalid value for syntax highlighting option.]) ;; +esac + HIGHLIGHT_OPTIONS="" -AC_PATH_PROG([HIGHLIGHT], [source-highlight]) -if test -n "$HIGHLIGHT"; then - HIGHLIGHT_OPTIONS="-t4 -sc -cstyle.css --no-doc -i" -else - AC_PATH_PROG([HIGHLIGHT], [highlight]) +if test "$with_highlight" = "auto"; then + AC_PATH_PROG([HIGHLIGHT], [source-highlight]) if test -n "$HIGHLIGHT"; then - HIGHLIGHT_OPTIONS="-X -f --class-name=gtkdoc " + HIGHLIGHT_OPTIONS="-t4 -sc -cstyle.css --no-doc -i" else - AC_PATH_PROG([HIGHLIGHT], [vim]) + AC_PATH_PROG([HIGHLIGHT], [highlight]) if test -n "$HIGHLIGHT"; then - dnl vim is useless if it does not support syntax highlighting + HIGHLIGHT_OPTIONS="-X -f --class-name=gtkdoc " + else + AC_PATH_PROG([HIGHLIGHT], [vim]) + if test -n "$HIGHLIGHT"; then + dnl vim is useless if it does not support syntax highlighting + AC_MSG_CHECKING([whether vim has +syntax feature]) + if $HIGHLIGHT --version | grep '+syntax' >/dev/null; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + HIGHLIGHT= + fi + fi + fi + fi +else + if test "$with_highlight" != "no"; then + AC_PATH_PROG([HIGHLIGHT], [$with_highlight], [no]) + fi + + case $with_highlight in + source-highlight) HIGHLIGHT_OPTIONS="-t4 -sc -cstyle.css --no-doc -i";; + highlight) HIGHLIGHT_OPTIONS="-X -f --class-name=gtkdoc ";; + vim) AC_MSG_CHECKING([whether vim has +syntax feature]) if $HIGHLIGHT --version | grep '+syntax' >/dev/null; then AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) - HIGHLIGHT= + HIGHLIGHT=no fi - fi + ;; + esac + + if test "$HIGHLIGHT" = "no" && test "$with_highlight" != "no"; then + AC_MSG_ERROR([Could not find requested syntax highlighter]) fi fi AC_SUBST([HIGHLIGHT_OPTIONS]) diff -Nru gtk-doc-1.14/debian/changelog gtk-doc-1.17/debian/changelog --- gtk-doc-1.14/debian/changelog 2011-07-28 16:48:30.000000000 +0000 +++ gtk-doc-1.17/debian/changelog 2011-07-28 16:48:31.000000000 +0000 @@ -1,52 +1,74 @@ -gtk-doc (1.14-0ubuntu1) lucid; urgency=low +gtk-doc (1.17-0ubuntu1ppa1) lucid; urgency=low + + * Backported to lucid + + -- Maarten Rijke Thu, 28 Jul 2011 18:38:29 +0200 + +gtk-doc (1.17-0ubuntu1) natty; urgency=low * New upstream release - - 593282 : Append " _struct " prefix to every struct name - - 599514 : sane support for per-page images - - 604892 : checks fail - - 613611 : parameter descriptions with annotations truncated at first \n - - 115531 : add short description to index entries - - 165425 : gtk-doc fails to parse unions - - 512155 : gets confused by multiline typedef - - 568711 : undocumented enum values are not reported - - 590602 : secondly running gtkdoc-mkdb will generate DOCTYPE missing XML - files - - 590625 : $(DOC_MODULE)-overrides.txt is required by " make dist " - - 591975 : Section_Id always embeds a trailing newline - - 604885 : Fix the use of gtkdocize --flavour option - - 604992 : gtkdoc-fixxref broken link warning is broken for functions - - 604995 : Syntax error in gtkdoc-mkman - - 604998 : Check for syntax errors in the test suite - - 605052 : put class structs to the generated section file - - 605211 : Many build failures with gtk-doc 1.13 - - 605281 : Add " Since " and " Deprecated " tag to - function example - - 605285 : Add < keycap > and < keycombo > example - - 605289 : Some documentation improvements - - 605452 : Added more info to " Documenting symbols " sectio - - 605564 : Env var equivalent to --flavour=no-tmpl - - 606661 : XInclude error while gnerating documentation - - 607445 : gtk-doc does not support long double as returned value type - - 607531 : Execute system() calls in subshells to ease debugging - - 609062 : [All-langs] [gtk-doc] Translated *.po files not available within - ~/po directory - - 609194 : sort interface implementers - - 610255 : Self-test failure in git as of 2010-02-17: FAIL: gobject.sh - - 610257 : Patch to make GTK-DOC notice functions/variables with 'signed' - prototypes - - 611848 : gtk-doc produces invalid DocBook markup if the SECTION ends with a - tag that cannot be nested inside < para > + * Fix builds where srcdir != builddir (LP: #762567) + + -- Robert Ancell Sat, 16 Apr 2011 18:09:29 +1000 + +gtk-doc (1.16-0ubuntu1) natty; urgency=low + + * New upstream release with lots of bug fixes. + + -- Martin Pitt Thu, 27 Jan 2011 15:42:02 +0100 + +gtk-doc (1.15-2ubuntu2) natty; urgency=low + * debian/control.in: - - drop optional highlight build-dep (in universe, as well as - libsource-highlight-dev alternative) (LP: #550354) - * removed debian/patches/01_syntax_error.patch: upstreamed - * removed debian/patches/02_fixxref_fix_backwards_compatibility.patch: - available upstream - * removed debian/patches/03_gtkdoc-scan_touch_MODULE-overrides.txt.patch: - available upstream - * revmoed debian/patches/50_shell-errors.patch: upstreamed + - drop highlight from binary dep as well + + -- Didier Roche Wed, 03 Nov 2010 18:11:57 +0100 + +gtk-doc (1.15-2ubuntu1) natty; urgency=low + + * Merge from debian unstable, remaining change: + - debian/control.in: + drop optional highlight build-dep (in universe) + + -- Didier Roche Wed, 03 Nov 2010 14:59:16 +0100 + +gtk-doc (1.15-2) unstable; urgency=low + + * Drop emacs byte-compilation support since it would require a + dependency on emacsen-common. Closes: #586328. + + -- Josselin Mouette Sat, 26 Jun 2010 10:05:32 +0200 + +gtk-doc (1.15-1) unstable; urgency=low + + * New upstream release: + + debian/patches/Add-support-for-scope-and-skip-annotations.patch: + - Dropped, merged upstream. + + -- Sebastian Dröge Sat, 22 May 2010 12:28:50 +0200 + +gtk-doc (1.14-2) unstable; urgency=low + + * Add Add-support-for-scope-and-skip-annotations.patch + + patch name says it all really :) (from upstream git) + + -- Sjoerd Simons Tue, 27 Apr 2010 22:09:02 +0100 + +gtk-doc (1.14-1) unstable; urgency=low + + [ Emilio Pozuelo Monfort ] + * debian/patches/50_shell-errors.patch: + - Forwarded, add header. + + [ Sebastian Dröge ] + * New upstream release: + + debian/patches/01_syntax_error.patch, + debian/patches/02_fixxref_fix_backwards_compatibility.patch, + debian/patches/03_gtkdoc-scan_touch_MODULE-overrides.txt.patch, + debian/patches/50_shell-errors.patch: + - Dropped, merged upstream. - -- Didier Roche Mon, 29 Mar 2010 13:02:48 +0200 + -- Sebastian Dröge Sun, 28 Mar 2010 20:47:47 +0200 gtk-doc (1.13-2) unstable; urgency=low diff -Nru gtk-doc-1.14/debian/control gtk-doc-1.17/debian/control --- gtk-doc-1.14/debian/control 2011-07-28 16:48:30.000000000 +0000 +++ gtk-doc-1.17/debian/control 2011-07-28 16:48:31.000000000 +0000 @@ -8,8 +8,8 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Loic Minier -Uploaders: Debian GNOME Maintainers , Emilio Pozuelo Monfort , Loic Minier , Mario Lang , Sebastian Dröge -Standards-Version: 3.8.3 +Uploaders: Debian GNOME Maintainers , Emilio Pozuelo Monfort , Josselin Mouette , Sebastian Dröge , Sjoerd Simons +Standards-Version: 3.8.4 XS-Python-Version: >= 2.3 Build-Depends: cdbs, debhelper (>= 5), diff -Nru gtk-doc-1.14/debian/control.in gtk-doc-1.17/debian/control.in --- gtk-doc-1.14/debian/control.in 2011-07-28 16:48:30.000000000 +0000 +++ gtk-doc-1.17/debian/control.in 2011-07-28 16:48:31.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Loic Minier Uploaders: @GNOME_TEAM@ -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 XS-Python-Version: >= 2.3 Build-Depends: cdbs, debhelper (>= 5), diff -Nru gtk-doc-1.14/debian/gtk-doc-tools.emacsen-install gtk-doc-1.17/debian/gtk-doc-tools.emacsen-install --- gtk-doc-1.14/debian/gtk-doc-tools.emacsen-install 2011-07-28 16:48:30.000000000 +0000 +++ gtk-doc-1.17/debian/gtk-doc-tools.emacsen-install 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -#! /bin/sh -e -# /usr/lib/emacsen-common/packages/install/gtk-doc-tools - -# Written by Jim Van Zandt , borrowing heavily -# from the install scripts for gettext by Santiago Vila -# and octave by Dirk Eddelbuettel . - -FLAVOR=$1 -PACKAGE=gtk-doc-tools - -if [ ${FLAVOR} = emacs ]; then exit 0; fi - -echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR} - -#FLAVORTEST=`echo $FLAVOR | cut -c-6` -#if [ ${FLAVORTEST} = xemacs ] ; then -# SITEFLAG="-no-site-file" -#else -# SITEFLAG="--no-site-file" -#fi -FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile" - -ELDIR=/usr/share/emacs/site-lisp/${PACKAGE} -ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE} - -install -m 755 -d ${ELCDIR} -cd ${ELDIR} -FILES=`echo *.el` -cp ${FILES} ${ELCDIR} -cd ${ELCDIR} - -cat << EOF > path.el -(setq load-path (cons "." load-path) byte-compile-warnings nil) -EOF -${FLAVOR} ${FLAGS} ${FILES} -rm -f *.el path.el - -exit 0 diff -Nru gtk-doc-1.14/debian/gtk-doc-tools.emacsen-remove gtk-doc-1.17/debian/gtk-doc-tools.emacsen-remove --- gtk-doc-1.14/debian/gtk-doc-tools.emacsen-remove 2011-07-28 16:48:30.000000000 +0000 +++ gtk-doc-1.17/debian/gtk-doc-tools.emacsen-remove 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -#!/bin/sh -e -# /usr/lib/emacsen-common/packages/remove/gtk-doc-tools - -FLAVOR=$1 -PACKAGE=gtk-doc-tools - -if [ ${FLAVOR} != emacs ]; then - - echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR} - rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE} -fi diff -Nru gtk-doc-1.14/examples/Makefile.am gtk-doc-1.17/examples/Makefile.am --- gtk-doc-1.14/examples/Makefile.am 2009-09-30 21:16:49.000000000 +0000 +++ gtk-doc-1.17/examples/Makefile.am 2010-11-26 10:18:00.000000000 +0000 @@ -18,10 +18,10 @@ # The top-level SGML file. You can change this if you want to. DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml -# The directory containing the source code. Relative to $(srcdir). -# gtk-doc will search all .c & .h files beneath here for inline comments -# documenting the functions and macros. -# e.g. DOC_SOURCE_DIR=../../../gtk +# Directories containing the source code, relative to $(srcdir). +# gtk-doc will search all .c and .h files beneath these paths +# for inline comments documenting functions and macros. +# e.g. DOC_SOURCE_DIR=../../../gtk ../../../gdk DOC_SOURCE_DIR= # Extra options to pass to gtkdoc-scangobj. Not normally needed. @@ -32,8 +32,8 @@ SCAN_OPTIONS= # Extra options to supply to gtkdoc-mkdb. -# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml -MKDB_OPTIONS=--sgml-mode --output-format=xml +# e.g. MKDB_OPTIONS=--xml-mode --output-format=xml +MKDB_OPTIONS=--xml-mode --output-format=xml # Extra options to supply to gtkdoc-mktmpl # e.g. MKTMPL_OPTIONS=--only-section-tmpl @@ -56,8 +56,8 @@ # e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h EXTRA_HFILES= -# Header files to ignore when scanning. Use base file name, no paths -# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h +# Header files or dirs to ignore when scanning. Use base file/dir names +# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h private_code IGNORE_HFILES= # Images to copy into HTML directory. @@ -93,9 +93,12 @@ # for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt #DISTCLEANFILES += -# Comment this out if you want your docs-status tested during 'make check' +# Comment this out if you want 'make check' to test you doc status +# and run some sanity checks if ENABLE_GTK_DOC -#TESTS_ENVIRONMENT = cd $(srcsrc) && +TESTS_ENVIRONMENT = cd $(srcdir) && \ + DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \ + SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir) #TESTS = $(GTKDOC_CHECK) endif diff -Nru gtk-doc-1.14/gnome-doc-utils.make gtk-doc-1.17/gnome-doc-utils.make --- gtk-doc-1.14/gnome-doc-utils.make 2009-12-18 13:06:49.000000000 +0000 +++ gtk-doc-1.17/gnome-doc-utils.make 2011-01-23 11:33:56.000000000 +0000 @@ -266,6 +266,13 @@ .PHONY: po po: $(_DOC_POFILES) +## @ _DOC_MOFILES +## The .mo files used for translating the document +_DOC_MOFILES = $(patsubst %.po,%.mo,$(_DOC_POFILES)) + +.PHONY: mo +mo: $(_DOC_MOFILES) + ## @ _DOC_LC_MODULES ## The top-level documentation files in all other locales _DOC_LC_MODULES = $(if $(DOC_MODULE), \ @@ -332,16 +339,23 @@ $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \ fi +$(_DOC_MOFILES): %.mo: %.po + @if ! test -d $(dir $@); then \ + echo "mkdir $(dir $@)"; \ + mkdir "$(dir $@)"; \ + fi + msgfmt -o $@ $< + # FIXME: fix the dependancy # FIXME: hook xml2po up -$(_DOC_LC_DOCS) : $(_DOC_POFILES) +$(_DOC_LC_DOCS) : $(_DOC_MOFILES) $(_DOC_LC_DOCS) : $(_DOC_C_DOCS) if ! test -d $(dir $@); then mkdir $(dir $@); fi if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ - po="$(dir $@)$(patsubst %/$(notdir $@),%,$@).po"; \ - if [ -f "$${po}" ]; then po="../$${po}"; else po="$(_DOC_ABS_SRCDIR)/$${po}"; fi; \ + mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \ + if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \ (cd $(dir $@) && \ - $(_xml2po) -m $(_xml2po_mode) -e -p "$${po}" \ + $(_xml2po) -m $(_xml2po_mode) -e -t "$${mo}" \ "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \ cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp) @@ -386,12 +400,14 @@ clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML) clean-doc-lc: rm -f $(_DOC_LC_DOCS) + rm -f $(_DOC_MOFILES) @list='$(_DOC_POFILES)'; for po in $$list; do \ if ! test "$$po" -ef "$(srcdir)/$$po"; then \ echo "rm -f $$po"; \ rm -f "$$po"; \ fi; \ done +# .xml2.po.mo cleaning is obsolete as of 0.18.1 and could be removed in 0.20.x @for lc in C $(_DOC_REAL_LINGUAS); do \ if test -f "$$lc/.xml2po.mo"; then \ echo "rm -f $$lc/.xml2po.mo"; \ diff -Nru gtk-doc-1.14/gtkdoc-check.in gtk-doc-1.17/gtkdoc-check.in --- gtk-doc-1.14/gtkdoc-check.in 2009-04-22 19:36:57.000000000 +0000 +++ gtk-doc-1.17/gtkdoc-check.in 2010-10-04 08:48:49.000000000 +0000 @@ -51,32 +51,55 @@ exit 0; } -my $DOC_MODULE; -my $checks = 3; +my $checks = 4; +# Get parameters from test env, if not there try to grab them from the makefile # We like Makefile.am more but builddir does not necessarily contain one. my $makefile = (-f 'Makefile.am') ? 'Makefile.am' : 'Makefile'; -$DOC_MODULE = &Grep('^\s*DOC_MODULE\s*=\s*(\S+)', $makefile, 'DOC_MODULE'); + +# For historic reasons tests are launched in srcdir +my $SRCDIR = $ENV{"SRCDIR"}; +my $BUILDDIR = $ENV{"BUILDDIR"}; +my $dir = "."; +if (defined($BUILDDIR) and $BUILDDIR ne "") { + $dir=$BUILDDIR; +} + +# debug +#for my $key (sort(keys(%ENV))) { print "$key = ", $ENV{$key}, "\n"; } +# debug + +my $DOC_MODULE = $ENV{"DOC_MODULE"}; +if (!defined($DOC_MODULE) or $DOC_MODULE eq "") { + $DOC_MODULE = &Grep('^\s*DOC_MODULE\s*=\s*(\S+)', $makefile, 'DOC_MODULE'); +} +my $DOC_MAIN_SGML_FILE = $ENV{"DOC_MAIN_SGML_FILE"}; +if (!defined($DOC_MAIN_SGML_FILE) or $DOC_MAIN_SGML_FILE eq "") { + $DOC_MAIN_SGML_FILE = &Grep('^\s*DOC_MAIN_SGML_FILE\s*=\s*(\S+)', $makefile, 'DOC_MAIN_SGML_FILE'); + $DOC_MAIN_SGML_FILE =~ s/\$\(DOC_MODULE\)/$DOC_MODULE/; +} print "Running suite(s): gtk-doc-$DOC_MODULE\n"; my $undocumented = int &Grep('^(\d+)\s+not\s+documented\.\s*$', - "$DOC_MODULE-undocumented.txt", + "$dir/$DOC_MODULE-undocumented.txt", 'number of undocumented symbols'); my $incomplete = int &Grep('^(\d+)\s+symbols?\s+incomplete\.\s*$', - "$DOC_MODULE-undocumented.txt", + "$dir/$DOC_MODULE-undocumented.txt", 'number of incomplete symbols'); my $total = $undocumented + $incomplete; if ($total) { print "$DOC_MODULE-undocumented.txt:1:E: $total undocumented or incomplete symbols\n"; } -my $undeclared = &CheckEmpty("$DOC_MODULE-undeclared.txt", +my $undeclared = &CheckEmpty("$dir/$DOC_MODULE-undeclared.txt", 'undeclared symbols'); -my $unused = &CheckEmpty("$DOC_MODULE-unused.txt", +my $unused = &CheckEmpty("$dir/$DOC_MODULE-unused.txt", 'unused documentation entries'); -my $failed = ($total > 0) + ($undeclared != 0) + ($unused != 0); +my $missing_includes = &CheckIncludes ("$dir/$DOC_MAIN_SGML_FILE"); + +my $failed = ($total > 0) + ($undeclared != 0) + ($unused != 0) + ($missing_includes != 0); my $rate = 100.0*($checks - $failed)/$checks; printf "%.1f%%: Checks %d, Failures: %d\n", $rate, $checks, $failed; exit ($failed != 0); @@ -119,3 +142,36 @@ return $count; } +sub CheckIncludes() { + my ($main_sgml_file) = @_; + + if (not open GFILE, "<$main_sgml_file") { + die "Cannot open $main_sgml_file: $!\n"; + } + + # Check that each of the XML files in the xml directory are included in $DOC_MAIN_SGML_FILE + my @xml_files = ; + my $num_missing = 0; + + foreach my $xml_file (@xml_files) { + my $regex = quotemeta ($xml_file); + my $found = 0; + + while () { + next if not m/"$regex"/; + $found = 1; + last; + } + + if (!$found) { + $num_missing++; + print "$main_sgml_file doesn't appear to include \"$xml_file\"\n"; + } + + seek (GFILE, 0, 0); + } + + close (GFILE); + + return $num_missing; +} diff -Nru gtk-doc-1.14/gtkdoc-common.pl.in gtk-doc-1.17/gtkdoc-common.pl.in --- gtk-doc-1.14/gtkdoc-common.pl.in 2010-03-04 21:55:27.000000000 +0000 +++ gtk-doc-1.17/gtkdoc-common.pl.in 2011-01-14 21:29:47.000000000 +0000 @@ -116,7 +116,7 @@ # Remove all other comments; $declaration =~ s@/\*([^*]+|\*(?!/))*\*/@ @g; - $declaration =~ s@//.*$@@g; + $declaration =~ s@//.*@@g; my @result = (); @@ -128,7 +128,7 @@ if (!scalar($declaration =~ m/(?:struct|union)\s+\w*\s*\{/msg)) { die "Declaration '$declaration' does not begin with struct/union [NAME] {\n"; } - + #print "DEBUG: public fields in struct/union: $declaration\n"; # Treat lines in sequence, allowing singly nested anonymous structs @@ -140,7 +140,7 @@ # FIXME: Just ignore nested structs and unions for now next if $line =~ /{/; - + # ignore preprocessor directives while ($line =~ /^#.*?\n\s*(.*)/msg) { $line=$1; @@ -252,7 +252,7 @@ if ($declaration =~ m/enum\s+\S+\s*;/msg) { return (); } - + # Remove private symbols # Assume end of declaration if line begins with '}' $declaration =~ s!\n?[ \t]*/\*\s*<\s*(private|protected)\s*>\s*\*/.*?(?:/\*\s*<\s*public\s*>\s*\*/|(?=^\}))!!msgx; @@ -274,7 +274,7 @@ $declaration =~ s/\([^)]+\)//g; # Remove comma from comma - possible whitespace - closing brace sequence - # since it is legal in GNU C and C99 to have a trailing comma but doesn't + # since it is legal in GNU C and C99 to have a trailing comma but doesn't # result in an actual enum member $declaration =~ s/,(\s*})/$1/g; @@ -293,7 +293,7 @@ while ($line =~ /^#.*?\n\s*(.*)/msg) { $line=$1; } - + if ($line =~ m/^(\w+)\s*(=.*)?$/msg) { push @result, $1; @@ -332,9 +332,9 @@ sub ParseFunctionDeclaration { my ($declaration, $typefunc, $namefunc) = @_; - + my @result = (); - + my ($param_num) = 0; while ($declaration ne "") { #print "$declaration"; @@ -360,8 +360,8 @@ # allow alphanumerics, '_', '[' & ']' in param names # Try to match a standard parameter - # $1 $2 $3 $4 $5 - } elsif ($declaration =~ s/^\s*((?:G_CONST_RETURN|G_GNUC_[A-Z_]+\s+|unsigned long|unsigned short|signed long|signed short|unsigned|signed|long|short|volatile|const)\s+)*((?:struct\b|enum\b)?\s*\w+)\s*((?:(?:const\b|restrict\b|G_GNUC_[A-Z_]+\b)?\s*\*?\s*(?:const\b|restrict\b|G_GNUC_[A-Z_]+\b)?\s*)*)(\w+)?\s*((?:\[\S*\])*)\s*[,\n]//) { + # $1 $2 $3 $4 $5 + } elsif ($declaration =~ s/^\s*((?:(?:G_CONST_RETURN|G_GNUC_[A-Z_]+\s+|unsigned long|unsigned short|signed long|signed short|unsigned|signed|long|short|volatile|const)\s+)*)((?:struct\b|enum\b)?\s*\w+)\s*((?:(?:const\b|restrict\b|G_GNUC_[A-Z_]+\b)?\s*\*?\s*(?:const\b|restrict\b|G_GNUC_[A-Z_]+\b)?\s*)*)(\w+)?\s*((?:\[\S*\])*)\s*[,\n]//) { my $pre = defined($1) ? $1 : ""; my $type = $2; my $ptr = defined($3) ? $3 : ""; @@ -397,8 +397,8 @@ push @result, $label; # Try to match parameters which are functions - # $1 $2 $3 $4 $5 $7 $8 - } elsif ($declaration =~ s/^(const\s+|G_CONST_RETURN\s+|G_GNUC_[A-Z_]+\s+|signed\s+|unsigned\s+)*(struct\s+)?(\w+)\s*(\**)\s*(?:restrict\b)?\s*(const\s+)?\(\s*\*+\s*(\w+)\s*\)\s*\(([^)]*)\)\s*[,\n]//) { + # $1 $2 $3 $4 $5 $6 $7 $8 + } elsif ($declaration =~ s/^(const\s+|G_CONST_RETURN\s+|G_GNUC_[A-Z_]+\s+|signed\s+|unsigned\s+)*(struct\s+)?(\w+)\s*(\**)\s*(?:restrict\b)?\s*(const\s+)?\(\s*(\*[\s\*]*)\s*(\w+)\s*\)\s*\(([^)]*)\)\s*[,\n]//) { my $mod1 = defined($1) ? $1 : ""; if (defined($2)) { $mod1 .= $2; } my $type = $3; @@ -407,7 +407,7 @@ my $func_ptr = $6; my $name = $7; my $func_params = defined($8) ? $8 : ""; - + #if (!defined($type)) { print "## no type\n"; }; #if (!defined($ptr1)) { print "## no ptr1\n"; }; #if (!defined($func_ptr)) { print "## no func_ptr\n"; }; @@ -416,10 +416,9 @@ if ($ptr1 && $ptr1 !~ m/\*$/) { $ptr1 .= " "; } $func_ptr =~ s/\s+//g; - #print "Type: [$mod1][$xref][$ptr1][$mod2] ([$func_ptr][$name]) ($func_params)\n"; - push @result, $name; my $xref = defined $typefunc ? $typefunc->($type, "$type") : $type; + #print "Type: [$mod1][$xref][$ptr1][$mod2] ([$func_ptr][$name]) ($func_params)\n";# my $label = "$mod1$xref$ptr1$mod2 ($func_ptr$name) ($func_params)"; if (defined $namefunc) { $label = $namefunc->($label) @@ -446,12 +445,12 @@ sub ParseMacroDeclaration { my ($declaration, $namefunc) = @_; - + my @result = (); if ($declaration =~ m/^\s*#\s*define\s+\w+\(([^\)]*)\)/) { my $params = $1; - + $params =~ s/\\\n//g; foreach $param (split (/,/, $params)) { $param =~ s/^\s+//; @@ -477,10 +476,10 @@ sub LogWarning { my ($file, $line, $message) = @_; - + $file="unknown" if !defined($file); $line="0" if !defined($line); - + print "$file:$line: warning: $message\n" } diff -Nru gtk-doc-1.14/gtkdoc-fixxref.in gtk-doc-1.17/gtkdoc-fixxref.in --- gtk-doc-1.14/gtkdoc-fixxref.in 2009-12-25 22:40:19.000000000 +0000 +++ gtk-doc-1.17/gtkdoc-fixxref.in 2010-08-22 18:58:06.000000000 +0000 @@ -291,6 +291,9 @@ close (HTMLFILE); if ("@HIGHLIGHT@" ne "") { + # FIXME: ideally we'd pass a clue about the example language to the highligher + # unfortunately the "language" attribute is not appearing in the html output + # we could patch the customization to have inside of 
         if ("@HIGHLIGHT@" =~ m%/vim$%) {
             $entire_file =~ s%
(.*?)
%&HighlightSourceVim($1,$2);%gse;
         }
@@ -461,7 +464,7 @@
     close (NEWFILE);
 
     # format source
-    system "echo 'let html_number_lines=0|let html_use_css=1|let use_xhtml=1|syn on|e $temp_source_file|run! syntax/2html.vim|wa!|qa!' | @HIGHLIGHT@ -n -e -u /dev/null -T xterm >/dev/null";
+    system "echo 'let html_number_lines=0|let html_use_css=1|let use_xhtml=1|syn on|e $temp_source_file|run! syntax/2html.vim|w! $temp_source_file.html|qa!' | @HIGHLIGHT@ -n -e -u NONE -T xterm >/dev/null";
 
     my $highlighted_source;
     {
diff -Nru gtk-doc-1.14/gtk-doc.flat.make gtk-doc-1.17/gtk-doc.flat.make
--- gtk-doc-1.14/gtk-doc.flat.make	1970-01-01 00:00:00.000000000 +0000
+++ gtk-doc-1.17/gtk-doc.flat.make	2011-02-26 12:26:12.000000000 +0000
@@ -0,0 +1,264 @@
+# -*- mode: makefile -*-
+
+####################################
+# Everything below here is generic #
+####################################
+
+if GTK_DOC_USE_LIBTOOL
+GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_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 =
+endif
+
+# We set GPATH here; this gives us semantics for GNU make
+# which are more like other make's VPATH, when it comes to
+# whether a source that is a target of one rule is then
+# searched for in VPATH/GPATH.
+#
+GPATH = $(srcdir)
+
+TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
+
+SETUP_FILES = \
+	$(content_files)		\
+	$(DOC_MAIN_SGML_FILE)		\
+	$(DOC_MODULE)-sections.txt	\
+	$(DOC_MODULE)-overrides.txt
+
+EXTRA_DIST += 				\
+	$(SETUP_FILES)
+
+DOC_STAMPS=setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \
+	html-build.stamp pdf-build.stamp \
+	setup.stamp tmpl.stamp sgml.stamp html.stamp pdf.stamp
+
+SCANOBJ_FILES = 		 \
+	$(DOC_MODULE).args 	 \
+	$(DOC_MODULE).hierarchy  \
+	$(DOC_MODULE).interfaces \
+	$(DOC_MODULE).prerequisites \
+	$(DOC_MODULE).signals
+
+REPORT_FILES = \
+	$(DOC_MODULE)-undocumented.txt \
+	$(DOC_MODULE)-undeclared.txt \
+	$(DOC_MODULE)-unused.txt
+
+CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
+
+if ENABLE_GTK_DOC
+if GTK_DOC_BUILD_HTML
+HTML_BUILD_STAMP=html-build.stamp
+else
+HTML_BUILD_STAMP=
+endif
+if GTK_DOC_BUILD_PDF
+PDF_BUILD_STAMP=pdf-build.stamp
+else
+PDF_BUILD_STAMP=
+endif
+
+all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+else
+all-local:
+endif
+
+docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+
+$(REPORT_FILES): sgml-build.stamp
+
+#### setup ####
+
+setup-build.stamp:
+	-@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	   echo 'gtk-doc: Preparing build'; \
+	   files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+	   if test "x$$files" != "x" ; then \
+	       for file in $$files ; do \
+	           test -f $(abs_srcdir)/$$file && \
+	               cp -p $(abs_srcdir)/$$file $(abs_builddir)/; \
+	       done \
+	   fi; \
+	   test -f $(abs_srcdir)/tmpl && \
+	       cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \
+	fi
+	@touch setup-build.stamp
+
+
+setup.stamp: setup-build.stamp
+	@true
+
+
+#### scan ####
+
+scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
+	@echo 'gtk-doc: Scanning header files'
+	@_source_dir='' ; \
+	for i in $(DOC_SOURCE_DIR) ; do \
+	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
+	done ; \
+	gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
+	@if grep -l '^..*$$' $(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) ; \
+	else \
+	    for i in $(SCANOBJ_FILES) ; do \
+               test -f $$i || touch $$i ; \
+	    done \
+	fi
+	@touch scan-build.stamp
+
+$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
+	@true
+
+#### templates ####
+
+tmpl-build.stamp: setup.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+	@echo 'gtk-doc: Rebuilding template files'
+	@gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	  if test -w $(abs_srcdir) ; then \
+	    cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \
+	  fi \
+	fi
+	@touch tmpl-build.stamp
+
+tmpl.stamp: tmpl-build.stamp
+	@true
+
+$(srcdir)/tmpl/*.sgml:
+	@true
+
+#### xml ####
+
+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)
+	@_source_dir='' ; \
+	for i in $(DOC_SOURCE_DIR) ; do \
+	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
+	done ; \
+	gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
+	@touch sgml-build.stamp
+
+sgml.stamp: sgml-build.stamp
+	@true
+
+#### html ####
+
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+	@echo 'gtk-doc: Building HTML'
+	@rm -rf html
+	@mkdir html
+	@mkhtml_options=""; \
+	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
+	if test "$(?)" = "0"; then \
+	  mkhtml_options=--path="$(abs_srcdir)"; \
+	fi; \
+	cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+	-@test "x$(HTML_IMAGES)" = "x" || \
+	for file in $(HTML_IMAGES) ; do \
+	  if test -f $(abs_srcdir)/$$file ; then \
+	    cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
+	  fi; \
+	  if test -f $(abs_builddir)/$$file ; then \
+	    cp $(abs_builddir)/$$file $(abs_builddir)/html; \
+	  fi; \
+	done;
+	@echo 'gtk-doc: Fixing cross-references'
+	@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'
+	@rm -rf $(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; \
+	gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
+	@touch pdf-build.stamp
+
+##############
+
+clean-local:
+	rm -f *~ *.bak
+	rm -rf .libs
+
+distclean-local:
+	rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
+	    $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+	if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
+	    rm -rf tmpl; \
+	fi
+
+maintainer-clean-local: clean
+	rm -rf xml html
+
+install-data-local:
+	@installfiles=`echo $(srcdir)/html/*`; \
+	if test "$$installfiles" = '$(srcdir)/html/*'; \
+	then echo '-- Nothing to install' ; \
+	else \
+	  if test -n "$(DOC_MODULE_VERSION)"; then \
+	    installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
+	  else \
+	    installdir="$(DESTDIR)$(TARGET_DIR)"; \
+	  fi; \
+	  $(mkinstalldirs) $${installdir} ; \
+	  for i in $$installfiles; do \
+	    echo '-- Installing '$$i ; \
+	    $(INSTALL_DATA) $$i $${installdir}; \
+	  done; \
+	  if test -n "$(DOC_MODULE_VERSION)"; then \
+	    mv -f $${installdir}/$(DOC_MODULE).devhelp2 \
+	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \
+	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
+	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
+	  fi; \
+	  $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
+	fi
+
+uninstall-local:
+	@if test -n "$(DOC_MODULE_VERSION)"; then \
+	  installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
+	else \
+	  installdir="$(DESTDIR)$(TARGET_DIR)"; \
+	fi; \
+	rm -rf $${installdir}
+
+#
+# Require gtk-doc when making dist
+#
+if ENABLE_GTK_DOC
+dist-check-gtkdoc:
+else
+dist-check-gtkdoc:
+	@echo "*** gtk-doc must be installed and enabled in order to make dist"
+	@false
+endif
+
+dist-hook: dist-check-gtkdoc dist-hook-local
+	mkdir $(distdir)/tmpl
+	mkdir $(distdir)/html
+	-cp $(build)/tmpl/*.sgml $(distdir)/tmpl
+	cp $(builddir)/html/* $(distdir)/html
+	-cp $(builddir)/$(DOC_MODULE).pdf $(distdir)/
+	-cp $(build)/$(DOC_MODULE).types $(distdir)/
+	-cp $(build)/$(DOC_MODULE)-sections.txt $(distdir)/
+	cd $(distdir) && rm -f $(DISTCLEANFILES)
+	$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
+
+.PHONY : dist-hook-local docs
diff -Nru gtk-doc-1.14/gtkdocize.in gtk-doc-1.17/gtkdocize.in
--- gtk-doc-1.14/gtkdocize.in	2010-01-06 21:06:19.000000000 +0000
+++ gtk-doc-1.17/gtkdocize.in	2010-06-13 10:58:16.000000000 +0000
@@ -18,7 +18,7 @@
 
 # mini help
 usage="\
-usage: $progname [ --copy ] [ --docdir DIR ] [ --flavour {legacy|no-tmpl} ]"
+usage: $progname [ --copy ] [ --docdir DIR ] [ --flavour {legacy|legacy-flat|no-tmpl|no-tmpl-flat} ]"
 
 # detect configure script
 no_configure_found=0
@@ -87,9 +87,9 @@
 done
 
 case "$flavour" in
-  legacy)
+  legacy*)
     ;;
-  no-tmpl)
+  no-tmpl*)
     makefile=gtk-doc.notmpl.make
     ;;
   *)
diff -Nru gtk-doc-1.14/gtk-doc.make gtk-doc-1.17/gtk-doc.make
--- gtk-doc-1.14/gtk-doc.make	2010-01-03 20:16:48.000000000 +0000
+++ gtk-doc-1.17/gtk-doc.make	2011-02-02 22:11:15.000000000 +0000
@@ -23,17 +23,18 @@
 
 TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
 
-EXTRA_DIST = 				\
+SETUP_FILES = \
 	$(content_files)		\
-	$(HTML_IMAGES)			\
 	$(DOC_MAIN_SGML_FILE)		\
 	$(DOC_MODULE)-sections.txt	\
 	$(DOC_MODULE)-overrides.txt
 
-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
-	pdf-build.stamp \
-	$(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
-	$(srcdir)/pdf.stamp
+EXTRA_DIST = 				\
+	$(SETUP_FILES)
+
+DOC_STAMPS=setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \
+	html-build.stamp pdf-build.stamp \
+	setup.stamp tmpl.stamp sgml.stamp html.stamp pdf.stamp
 
 SCANOBJ_FILES = 		 \
 	$(DOC_MODULE).args 	 \
@@ -70,17 +71,40 @@
 
 $(REPORT_FILES): sgml-build.stamp
 
+#### setup ####
+
+setup-build.stamp:
+	-@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	   echo 'gtk-doc: Preparing build'; \
+	   files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+	   if test "x$$files" != "x" ; then \
+	       for file in $$files ; do \
+	           test -f $(abs_srcdir)/$$file && \
+	               cp -p $(abs_srcdir)/$$file $(abs_builddir)/; \
+	       done \
+	   fi; \
+	   test -f $(abs_srcdir)/tmpl && \
+	       cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \
+	fi
+	@touch setup-build.stamp
+
+
+setup.stamp: setup-build.stamp
+	@true
+
+
 #### scan ####
 
 scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
 	@echo 'gtk-doc: Scanning header files'
-	@-chmod -R u+w $(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 \
-	    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) ; \
+	@_source_dir='' ; \
+	for i in $(DOC_SOURCE_DIR) ; do \
+	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
+	done ; \
+	gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
+	@if grep -l '^..*$$' $(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) ; \
 	else \
-	    cd $(srcdir) ; \
 	    for i in $(SCANOBJ_FILES) ; do \
                test -f $$i || touch $$i ; \
 	    done \
@@ -92,10 +116,14 @@
 
 #### templates ####
 
-tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+tmpl-build.stamp: setup.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)
+	@gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	  if test -w $(abs_srcdir) ; then \
+	    cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \
+	  fi \
+	fi
 	@touch tmpl-build.stamp
 
 tmpl.stamp: tmpl-build.stamp
@@ -109,8 +137,11 @@
 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) && \
-	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)
+	@_source_dir='' ; \
+	for i in $(DOC_SOURCE_DIR) ; do \
+	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
+	done ; \
+	gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
 	@touch sgml-build.stamp
 
 sgml.stamp: sgml-build.stamp
@@ -120,26 +151,32 @@
 
 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
+	@rm -rf html
+	@mkdir html
 	@mkhtml_options=""; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
 	if test "$(?)" = "0"; then \
-	  mkhtml_options=--path="$(srcdir)"; \
+	  mkhtml_options=--path="$(abs_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 )
+	cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+	-@test "x$(HTML_IMAGES)" = "x" || \
+	for file in $(HTML_IMAGES) ; do \
+	  if test -f $(abs_srcdir)/$$file ; then \
+	    cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
+	  fi; \
+	  if test -f $(abs_builddir)/$$file ; then \
+	    cp $(abs_builddir)/$$file $(abs_builddir)/html; \
+	  fi; \
+	done;
 	@echo 'gtk-doc: Fixing cross-references'
-	@cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+	@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
+	@rm -rf $(DOC_MODULE).pdf
 	@mkpdf_imgdirs=""; \
 	if test "x$(HTML_IMAGES)" != "x"; then \
 	  for img in $(HTML_IMAGES); do \
@@ -150,7 +187,7 @@
 	    fi; \
 	  done; \
 	fi; \
-	cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
+	gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
 	@touch pdf-build.stamp
 
 ##############
@@ -160,12 +197,15 @@
 	rm -rf .libs
 
 distclean-local:
-	cd $(srcdir) && \
-	  rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
-	         $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+	rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
+	    $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+	if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
+	    rm -rf tmpl; \
+	fi
 
 maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf xml html
+	rm -rf xml html
 
 install-data-local:
 	@installfiles=`echo $(srcdir)/html/*`; \
@@ -213,11 +253,11 @@
 dist-hook: dist-check-gtkdoc dist-hook-local
 	mkdir $(distdir)/tmpl
 	mkdir $(distdir)/html
-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	cp $(srcdir)/html/* $(distdir)/html
-	-cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
-	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
-	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+	-cp $(build)/tmpl/*.sgml $(distdir)/tmpl
+	cp $(builddir)/html/* $(distdir)/html
+	-cp $(builddir)/$(DOC_MODULE).pdf $(distdir)/
+	-cp $(build)/$(DOC_MODULE).types $(distdir)/
+	-cp $(build)/$(DOC_MODULE)-sections.txt $(distdir)/
 	cd $(distdir) && rm -f $(DISTCLEANFILES)
 	$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
 
diff -Nru gtk-doc-1.14/gtkdoc-mkdb.in gtk-doc-1.17/gtkdoc-mkdb.in
--- gtk-doc-1.14/gtkdoc-mkdb.in	2010-03-28 15:42:14.000000000 +0000
+++ gtk-doc-1.17/gtkdoc-mkdb.in	2010-10-23 07:33:05.000000000 +0000
@@ -44,7 +44,7 @@
 my $PRINT_HELP;
 my $MAIN_SGML_FILE;
 my $EXPAND_CONTENT_FILES = "";
-my $SGML_MODE;
+my $INLINE_MARKUP_MODE;
 my $DEFAULT_STABILITY;
 my $DEFAULT_INCLUDES;
 my $OUTPUT_FORMAT;
@@ -62,7 +62,8 @@
 	      'help' => \$PRINT_HELP,
 	      'main-sgml-file' => \$MAIN_SGML_FILE,
 	      'expand-content-files' => \$EXPAND_CONTENT_FILES,
-	      'sgml-mode' => \$SGML_MODE,
+	      'sgml-mode' => \$INLINE_MARKUP_MODE,
+	      'xml-mode' => \$INLINE_MARKUP_MODE,
 	      'default-stability' => \$DEFAULT_STABILITY,
 	      'default-includes' => \$DEFAULT_INCLUDES,
 	      'output-format' => \$OUTPUT_FORMAT,
@@ -74,8 +75,8 @@
     "ignore-files:s", "output-dir:s", "tmpl-dir:s", "version", "outputallsymbols",
     "outputsymbolswithoutsince",
     "expand-content-files:s", "main-sgml-file:s", "extra-db-files:s", "help",
-    "sgml-mode", "default-stability:s", "default-includes:s", "output-format:s",
-    "name-space:s");
+    "sgml-mode", "xml-mode", "default-stability:s", "default-includes:s", 
+    "output-format:s", "name-space:s");
 
 if ($PRINT_VERSION) {
     print "@VERSION@\n";
@@ -105,7 +106,7 @@
 --main-sgml-file=FILE      File containing the toplevel DocBook file.
 --expand-content-files=FILES Extra DocBook files to expand abbreviations in.
 --output-format=FORMAT     Format to use for the generated docbook, XML or SGML.
---sgml-mode                Allow DocBook markup in inline documentation.
+--{xml,sgml}-mode          Allow DocBook markup in inline documentation.
 --default-stability=LEVEL  Specify default stability Level. Valid values are
                            Stable, Unstable, or Private.
 --default-includes=FILENAMES Specify default includes for section Synopsis
@@ -163,16 +164,19 @@
 	    $doctype_header .= $_;
 	}
 	close(INPUT);
+	$doctype_header =~ s/##g;
     } else {
         $doctype_header =
 "\n" .
-"\n" .
 "]>\n";
     }
-    $doctype_header =~ s/ "NULL is ok, both for passing and for returning.",
     'array' => "Parameter points to an array of items.",
+    'closure' => "This parameter is a 'user_data', for callbacks; many bindings can pass NULL here.",
     'default' => "Default parameter value (for in case the shadows-to function has less parameters).",
     'element-type' => "Generics and defining elements of containers and arrays.",
     'error-domains' => "Typed errors. Similar to throws in Java.",
@@ -306,7 +313,11 @@
     'out' => "Parameter for returning results. Default is transfer full.",
     'transfer container' => "Free data container after the code is done.",
     'transfer full' => "Free data after the code is done.",
-    'transfer none' => "Don't free data after the code is done."
+    'transfer none' => "Don't free data after the code is done.",
+    'scope call' => "The callback is valid only during the call to the method.",
+    'scope async' => "The callback is valid until first called.",
+    'scope notified' => "The callback is valid until the GDestroyNotify argument is called.",
+    'type' => "Override the parsed C type with given type"
 );
 
 # Create the root DocBook output directory if it doens't exist.
@@ -456,7 +467,9 @@
 	print (OUTPUT " \n");
     }
     else {
-        print (OUTPUT "\n");
+        if ($count % $cols > 0) {
+            print (OUTPUT "\n");
+        }
     }
 
     print (OUTPUT <([\w ]+)<\/acronym>/) {
-            if (!exists($AnnotationsUsed{$1})) {
-                $AnnotationsUsed{$1} = 1;
-                goto rerun;
+        if(defined($AnnotationDefinition{$annotation})) {
+            if($AnnotationDefinition{$annotation} =~ m/([\w ]+)<\/acronym>/) {
+                if (!exists($AnnotationsUsed{$1})) {
+                    $AnnotationsUsed{$1} = 1;
+                    goto rerun;
+                }
             }
         }
     }
@@ -1083,19 +1101,20 @@
 EOF
 
     foreach my $annotation (keys(%AnnotationsUsed)) {
-        my $def = $AnnotationDefinition{$annotation};
-        my $curletter = uc(substr($annotation,0,1));
-
-        if ($curletter ne $lastletter) {
-            $lastletter = $curletter;
-      
-            if ($divopen == 1) {
-                print (OUTPUT "\n");
+        if(defined($AnnotationDefinition{$annotation})) {
+            my $def = $AnnotationDefinition{$annotation};
+            my $curletter = uc(substr($annotation,0,1));
+    
+            if ($curletter ne $lastletter) {
+                $lastletter = $curletter;
+          
+                if ($divopen == 1) {
+                    print (OUTPUT "\n");
+                }
+                print (OUTPUT "$curletter\n");
+                $divopen = 1;
             }
-            print (OUTPUT "$curletter\n");
-            $divopen = 1;
-        }
-        print (OUTPUT <
       $annotation
       
@@ -1103,6 +1122,7 @@
       
     
 EOF
+        }
     }
 
     if ($divopen == 1) {
@@ -1565,8 +1585,12 @@
 	    $desc .= "$text\n";
 	    if (defined $field_descr) {
                 ($field_descr,$param_annotations) = &ExpandAnnotation($symbol, $field_descr);
-                $field_descr = &ExpandAbbreviations($symbol, $field_descr);
-		$desc .= "$field_descr$param_annotations\n";
+		$field_descr = &ExpandAbbreviations($symbol, $field_descr);
+		$field_descr .= $param_annotations;
+		# trim
+		$field_descr =~ s/^(\s|\n)+//msg;
+		$field_descr =~ s/(\s|\n)+$//msg;
+		$desc .= "$field_descr\n";
 		delete $field_descrs{$field_name};
 	    } else {
 	        &LogWarning (&GetSymbolSourceFile ($symbol), &GetSymbolSourceLine($symbol),
@@ -1698,8 +1722,12 @@
 	    $desc .= "$text\n";
 	    if (defined $field_descr) {
                 ($field_descr,$param_annotations) = &ExpandAnnotation($symbol, $field_descr);
-                $field_descr = &ExpandAbbreviations($symbol, $field_descr);
-		$desc .= "$field_descr$param_annotations\n";
+		$field_descr = &ExpandAbbreviations($symbol, $field_descr);
+		$field_descr .= $param_annotations;
+		# trim
+		$field_descr =~ s/^(\s|\n)+//msg;
+		$field_descr =~ s/(\s|\n)+$//msg;
+		$desc .= "$field_descr\n";
 		delete $field_descrs{$field_name};
 	    } else {
 	        &LogWarning (&GetSymbolSourceFile ($symbol), &GetSymbolSourceLine($symbol),
@@ -2072,6 +2100,9 @@
             ($param_desc,$param_annotations) = & ExpandAnnotation($symbol, $param_desc);
             $param_desc = &ExpandAbbreviations($symbol, $param_desc);
             $param_desc .= $param_annotations;
+            # trim
+            $param_desc =~ s/^(\s|\n)+//msg;
+            $param_desc =~ s/(\s|\n)+$//msg;
 	    if ($param_name eq "Returns") {
 		$returns = "$param_desc";
 	    } elsif ($param_name eq "void") {
@@ -2122,7 +2153,7 @@
 	        $output .= $params_desc;
 	    }
 
-	    # Output the returns info last.
+	    # Output the returns info last
 	    if ($returns) {
 		$output .= "Returns :$returns\n";
 	    }
@@ -2477,6 +2508,10 @@
     API Index
     
   
+  
+    Index of deprecated API
+    
+  
 
   
 
@@ -2508,7 +2543,7 @@
 # Function    : ConvertSGMLChars
 # Description : This is used for text in source code comment blocks, to turn
 #               chars which are used in SGML into entities, e.g. '<' into
-#               '<'. Depending on $SGML_MODE, this is done
+#               '<'. Depending on $INLINE_MARKUP_MODE, this is done
 #               unconditionally or only if the character doesn't seem to be
 #               part of an SGML construct (tag or entity reference).
 # Arguments   : $text - the text to turn into proper SGML.
@@ -2517,8 +2552,8 @@
 sub ConvertSGMLChars {
     my ($symbol, $text) = @_;
 
-    if ($SGML_MODE) {
-        # For the SGML mode only convert to entities outside CDATA sections.
+    if ($INLINE_MARKUP_MODE) {
+        # For the XML/SGML mode only convert to entities outside CDATA sections.
         return &ModifyXMLElements ($text, $symbol,
 				   "]*>",
 				   \&ConvertSGMLCharsEndTag,
@@ -2583,20 +2618,20 @@
 
 #############################################################################
 # Function    : ExpandAnnotation
-# Description : This turns annotations into acrony tags.
+# Description : This turns annotations into acronym tags.
 # Arguments   : $symbol - the symbol being documented, for error messages.
 #		$text - the text to expand.
 #############################################################################
 sub ExpandAnnotation {
     my ($symbol, $param_desc) = @_;
     my $param_annotations = "";
-    
-    if ($param_desc =~ m%\s*\((.*)\):%) {
+
+    # look for annotations at the start of the comment part
+    if ($param_desc =~ m%^\s*\((.*?)\):%) {
         my @annotations;
         my $annotation;
-        my $annotation_extra = "";
         $param_desc = $';
-    
+        
         @annotations = split(/\)\s*\(/,$1);
         foreach $annotation (@annotations) {
             # need to search for the longest key-match in %AnnotationDefinition
@@ -2611,23 +2646,27 @@
                     }
                 }
             }
+            my $annotation_extra = "";
             if ($match_annotation ne "") {
                 if ($annotation =~ m%$match_annotation\s+(.*)%) {
                     $annotation_extra = " $1";
                 }
                 $AnnotationsUsed{$match_annotation} = 1;
-                $param_annotations .= "$match_annotation$annotation_extra. ";
+                $param_annotations .= "[$match_annotation$annotation_extra]";
             }
             else {
                 &LogWarning (&GetSymbolSourceFile ($symbol), &GetSymbolSourceLine($symbol),
                     "unknown annotation \"$annotation\" in documentation for $symbol.");
-                $param_annotations=$annotation;
+                $param_annotations .= "[$annotation]";
             }
         }
         chomp($param_desc);
-        $param_desc =~ m/^(.*)\.*\s*$/s;
+        $param_desc =~ m/^(.*?)\.*\s*$/s;
         $param_desc = "$1. ";
-    }    
+    }
+    if ($param_annotations ne "") {
+        $param_annotations = "$param_annotations";
+    }
     return ($param_desc, $param_annotations);
 }
 
@@ -2644,6 +2683,7 @@
   my ($symbol, $text) = @_;
 
   # Convert "|[" and "]|" into the start and end of program listing examples.
+  # FIXME: we like to have a way to specify parameters e.g. language="c"
   $text =~ s%\|\[%%g;
   $text =~ s%\]\|%%g;
   # TODO: check for a xml comment after |[ and pick the language attribute from
@@ -3328,36 +3368,37 @@
 
             if (defined ($flags)) {
               if ($flags =~ m/f/) {
-                $flags_string = "Run First";
+                $flags_string = "Run First";
               }
               elsif ($flags =~ m/l/) {
-                $flags_string = "Run Last";
+                $flags_string = "Run Last";
               }
               elsif ($flags =~ m/c/) {
+                $flags_string = "Cleanup";
                 $flags_string = "Cleanup";
               }
               if ($flags =~ m/r/) {
                 if ($flags_string) { $flags_string .= " / "; }
-                $flags_string .= "No Recursion";
+                $flags_string = "No Recursion";
               }
               if ($flags =~ m/d/) {
                 if ($flags_string) { $flags_string .= " / "; }
-                $flags_string .= "Has Details";
+                $flags_string = "Has Details";
               }
               if ($flags =~ m/a/) {
                 if ($flags_string) { $flags_string .= " / "; }
-                $flags_string .= "Action";
+                $flags_string = "Action";
               }
               if ($flags =~ m/h/) {
                 if ($flags_string) { $flags_string .= " / "; }
-                $flags_string .= "No Hooks";
+                $flags_string = "No Hooks";
               }
             }
 
 	    if ($flags_string)
 	      {
 		$synop .= ": $flags_string\n";
-
+		
 		$pad = ' ' x (5 + $name_len - length("user_data"));
 		$desc  .= "$pad : $flags_string\n";
 	      }
@@ -3782,7 +3823,7 @@
 		$symbol = $1;
 		#print "SECTION DOCS found in source for : '$symbol'\n";
 		$ignore_broken_returns = 1;
-	    } elsif (m%^\s*([\w:-]*\w)\s*:?\s*$%) {
+	    } elsif (m%^\s*([\w:-]*\w)\s*:?\s*(\([a-z ]+\)\s*)*$%) {
 		$symbol = $1;
 		#print "SYMBOL DOCS found in source for : '$symbol'\n";
 	    }
@@ -4267,11 +4308,10 @@
 
 	my $have_tmpl_docs = 0;
 
-	## See if the symbol is documented in template
+	## see if the symbol is documented in template
 	my $tmpl_doc = defined ($SymbolDocs{$symbol}) ? $SymbolDocs{$symbol} : "";
 	my $check_tmpl_doc =$tmpl_doc;
-	# remove all xml-tags and whitespaces
-	#$check_tmpl_doc =~ s/<\/?[a-z]+>//g;
+	# remove all xml-tags and whitespaces 
 	$check_tmpl_doc =~ s/<.*?>//g;
 	$check_tmpl_doc =~ s/\s//g;
 	# anything left ?
@@ -4279,8 +4319,13 @@
 	    $have_tmpl_docs = 1;
             #print "## [$check_tmpl_doc]\n";
 	} else {
-            $tmpl_doc = "";
-        }
+	    # if the docs have just an empty para, don't merge that.
+	    $check_tmpl_doc = $tmpl_doc;
+	    $check_tmpl_doc =~ s/(\s|\n)//msg;
+	    if ($check_tmpl_doc eq "") {
+	       $tmpl_doc = ""; 
+	    }
+	}
 
 	if (exists ($SourceSymbolDocs{$symbol})) {
 	    my $type = $DeclarationTypes {$symbol};
@@ -4304,7 +4349,7 @@
 	    # remove leading and training whitespaces
 	    $src_doc =~ s/^\s+//;
 	    $src_doc =~ s/\s+$//;
-
+	    
 	    # Don't output warnings for overridden titles as titles are
 	    # automatically generated in the -sections.txt file, and thus they
 	    # are often overridden.
@@ -4331,9 +4376,11 @@
                 # If there is a blank line, finish the paragraph and start another.
                 $src_doc = &ConvertBlankLines ($src_doc, $symbol);
                 $src_doc_para = "\n$src_doc\n";
-                # fixup xml markup
-                $src_doc_para =~ s%\n\n%%gms;
+                ## fixup xml markup
+                # FIXME: this is questionable, as we can't make assumtions on the content really
+                #$src_doc_para =~ s%^\n(\n%%gms;
+                #$src_doc_para =~ s%()\n$%$1%gms;
                 #print "$symbol : [$src_doc][$src_doc_para]\n";
             }
 
@@ -4347,7 +4394,7 @@
                 $SymbolDocs{$symbol} = "$src_doc_para$tmpl_doc";
             }
 
-            # merge parameters
+	    # merge parameters
 	    if ($symbol =~ m/.*::.*/) {
 		# For signals we prefer the param names from the source docs,
 		# since the ones from the templates are likely to contain the
@@ -4443,7 +4490,6 @@
 	# if this symbol is documented, check if docs are complete
 	$check_tmpl_doc = defined ($SymbolDocs{$symbol}) ? $SymbolDocs{$symbol} : "";
 	# remove all xml-tags and whitespaces
-	#$check_tmpl_doc =~ s/<\/?[a-z]+>//g;
 	$check_tmpl_doc =~ s/<.*?>//g;
 	$check_tmpl_doc =~ s/\s//g;
 	if ($check_tmpl_doc ne "") {
diff -Nru gtk-doc-1.14/gtkdoc-mkhtml.in gtk-doc-1.17/gtkdoc-mkhtml.in
--- gtk-doc-1.14/gtkdoc-mkhtml.in	2009-12-21 12:57:59.000000000 +0000
+++ gtk-doc-1.17/gtkdoc-mkhtml.in	2010-07-13 19:45:38.000000000 +0000
@@ -33,10 +33,14 @@
 
 if test $uninstalled = yes; then
       # this does not work from buiddir!=srcdir
-      # we could try this
-      # MAKE_SCRDIR=$(abs_srcdir) MAKE_BUILDDIR=$(abs_builddir) gtkdoc-mkhtml ...
       gtkdocdir=`dirname $0`
-      #echo "uninstalled, gtkdocdir=$gtkdocdir"
+      if test ! -e $gtkdocdir/gtk-doc.xsl; then
+        # try to src dir (set from makefiles) too
+        if test -e $ABS_TOP_SRCDIR/gtk-doc.xsl; then
+          gtkdocdir=$ABS_TOP_SRCDIR
+        fi
+      fi
+      #echo "uninstalled, gtkdocdir=$gtkdocdir, cwd=$PWD"
 else
       # the first two are needed to resolve datadir
       prefix=@prefix@
@@ -67,6 +71,10 @@
 fi
 
 if $is_xml; then
+  #echo @XSLTPROC@ $path_arg --nonet --xinclude \
+  #    --stringparam gtkdoc.bookname $module \
+  #    --stringparam gtkdoc.version "@VERSION@" \
+  #    "$@" $gtkdocdir/gtk-doc.xsl $document
   @XSLTPROC@ $path_arg --nonet --xinclude \
       --stringparam gtkdoc.bookname $module \
       --stringparam gtkdoc.version "@VERSION@" \
@@ -78,8 +86,8 @@
 fi
 
 # copy navigation images and stylesheets to html directory ...
-cp -f $gtkdocdir/*.png .
-cp -f $gtkdocdir/*.css .
+cp -f $gtkdocdir/*.png ./
+cp -f $gtkdocdir/*.css ./
 
 
 echo "timestamp" > ../html.stamp
diff -Nru gtk-doc-1.14/gtkdoc-mkman.in gtk-doc-1.17/gtkdoc-mkman.in
--- gtk-doc-1.14/gtkdoc-mkman.in	2009-12-19 20:05:26.000000000 +0000
+++ gtk-doc-1.17/gtkdoc-mkman.in	2010-09-08 18:29:23.000000000 +0000
@@ -62,8 +62,8 @@
 if $is_xml; then
   # see http://bugzilla.gnome.org/show_bug.cgi?id=467488
   @XSLTPROC@ $path_arg --nonet --xinclude \
-      --stringparam gtkdoc.bookname $module
-      --stringparam gtkdoc.version"@VERSION@" \
+      --stringparam gtkdoc.bookname $module \
+      --stringparam gtkdoc.version "@VERSION@" \
       manpages/docbook.xsl $document || exit $?
 else
   for i in `cd sgml;ls *.sgml`; do
diff -Nru gtk-doc-1.14/gtkdoc-mkpdf.in gtk-doc-1.17/gtkdoc-mkpdf.in
--- gtk-doc-1.14/gtkdoc-mkpdf.in	2009-09-30 21:16:49.000000000 +0000
+++ gtk-doc-1.17/gtkdoc-mkpdf.in	2010-07-13 19:45:38.000000000 +0000
@@ -78,7 +78,8 @@
     # xsltproc is already called with --xinclude
     # does not work: --xslt-opts "$path_arg --nonet $@"
     #echo "calling: @DBLATEX@ -o $module.pdf $imgdirs $document"
-    @DBLATEX@ -o $module.pdf $imgdirs $document
+    @DBLATEX@ 2>&1 -o $module.pdf $imgdirs $document | \
+      grep -v "not supported in programlisting or screen"
   else
     if test -n "@FOP@"; then
       @XSLTPROC@ $path_arg --nonet --xinclude \
diff -Nru gtk-doc-1.14/gtk-doc.notmpl-flat.make gtk-doc-1.17/gtk-doc.notmpl-flat.make
--- gtk-doc-1.14/gtk-doc.notmpl-flat.make	1970-01-01 00:00:00.000000000 +0000
+++ gtk-doc-1.17/gtk-doc.notmpl-flat.make	2011-02-26 12:26:12.000000000 +0000
@@ -0,0 +1,240 @@
+# -*- mode: makefile -*-
+
+####################################
+# Everything below here is generic #
+####################################
+
+if GTK_DOC_USE_LIBTOOL
+GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_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 =
+endif
+
+# We set GPATH here; this gives us semantics for GNU make
+# which are more like other make's VPATH, when it comes to
+# whether a source that is a target of one rule is then
+# searched for in VPATH/GPATH.
+#
+GPATH = $(srcdir)
+
+TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
+
+SETUP_FILES = \
+	$(content_files)		\
+	$(DOC_MAIN_SGML_FILE)		\
+	$(DOC_MODULE)-sections.txt	\
+	$(DOC_MODULE)-overrides.txt
+
+EXTRA_DIST += 				\
+	$(SETUP_FILES)
+
+DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \
+	html-build.stamp pdf-build.stamp \
+	setup.stamp sgml.stamp html.stamp pdf.stamp
+
+SCANOBJ_FILES = 		 \
+	$(DOC_MODULE).args 	 \
+	$(DOC_MODULE).hierarchy  \
+	$(DOC_MODULE).interfaces \
+	$(DOC_MODULE).prerequisites \
+	$(DOC_MODULE).signals
+
+REPORT_FILES = \
+	$(DOC_MODULE)-undocumented.txt \
+	$(DOC_MODULE)-undeclared.txt \
+	$(DOC_MODULE)-unused.txt
+
+CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
+
+if ENABLE_GTK_DOC
+if GTK_DOC_BUILD_HTML
+HTML_BUILD_STAMP=html-build.stamp
+else
+HTML_BUILD_STAMP=
+endif
+if GTK_DOC_BUILD_PDF
+PDF_BUILD_STAMP=pdf-build.stamp
+else
+PDF_BUILD_STAMP=
+endif
+
+all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+else
+all-local:
+endif
+
+docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+
+$(REPORT_FILES): sgml-build.stamp
+
+#### setup ####
+
+setup-build.stamp:
+	-@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	   echo 'gtk-doc: Preparing build'; \
+	   files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+	   if test "x$$files" != "x" ; then \
+	       for file in $$files ; do \
+	           test -f $(abs_srcdir)/$$file && \
+	               cp -p $(abs_srcdir)/$$file $(abs_builddir)/; \
+	       done \
+	   fi \
+	fi
+	@touch setup-build.stamp
+
+
+setup.stamp: setup-build.stamp
+	@true
+
+
+#### scan ####
+
+scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
+	@echo 'gtk-doc: Scanning header files'
+	@_source_dir='' ; \
+	for i in $(DOC_SOURCE_DIR) ; do \
+	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
+	done ; \
+	gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
+	@if grep -l '^..*$$' $(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) ; \
+	else \
+	    for i in $(SCANOBJ_FILES) ; do \
+                 test -f $$i || touch $$i ; \
+	    done \
+	fi
+	@touch scan-build.stamp
+
+$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
+	@true
+
+#### xml ####
+
+sgml-build.stamp: setup.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
+	@echo 'gtk-doc: Building XML'
+	@_source_dir='' ; \
+	for i in $(DOC_SOURCE_DIR) ; do \
+	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
+	done ; \
+	gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
+	@touch sgml-build.stamp
+
+sgml.stamp: sgml-build.stamp
+	@true
+
+#### html ####
+
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+	@echo 'gtk-doc: Building HTML'
+	@rm -rf html
+	@mkdir html
+	@mkhtml_options=""; \
+	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
+	if test "$(?)" = "0"; then \
+	  mkhtml_options=--path="$(abs_srcdir)"; \
+	fi; \
+	cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+	-@test "x$(HTML_IMAGES)" = "x" || \
+	for file in $(HTML_IMAGES) ; do \
+	  if test -f $(abs_srcdir)/$$file ; then \
+	    cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
+	  fi; \
+	  if test -f $(abs_builddir)/$$file ; then \
+	    cp $(abs_builddir)/$$file $(abs_builddir)/html; \
+	  fi; \
+	done;
+	@echo 'gtk-doc: Fixing cross-references'
+	@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'
+	@rm -rf $(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; \
+	gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
+	@touch pdf-build.stamp
+
+##############
+
+clean-local:
+	rm -f *~ *.bak
+	rm -rf .libs
+
+distclean-local:
+	rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
+	    $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+	if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
+	fi
+
+maintainer-clean-local: clean
+	rm -rf xml html
+
+install-data-local:
+	@installfiles=`echo $(builddir)/html/*`; \
+	if test "$$installfiles" = '$(srcdir)/html/*'; \
+	then echo '-- Nothing to install' ; \
+	else \
+	  if test -n "$(DOC_MODULE_VERSION)"; then \
+	    installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
+	  else \
+	    installdir="$(DESTDIR)$(TARGET_DIR)"; \
+	  fi; \
+	  $(mkinstalldirs) $${installdir} ; \
+	  for i in $$installfiles; do \
+	    echo '-- Installing '$$i ; \
+	    $(INSTALL_DATA) $$i $${installdir}; \
+	  done; \
+	  if test -n "$(DOC_MODULE_VERSION)"; then \
+	    mv -f $${installdir}/$(DOC_MODULE).devhelp2 \
+	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \
+	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
+	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
+	  fi; \
+	  $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
+	fi
+
+uninstall-local:
+	@if test -n "$(DOC_MODULE_VERSION)"; then \
+	  installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
+	else \
+	  installdir="$(DESTDIR)$(TARGET_DIR)"; \
+	fi; \
+	rm -rf $${installdir}
+
+#
+# Require gtk-doc when making dist
+#
+if ENABLE_GTK_DOC
+dist-check-gtkdoc:
+else
+dist-check-gtkdoc:
+	@echo "*** gtk-doc must be installed and enabled in order to make dist"
+	@false
+endif
+
+dist-hook: dist-check-gtkdoc dist-hook-local
+	mkdir $(distdir)/html
+	cp $(builddir)/html/* $(distdir)/html
+	-cp $(builddir)/$(DOC_MODULE).pdf $(distdir)/
+	-cp $(builddir)/$(DOC_MODULE).types $(distdir)/
+	-cp $(builddir)/$(DOC_MODULE)-sections.txt $(distdir)/
+	cd $(distdir) && rm -f $(DISTCLEANFILES)
+	$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
+
+.PHONY : dist-hook-local docs
diff -Nru gtk-doc-1.14/gtk-doc.notmpl.make gtk-doc-1.17/gtk-doc.notmpl.make
--- gtk-doc-1.14/gtk-doc.notmpl.make	2010-01-03 20:16:48.000000000 +0000
+++ gtk-doc-1.17/gtk-doc.notmpl.make	2011-02-02 22:11:09.000000000 +0000
@@ -23,16 +23,18 @@
 
 TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
 
-EXTRA_DIST = 				\
+SETUP_FILES = \
 	$(content_files)		\
-	$(HTML_IMAGES)			\
 	$(DOC_MAIN_SGML_FILE)		\
 	$(DOC_MODULE)-sections.txt	\
 	$(DOC_MODULE)-overrides.txt
 
-DOC_STAMPS=scan-build.stamp sgml-build.stamp html-build.stamp pdf-build.stamp \
-	$(srcdir)/sgml.stamp $(srcdir)/html.stamp  \
-	$(srcdir)/pdf.stamp
+EXTRA_DIST = 				\
+	$(SETUP_FILES)
+
+DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \
+	html-build.stamp pdf-build.stamp \
+	setup.stamp sgml.stamp html.stamp pdf.stamp
 
 SCANOBJ_FILES = 		 \
 	$(DOC_MODULE).args 	 \
@@ -69,19 +71,40 @@
 
 $(REPORT_FILES): sgml-build.stamp
 
+#### setup ####
+
+setup-build.stamp:
+	-@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	   echo 'gtk-doc: Preparing build'; \
+	   files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+	   if test "x$$files" != "x" ; then \
+	       for file in $$files ; do \
+	           test -f $(abs_srcdir)/$$file && \
+	               cp -p $(abs_srcdir)/$$file $(abs_builddir)/; \
+	       done \
+	   fi \
+	fi
+	@touch setup-build.stamp
+
+
+setup.stamp: setup-build.stamp
+	@true
+
+
 #### scan ####
 
 scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
 	@echo 'gtk-doc: Scanning header files'
-	@-chmod -R u+w $(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 \
-	    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) ; \
+	@_source_dir='' ; \
+	for i in $(DOC_SOURCE_DIR) ; do \
+	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
+	done ; \
+	gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
+	@if grep -l '^..*$$' $(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) ; \
 	else \
-	    cd $(srcdir) ; \
 	    for i in $(SCANOBJ_FILES) ; do \
-               test -f $$i || touch $$i ; \
+                 test -f $$i || touch $$i ; \
 	    done \
 	fi
 	@touch scan-build.stamp
@@ -91,11 +114,13 @@
 
 #### xml ####
 
-sgml-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
+sgml-build.stamp: setup.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
 	@echo 'gtk-doc: Building XML'
-	@-chmod -R u+w $(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)
+	@_source_dir='' ; \
+	for i in $(DOC_SOURCE_DIR) ; do \
+	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
+	done ; \
+	gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
 	@touch sgml-build.stamp
 
 sgml.stamp: sgml-build.stamp
@@ -105,26 +130,32 @@
 
 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
+	@rm -rf html
+	@mkdir html
 	@mkhtml_options=""; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
 	if test "$(?)" = "0"; then \
-	  mkhtml_options=--path="$(srcdir)"; \
+	  mkhtml_options=--path="$(abs_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 )
+	cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+	-@test "x$(HTML_IMAGES)" = "x" || \
+	for file in $(HTML_IMAGES) ; do \
+	  if test -f $(abs_srcdir)/$$file ; then \
+	    cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
+	  fi; \
+	  if test -f $(abs_builddir)/$$file ; then \
+	    cp $(abs_builddir)/$$file $(abs_builddir)/html; \
+	  fi; \
+	done;
 	@echo 'gtk-doc: Fixing cross-references'
-	@cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+	@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
+	@rm -rf $(DOC_MODULE).pdf
 	@mkpdf_imgdirs=""; \
 	if test "x$(HTML_IMAGES)" != "x"; then \
 	  for img in $(HTML_IMAGES); do \
@@ -135,7 +166,7 @@
 	    fi; \
 	  done; \
 	fi; \
-	cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
+	gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
 	@touch pdf-build.stamp
 
 ##############
@@ -145,15 +176,17 @@
 	rm -rf .libs
 
 distclean-local:
-	cd $(srcdir) && \
-	  rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
-	         $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+	rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
+	    $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+	if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
+	fi
 
 maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf html
+	rm -rf xml html
 
 install-data-local:
-	@installfiles=`echo $(srcdir)/html/*`; \
+	@installfiles=`echo $(builddir)/html/*`; \
 	if test "$$installfiles" = '$(srcdir)/html/*'; \
 	then echo '-- Nothing to install' ; \
 	else \
@@ -197,10 +230,10 @@
 
 dist-hook: dist-check-gtkdoc dist-hook-local
 	mkdir $(distdir)/html
-	cp $(srcdir)/html/* $(distdir)/html
-	-cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
-	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
-	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+	cp $(builddir)/html/* $(distdir)/html
+	-cp $(builddir)/$(DOC_MODULE).pdf $(distdir)/
+	-cp $(builddir)/$(DOC_MODULE).types $(distdir)/
+	-cp $(builddir)/$(DOC_MODULE)-sections.txt $(distdir)/
 	cd $(distdir) && rm -f $(DISTCLEANFILES)
 	$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
 
diff -Nru gtk-doc-1.14/gtk-doc.pc.in gtk-doc-1.17/gtk-doc.pc.in
--- gtk-doc-1.14/gtk-doc.pc.in	2009-04-22 19:36:57.000000000 +0000
+++ gtk-doc-1.17/gtk-doc.pc.in	2011-01-14 21:29:47.000000000 +0000
@@ -1,5 +1,6 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
+data_dir=@PACKAGE_DATA_DIR@
 
 Name: gtk-doc
 Description: API documentation generator
diff -Nru gtk-doc-1.14/gtkdoc-scangobj.in gtk-doc-1.17/gtkdoc-scangobj.in
--- gtk-doc-1.14/gtkdoc-scangobj.in	2010-01-29 10:21:37.000000000 +0000
+++ gtk-doc-1.17/gtkdoc-scangobj.in	2011-01-14 21:34:06.000000000 +0000
@@ -20,15 +20,10 @@
 #
 
 #
-# This gets information about object heirarchies and signals
+# This gets information about object hierarchies and signals
 # by compiling a small C program. CFLAGS and LDFLAGS must be
 # set appropriately before running this script.
 #
-# NOTE: the lookup_signal_arg_names() function contains the argument names of
-#       standard GTK signal handlers. This may need to be updated for new
-#       GTK signals or Gnome widget signals.
-#       FIXME: this is only needed for undocumented signals, we should remove
-#       the list as its totally undermaintained anyway
 
 use Getopt::Long;
 
@@ -54,7 +49,7 @@
 	   'output-dir' => \$OUTPUT_DIR,
 	   'version' => \$PRINT_VERSION,
 	   'help' => \$PRINT_HELP);
-	   
+
 GetOptions(\%optctl, "module=s", "types:s", "output-dir:s", "nogtkinit", "type-init-func:s", "query-child-properties:s", "version", "help");
 
 if ($NO_GTK_INIT) {
@@ -213,10 +208,6 @@
 				  guint signal_id);
 static const gchar * get_type_name (GType type,
 			            gboolean * is_pointer);
-static const gchar * get_gdk_event (const gchar * signal_name);
-static const gchar ** lookup_signal_arg_names (const gchar * type,
-					       const gchar * signal_name);
-
 static void output_object_hierarchy (void);
 static void output_hierarchy (FILE *fp,
 			      GType type,
@@ -313,10 +304,9 @@
   GSignalQuery query_info;
   const gchar *type_name, *ret_type, *object_arg, *arg_name;
   gchar *pos, *object_arg_lower;
-  gboolean is_pointer;                                   
+  gboolean is_pointer;
   gchar buffer[1024];
   guint i, param;
-  const gchar **arg_names;
   gint param_num, widget_num, event_num, callback_num;
   gint *arg_num;
   gchar signal_name[128];
@@ -337,7 +327,7 @@
   pos += strlen (pos);
 
   /* Try to come up with a sensible variable name for the first arg
-   * I chops off 2 know prefixes :/ and makes the name lowercase
+   * It chops off 2 know prefixes :/ and makes the name lowercase
    * It should replace lowercase -> uppercase with '_'
    * GFileMonitor -> file_monitor
    * GIOExtensionPoint -> extension_point
@@ -371,64 +361,46 @@
     }
 
   /* Output the signal parameters. */
-  arg_names = lookup_signal_arg_names (object_name, signal_name);
-
   for (param = 0; param < query_info.n_params; param++)
     {
-      if (arg_names)
-	{
-	  sprintf (pos, "%s\\n", arg_names[param]);
-	  pos += strlen (pos);
-	}
+      type_name = get_type_name (query_info.param_types[param] & ~G_SIGNAL_TYPE_STATIC_SCOPE, &is_pointer);
+
+      /* Most arguments to the callback are called "arg1", "arg2", etc.
+         GtkWidgets are called "widget", "widget2", ...
+         GtkCallbacks are called "callback", "callback2", ... */
+      if (!strcmp (type_name, "GtkWidget"))
+        {
+          arg_name = "widget";
+          arg_num = &widget_num;
+        }
+      else if (!strcmp (type_name, "GtkCallback")
+               || !strcmp (type_name, "GtkCCallback"))
+        {
+          arg_name = "callback";
+          arg_num = &callback_num;
+        }
       else
-	{
-	  type_name = get_type_name (query_info.param_types[param] & ~G_SIGNAL_TYPE_STATIC_SCOPE, &is_pointer);
+        {
+          arg_name = "arg";
+          arg_num = ¶m_num;
+        }
+      sprintf (pos, "%s ", type_name);
+      pos += strlen (pos);
 
-	  /* Most arguments to the callback are called "arg1", "arg2", etc.
-	     GdkWidgets are called "widget", "widget2", ...
-	     GdkEvents are called "event", "event2", ...
-	     GtkCallbacks are called "callback", "callback2", ... */
-	  if (!strcmp (type_name, "GtkWidget"))
-	    {
-	      arg_name = "widget";
-	      arg_num = &widget_num;
-	    }
-	  else if (!strcmp (type_name, "GdkEvent"))
-	    {
-	      type_name = get_gdk_event (signal_name);
-	      arg_name = "event";
-	      arg_num = &event_num;
-	      is_pointer = TRUE;
-	    }
-	  else if (!strcmp (type_name, "GtkCallback")
-		   || !strcmp (type_name, "GtkCCallback"))
-	    {
-	      arg_name = "callback";
-	      arg_num = &callback_num;
-	    }
-	  else
-	    {
-	      arg_name = "arg";
-	      arg_num = ¶m_num;
-	    }
-	  sprintf (pos, "%s ", type_name);
-	  pos += strlen (pos);
+      if (!arg_num || *arg_num == 0)
+        sprintf (pos, "%s%s\\n", is_pointer ? "*" : " ", arg_name);
+      else
+        sprintf (pos, "%s%s%i\\n", is_pointer ? "*" : " ", arg_name,
+                 *arg_num);
+      pos += strlen (pos);
 
-	  if (!arg_num || *arg_num == 0)
-	    sprintf (pos, "%s%s\\n", is_pointer ? "*" : " ", arg_name);
-	  else
-	    sprintf (pos, "%s%s%i\\n", is_pointer ? "*" : " ", arg_name,
-		     *arg_num);
-	  pos += strlen (pos);
-
-	  if (arg_num)
-	    {
-	      if (*arg_num == 0)
-		*arg_num = 2;
-	      else
-	        *arg_num += 1;
-	    }
-	}
+      if (arg_num)
+        {
+          if (*arg_num == 0)
+            *arg_num = 2;
+          else
+            *arg_num += 1;
+        }
     }
 
   pos = flags;
@@ -505,7 +477,13 @@
     *is_pointer = TRUE;
     return "GParamSpec";
 
-  default:
+#if GLIB_CHECK_VERSION (2, 25, 9)
+  case G_TYPE_VARIANT:
+    *is_pointer = TRUE;
+    return "GVariant";
+#endif
+
+default:
     break;
   }
 
@@ -513,13 +491,15 @@
      e.g. 'GtkWidget *'. */
   if (g_type_is_a (type, G_TYPE_OBJECT))
     *is_pointer = TRUE;
-  
+
   /* Also catch non GObject root types */
   if (G_TYPE_IS_CLASSED (type))
     *is_pointer = TRUE;
-  
+
   /* All boxed subtypes will be pointers as well. */
-  if (g_type_is_a (type, G_TYPE_BOXED))
+  /* Exception: GStrv */
+  if (g_type_is_a (type, G_TYPE_BOXED) &&
+      !g_type_is_a (type, G_TYPE_STRV))
     *is_pointer = TRUE;
 
   /* All pointer subtypes will be pointers as well. */
@@ -535,289 +515,15 @@
 }
 
 
-static const gchar *
-get_gdk_event (const gchar * signal_name)
-{
-  static const gchar *GbGDKEvents[] =
-  {
-    "button_press_event", "GdkEventButton",
-    "button_release_event", "GdkEventButton",
-    "motion_notify_event", "GdkEventMotion",
-    "delete_event", "GdkEvent",
-    "destroy_event", "GdkEvent",
-    "expose_event", "GdkEventExpose",
-    "key_press_event", "GdkEventKey",
-    "key_release_event", "GdkEventKey",
-    "enter_notify_event", "GdkEventCrossing",
-    "leave_notify_event", "GdkEventCrossing",
-    "configure_event", "GdkEventConfigure",
-    "focus_in_event", "GdkEventFocus",
-    "focus_out_event", "GdkEventFocus",
-    "map_event", "GdkEvent",
-    "unmap_event", "GdkEvent",
-    "property_notify_event", "GdkEventProperty",
-    "selection_clear_event", "GdkEventSelection",
-    "selection_request_event", "GdkEventSelection",
-    "selection_notify_event", "GdkEventSelection",
-    "proximity_in_event", "GdkEventProximity",
-    "proximity_out_event", "GdkEventProximity",
-    "drag_begin_event", "GdkEventDragBegin",
-    "drag_request_event", "GdkEventDragRequest",
-    "drag_end_event", "GdkEventDragRequest",
-    "drop_enter_event", "GdkEventDropEnter",
-    "drop_leave_event", "GdkEventDropLeave",
-    "drop_data_available_event", "GdkEventDropDataAvailable",
-    "other_event", "GdkEventOther",
-    "client_event", "GdkEventClient",
-    "no_expose_event", "GdkEventNoExpose",
-    "visibility_notify_event", "GdkEventVisibility",
-    "window_state_event", "GdkEventWindowState",
-    "scroll_event", "GdkEventScroll",
-    NULL
-  };
-
-  gint i;
-
-  for (i = 0; GbGDKEvents[i]; i += 2)
-    {
-      if (!strcmp (signal_name, GbGDKEvents[i]))
-	return GbGDKEvents[i + 1];
-    }
-  return "GdkEvent";
-}
-
-
-/* This returns argument names to use for some known GTK signals.
-    It is passed a widget name, e.g. 'GtkCList' and a signal name, e.g.
-    'select_row' and it returns a pointer to an array of argument types and
-    names. */
-static const gchar **
-lookup_signal_arg_names (const gchar * type, const gchar * signal_name)
-{
-  /* Each arg array starts with the object type name and the signal name,
-     and then signal arguments follow. */
-  static const gchar *GbArgTable[][16] =
-  {
-    {"GtkCList", "select_row",
-     "gint             row",
-     "gint             column",
-     "GdkEventButton  *event"},
-    {"GtkCList", "unselect_row",
-     "gint             row",
-     "gint             column",
-     "GdkEventButton  *event"},
-    {"GtkCList", "click_column",
-     "gint             column"},
-
-    {"GtkCList", "resize_column",
-     "gint             column",
-     "gint             width"},
-
-    {"GtkCList", "extend_selection",
-     "GtkScrollType    scroll_type",
-     "gfloat           position",
-     "gboolean         auto_start_selection"},
-    {"GtkCList", "scroll_vertical",
-     "GtkScrollType    scroll_type",
-     "gfloat           position"},
-    {"GtkCList", "scroll_horizontal",
-     "GtkScrollType    scroll_type",
-     "gfloat           position"},
-
-    {"GtkCTree", "tree_select_row",
-     "GtkCTreeNode    *node",
-     "gint             column"},
-    {"GtkCTree", "tree_unselect_row",
-     "GtkCTreeNode    *node",
-     "gint             column"},
-    {"GtkCTree", "tree_expand",
-     "GtkCTreeNode    *node"},
-    {"GtkCTree", "tree_collapse",
-     "GtkCTreeNode    *node"},
-    {"GtkCTree", "tree_move",
-     "GtkCTreeNode    *node",
-     "GtkCTreeNode    *new_parent",
-     "GtkCTreeNode    *new_sibling"},
-    {"GtkCTree", "change_focus_row_expansion",
-     "GtkCTreeExpansionType expansion"},
-
-    {"GtkEditable", "insert_text",
-     "gchar           *new_text",
-     "gint             new_text_length",
-     "gint            *position"},
-    {"GtkEditable", "delete_text",
-     "gint             start_pos",
-     "gint             end_pos"},
-    {"GtkEditable", "set_editable",
-     "gboolean         is_editable"},
-    {"GtkEditable", "move_cursor",
-     "gint             x",
-     "gint             y"},
-    {"GtkEditable", "move_word",
-     "gint             num_words"},
-    {"GtkEditable", "move_page",
-     "gint             x",
-     "gint             y"},
-    {"GtkEditable", "move_to_row",
-     "gint             row"},
-    {"GtkEditable", "move_to_column",
-     "gint             column"},
-
-    {"GtkEditable", "kill_char",
-     "gint             direction"},
-    {"GtkEditable", "kill_word",
-     "gint             direction"},
-    {"GtkEditable", "kill_line",
-     "gint             direction"},
-
-
-    {"GtkInputDialog", "enable_device",
-     "GdkDevice       *deviceid"},
-    {"GtkInputDialog", "disable_device",
-     "GdkDevice       *deviceid"},
-
-    {"GtkListItem", "extend_selection",
-     "GtkScrollType    scroll_type",
-     "gfloat           position",
-     "gboolean         auto_start_selection"},
-    {"GtkListItem", "scroll_vertical",
-     "GtkScrollType    scroll_type",
-     "gfloat           position"},
-    {"GtkListItem", "scroll_horizontal",
-     "GtkScrollType    scroll_type",
-     "gfloat           position"},
-
-    {"GtkMenuShell", "move_current",
-     "GtkMenuDirectionType direction"},
-    {"GtkMenuShell", "activate_current",
-     "gboolean         force_hide"},
-
-
-    {"GtkNotebook", "switch_page",
-     "GtkNotebookPage *page",
-     "guint            page_num"},
-    {"GtkStatusbar", "text_pushed",
-     "guint            context_id",
-     "gchar           *text"},
-    {"GtkStatusbar", "text_popped",
-     "guint            context_id",
-     "gchar           *text"},
-    {"GtkTipsQuery", "widget_entered",
-     "GtkWidget       *widget",
-     "gchar           *tip_text",
-     "gchar           *tip_private"},
-    {"GtkTipsQuery", "widget_selected",
-     "GtkWidget       *widget",
-     "gchar           *tip_text",
-     "gchar           *tip_private",
-     "GdkEventButton  *event"},
-    {"GtkToolbar", "orientation_changed",
-     "GtkOrientation   orientation"},
-    {"GtkToolbar", "style_changed",
-     "GtkToolbarStyle  style"},
-    {"GtkWidget", "draw",
-     "GdkRectangle    *area"},
-    {"GtkWidget", "size_request",
-     "GtkRequisition  *requisition"},
-    {"GtkWidget", "size_allocate",
-     "GtkAllocation   *allocation"},
-    {"GtkWidget", "state_changed",
-     "GtkStateType     state"},
-    {"GtkWidget", "style_set",
-     "GtkStyle        *previous_style"},
-
-    {"GtkWidget", "install_accelerator",
-     "gchar           *signal_name",
-     "gchar            key",
-     "gint             modifiers"},
-
-    {"GtkWidget", "add_accelerator",
-     "guint            accel_signal_id",
-     "GtkAccelGroup   *accel_group",
-     "guint            accel_key",
-     "GdkModifierType  accel_mods",
-     "GtkAccelFlags    accel_flags"},
-
-    {"GtkWidget", "parent_set",
-     "GtkObject       *old_parent"},
-
-    {"GtkWidget", "remove_accelerator",
-     "GtkAccelGroup   *accel_group",
-     "guint            accel_key",
-     "GdkModifierType  accel_mods"},
-    {"GtkWidget", "debug_msg",
-     "gchar           *message"},
-    {"GtkWindow", "move_resize",
-     "gint            *x",
-     "gint            *y",
-     "gint             width",
-     "gint             height"},
-    {"GtkWindow", "set_focus",
-     "GtkWidget       *widget"},
-
-    {"GtkWidget", "selection_get",
-     "GtkSelectionData *data",
-     "guint            info",
-     "guint            time"},
-    {"GtkWidget", "selection_received",
-     "GtkSelectionData *data",
-     "guint            time"},
-
-    {"GtkWidget", "drag_begin",
-     "GdkDragContext  *drag_context"},
-    {"GtkWidget", "drag_end",
-     "GdkDragContext  *drag_context"},
-    {"GtkWidget", "drag_data_delete",
-     "GdkDragContext  *drag_context"},
-    {"GtkWidget", "drag_leave",
-     "GdkDragContext  *drag_context",
-     "guint            time"},
-    {"GtkWidget", "drag_motion",
-     "GdkDragContext  *drag_context",
-     "gint             x",
-     "gint             y",
-     "guint            time"},
-    {"GtkWidget", "drag_drop",
-     "GdkDragContext  *drag_context",
-     "gint             x",
-     "gint             y",
-     "guint            time"},
-    {"GtkWidget", "drag_data_get",
-     "GdkDragContext  *drag_context",
-     "GtkSelectionData *data",
-     "guint            info",
-     "guint            time"},
-    {"GtkWidget", "drag_data_received",
-     "GdkDragContext  *drag_context",
-     "gint             x",
-     "gint             y",
-     "GtkSelectionData *data",
-     "guint            info",
-     "guint            time"},
-
-    {NULL}
-  };
-
-  gint i;
-
-  for (i = 0; GbArgTable[i][0]; i++)
-    {
-#if 1
-      if (!strcmp (type, GbArgTable[i][0])
-	  && !strcmp (signal_name, GbArgTable[i][1]))
-	return &GbArgTable[i][2];
-#endif
-    }
-  return NULL;
-}
-
 /* This outputs the hierarchy of all objects which have been initialized,
    i.e. by calling their XXX_get_type() initialization function. */
 static void
 output_object_hierarchy (void)
 {
   FILE *fp;
-  gint i;
+  gint i,j;
+  GType root, type;
+  GType root_types[$ntypes] = { G_TYPE_INVALID, };
 
   fp = fopen (hierarchy_filename, "w");
   if (fp == NULL)
@@ -827,20 +533,29 @@
     }
   output_hierarchy (fp, G_TYPE_OBJECT, 0);
   output_hierarchy (fp, G_TYPE_INTERFACE, 0);
-  
+
   for (i=0; object_types[i]; i++) {
-    if (!g_type_parent (object_types[i]) &&
-      (object_types[i] != G_TYPE_OBJECT) &&
-      (object_types[i] != G_TYPE_INTERFACE)
-    ) {
-      output_hierarchy (fp, object_types[i], 0);
+    root = object_types[i];
+    while ((type = g_type_parent (root))) {
+      root = type;
+    }
+    if ((root != G_TYPE_OBJECT) && (root != G_TYPE_INTERFACE)) {
+      for (j=0; root_types[j]; j++) {
+        if (root == root_types[j]) {
+          root = G_TYPE_INVALID; break;
+        }
+      }
+      if(root) {
+        root_types[j] = root;
+        output_hierarchy (fp, root, 0);
+      }
     }
   }
 
   fclose (fp);
 }
 
-/* This is called recursively to output the hierarchy of a widget. */
+/* This is called recursively to output the hierarchy of a object. */
 static void
 output_hierarchy (FILE  *fp,
 		  GType  type,
@@ -856,7 +571,7 @@
   for (i = 0; i < level; i++)
     fprintf (fp, "  ");
   fprintf (fp, "%s\\n", g_type_name (type));
-  
+
   children = g_type_children (type, &n_children);
 
   for (i=0; i < n_children; i++)
@@ -1020,8 +735,13 @@
     desc = g_strdup ("G_MINFLOAT");
   else if (GTKDOC_COMPARE_FLOAT (value, -G_MAXFLOAT))
     desc = g_strdup ("-G_MAXFLOAT");
-  else
-    desc = g_strdup_printf ("%lg", value);
+  else{
+    /* make sure floats are output with a decimal dot irrespective of
+    * current locale. Use formatd since we want human-readable numbers
+    * and do not need the exact same bit representation when deserialising */
+    desc = g_malloc0 (G_ASCII_DTOSTR_BUF_SIZE);
+    g_ascii_formatd (desc, G_ASCII_DTOSTR_BUF_SIZE, "%g", value);
+  }
 
   return desc;
 }
@@ -1297,6 +1017,26 @@
       g_free (lower);
       g_free (upper);
     }
+#if GLIB_CHECK_VERSION (2, 12, 0)
+  else if (G_IS_PARAM_SPEC_GTYPE (spec))
+    {
+      GParamSpecGType *pspec = G_PARAM_SPEC_GTYPE (spec);
+      gboolean is_pointer;
+
+      desc = g_strdup (get_type_name (pspec->is_a_type, &is_pointer));
+    }
+#endif
+#if GLIB_CHECK_VERSION (2, 25, 9)
+  else if (G_IS_PARAM_SPEC_VARIANT (spec))
+    {
+      GParamSpecVariant *pspec = G_PARAM_SPEC_VARIANT (spec);
+      gchar *variant_type;
+
+      variant_type = g_variant_type_dup_string (pspec->type);
+      desc = g_strdup_printf ("GVariant<%s>", variant_type);
+      g_free (variant_type);
+    }
+#endif
   else
     {
       desc = g_strdup ("");
@@ -1418,13 +1158,23 @@
     {
       GParamSpecFloat *pspec = G_PARAM_SPEC_FLOAT (spec);
 
-      desc = g_strdup_printf ("%g", pspec->default_value);
+      /* make sure floats are output with a decimal dot irrespective of
+       * current locale. Use formatd since we want human-readable numbers
+       * and do not need the exact same bit representation when deserialising */
+      desc = g_malloc0 (G_ASCII_DTOSTR_BUF_SIZE);
+      g_ascii_formatd (desc, G_ASCII_DTOSTR_BUF_SIZE, "%g",
+          pspec->default_value);
     }
   else if (G_IS_PARAM_SPEC_DOUBLE (spec))
     {
       GParamSpecDouble *pspec = G_PARAM_SPEC_DOUBLE (spec);
 
-      desc = g_strdup_printf ("%lg", pspec->default_value);
+      /* make sure floats are output with a decimal dot irrespective of
+       * current locale. Use formatd since we want human-readable numbers
+       * and do not need the exact same bit representation when deserialising */
+      desc = g_malloc0 (G_ASCII_DTOSTR_BUF_SIZE);
+      g_ascii_formatd (desc, G_ASCII_DTOSTR_BUF_SIZE, "%g",
+          pspec->default_value);
     }
   else if (G_IS_PARAM_SPEC_STRING (spec))
     {
@@ -1441,6 +1191,17 @@
       else
 	desc = g_strdup_printf ("NULL");
     }
+#if GLIB_CHECK_VERSION (2, 25, 9)
+  else if (G_IS_PARAM_SPEC_VARIANT (spec))
+    {
+      GParamSpecVariant *pspec = G_PARAM_SPEC_VARIANT (spec);
+
+      if (pspec->default_value)
+	desc = g_variant_print (pspec->default_value, TRUE);
+      else
+	desc = g_strdup ("NULL");
+    }
+#endif
   else
     {
       desc = g_strdup ("");
@@ -1548,6 +1309,14 @@
     }
 #endif
 
+#ifdef GTK_IS_CELL_AREA_CLASS
+    if (!child_prop && GTK_IS_CELL_AREA_CLASS (class)) {
+      properties = gtk_cell_area_class_list_cell_properties (class, &n_properties);
+      child_prop = TRUE;
+      continue;
+    }
+#endif
+
 #ifdef GTK_IS_WIDGET_CLASS
 #if GTK_CHECK_VERSION(2,1,0)
     if (!style_prop && GTK_IS_WIDGET_CLASS (class)) {
@@ -1601,7 +1370,9 @@
 system("($command)") == 0 or die "Compilation of scanner failed: $!\n";
 
 print "gtk-doc: Linking scanner\n";
-$command = "$LD -o $MODULE-scan $o_file $LDFLAGS";
+# FIXME: Can we turn off as-needed for the docs (or better fix it?)
+#$command = "$LD -Wl,--no-as-needed $o_file $LDFLAGS -o $MODULE-scan";
+$command = "$LD $o_file $LDFLAGS -o $MODULE-scan";
 system("($command)") == 0 or die "Linking of scanner failed: $!\n";
 
 print "gtk-doc: Running scanner $MODULE-scan\n";
diff -Nru gtk-doc-1.14/gtkdoc-scan.in gtk-doc-1.17/gtkdoc-scan.in
--- gtk-doc-1.14/gtkdoc-scan.in	2010-03-04 21:55:27.000000000 +0000
+++ gtk-doc-1.17/gtkdoc-scan.in	2010-11-26 10:18:00.000000000 +0000
@@ -90,7 +90,8 @@
 
 --module=MODULE_NAME       Name of the doc module being parsed
 --source-dir=DIRNAME       Directories containing the source files to scan
---ignore-headers=FILES     A space-separated list of header files not to scan
+--ignore-headers=FILES     A space-separated list of header files/dirs not to
+                           scan
 --output-dir=DIRNAME       The directory where the results are stored
 --deprecated-guards=GUARDS A |-separated list of symbols used as deprecation
                            guards
@@ -271,10 +272,16 @@
 				  #   nested structs or unions.
     my @objects = ();		  # Holds declarations that look like GtkObject
 				  #   subclasses, which we remove from the list.
+    my ($internal) = 0;             # Set to 1 for internal symbols, we need to
+                                    #   fully parse, but don't add them to docs
+    my %forward_decls = ();         # hashtable of forward declarations, we skip
+                                    #   them if we find the real declaration
+                                    #   later.
 
     my $file_basename;
 
     my $deprecated_conditional_nest = 0;
+    my $ignore_conditional_nest = 0;
 
     my $deprecated = "";
 
@@ -320,44 +327,48 @@
 	    }
 	    next;
 	}
-	# Skip complete blocks, needed fo inline macros
-	if ($skip_block==1) {
-	    if (m%{%) {
-	        $skip_block=2;
-	    }
-	    next;
-	} elsif ($skip_block==2) {
-	    if (m%}%) {
-	        $skip_block=0;
-	    }
-	    next;
-	}
 
         # Keep a count of #if, #ifdef, #ifndef nesting,
         # and if we enter a deprecation-symbol-bracketed
         # zone, take note.
         if (m/^\s*#\s*if(?:n?def\b|\s+!?\s*defined\s*\()\s*(\w+)/) {
-            if ($deprecated_conditional_nest == 0 and $1 =~ /$DEPRECATED_GUARDS/) {
+            my $define_name = $1;
+            if ($deprecated_conditional_nest == 0 and $define_name =~ /$DEPRECATED_GUARDS/) {
                  $deprecated_conditional_nest = 1;
             } elsif ($deprecated_conditional_nest > 0) {
                  $deprecated_conditional_nest += 1;
             }
+            if ($ignore_conditional_nest == 0 and $define_name =~ /__GTK_DOC_IGNORE__/) {
+                 $ignore_conditional_nest = 1;
+            } elsif ($ignore_conditional_nest > 0) {
+                 $ignore_conditional_nest += 1;
+            }
         } elsif (m/^\s*#\sif/) {
             if ($deprecated_conditional_nest > 0) {
                  $deprecated_conditional_nest += 1;
             }
+            if ($ignore_conditional_nest > 0) {
+                 $ignore_conditional_nest += 1;
+            }
         } elsif (m/^\s*#endif/) {
             if ($deprecated_conditional_nest > 0) {
                 $deprecated_conditional_nest -= 1;
             }
+            if ($ignore_conditional_nest > 0) {
+                $ignore_conditional_nest -= 1;
+            }
         }
 
-        # set global that affects AddSymbolToList
+        # set global that is used later when we do AddSymbolToList
         if ($deprecated_conditional_nest > 0) {
             $deprecated = "\n";
         } else {
             $deprecated = "";
         }
+        
+        if($ignore_conditional_nest) {
+            next;
+        }
 
 	if (!$in_declaration) {
 	    # Skip top-level comments.
@@ -377,6 +388,7 @@
 
 	    if (m/^\s*#\s*define\s+(\w+)/) {
 		$symbol = $1;
+		$decl = $_;
 		# We assume all macros which start with '_' are private, but
 		# we accept '_' itself which is the standard gettext macro.
 		# We also try to skip the first macro if it looks like the
@@ -389,11 +401,14 @@
 		     && (($symbol ne 'TRUE' && $symbol ne 'FALSE')
 			 || $MODULE eq 'glib'))
 		    || $symbol eq "_") {
-		    $decl = $_;
 		    $in_declaration = "macro";
+		    #print "DEBUG: Macro: $symbol\n";
+		} else {
+		    #print "DEBUG: skipping Macro: $symbol\n";
+		    $in_declaration = "macro";
+		    $internal = 1;
 		}
 		$first_macro = 0;
-                #print "DEBUG: Macro: $symbol\n";
 
 
 	    # TYPEDEF'D FUNCTIONS (i.e. user functions)
@@ -470,8 +485,7 @@
 		# will override this.
 		my $structsym = uc $1;
 		#print "DEBUG: $structsym typedef: $2\n";
-		&AddSymbolToList (\$list, $2);
-		print DECL "<$structsym>\n$2\n$deprecated\n";
+		$forward_decls{$2} = "<$structsym>\n$2\n$deprecated\n"
 
 	    } elsif (m/^\s*(?:struct|union)\s+_(\w+)\s*;/) {
 		# Skip private structs/unions.
@@ -483,8 +497,7 @@
 	        # can differentiate it from a typedef.
 	        my $structsym = uc $1;
 	        #print "DEBUG: $structsym: $2\n";
-		&AddSymbolToList (\$list, $2);
-		print DECL "<$structsym>\n$2\n$_$deprecated\n";
+                $forward_decls{$2} = "<$structsym>\n$2\n$_$deprecated\n";
 
 	    } elsif (m/^\s*typedef\s+(struct|union)\s*\w*\s*{/) {
 		$symbol = "";
@@ -497,14 +510,16 @@
 
 	    } elsif (m/^\s*typedef\s+(?:struct|union)\s+\w+[\s\*]+(\w+)\s*;/) {
 		#print "DEBUG: Found struct/union(*) typedef $1: $_";
-		&AddSymbolToList (\$list, $1);
-		print DECL "\n$1\n$deprecated$_\n";
+		if (&AddSymbolToList (\$list, $1)) {
+		    print DECL "\n$1\n$deprecated$_\n";
+		}
 
 	    } elsif (m/^\s*(G_GNUC_EXTENSION\s+)?typedef\s+(.+[\s\*])(\w+)(\s*\[[^\]]+\])*\s*;/) {
 		if ($2 !~ m/^struct\s/ && $2 !~ m/^union\s/) {
 		    #print "DEBUG: Found typedef: $_";
-		    &AddSymbolToList (\$list, $3);
-		    print DECL "\n$3\n$deprecated$_\n";
+		    if (&AddSymbolToList (\$list, $3)) {
+		        print DECL "\n$3\n$deprecated$_\n";
+		    }
 		}
 	    } elsif (m/^\s*typedef\s+/) {
 		#print "DEBUG: Skipping typedef: $_";
@@ -516,29 +531,43 @@
 		$symbol = $5;
 	        s/^\s*([A-Za-z_]+VAR)\b/extern/;
 		#print "DEBUG: Possible extern: $_";
-		&AddSymbolToList (\$list, $symbol);
-		print DECL "\n$symbol\n$deprecated$_\n";
+		if (&AddSymbolToList (\$list, $symbol)) {
+		    print DECL "\n$symbol\n$deprecated$_\n";
+		}
 
 
 	    # FUNCTIONS
 
 	    # We assume that functions which start with '_' are private, so
 	    # we skip them.
-	    #                                                                       $1                                                                                                                                                             $2
-	    } elsif (m/^\s*(?:\b(?:extern|G_INLINE_FUNC|${IGNORE_DECORATORS})\b\s*)*((?:const\s+|G_CONST_RETURN\s+|signed\s+|unsigned\s+|long\s+|short\s+|struct\s+|union\s+|enum\s+)*_\w+(?:\**\s+\**(?:const|G_CONST_RETURN))?(?:\s+|\s*\*+))\s*\(\s*\*+\s*([A-Za-z]\w*)\s*\)\s*\(/o) {
+	    #                                                                       $1                                                                                                    $2                                                          $3
+	    } elsif (m/^\s*(?:\b(?:extern|G_INLINE_FUNC|${IGNORE_DECORATORS})\b\s*)*((?:const\s+|G_CONST_RETURN\s+|signed\s+|unsigned\s+|long\s+|short\s+|struct\s+|union\s+|enum\s+)*\w+)((?:\s+|\*)+(?:\s*(?:\*+|\bconst\b|\bG_CONST_RETURN\b))*)\s*(_[A-Za-z]\w*)\s*\(/o) {
 		$ret_type = $1;
-		$symbol = $2;
+		if (defined ($2)) { $ret_type .= " $2"; }
+		$symbol = $3;
 		$decl = $';
-		#print "DEBUG: internal Function: $symbol, Returns: $ret_type\n";
+		#print "DEBUG: internal Function: $symbol, Returns: [$1][$2]\n";
 		$in_declaration = "function";
+		$internal = 1;
+		if (m/^\s*G_INLINE_FUNC/) {
+		    #print "DEBUG: skip block after inline function\n";
+		    # now we we need to skip a whole { } block
+		    $skip_block = 1;
+		}
 
-	    #                                                                       $1                                                                                                                                                 $2
-	    } elsif (m/^\s*(?:\b(?:extern|G_INLINE_FUNC|${IGNORE_DECORATORS})\b\s*)*((?:const\s+|G_CONST_RETURN\s+|signed\s+|unsigned\s+|long\s+|short\s+|struct\s+|union\s+|enum\s+)*\w+(?:\**\s+\**(?:const|G_CONST_RETURN))?(?:\s+|\s*\*+))\s*([A-Za-z]\w*)\s*\(/o) {
+	    #                                                                       $1                                                                                                    $2                                                          $3
+	    } elsif (m/^\s*(?:\b(?:extern|G_INLINE_FUNC|${IGNORE_DECORATORS})\b\s*)*((?:const\s+|G_CONST_RETURN\s+|signed\s+|unsigned\s+|long\s+|short\s+|struct\s+|union\s+|enum\s+)*\w+)((?:\s+|\*)+(?:\s*(?:\*+|\bconst\b|\bG_CONST_RETURN\b))*)\s*([A-Za-z]\w*)\s*\(/o) {	            
 		$ret_type = $1;
-		$symbol = $2;
+		if (defined ($2)) { $ret_type .= " $2"; }
+		$symbol = $3;
 		$decl = $';
-		#print "DEBUG: Function (1): $symbol, Returns: $ret_type\n";
+		#print "DEBUG: Function (1): $symbol, Returns: [$1][$2]\n";
 		$in_declaration = "function";
+		if (m/^\s*G_INLINE_FUNC/) {
+		    #print "DEBUG: skip block after inline function\n";
+		    # now we we need to skip a whole { } block
+		    $skip_block = 1;
+		}
 
 	    # Try to catch function declarations which have the return type on
 	    # the previous line. But we don't want to catch complete functions
@@ -550,13 +579,24 @@
 
 		if ($previous_line !~ m/^\s*G_INLINE_FUNC/) {
 		    if ($previous_line !~ m/^\s*static\s+/) {
-                        #                                                                       $1                                                                         $2
-                        if ($previous_line =~ m/^\s*(?:\b(?:extern|${IGNORE_DECORATORS})\b\s*)*((?:const\s+|G_CONST_RETURN\s+|signed\s+|unsigned\s+|struct\s+|union\s+|enum\s+)?\w+)((?:\s*(?:\*+|\bconst\b|\bG_CONST_RETURN\b))*)\s*$/o) {
+                        #                                                                       $1                                                                                                   $2
+                        if ($previous_line =~ m/^\s*(?:\b(?:extern|${IGNORE_DECORATORS})\b\s*)*((?:const\s+|G_CONST_RETURN\s+|signed\s+|unsigned\s+|long\s+|short\s+|struct\s+|union\s+|enum\s+)*\w+)((?:\s*(?:\*+|\bconst\b|\bG_CONST_RETURN\b))*)\s*$/o) {
                             $ret_type = $1;
                             if (defined ($2)) { $ret_type .= " $2"; }
                             #print "DEBUG: Function  (2): $symbol, Returns: $ret_type\n";
                             $in_declaration = "function";
                         }
+                    } else {
+                        #print "DEBUG: skip block after inline function\n";
+                        # now we we need to skip a whole { } block
+                        $skip_block = 1;
+                        #                                                                                    $1                                                                                                   $2
+                        if ($previous_line =~ m/^\s*(?:\b(?:extern|static|inline|${IGNORE_DECORATORS})\b\s*)*((?:const\s+|G_CONST_RETURN\s+|signed\s+|unsigned\s+|long\s+|short\s+|struct\s+|union\s+|enum\s+)*\w+)((?:\s*(?:\*+|\bconst\b|\bG_CONST_RETURN\b))*)\s*$/o) {
+                            $ret_type = $1;
+                            if (defined ($2)) { $ret_type .= " $2"; }
+                            #print "DEBUG: Function  (3): $symbol, Returns: $ret_type\n";
+                            $in_declaration = "function";
+                        }
                     }
                 }
                 else {
@@ -564,14 +604,12 @@
                         #print "DEBUG: skip block after inline function\n";
                         # now we we need to skip a whole { } block
                         $skip_block = 1;
-                        #                                                                       $1                                                                         $2
-                        if ($previous_line =~ m/^\s*(?:\b(?:extern|G_INLINE_FUNC|${IGNORE_DECORATORS})\b\s*)*((?:const\s+|G_CONST_RETURN\s+|signed\s+|unsigned\s+|struct\s+|union\s+|enum\s+)?\w+)((?:\s*(?:\*+|\bconst\b|\bG_CONST_RETURN\b))*)\s*$/o) {
+                        #                                                                                    $1                                                                                                    $2
+                        if ($previous_line =~ m/^\s*(?:\b(?:extern|G_INLINE_FUNC|${IGNORE_DECORATORS})\b\s*)*((?:const\s+|G_CONST_RETURN\s+|signed\s+|unsigned\s+|long\s+|short\s+|struct\s+|union\s+|enum\s+)*\w+)((?:\s*(?:\*+|\bconst\b|\bG_CONST_RETURN\b))*)\s*$/o) {
                             $ret_type = $1;
                             if (defined ($2)) { $ret_type .= " $2"; }
-                            #print "DEBUG: Function (3): $symbol, Returns: $ret_type\n";
+                            #print "DEBUG: Function (4): $symbol, Returns: $ret_type\n";
                             $in_declaration = "function";
-                            # this is a hack to detect the end of declaration
-                            $decl.=";"
                         }
                     }
 		}
@@ -583,7 +621,7 @@
 		if ($previous_line =~ m/^\s*(?:\b(?:extern|G_INLINE_FUNC|${IGNORE_DECORATORS})\b\s*)*((?:const\s+|G_CONST_RETURN\s+|signed\s+|unsigned\s+|enum\s+)*\w+)(\s+\*+|\*+|\s)\s*([A-Za-z]\w*)\s*$/o) {
 		    $ret_type = "$1 $2";
 		    $symbol = $3;
-		    #print "DEBUG: Function (4): $symbol, Returns: $ret_type\n";
+		    #print "DEBUG: Function (5): $symbol, Returns: $ret_type\n";
 		    $in_declaration = "function";
 
 		} elsif ($previous_line =~ m/^\s*\w+\s*$/
@@ -595,7 +633,7 @@
                     $symbol = $previous_line;
                     $symbol =~ s/^\s+//;
                     $symbol =~ s/\s*\n//;
-                    #print "DEBUG: Function (5): $symbol, Returns: $ret_type\n";
+                    #print "DEBUG: Function (6): $symbol, Returns: $ret_type\n";
 		}
 
 	    #} elsif (m/^extern\s+/) {
@@ -613,7 +651,7 @@
 		# declaration of struct .
 		$symbol = $1;
 		$decl = $_;
-                # we will find the correct level as below we do $level += tr/{//;
+                 # we will find the correct level as below we do $level += tr/{//;
 		$level = 0;
 		$in_declaration = "struct";
 		#print "DEBUG: Struct(_): $symbol\n";
@@ -632,10 +670,31 @@
 	    }
 
 	} else {
-            #print "1: $_";
+            #print "1: [$skip_block] $_";
 	    # If we were already in the middle of a declaration, we simply add
 	    # the current line onto the end of it.
-	    $decl .= $_;
+	    if ($skip_block == 0) {
+	        $decl .= $_;
+	    } else {
+                if (m%(.*?){%) {
+                    if ($skip_block == 1) {
+                        $decl .= $1;
+                    }
+                    $skip_block += 1;
+                } elsif (m%}%) {
+                    $skip_block -= 1;
+                    if ($skip_block == 1) {
+                        # this is a hack to detect the end of declaration
+                        $decl .= ";";
+                        $skip_block = 0;
+                        #print "2: ---\n";
+                    }
+                } else {
+                    if ($skip_block == 1) {
+                        $decl .= $_;
+                    }
+                }
+            }
 	}
 
         #if ($in_declaration ne '') {
@@ -646,37 +705,49 @@
 	# ') __attribute__ (...);'.
 	if ($in_declaration eq 'function') {
 	    if ($decl =~ s/\)\s*(G_GNUC_.*|${IGNORE_DECORATORS}\s*|__attribute__\s*\(.*\)\s*)?;.*$//) {
-		$decl =~ s%/\*.*?\*/%%gs;	# remove comments.
-		#$decl =~ s/^\s+//;		# remove leading whitespace.
-		#$decl =~ s/\s+$//;		# remove trailing whitespace.
-		$decl =~ s/\s*\n\s*/ /gs;		# consolidate whitespace at start
-						# and end of lines.
-		$ret_type =~ s%/\*.*?\*/%%g;	# remove comments in ret type.
-		&AddSymbolToList (\$list, $symbol);
-		print DECL "\n$symbol\n$deprecated$ret_type\n$decl\n\n";
-                if ($REBUILD_TYPES) {
-                    # check if this looks like a get_type function and if so remember
-                    if (($symbol =~ m/_get_type$/) && ($ret_type =~ m/GType/) && ($decl =~ m/(void|)/)) {
-                        #print "Adding get-type: [$ret_type] [$symbol] [$decl]\tfrom $input_file\n";
-                        push (@get_types, $symbol);
-                    }
+		if ($internal == 0) {
+                     $decl =~ s%/\*.*?\*/%%gs;	# remove comments.
+                     #$decl =~ s/^\s+//;		# remove leading whitespace.
+                     #$decl =~ s/\s+$//;		# remove trailing whitespace.
+                     $decl =~ s/\s*\n\s*/ /gs;	# consolidate whitespace at start
+                                                   # and end of lines.
+                     $ret_type =~ s%/\*.*?\*/%%g;	# remove comments in ret type.
+                     if (&AddSymbolToList (\$list, $symbol)) {
+                         print DECL "\n$symbol\n$deprecated$ret_type\n$decl\n\n";
+                         if ($REBUILD_TYPES) {
+                             # check if this looks like a get_type function and if so remember
+                             if (($symbol =~ m/_get_type$/) && ($ret_type =~ m/GType/) && ($decl =~ m/(void|)/)) {
+                                 #print "Adding get-type: [$ret_type] [$symbol] [$decl]\tfrom $input_file\n";
+                                 push (@get_types, $symbol);
+                             }
+                         }
+                     }
+                } else {
+                     $internal = 0;
                 }
-		$in_declaration = "";
+                $in_declaration = "";
+                $skip_block = 0;
 	    }
 	}
 
 	if ($in_declaration eq 'user_function') {
 	    if ($decl =~ s/\).*$//) {
-		&AddSymbolToList (\$list, $symbol);
-		print DECL "\n$symbol\n$deprecated$ret_type\n$decl\n";
+	        if (&AddSymbolToList (\$list, $symbol)) {
+	            print DECL "\n$symbol\n$deprecated$ret_type\n$decl\n";
+	        }
 		$in_declaration = "";
 	    }
 	}
 
 	if ($in_declaration eq 'macro') {
 	    if ($decl !~ m/\\\s*$/) {
-		&AddSymbolToList (\$list, $symbol);
-		print DECL "\n$symbol\n$deprecated$decl\n";
+	        if ($internal == 0) {
+                    if (&AddSymbolToList (\$list, $symbol)) {
+                        print DECL "\n$symbol\n$deprecated$decl\n";
+                    }
+	        } else {
+                    $internal = 0;
+	        }
 		$in_declaration = "";
 	    }
 	}
@@ -686,8 +757,9 @@
 		if ($symbol eq "") {
 		    $symbol = $1;
 		}
-		&AddSymbolToList (\$list, $symbol);
-		print DECL "\n$symbol\n$deprecated$decl\n";
+		if (&AddSymbolToList (\$list, $symbol)) {
+		    print DECL "\n$symbol\n$deprecated$decl\n";
+		}
 		$in_declaration = "";
 	    }
 	}
@@ -707,10 +779,13 @@
 		    push (@objects, $objectname);
 		}
 		#print "Store struct: $symbol\n";
-		&AddSymbolToList (\$list, $symbol);
-
-		my $structsym = uc $in_declaration;
-		print DECL "<$structsym>\n$symbol\n$deprecated$decl\n";
+		if (&AddSymbolToList (\$list, $symbol)) {
+		    my $structsym = uc $in_declaration;
+		    print DECL "<$structsym>\n$symbol\n$deprecated$decl\n";
+		    if (defined($forward_decls{$symbol})) {
+		        undef($forward_decls{$symbol});
+		    }
+		}
 		$in_declaration = "";
 	    } else {
 		# We use tr to count the brackets in the line, and adjust
@@ -726,6 +801,14 @@
     }
     close(INPUT);
     
+    # print remaining forward declarations
+    foreach $symbol (keys %forward_decls) {
+        if (defined($forward_decls{$symbol})) {
+            &AddSymbolToList (\$list, $symbol);
+            print DECL $forward_decls{$symbol};
+        }
+    }
+    
     #print "DEBUG: Scanning $input_file done\n\n\n";
 
 
@@ -779,8 +862,12 @@
     my ($list, $symbol) = @_;
 
     if ($$list =~ m/\b\Q$symbol\E\b/) {
-#	print "Symbol $symbol already in list. skipping\n";
-	return;
+         #print "Symbol $symbol already in list. skipping\n";
+         # we return 0 to skip outputting another entry to -decl.txt
+         # this is to avoid redeclarations (e.g. in conditional
+         # sections).
+	return 0;
     }
     $$list .= "$symbol\n";
+    return 1;
 }
diff -Nru gtk-doc-1.14/gtkdoc-scanobj.in gtk-doc-1.17/gtkdoc-scanobj.in
--- gtk-doc-1.14/gtkdoc-scanobj.in	2010-01-29 10:21:37.000000000 +0000
+++ gtk-doc-1.17/gtkdoc-scanobj.in	2010-10-23 07:33:05.000000000 +0000
@@ -24,11 +24,6 @@
 # by compiling a small C program. CFLAGS and LDFLAGS must be
 # set appropriately before running this script.
 #
-# NOTE: the lookup_signal_arg_names() function contains the argument names of
-#       standard GTK signal handlers. This may need to be updated for new
-#       GTK signals or Gnome widget signals.
-#       FIXME: this is only needed for undocumented signals, we should remove
-#       the list as its totally undermaintained anyway
 
 use Getopt::Long;
 
@@ -152,10 +147,6 @@
 				  guint signal_id);
 static gchar * get_type_name (GtkType type,
 			      gboolean * is_pointer);
-static gchar * get_gdk_event (const gchar * signal_name);
-static gchar ** lookup_signal_arg_names (gchar * type,
-					 const gchar * signal_name);
-
 static void output_widget_hierarchy (void);
 static void output_hierarchy (FILE *fp,
 			      GtkType type,
@@ -250,7 +241,6 @@
   gboolean is_pointer;
   gchar buffer[1024];
   guint i, param;
-  gchar **arg_names;
   gint param_num, widget_num, event_num, callback_num;
   gint *arg_num;
   gchar signal_name[128];
@@ -304,59 +294,41 @@
     }
 
   /* Output the signal parameters. */
-  arg_names = lookup_signal_arg_names (object_name, signal_name);
-
   for (param = 0; param < query_info->nparams; param++)
     {
-      if (arg_names)
-	{
-	  sprintf (pos, "%s\\n", arg_names[param]);
-	  pos += strlen (pos);
-	}
+      type_name = get_type_name (query_info->params[param], &is_pointer);
+
+      /* Most arguments to the callback are called "arg1", "arg2", etc.
+         GtkWidgets are called "widget", "widget2", ...
+         GtkCallbacks are called "callback", "callback2", ... */
+      if (!strcmp (type_name, "GtkWidget"))
+        {
+          arg_name = "widget";
+          arg_num = &widget_num;
+        }
+      else if (!strcmp (type_name, "GtkCallback")
+               || !strcmp (type_name, "GtkCCallback"))
+        {
+          arg_name = "callback";
+          arg_num = &callback_num;
+        }
       else
-	{
-	  type_name = get_type_name (query_info->params[param], &is_pointer);
+        {
+          arg_name = "arg";
+          arg_num = ¶m_num;
+        }
+      sprintf (pos, "%s ", type_name);
+      pos += strlen (pos);
 
-	  /* Most arguments to the callback are called "arg1", "arg2", etc.
-	     GdkWidgets are called "widget", "widget2", ...
-	     GdkEvents are called "event", "event2", ...
-	     GtkCallbacks are called "callback", "callback2", ... */
-	  if (!strcmp (type_name, "GtkWidget"))
-	    {
-	      arg_name = "widget";
-	      arg_num = &widget_num;
-	    }
-	  else if (!strcmp (type_name, "GdkEvent"))
-	    {
-	      type_name = get_gdk_event (signal_name);
-	      arg_name = "event";
-	      arg_num = &event_num;
-	      is_pointer = TRUE;
-	    }
-	  else if (!strcmp (type_name, "GtkCallback")
-		   || !strcmp (type_name, "GtkCCallback"))
-	    {
-	      arg_name = "callback";
-	      arg_num = &callback_num;
-	    }
-	  else
-	    {
-	      arg_name = "arg";
-	      arg_num = ¶m_num;
-	    }
-	  sprintf (pos, "%s ", type_name);
-	  pos += strlen (pos);
-
-	  if (!arg_num || *arg_num == 0)
-	    sprintf (pos, "%s%s\\n", is_pointer ? "*" : " ", arg_name);
-	  else
-	    sprintf (pos, "%s%s%i\\n", is_pointer ? "*" : " ", arg_name,
-		     *arg_num);
-	      pos += strlen (pos);
-	      
-	      if (arg_num)
-		*arg_num += 1;
-	}
+      if (!arg_num || *arg_num == 0)
+        sprintf (pos, "%s%s\\n", is_pointer ? "*" : " ", arg_name);
+      else
+        sprintf (pos, "%s%s%i\\n", is_pointer ? "*" : " ", arg_name,
+                 *arg_num);
+          pos += strlen (pos);
+          
+          if (arg_num)
+            *arg_num += 1;
     }
 
   /* Output the return type and function name. */
@@ -433,283 +405,6 @@
 }
 
 
-static gchar *
-get_gdk_event (const gchar * signal_name)
-{
-  static gchar *GbGDKEvents[] =
-  {
-    "button_press_event", "GdkEventButton",
-    "button_release_event", "GdkEventButton",
-    "motion_notify_event", "GdkEventMotion",
-    "delete_event", "GdkEvent",
-    "destroy_event", "GdkEvent",
-    "expose_event", "GdkEventExpose",
-    "key_press_event", "GdkEventKey",
-    "key_release_event", "GdkEventKey",
-    "enter_notify_event", "GdkEventCrossing",
-    "leave_notify_event", "GdkEventCrossing",
-    "configure_event", "GdkEventConfigure",
-    "focus_in_event", "GdkEventFocus",
-    "focus_out_event", "GdkEventFocus",
-    "map_event", "GdkEvent",
-    "unmap_event", "GdkEvent",
-    "property_notify_event", "GdkEventProperty",
-    "selection_clear_event", "GdkEventSelection",
-    "selection_request_event", "GdkEventSelection",
-    "selection_notify_event", "GdkEventSelection",
-    "proximity_in_event", "GdkEventProximity",
-    "proximity_out_event", "GdkEventProximity",
-    "drag_begin_event", "GdkEventDragBegin",
-    "drag_request_event", "GdkEventDragRequest",
-    "drag_end_event", "GdkEventDragRequest",
-    "drop_enter_event", "GdkEventDropEnter",
-    "drop_leave_event", "GdkEventDropLeave",
-    "drop_data_available_event", "GdkEventDropDataAvailable",
-    "other_event", "GdkEventOther",
-    "client_event", "GdkEventClient",
-    "no_expose_event", "GdkEventNoExpose",
-    "visibility_notify_event", "GdkEventVisibility",
-    "window_state_event", "GdkEventWindowState",
-    "scroll_event", "GdkEventScroll",
-    NULL
-  };
-
-  gint i;
-
-  for (i = 0; GbGDKEvents[i]; i += 2)
-    {
-      if (!strcmp (signal_name, GbGDKEvents[i]))
-	return GbGDKEvents[i + 1];
-    }
-  return "GdkEvent";
-}
-
-
-/* This returns argument names to use for some known GTK signals.
-    It is passed a widget name, e.g. 'GtkCList' and a signal name, e.g.
-    'select_row' and it returns a pointer to an array of argument types and
-    names. */
-static gchar **
-lookup_signal_arg_names (gchar * type, const gchar * signal_name)
-{
-  /* Each arg array starts with the object type name and the signal name,
-     and then signal arguments follow. */
-  static gchar *GbArgTable[][16] =
-  {
-    {"GtkCList", "select_row",
-     "gint             row",
-     "gint             column",
-     "GdkEventButton  *event"},
-    {"GtkCList", "unselect_row",
-     "gint             row",
-     "gint             column",
-     "GdkEventButton  *event"},
-    {"GtkCList", "click_column",
-     "gint             column"},
-
-    {"GtkCList", "resize_column",
-     "gint             column",
-     "gint             width"},
-
-    {"GtkCList", "extend_selection",
-     "GtkScrollType    scroll_type",
-     "gfloat           position",
-     "gboolean         auto_start_selection"},
-    {"GtkCList", "scroll_vertical",
-     "GtkScrollType    scroll_type",
-     "gfloat           position"},
-    {"GtkCList", "scroll_horizontal",
-     "GtkScrollType    scroll_type",
-     "gfloat           position"},
-    {"GtkContainer", "focus",
-     "GtkDirectionType direction"},
-    {"GtkCTree", "tree_select_row",
-     "GList           *node",
-     "gint             column"},
-    {"GtkCTree", "tree_unselect_row",
-     "GList           *node",
-     "gint             column"},
-
-    {"GtkCTree", "tree_expand",
-     "GList           *node"},
-    {"GtkCTree", "tree_collapse",
-     "GList           *node"},
-    {"GtkCTree", "tree_move",
-     "GList           *node",
-     "GList           *new_parent",
-     "GList           *new_sibling"},
-    {"GtkCTree", "change_focus_row_expansion",
-     "GtkCTreeExpansionType expansion"},
-
-    {"GtkEditable", "insert_text",
-     "gchar           *new_text",
-     "gint             new_text_length",
-     "gint            *position"},
-    {"GtkEditable", "delete_text",
-     "gint             start_pos",
-     "gint             end_pos"},
-    {"GtkEditable", "set_editable",
-     "gboolean         is_editable"},
-    {"GtkEditable", "move_cursor",
-     "gint             x",
-     "gint             y"},
-    {"GtkEditable", "move_word",
-     "gint             num_words"},
-    {"GtkEditable", "move_page",
-     "gint             x",
-     "gint             y"},
-    {"GtkEditable", "move_to_row",
-     "gint             row"},
-    {"GtkEditable", "move_to_column",
-     "gint             column"},
-
-    {"GtkEditable", "kill_char",
-     "gint             direction"},
-    {"GtkEditable", "kill_word",
-     "gint             direction"},
-    {"GtkEditable", "kill_line",
-     "gint             direction"},
-
-
-    {"GtkInputDialog", "enable_device",
-     "gint             deviceid"},
-    {"GtkInputDialog", "disable_device",
-     "gint             deviceid"},
-
-    {"GtkListItem", "extend_selection",
-     "GtkScrollType    scroll_type",
-     "gfloat           position",
-     "gboolean         auto_start_selection"},
-    {"GtkListItem", "scroll_vertical",
-     "GtkScrollType    scroll_type",
-     "gfloat           position"},
-    {"GtkListItem", "scroll_horizontal",
-     "GtkScrollType    scroll_type",
-     "gfloat           position"},
-
-    {"GtkMenuShell", "move_current",
-     "GtkMenuDirectionType direction"},
-    {"GtkMenuShell", "activate_current",
-     "gboolean         force_hide"},
-
-
-    {"GtkNotebook", "switch_page",
-     "GtkNotebookPage *page",
-     "gint             page_num"},
-    {"GtkStatusbar", "text_pushed",
-     "guint            context_id",
-     "gchar           *text"},
-    {"GtkStatusbar", "text_popped",
-     "guint            context_id",
-     "gchar           *text"},
-    {"GtkTipsQuery", "widget_entered",
-     "GtkWidget       *widget",
-     "gchar           *tip_text",
-     "gchar           *tip_private"},
-    {"GtkTipsQuery", "widget_selected",
-     "GtkWidget       *widget",
-     "gchar           *tip_text",
-     "gchar           *tip_private",
-     "GdkEventButton  *event"},
-    {"GtkToolbar", "orientation_changed",
-     "GtkOrientation   orientation"},
-    {"GtkToolbar", "style_changed",
-     "GtkToolbarStyle  style"},
-    {"GtkWidget", "draw",
-     "GdkRectangle    *area"},
-    {"GtkWidget", "size_request",
-     "GtkRequisition  *requisition"},
-    {"GtkWidget", "size_allocate",
-     "GtkAllocation   *allocation"},
-    {"GtkWidget", "state_changed",
-     "GtkStateType     state"},
-    {"GtkWidget", "style_set",
-     "GtkStyle        *previous_style"},
-
-    {"GtkWidget", "install_accelerator",
-     "gchar           *signal_name",
-     "gchar            key",
-     "gint             modifiers"},
-
-    {"GtkWidget", "add_accelerator",
-     "guint            accel_signal_id",
-     "GtkAccelGroup   *accel_group",
-     "guint            accel_key",
-     "GdkModifierType  accel_mods",
-     "GtkAccelFlags    accel_flags"},
-
-    {"GtkWidget", "parent_set",
-     "GtkObject       *old_parent"},
-
-    {"GtkWidget", "remove_accelerator",
-     "GtkAccelGroup   *accel_group",
-     "guint            accel_key",
-     "GdkModifierType  accel_mods"},
-    {"GtkWidget", "debug_msg",
-     "gchar           *message"},
-    {"GtkWindow", "move_resize",
-     "gint            *x",
-     "gint            *y",
-     "gint             width",
-     "gint             height"},
-    {"GtkWindow", "set_focus",
-     "GtkWidget       *widget"},
-
-    {"GtkWidget", "selection_get",
-     "GtkSelectionData *data",
-     "guint            info",
-     "guint            time"},
-    {"GtkWidget", "selection_received",
-     "GtkSelectionData *data",
-     "guint            time"},
-
-    {"GtkWidget", "drag_begin",
-     "GdkDragContext  *drag_context"},
-    {"GtkWidget", "drag_end",
-     "GdkDragContext  *drag_context"},
-    {"GtkWidget", "drag_data_delete",
-     "GdkDragContext  *drag_context"},
-    {"GtkWidget", "drag_leave",
-     "GdkDragContext  *drag_context",
-     "guint            time"},
-    {"GtkWidget", "drag_motion",
-     "GdkDragContext  *drag_context",
-     "gint             x",
-     "gint             y",
-     "guint            time"},
-    {"GtkWidget", "drag_drop",
-     "GdkDragContext  *drag_context",
-     "gint             x",
-     "gint             y",
-     "guint            time"},
-    {"GtkWidget", "drag_data_get",
-     "GdkDragContext  *drag_context",
-     "GtkSelectionData *data",
-     "guint            info",
-     "guint            time"},
-    {"GtkWidget", "drag_data_received",
-     "GdkDragContext  *drag_context",
-     "gint             x",
-     "gint             y",
-     "GtkSelectionData *data",
-     "guint            info",
-     "guint            time"},
-
-    {NULL}
-  };
-
-  gint i;
-
-  for (i = 0; GbArgTable[i][0]; i++)
-    {
-      if (!strcmp (type, GbArgTable[i][0])
-	  && !strcmp (signal_name, GbArgTable[i][1]))
-	return &GbArgTable[i][2];
-    }
-  return NULL;
-}
-
-
 /* This outputs the hierarchy of all widgets which have been initialized,
    i.e. by calling their XXX_get_type() initialization function. */
 static void
@@ -841,7 +536,9 @@
 system("($command)") == 0 or die "Compilation of scanner failed: $!\n";
 
 print "gtk-doc: Linking scanner\n";
-$command = "$LD -o $MODULE-scan $o_file $LDFLAGS";
+# FIXME: Can we turn off as-needed for the docs (or better fix it?)
+#$command = "$LD -Wl,--no-as-needed $o_file $LDFLAGS -o $MODULE-scan";
+$command = "$LD $o_file $LDFLAGS -o $MODULE-scan";
 system("($command)") == 0 or die "Linking of scanner failed: $!\n";
 
 print "gtk-doc: Running scanner $MODULE-scan\n";
diff -Nru gtk-doc-1.14/gtk-doc.spec gtk-doc-1.17/gtk-doc.spec
--- gtk-doc-1.14/gtk-doc.spec	2010-01-03 12:15:19.000000000 +0000
+++ gtk-doc-1.17/gtk-doc.spec	2011-02-26 12:26:11.000000000 +0000
@@ -2,7 +2,7 @@
 
 Summary: 	GTK+ DocBook Documentation Generator
 Name: 		gtk-doc
-Version: 	1.14
+Version: 	1.17
 Release: 	1
 License: 	GPL
 Group: 		Utilities/Text
diff -Nru gtk-doc-1.14/gtk-doc.xsl gtk-doc-1.17/gtk-doc.xsl
--- gtk-doc-1.14/gtk-doc.xsl	2010-03-28 15:42:14.000000000 +0000
+++ gtk-doc-1.17/gtk-doc.xsl	2010-06-13 10:58:16.000000000 +0000
@@ -158,7 +158,7 @@
     
   
 
-  
+  
   
     
     
@@ -179,7 +179,9 @@
   
 
   
-  
+  
+  
+  
         
           
             
@@ -203,9 +204,9 @@
         
       
     
-  
+  
   
-  
+    
   
     
       
@@ -263,7 +264,6 @@
             
           
         
-        
         
           
             
@@ -272,6 +272,8 @@
       
     
   
+  
+
 
   
   
@@ -306,7 +308,7 @@
     
       
       
-        
         
         
     
       <ONLINE href="
-        
-        ">

+      
+      ">

     
   
 
diff -Nru gtk-doc-1.14/help/Makefile.in gtk-doc-1.17/help/Makefile.in
--- gtk-doc-1.14/help/Makefile.in	2010-01-03 12:15:09.000000000 +0000
+++ gtk-doc-1.17/help/Makefile.in	2011-02-26 12:26:03.000000000 +0000
@@ -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,
@@ -96,7 +96,6 @@
   done; \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
@@ -158,6 +157,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
@@ -285,7 +285,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]*);; \
@@ -310,7 +310,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]*);; \
diff -Nru gtk-doc-1.14/help/manual/bn_IN/gtk-doc-manual.xml gtk-doc-1.17/help/manual/bn_IN/gtk-doc-manual.xml
--- gtk-doc-1.14/help/manual/bn_IN/gtk-doc-manual.xml	2010-03-28 17:28:00.000000000 +0000
+++ gtk-doc-1.17/help/manual/bn_IN/gtk-doc-manual.xml	2011-02-26 12:26:19.000000000 +0000
@@ -10,7 +10,7 @@
 
   
     GTK-Doc সহায়িকা
-    ১.১২
+    1.15
     GTK-Doc ব্যবহারের নির্দেশাবলী সহ, ডিভেলপরদের উদ্দেশ্যে নির্মিত সহায়িকা।
     
       
@@ -74,9 +74,27 @@
         or initial caps.
       
     
-    
+
     
       
+        1.17
+        26 Feb 2011
+        sk
+        urgent bug fix update
+      
+      
+        1.16
+        14 Jan 2011
+        sk
+        bugfixes, layout improvements
+      
+      
+        1.15
+        21 May 2010
+        sk
+        bug and regression fixes
+      
+      
         ১.১৪
         28 March 2010
         sk
@@ -151,13 +169,13 @@
             code looking for declarations of functions, macros, enums, structs, and unions.
             It creates the file <module>-decl-list.txt containg a list of the
             declarations, placing them into sections according to which header file they
-            are in. On the first run this file is copied to <module>-sections.txt
+            are in. On the first run this file is copied to <module>-sections.txt.
             The author can rearrange the sections, and the order of the
             declarations within them, to produce the final desired order.
             The second file it generates is <module>-decl.txt.
             This file contains the full declarations found by the scanner. If for
-            some reason one would like some sybols to show up in the docs, where
-            the full declaration cannot be found by th scanner or the declaration
+            some reason one would like some symbols to show up in the docs, where
+            the full declaration cannot be found by the scanner or the declaration
             should appear differently, one can place enties similar to the ones in
             <module>-decl.txt into <module>-overrides.txt.
 
@@ -183,8 +201,23 @@
         
 
         
-          SGML/XML ও HTML/PDF নির্মাণের প্রণালী। sgml/ অথবা xml/ সাব-ডিরেক্টরির মধ্যে উপস্থিত SGML অথবা XML ফাইলগুলিকে gtkdoc-mkdb দ্বারা টেমপ্লেট ফাইল রূপে পরিবর্তন করা হয়। সোর্স কোডের মধ্যে ফাংশান সংক্রান্ত নতিপত্র উপস্থিত থাকলে, বিশেষ কমেন্ট ব্লক প্রয়োগ করে সংশ্লিষ্ট অংশগুলি এইখানে অন্তর্ভুক্ত করা হয়। কোনো tmpl ফাইল ব্যবহার না করা হলে, শুধুমাত্র সোর্স থেকে নথি ও বিশ্লেষণের তথ্য সংগ্রহ করা হয়।
-          gtkdoc-mkhtml দ্বারা SGML/XML ফাইলগুলিকে HTML html/ সাব-ডিরেক্টরির মধ্যে HTML ফাইল রূপে পরিবর্তন করা হয়। একই পদ্ধতিতে  gtkdoc-mkpdf দ্বারা SGML/XML ফাইলগুলিকে PDF <package>.pdf নামক একটি PDF নথিতে রূপান্তর করা হয়।
+          
+            Generating the SGML/XML and HTML/PDF.
+
+            gtkdoc-mkdb turns the template files into
+            SGML or XML files in the sgml/
+            or xml/ subdirectory.
+            If the source code contains documentation on functions, using the
+            special comment blocks, it gets merged in here. If there are no tmpl files used
+            it only reads docs from sources and introspection data. We recommend
+            to use Docbook XML.
+          
+          
+            gtkdoc-mkhtml turns the SGML/XML files into HTML
+            files in the html/ subdirectory.
+            Likewise gtkdoc-mkpdf turns the SGML/XML files into a PDF
+            document called <package>.pdf.
+          
           sgml/ অথবা xml/ ও html/ ডিরেক্টরির মধ্যে উপস্থিত ফাইলগুলি সর্বদা নতুন করে লেখা হবে। এই ফাইলগুলি সরাসরি পরিবর্তন করা উচিত নয়।
         
 
@@ -284,7 +317,7 @@
 
     
       The next sections describe what steps to perform to integrate GTK-Doc into
-      your project. Theses section assume we work on a project called 'meep'.
+      your project. Theses sections assume we work on a project called 'meep'.
       This project contains a library called 'libmeep' and
       an end-user app called 'meeper'.
     
@@ -299,7 +332,9 @@
         For packages with just one library this step is not necessary.
       
 
-      নিম্নলিখিত উদাহরণের অনুরূপ হবে: ডিরেক্টরির বিন্যাসের উদাহরণ
+      
+        This can then look as shown below:
+        ডিরেক্টরির বিন্যাসের উদাহরণ
           
 
           
-        
+        
+      
     
 
     
@@ -330,7 +366,26 @@
           
         
       
-      
+
+      
+        This will require all developers to have gtk-doc installed. If it is
+        okay for your project to have optional api-doc build setup, you can
+        solve this as below. Keep it as is, as gtkdocize is looking for
+        GTK_DOC_CHECK  at the start of a line.
+        Keep gtk-doc optional
+          
+
+          
+        
+      
+
       
         The first argument is used to check for the gtkdocversion at configure time.
         The 2nd, optional argument is used by gtkdocize.
@@ -381,7 +436,7 @@
       
 
       
-        The next step is to edit the setting inside the Makefile.am.
+        The next step is to edit the settings inside the Makefile.am.
         All the settings have a comment above that describes their purpose.
         Most settings are extra flags passed to the respective tools. Every tool
         has a variable of the form .
@@ -392,8 +447,8 @@
       
 
       
-        You may also want to enable GTK-Doc for the distcheckmake target. Just
-        add then one-liner show in the next example to you top-level
+        You may also want to enable GTK-Doc for the distcheck make target. Just
+        add the one line shown in the next example to your top-level
         Makefile.am:
       
 
@@ -432,21 +487,23 @@
 
       
         When running gtkdocize it copies
-        gtk-doc.make to you project root (or any directory
+        gtk-doc.make to your project root (or any directory
         specified by the  option).
-        If also check you configure script for the GTK_DOC_CHECK
-        invocation.
+        It also checks you configure script for the GTK_DOC_CHECK
+        invocation. This macro can be used to pass extra parameters to
+        gtkdocize.
       
 
       
-        Historically GTK-Doc was gerating template files where developers entered the docs.
-        this turned out to be not so good. Since a few version GTK-Doc could also get all
-        the information from source comments.
-        Since GTK-Doc 1.9 the templates can be avoided. We encourage people to keep
+        Historically GTK-Doc was generating template files where developers entered the docs.
+        This turned out to be not so good (e.g. the need for having generated
+        files under version control).
+        Since GTK-Doc 1.9 the tools can get all the information from source comments
+        and thus the templates can be avoided. We encourage people to keep
         documentation in the code. gtkdocize supports now
         a  option that chooses a makefile that skips
         tmpl usage totally. Besides adding the option directly to the command
-        invocation, they can be added also to a environment variable called GTKDOCIZE_FLAGS
+        invocation, they can be added also to an environment variable called GTKDOCIZE_FLAGS
         or set as a 2nd parameter in GTK_DOC_CHECK macro in the configure script.
         If you have never changed file in tmpl by hand and migrating from older gtkdoc versions,
         please remove the dir (e.g. from version control system).
@@ -508,8 +565,8 @@
     
       GTK-Doc uses source code comment with a special syntax for code documentation.
       Further it retrieves information about your project structure from other
-      sources. During the next section you find all information about the syntax
-      of the comments.
+      sources. During the next section you will find all information about the
+      syntax of the comments.
     
 
     
@@ -527,6 +584,21 @@
       
     
 
+    
+      The scanner can handle the majority of c headers fine. In the case of
+      receiving warnings from the scanner that look like a special case, one can
+      hint GTK-Doc to skip over them.
+      GTK-Doc বিবৃতির অংশ
+        
+
+        
+      
+    
+
     
 
     
@@ -597,14 +669,15 @@
         
 
       
-	নথির মধ্যে কিছু বিশেষ অক্ষর যেমন '<', '>', '()', '@', '%', অথবা '#' প্রভৃতি ব্যবহার করতে ইচ্ছুক হলে GTK-Doc দ্বারা এইগুলিকে পরিবর্তন করতে প্রতিরোধ করার জন্য যথাক্রমে "&lt;", "&gt;", "&lpar;", "&rpar;", "&commat;", "&percnt;" and "&num;" XML এনটিটিগুলি ব্যবহার করুন অথবা ব্যাক-স্ল্যাশ চিহ্ন '\' সহযোগে এস্কেপ করানো আবশ্যক।
+	  নথির মধ্যে কিছু বিশেষ অক্ষর যেমন '<', '>', '()', '@', '%', অথবা '#' প্রভৃতি ব্যবহার করতে ইচ্ছুক হলে GTK-Doc দ্বারা এইগুলিকে পরিবর্তন করতে প্রতিরোধ করার জন্য যথাক্রমে "&lt;", "&gt;", "&lpar;", "&rpar;", "&commat;", "&percnt;" and "&num;" XML এনটিটিগুলি ব্যবহার করুন অথবা ব্যাক-স্ল্যাশ চিহ্ন '\' সহযোগে এস্কেপ করানো আবশ্যক।
       
 
       
         DocBook can do more that just links. One can also have lists, tables and
         examples. To enable the usage of SGML/XML tags inside doc-comments you
-        need to have  in the variable
-        MKDB_OPTIONS inside Makefile.am.
+        need to have  or 
+        in the variable MKDB_OPTIONS inside
+        Makefile.am.
       
 
       
@@ -643,7 +716,7 @@
  * @see_also: #MeepSettings
  * @stability: Stable
  * @include: meep/app.h
- * @Image: application.png
+ * @image: application.png
  *
  * The application class handles ...
  */
@@ -659,7 +732,7 @@
             
               The name links the section documentation to the respective part in
               the <package>-sections.txt file. The
-              name give here should match the <FILE> tag in the 
+              name give here should match the <FILE> tag in the
               <package>-sections.txt file.
             
           
@@ -684,15 +757,17 @@
           
             
               Overrides the use of title as a section identifier. For GObjects
-              the <title> is used as a section_id and for other section it
-              is <MODULE>-<title>.
+              the <title> is used as a section_id and for other sections
+              it is <MODULE>-<title>.
             
           
         
         
           @see_also
           
-            এই বিভাগ সম্বন্ধীয় সংকেতের তালিকা..
+            
+              A list of symbols that are related to this section.
+            
           
         
         
@@ -783,8 +858,8 @@
         Each symbol (function, macro, struct, enum, signal and property) is
         documented in a separate block. The block is best placed close to the
         definition of the symbols so that it is easy to keep them in sync.
-        Thus function are usually documented in the c-source and macros, struct
-        and enum in the header file.
+        Thus functions are usually documented in the c-source and macros,
+        structs and enums in the header file.
       
 
       সাধারণ ট্যাগ
@@ -979,7 +1054,17 @@
         
           Use /*< private >*/ before the private struct fields
           you want to hide. Use /*< public >*/ for the reverse
-          behavirour.
+          behaviour.
+        
+
+        
+          Struct comment blocks can also be used for GObjects and GObjectClasses.
+          It is usualy a good idea to add a comment blco for a class, if it has
+          vmethods (as this is how they can be documented). For the GObject
+          itself one can use the related section docs, having a separate block
+          for the instance struct would be useful if the instance has public
+          fields. One disadvantage here is that this creates two index entries
+          of the same name (the structure and the section).
         
 
       
@@ -1009,7 +1094,7 @@
         
           Use /*< private >*/ before the private enum values
           you want to hide. Use /*< public >*/ for the reverse
-          behavirour.
+          behaviour.
         
 
       
@@ -1234,7 +1319,7 @@
         GTK-Doc produces documentation in DocBook SGML/XML. When processing the
         inline source comments, the GTK-Doc tools generate one documentation
         page per class or module as a separate file. The master document
-        includes them and place them in a order.
+        includes them and place them in an order.
       
 
       
@@ -1332,6 +1417,9 @@
         If your library contains private types which you don't want to appear in
         the object hierarchy and the list of implemented or required interfaces,
         add them to a Private subsection.
+        Wheter you would place GObject and GObjectClass like structs in public
+        or Standard section depends if they have public entries (variables,
+        vmethods).
       
 
       
@@ -1389,11 +1477,11 @@
         make check run.
       
     
-    
+
     
       One can also look at the files produced by the source code scanner:
       <package>-decl-list.txt and
-      <package>-decl.txt. The first and can be
+      <package>-decl.txt. The first one can be
       compared with the section file if that is manualy maintained. The second
       lists all declarations fromt he headers If a symbol is missing one could
       check if this file contains it.
@@ -1408,13 +1496,102 @@
       <package>.prerequisites.txt and
       <package>.signals.txt. If there are missing
       symbols in any of those, one can ask gtkdoc to keep the intermedia scanner
-      file for further analysis, but running it as 
+      file for further analysis, but running it as
       GTK_DOC_KEEP_INTERMEDIATE=1 make.
     
   
 
+  
+    Documenting other interfaces
+
+    
+      So far we have been using GTK-Doc to document the API of code. The next
+      sections contain suggestions how the tools can be used to document other
+      interfaces too.
+    
+
+    
+      Commandline options and man pages
+
+      
+        As one can generate man pages for a docbook refentry as well, it sounds
+        like a good idea to use it for that purpose. This way the interface is
+        part of the reference and one gets the man-page for free.
+      
+
+      
+        Document the tool
+
+        
+          Create one refentry file per tool. Following
+          our example we would call it
+          meep/docs/reference/meeper/meep.xml. For the xml
+          tags that should be used and can look at generated file in the xml
+          subdirectory as well as examples e.g. in glib.
+        
+      
+
+      
+        Adding the extra configure check
+
+        
+          Extra configure checks
+            
+
+            
+          
+        
+      
+
+      
+        Adding the extra makefile rules
+
+        
+          Extra configure checks
+            
+
+            
+          
+        
+      
+    
+
+    
+      DBus interfaces
+
+      
+        (FIXME: http://hal.freedesktop.org/docs/DeviceKit/DeviceKit.html,
+http://cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus)
+      
+    
+
+  
+
   
-    সাধারণ প্রশ্নোত্তর
+    Frequently asked questions
 
     
       
@@ -1498,7 +1675,22 @@
       
     
   
-    
+
+  
+    Tools related to gtk-doc
+
+    
+      GtkDocPlugin - a Trac GTK-Doc
+      integration plugin, that adds api docs to a trac site and integrates with
+      the trac search.
+    
+    
+      Gtkdoc-depscan - a tool (part of gtk-doc) to check used API against since
+      tags in the api to determine the minimum required version.
+    
+
+  
+
   
   
 
       
-        You may also want to enable GTK-Doc for the distcheckmake target. Just
-        add then one-liner show in the next example to you top-level
+        You may also want to enable GTK-Doc for the distcheck make target. Just
+        add the one line shown in the next example to your top-level
         Makefile.am:
       
 
@@ -505,21 +543,23 @@
 
       
         When running gtkdocize it copies
-        gtk-doc.make to you project root (or any directory
+        gtk-doc.make to your project root (or any directory
         specified by the  option).
-        If also check you configure script for the GTK_DOC_CHECK
-        invocation.
+        It also checks you configure script for the GTK_DOC_CHECK
+        invocation. This macro can be used to pass extra parameters to
+        gtkdocize.
       
 
       
-        Historically GTK-Doc was gerating template files where developers entered the docs.
-        this turned out to be not so good. Since a few version GTK-Doc could also get all
-        the information from source comments.
-        Since GTK-Doc 1.9 the templates can be avoided. We encourage people to keep
+        Historically GTK-Doc was generating template files where developers entered the docs.
+        This turned out to be not so good (e.g. the need for having generated
+        files under version control).
+        Since GTK-Doc 1.9 the tools can get all the information from source comments
+        and thus the templates can be avoided. We encourage people to keep
         documentation in the code. gtkdocize supports now
         a  option that chooses a makefile that skips
         tmpl usage totally. Besides adding the option directly to the command
-        invocation, they can be added also to a environment variable called GTKDOCIZE_FLAGS
+        invocation, they can be added also to an environment variable called GTKDOCIZE_FLAGS
         or set as a 2nd parameter in GTK_DOC_CHECK macro in the configure script.
         If you have never changed file in tmpl by hand and migrating from older gtkdoc versions,
         please remove the dir (e.g. from version control system).
@@ -581,8 +621,8 @@
     
       GTK-Doc uses source code comment with a special syntax for code documentation.
       Further it retrieves information about your project structure from other
-      sources. During the next section you find all information about the syntax
-      of the comments.
+      sources. During the next section you will find all information about the
+      syntax of the comments.
     
 
     
@@ -600,6 +640,21 @@
       
     
 
+    
+      The scanner can handle the majority of c headers fine. In the case of
+      receiving warnings from the scanner that look like a special case, one can
+      hint GTK-Doc to skip over them.
+      GTK-Doc comment block
+        
+
+        
+      
+    
+
     
 
     
@@ -683,20 +738,21 @@
       
 
       
-	
-          If you need to use the special characters '<', '>', '()', '@',
-          '%', or '#' in your documentation without GTK-Doc changing them you
-          can use the XML entities "&lt;", "&gt;", "&lpar;",
-          "&rpar;", "&commat;", "&percnt;" and "&num;"
-          respectively or escape them with a backslash '\'.
-	
+	  
+        If you need to use the special characters '<', '>', '()', '@',
+        '%', or '#' in your documentation without GTK-Doc changing them you
+        can use the XML entities "&lt;", "&gt;", "&lpar;",
+        "&rpar;", "&commat;", "&percnt;" and "&num;"
+        respectively or escape them with a backslash '\'.
+	  
       
 
       
         DocBook can do more that just links. One can also have lists, tables and
         examples. To enable the usage of SGML/XML tags inside doc-comments you
-        need to have  in the variable
-        MKDB_OPTIONS inside Makefile.am.
+        need to have  or 
+        in the variable MKDB_OPTIONS inside
+        Makefile.am.
       
 
       
@@ -735,7 +791,7 @@
  * @see_also: #MeepSettings
  * @stability: Stable
  * @include: meep/app.h
- * @Image: application.png
+ * @image: application.png
  *
  * The application class handles ...
  */
@@ -751,7 +807,7 @@
             
               The name links the section documentation to the respective part in
               the <package>-sections.txt file. The
-              name give here should match the <FILE> tag in the 
+              name give here should match the <FILE> tag in the
               <package>-sections.txt file.
             
           
@@ -779,8 +835,8 @@
           
             
               Overrides the use of title as a section identifier. For GObjects
-              the <title> is used as a section_id and for other section it
-              is <MODULE>-<title>.
+              the <title> is used as a section_id and for other sections
+              it is <MODULE>-<title>.
             
           
         
@@ -788,7 +844,7 @@
           @see_also
           
             
-              A list of symbols that are related to this section..
+              A list of symbols that are related to this section.
             
           
         
@@ -884,8 +940,8 @@
         Each symbol (function, macro, struct, enum, signal and property) is
         documented in a separate block. The block is best placed close to the
         definition of the symbols so that it is easy to keep them in sync.
-        Thus function are usually documented in the c-source and macros, struct
-        and enum in the header file.
+        Thus functions are usually documented in the c-source and macros,
+        structs and enums in the header file.
       
 
       General tags
@@ -1100,7 +1156,17 @@
         
           Use /*< private >*/ before the private struct fields
           you want to hide. Use /*< public >*/ for the reverse
-          behavirour.
+          behaviour.
+        
+
+        
+          Struct comment blocks can also be used for GObjects and GObjectClasses.
+          It is usualy a good idea to add a comment blco for a class, if it has
+          vmethods (as this is how they can be documented). For the GObject
+          itself one can use the related section docs, having a separate block
+          for the instance struct would be useful if the instance has public
+          fields. One disadvantage here is that this creates two index entries
+          of the same name (the structure and the section).
         
 
       
@@ -1130,7 +1196,7 @@
         
           Use /*< private >*/ before the private enum values
           you want to hide. Use /*< public >*/ for the reverse
-          behavirour.
+          behaviour.
         
 
       
@@ -1376,7 +1442,7 @@
         GTK-Doc produces documentation in DocBook SGML/XML. When processing the
         inline source comments, the GTK-Doc tools generate one documentation
         page per class or module as a separate file. The master document
-        includes them and place them in a order.
+        includes them and place them in an order.
       
 
       
@@ -1474,6 +1540,9 @@
         If your library contains private types which you don't want to appear in
         the object hierarchy and the list of implemented or required interfaces,
         add them to a Private subsection.
+        Wheter you would place GObject and GObjectClass like structs in public
+        or Standard section depends if they have public entries (variables,
+        vmethods).
       
 
       
@@ -1531,11 +1600,11 @@
         make check run.
       
     
-    
+
     
       One can also look at the files produced by the source code scanner:
       <package>-decl-list.txt and
-      <package>-decl.txt. The first and can be
+      <package>-decl.txt. The first one can be
       compared with the section file if that is manualy maintained. The second
       lists all declarations fromt he headers If a symbol is missing one could
       check if this file contains it.
@@ -1550,13 +1619,102 @@
       <package>.prerequisites.txt and
       <package>.signals.txt. If there are missing
       symbols in any of those, one can ask gtkdoc to keep the intermedia scanner
-      file for further analysis, but running it as 
+      file for further analysis, but running it as
       GTK_DOC_KEEP_INTERMEDIATE=1 make.
     
   
 
+  
+    Documenting other interfaces
+
+    
+      So far we have been using GTK-Doc to document the API of code. The next
+      sections contain suggestions how the tools can be used to document other
+      interfaces too.
+    
+
+    
+      Commandline options and man pages
+
+      
+        As one can generate man pages for a docbook refentry as well, it sounds
+        like a good idea to use it for that purpose. This way the interface is
+        part of the reference and one gets the man-page for free.
+      
+
+      
+        Document the tool
+
+        
+          Create one refentry file per tool. Following
+          our example we would call it
+          meep/docs/reference/meeper/meep.xml. For the xml
+          tags that should be used and can look at generated file in the xml
+          subdirectory as well as examples e.g. in glib.
+        
+      
+
+      
+        Adding the extra configure check
+
+        
+          Extra configure checks
+            
+
+            
+          
+        
+      
+
+      
+        Adding the extra makefile rules
+
+        
+          Extra configure checks
+            
+
+            
+          
+        
+      
+    
+
+    
+      DBus interfaces
+
+      
+        (FIXME: http://hal.freedesktop.org/docs/DeviceKit/DeviceKit.html,
+http://cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus)
+      
+    
+
+  
+
   
-    Frequently asked question
+    Frequently asked questions
 
     
       
@@ -1601,7 +1759,7 @@
       
         A new class does not appear in the docs.
         
-          Is the new page xi:included from 
+          Is the new page xi:included from
           <package>-docs.{xml,sgml}.
         
       
@@ -1649,7 +1807,22 @@
       
     
   
-    
+
+  
+    Tools related to gtk-doc
+
+    
+      GtkDocPlugin - a Trac GTK-Doc
+      integration plugin, that adds api docs to a trac site and integrates with
+      the trac search.
+    
+    
+      Gtkdoc-depscan - a tool (part of gtk-doc) to check used API against since
+      tags in the api to determine the minimum required version.
+    
+
+  
+
   
   &FDL;
 
diff -Nru gtk-doc-1.14/help/manual/de/de.po gtk-doc-1.17/help/manual/de/de.po
--- gtk-doc-1.14/help/manual/de/de.po	2010-03-28 17:28:01.000000000 +0000
+++ gtk-doc-1.17/help/manual/de/de.po	2011-02-26 12:26:19.000000000 +0000
@@ -3,9 +3,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: 2010-01-21 20:41+0000\n"
-"PO-Revision-Date: 2010-02-25 15:50+0100\n"
+"Project-Id-Version: gtk-doc help master\n"
+"POT-Creation-Date: 2010-07-05 07:25+0000\n"
+"PO-Revision-Date: 2010-11-06 19:31+0100\n"
 "Last-Translator: Mario Blättermann \n"
 "Language-Team: German \n"
 "MIME-Version: 1.0\n"
@@ -18,9 +18,9 @@
 msgid "GTK-Doc Manual"
 msgstr "GTK-Doc-Handbuch"
 
-#: C/gtk-doc-manual.xml:13(edition) C/gtk-doc-manual.xml:92(revnumber)
-msgid "1.12"
-msgstr "1.12"
+#: C/gtk-doc-manual.xml:13(edition) C/gtk-doc-manual.xml:86(revnumber)
+msgid "1.15"
+msgstr "1.15"
 
 #: C/gtk-doc-manual.xml:14(para)
 msgid "User manual for developers with instructions of GTK-Doc usage."
@@ -111,16 +111,18 @@
 "geschrieben."
 
 #: C/gtk-doc-manual.xml:80(revnumber)
-msgid "1.14"
-msgstr "1.14"
+msgid "1.15.1"
+msgstr "1.15.1"
 
 #: C/gtk-doc-manual.xml:81(date)
-msgid "19 December 2009"
-msgstr "19. Dezember 2009"
+msgid "24 May 2010"
+msgstr "24. Mai 2010"
 
 #: C/gtk-doc-manual.xml:82(authorinitials)
 #: C/gtk-doc-manual.xml:88(authorinitials)
 #: C/gtk-doc-manual.xml:94(authorinitials)
+#: C/gtk-doc-manual.xml:100(authorinitials)
+#: C/gtk-doc-manual.xml:106(authorinitials)
 msgid "sk"
 msgstr "sk"
 
@@ -128,43 +130,67 @@
 msgid "development version"
 msgstr "Entwicklerversion"
 
-#: C/gtk-doc-manual.xml:86(revnumber)
+#: C/gtk-doc-manual.xml:87(date)
+msgid "21 May 2010"
+msgstr "21. Mai 2010"
+
+#: C/gtk-doc-manual.xml:89(revremark)
+msgid "bug and regression fixes"
+msgstr "Korrekturen von Fehlern und Einschränkungen"
+
+#: C/gtk-doc-manual.xml:92(revnumber)
+msgid "1.14"
+msgstr "1.14"
+
+#: C/gtk-doc-manual.xml:93(date)
+msgid "28 March 2010"
+msgstr "28. März 2010"
+
+#: C/gtk-doc-manual.xml:95(revremark)
+msgid "bugfixes and performance improvements"
+msgstr "Fehlerkorrekturen und Leistungssteigerung"
+
+#: C/gtk-doc-manual.xml:98(revnumber)
 msgid "1.13"
 msgstr "1.13"
 
-#: C/gtk-doc-manual.xml:87(date) C/gtk-doc-manual.xml:93(date)
+#: C/gtk-doc-manual.xml:99(date) C/gtk-doc-manual.xml:105(date)
 msgid "18 December 2009"
 msgstr "18. Dezember 2009"
 
-#: C/gtk-doc-manual.xml:89(revremark)
+#: C/gtk-doc-manual.xml:101(revremark)
 msgid "broken tarball update"
 msgstr "Aktualisierung wegen beschädigtem Tar-Archiv"
 
-#: C/gtk-doc-manual.xml:95(revremark)
+#: C/gtk-doc-manual.xml:104(revnumber)
+msgid "1.12"
+msgstr "1.12"
+
+#: C/gtk-doc-manual.xml:107(revremark)
 msgid "new tool features and bugfixes"
 msgstr "Neue Funktionsmerkmale und Fehlerkorrekturen"
 
-#: C/gtk-doc-manual.xml:98(revnumber)
+#: C/gtk-doc-manual.xml:110(revnumber)
 msgid "1.11"
 msgstr "1.11"
 
-#: C/gtk-doc-manual.xml:99(date)
+#: C/gtk-doc-manual.xml:111(date)
 msgid "16 Novemebr 2008"
 msgstr "16. November 2008"
 
-#: C/gtk-doc-manual.xml:100(authorinitials)
+#: C/gtk-doc-manual.xml:112(authorinitials)
 msgid "mal"
 msgstr "mal"
 
-#: C/gtk-doc-manual.xml:101(revremark)
+#: C/gtk-doc-manual.xml:113(revremark)
 msgid "GNOME doc-utils migration"
 msgstr "Migration auf die gnome-doc-utils"
 
-#: C/gtk-doc-manual.xml:110(title)
+#: C/gtk-doc-manual.xml:122(title)
 msgid "Introduction"
 msgstr "Einführung"
 
-#: C/gtk-doc-manual.xml:112(para)
+#: C/gtk-doc-manual.xml:124(para)
 msgid ""
 "This chapter introduces GTK-Doc and gives an overview of what it is and how "
 "it is used."
@@ -172,11 +198,11 @@
 "Dieses Kapitel führt in GTK-Doc ein und gibt einen Überblick darüber, worum "
 "es sich dabei handelt und wie es benutzt wird."
 
-#: C/gtk-doc-manual.xml:118(title)
+#: C/gtk-doc-manual.xml:130(title)
 msgid "What is GTK-Doc?"
 msgstr "Was ist GTK-Doc?"
 
-#: C/gtk-doc-manual.xml:120(para)
+#: C/gtk-doc-manual.xml:132(para)
 msgid ""
 "GTK-Doc is used to document C code. It is typically used to document the "
 "public API of libraries, such as the GTK+ and GNOME libraries. But it can "
@@ -187,11 +213,11 @@
 "GNOME-Bibliotheken. Es kann aber auch zur Dokumentation von Anwendungscode "
 "verwendet werden."
 
-#: C/gtk-doc-manual.xml:128(title)
+#: C/gtk-doc-manual.xml:140(title)
 msgid "How Does GTK-Doc Work?"
 msgstr "Wie funktioniert GTK-Doc?"
 
-#: C/gtk-doc-manual.xml:130(para)
+#: C/gtk-doc-manual.xml:142(para)
 msgid ""
 "GTK-Doc works by using documentation of functions placed inside the source "
 "files in specially-formatted comment blocks, or documentation added to the "
@@ -199,8 +225,14 @@
 "document functions that are declared in header files; it won't produce output "
 "for static functions)."
 msgstr ""
+"GTK-Doc verwendet Funktionsdokumentationen, die sich in den Quelldateien "
+"innerhalb speziell formatierter Kommentarblöcke befinden, oder Dokumentation, "
+"die zu den von GTK-Doc verwendeten Vorlagendateien hinzugefügt wurde. "
+"Beachten Sie jedoch, dass GTK-Doc nur Funktionen dokumentieren wird, die in "
+"den Header-Dateien deklariert sind. Es erstellt keine Ausgaben für statische "
+"Funktionen."
 
-#: C/gtk-doc-manual.xml:137(para)
+#: C/gtk-doc-manual.xml:149(para)
 msgid ""
 "GTK-Doc consists of a number of perl scripts, each performing a different "
 "step in the process."
@@ -208,19 +240,23 @@
 "GTK-Doc besteht aus einer Anzahl von Perl-Skripten, wovon jedes einen "
 "bestimmten Schritt in dem Prozess ausführt."
 
-#: C/gtk-doc-manual.xml:142(para)
+#: C/gtk-doc-manual.xml:154(para)
 msgid "There are 5 main steps in the process:"
 msgstr "Dieser Vorgang umfasst fünf Hauptschritte:"
 
-#: C/gtk-doc-manual.xml:149(para)
+#: C/gtk-doc-manual.xml:161(para)
 msgid ""
 "Writing the documentation. The author fills in the "
 "source files with the documentation for each function, macro, union etc. (In "
 "the past information was entered in generated template files, which is not "
 "recommended anymore)."
 msgstr ""
+"Schreiben der Dokumentation. Der Autor ergänzt die "
+"Quelldateien um die Dokumentation für jede Funktion, jedes Makro usw. In der "
+"Vergangenheit wurden diese Informationen in erstellte Vorlagendateien "
+"eingegeben. Dies wird nicht mehr empfohlen."
 
-#: C/gtk-doc-manual.xml:159(para)
+#: C/gtk-doc-manual.xml:171(para)
 msgid ""
 "Gathering information about the code.gtkdoc-"
 "scan scans the header files of the code looking for "
@@ -228,12 +264,12 @@
 "file <module>-decl-list.txt containg a list of the "
 "declarations, placing them into sections according to which header file they "
 "are in. On the first run this file is copied to <module>-"
-"sections.txt The author can rearrange the sections, and the order "
+"sections.txt. The author can rearrange the sections, and the order "
 "of the declarations within them, to produce the final desired order. The "
 "second file it generates is <module>-decl.txt. "
 "This file contains the full declarations found by the scanner. If for some "
-"reason one would like some sybols to show up in the docs, where the full "
-"declaration cannot be found by th scanner or the declaration should appear "
+"reason one would like some symbols to show up in the docs, where the full "
+"declaration cannot be found by the scanner or the declaration should appear "
 "differently, one can place enties similar to the ones in <"
 "module>-decl.txt into <module>-overrides.txt. gtkdoc-scanobj can also be used to "
@@ -242,7 +278,7 @@
 "about any GTK Args and Signals it provides."
 msgstr ""
 
-#: C/gtk-doc-manual.xml:184(para)
+#: C/gtk-doc-manual.xml:196(para)
 msgid ""
 "Generating the \"template\" files.gtkdoc-"
 "mktmpl creates a number of files in the gtkdocize supports now "
@@ -260,26 +296,29 @@
 "please remove the dir (e.g. from version control system)."
 msgstr ""
 
-#: C/gtk-doc-manual.xml:205(para)
+#: C/gtk-doc-manual.xml:217(para)
 msgid ""
 "Generating the SGML/XML and HTML/PDF.gtkdoc-"
 "mkdb turns the template files into SGML or XML files in the "
 "sgml/ or xml/ subdirectory. If the source code contains documentation on "
 "functions, using the special comment blocks, it gets merged in here. If there "
-"are no tmpl files used it only reads takes docs from sources and "
-"introspection data."
+"are no tmpl files used it only reads docs from sources and introspection data."
 msgstr ""
 
-#: C/gtk-doc-manual.xml:215(para)
+#: C/gtk-doc-manual.xml:227(para)
 msgid ""
 "gtkdoc-mkhtml turns the SGML/XML files into HTML "
 "files in the html/ subdirectory. "
 "Likewise gtkdoc-mkpdf turns the SGML/XML files "
-"into a PDF docuemnt called <package>.pdf."
+"into a PDF document called <package>.pdf."
 msgstr ""
+"gtkdoc-mkhtml konvertiert die SGML/XML-Dateien in "
+"HTML-Dateien im Unterordner html/. "
+"Ebenso konvertiert gtkdoc-mkpdf die SGML/XML-"
+"Dateien in ein PDF-Dokument namens <package>.pdf."
 
-#: C/gtk-doc-manual.xml:221(para)
+#: C/gtk-doc-manual.xml:233(para)
 msgid ""
 "Files in sgml/ or xml/ and html/-Ordnern werden immer überschrieben. Niemand sollte diese direkt "
 "bearbeiten."
 
-#: C/gtk-doc-manual.xml:229(para)
+#: C/gtk-doc-manual.xml:241(para)
 msgid ""
 "Fixing up cross-references between documents. After "
 "installing the HTML files, gtkdoc-fixxref can be "
@@ -303,20 +342,20 @@
 "will try to turn links back to local links (where those docs are installed)."
 msgstr ""
 
-#: C/gtk-doc-manual.xml:247(title)
+#: C/gtk-doc-manual.xml:259(title)
 msgid "Getting GTK-Doc"
 msgstr "GTK-Doc bekommen"
 
-#: C/gtk-doc-manual.xml:250(title)
+#: C/gtk-doc-manual.xml:262(title)
 msgid "Requirements"
 msgstr "Erfordernisse"
 
-#: C/gtk-doc-manual.xml:251(para)
+#: C/gtk-doc-manual.xml:263(para)
 msgid "Perl v5 - the main scripts are in Perl."
 msgstr ""
 "Perl v5 - Die Hauptskripte wurden in Perl geschrieben."
 
-#: C/gtk-doc-manual.xml:254(para)
+#: C/gtk-doc-manual.xml:266(para)
 msgid ""
 "DocBook DTD v3.0 - This is the DocBook SGML DTD. http://www.ora.com/"
@@ -326,7 +365,7 @@
 "\"http://www.ora.com/davenport\" type=\"http\">http://www.ora.com/davenport"
 
-#: C/gtk-doc-manual.xml:258(para)
+#: C/gtk-doc-manual.xml:270(para)
 msgid ""
 "Jade v1.1 - This is a DSSSL processor for converting "
 "SGML to various formats. http://www.jclark.com/jade"
 
-#: C/gtk-doc-manual.xml:262(para)
+#: C/gtk-doc-manual.xml:274(para)
 msgid ""
 "Modular DocBook Stylesheets This is the DSSSL code to "
 "convert DocBook to HTML (and a few other formats). It's used together with "
@@ -353,7 +392,7 @@
 "\"http://nwalsh.com/docbook/dsssl\" type=\"http\">http://nwalsh.com/docbook/"
 "dsssl"
 
-#: C/gtk-doc-manual.xml:271(para)
+#: C/gtk-doc-manual.xml:283(para)
 msgid ""
 "docbook-to-man - if you want to create man pages from "
 "the DocBook. I've customized the 'translation spec' slightly, to capitalise "
@@ -363,11 +402,11 @@
 "ulink> NOTE: This does not work yet."
 msgstr ""
 
-#: C/gtk-doc-manual.xml:282(title)
+#: C/gtk-doc-manual.xml:294(title)
 msgid "Installation"
 msgstr "Installation"
 
-#: C/gtk-doc-manual.xml:283(para)
+#: C/gtk-doc-manual.xml:295(para)
 msgid ""
 "There is no standard place where the DocBook Modular Stylesheets are "
 "installed."
@@ -375,12 +414,12 @@
 "Es gibt keinen Standardort, an welchem die Modularen DocBook-Stilvorlagen "
 "installiert werden."
 
-#: C/gtk-doc-manual.xml:286(para)
+#: C/gtk-doc-manual.xml:298(para)
 msgid "GTK-Doc's configure script searches these 3 directories automatically:"
 msgstr ""
 "Das Configure-Skript von GTK-Doc durchsucht folgende drei Ordner automatisch:"
 
-#: C/gtk-doc-manual.xml:289(para)
+#: C/gtk-doc-manual.xml:301(para)
 msgid ""
 " /usr/lib/sgml/stylesheets/nwalsh-modular  (used by "
 "RedHat)"
@@ -388,18 +427,18 @@
 " /usr/lib/sgml/stylesheets/nwalsh-modular  (verwendet "
 "von RedHat)"
 
-#: C/gtk-doc-manual.xml:292(para)
+#: C/gtk-doc-manual.xml:304(para)
 msgid ""
 " /usr/lib/dsssl/stylesheets/docbook  (used by Debian)"
 msgstr ""
 " /usr/lib/dsssl/stylesheets/docbook  (verwendet von "
 "Debian)"
 
-#: C/gtk-doc-manual.xml:295(para)
+#: C/gtk-doc-manual.xml:307(para)
 msgid " /usr/share/sgml/docbkdsl  (used by SuSE)"
 msgstr " /usr/share/sgml/docbkdsl  (verwendet von SuSE)"
 
-#: C/gtk-doc-manual.xml:298(para)
+#: C/gtk-doc-manual.xml:310(para)
 msgid ""
 "If you have the stylesheets installed somewhere else, you need to configure "
 "GTK-Doc using the option:  --with-dsssl-dir=<"
@@ -409,15 +448,15 @@
 "mit folgender Option konfigurieren: --with-dsssl-dir=<"
 "PFAD_ZUM_BASISORDNER_DER_STILVORLAGEN> "
 
-#: C/gtk-doc-manual.xml:322(title)
+#: C/gtk-doc-manual.xml:334(title)
 msgid "About GTK-Doc"
 msgstr "Info zu GTK-Doc"
 
-#: C/gtk-doc-manual.xml:324(para) C/gtk-doc-manual.xml:338(para)
+#: C/gtk-doc-manual.xml:336(para) C/gtk-doc-manual.xml:350(para)
 msgid "(FIXME)"
 msgstr "(FIXME)"
 
-#: C/gtk-doc-manual.xml:328(para)
+#: C/gtk-doc-manual.xml:340(para)
 msgid ""
 "(History, authors, web pages, license, future plans, comparison with other "
 "similar systems.)"
@@ -425,35 +464,35 @@
 "(Geschichte, Autoren, Webseiten, Lizenz, Zukunftspläne, Vergleich mit "
 "ähnlichen Systemen)"
 
-#: C/gtk-doc-manual.xml:336(title)
+#: C/gtk-doc-manual.xml:348(title)
 msgid "About this Manual"
 msgstr "Über dieses Handbuch"
 
-#: C/gtk-doc-manual.xml:342(para)
+#: C/gtk-doc-manual.xml:354(para)
 msgid "(who it is meant for, where you can get it, license)"
-msgstr ""
+msgstr "(wofür es bestimmt ist, wo Sie es erhalten können, Lizenz)"
 
-#: C/gtk-doc-manual.xml:351(title)
+#: C/gtk-doc-manual.xml:363(title)
 msgid "Setting up your project"
 msgstr "Einrichten Ihre Projekts"
 
-#: C/gtk-doc-manual.xml:353(para)
+#: C/gtk-doc-manual.xml:365(para)
 msgid ""
 "The next sections describe what steps to perform to integrate GTK-Doc into "
-"your project. Theses section assume we work on a project called 'meep'. This "
+"your project. Theses sections assume we work on a project called 'meep'. This "
 "project contains a library called 'libmeep' and an end-user app called "
 "'meeper'."
 msgstr ""
 "Die nächsten Abschnitte beschreiben die notwendigen Schritte, um GTK-Doc in "
 "Ihr Projekt zu integrieren. Nehmen wir an, wir arbeiten an einem Projekt "
-"namens »meep«. Das Projekt enthält eine Bilbliothek namens »libmeep« sowie eine "
-"Endbenutzer-Anwendung namens »meeper«."
+"namens »meep«. Das Projekt enthält eine Bibliothek namens »libmeep« sowie "
+"eine Endbenutzer-Anwendung namens »meeper«."
 
-#: C/gtk-doc-manual.xml:361(title)
+#: C/gtk-doc-manual.xml:373(title)
 msgid "Setting up a skeleton documentation"
 msgstr "Einrichten des Grundgerüsts der Dokumentation"
 
-#: C/gtk-doc-manual.xml:363(para)
+#: C/gtk-doc-manual.xml:375(para)
 msgid ""
 "Under your top-level project directory create folders called docs/reference "
 "(this way you can also have docs/help for end-user documentation). It is "
@@ -466,26 +505,26 @@
 "Unterordner mit dem Namen des Dokumentationspakets anzulegen. Für Pakete, die "
 "nur eine einzige Bibliothek enthalten, ist dieser Schritt nicht notwendig."
 
-#: C/gtk-doc-manual.xml:372(title)
+#: C/gtk-doc-manual.xml:384(title)
 msgid "Example directory structure"
 msgstr "Beispiel für die Ordnerstruktur"
 
-#: C/gtk-doc-manual.xml:370(para)
-msgid "This can then look as show below: "
+#: C/gtk-doc-manual.xml:382(para)
+msgid "This can then look as shown below: "
 msgstr "Dies kann dann wie nachstehend angezeigt aussehen: "
 
-#: C/gtk-doc-manual.xml:390(title) C/gtk-doc-manual.xml:397(title)
+#: C/gtk-doc-manual.xml:402(title) C/gtk-doc-manual.xml:409(title)
 msgid "Integration with autoconf"
 msgstr "Integration in autoconf"
 
-#: C/gtk-doc-manual.xml:392(para)
+#: C/gtk-doc-manual.xml:404(para)
 msgid ""
 "Very easy! Just add one line to your configure.ac script."
 msgstr ""
 "Sehr einfach! Fügen Sie eine Zeile zu Ihrem configure.ac-"
 "Skript hinzu."
 
-#: C/gtk-doc-manual.xml:407(para)
+#: C/gtk-doc-manual.xml:419(para)
 msgid ""
 "The first argument is used to check for the gtkdocversion at configure time. "
 "The 2nd, optional argument is used by gtkdocize. "
@@ -496,28 +535,28 @@
 "gtkdocize verwendet. Das Makro "
 "GTK_DOC_CHECK fügt verschiedene Schalter für configure hinzu:"
 
-#: C/gtk-doc-manual.xml:413(para)
+#: C/gtk-doc-manual.xml:425(para)
 msgid "--with-html-dir=PATH : path to installed docs"
 msgstr "--with-html-dir=PATH : Pfad zur installierten Dokumentation"
 
-#: C/gtk-doc-manual.xml:414(para)
+#: C/gtk-doc-manual.xml:426(para)
 msgid "--enable-gtk-doc : use gtk-doc to build documentation [default=no]"
 msgstr ""
 "--enable-gtk-doc : gtk-doc zur Erstellung der Dokumentation verwenden "
 "[Vorgabe=no]"
 
-#: C/gtk-doc-manual.xml:415(para)
+#: C/gtk-doc-manual.xml:427(para)
 msgid "--enable-gtk-doc-html : build documentation in html format [default=yes]"
 msgstr ""
 "--enable-gtk-doc-html : Erstellung der Dokumentation im HTML-Format "
 "[Vorgabe=yes]"
 
-#: C/gtk-doc-manual.xml:416(para)
+#: C/gtk-doc-manual.xml:428(para)
 msgid "--enable-gtk-doc-pdf : build documentation in pdf format [default=no]"
 msgstr ""
 "--enable-gtk-doc-pdf : Erstellung der Dokumentation im PDF-Format [Vorgabe=no]"
 
-#: C/gtk-doc-manual.xml:420(para)
+#: C/gtk-doc-manual.xml:432(para)
 msgid ""
 "GTK-Doc is disabled by default! Remember to pass the option  to the next configure run. Otherwise "
@@ -530,7 +569,7 @@
 "erstellte Dokumentation installiert. Dies ergibt für Benutzer durchaus Sinn, "
 "aber nicht für Entwickler."
 
-#: C/gtk-doc-manual.xml:428(para)
+#: C/gtk-doc-manual.xml:440(para)
 msgid ""
 "Furthermore it is recommended that you have the following line inside you "
 "configure.ac script. This allows gtkdocize das automatische Kopieren der Makrodefinition für "
 "GTK_DOC_CHECK in Ihr Projekt."
 
-#: C/gtk-doc-manual.xml:436(title)
+#: C/gtk-doc-manual.xml:448(title)
 msgid "Preparation for gtkdocize"
 msgstr "Vorbereitung für gtkdocize"
 
-#: C/gtk-doc-manual.xml:447(title)
+#: C/gtk-doc-manual.xml:459(title)
 msgid "Integration with automake"
 msgstr "Integration in automake"
 
-#: C/gtk-doc-manual.xml:449(para)
+#: C/gtk-doc-manual.xml:461(para)
 msgid ""
 "First copy the Makefile.am from the examples "
 "subdirectory of the gtkdoc-sources to your project's API documentation "
@@ -563,9 +602,9 @@
 "filename>). Falls Sie mehrere Dokumentationspakete haben, müssen Sie dies für "
 "jedes davon wiederholen."
 
-#: C/gtk-doc-manual.xml:456(para)
+#: C/gtk-doc-manual.xml:468(para)
 msgid ""
-"The next step is to edit the setting inside the Makefile.amMakefile.am. All the settings have a comment above that describes their "
 "purpose. Most settings are extra flags passed to the respective tools. Every "
 "tool has a variable of the form . "
@@ -581,25 +620,25 @@
 "unterstützten Parameter."
 
 #. FIXME: explain options ?
-#: C/gtk-doc-manual.xml:467(para)
+#: C/gtk-doc-manual.xml:479(para)
 msgid ""
-"You may also want to enable GTK-Doc for the distcheckmake target. Just add "
-"then one-liner show in the next example to you top-level Makefile."
+"You may also want to enable GTK-Doc for the distcheck make target. Just add "
+"the one line shown in the next example to your top-level Makefile."
 "am:"
 msgstr ""
 "Vielleicht möchten Sie auch GTK-Doc für das distcheckmake-Ziel aktivieren. "
 "Fügen Sie dazu den im nächsten Beispiel gezeigten Einzeiler zur Datei "
 "Makefile.am der obersten Ebene hinzu:"
 
-#: C/gtk-doc-manual.xml:474(title)
+#: C/gtk-doc-manual.xml:486(title)
 msgid "Enable GTK-Doc during make distcheck"
 msgstr "GTK-Doc während »make distcheck« aktivieren"
 
-#: C/gtk-doc-manual.xml:486(title)
+#: C/gtk-doc-manual.xml:498(title)
 msgid "Integration with autogen"
 msgstr "Integration in autogen"
 
-#: C/gtk-doc-manual.xml:488(para)
+#: C/gtk-doc-manual.xml:500(para)
 msgid ""
 "Most projects will have an autogen.sh script to setup "
 "the build infrastructure after a checkout from version control system (such "
@@ -614,40 +653,44 @@
 "solchen Skript verwendet werden kann. Es sollte vor autoheader, automake oder "
 "autoconf ausgeführt werden."
 
-#: C/gtk-doc-manual.xml:497(title)
+#: C/gtk-doc-manual.xml:509(title)
 msgid "Running gtkdocize from autogen.sh"
 msgstr "Ausführen von gtkdocize durch autogen.sh"
 
-#: C/gtk-doc-manual.xml:506(para)
+#: C/gtk-doc-manual.xml:518(para)
 msgid ""
 "When running gtkdocize it copies gtk-doc."
-"make to you project root (or any directory specified by the "
-" option). If also check you configure script for the "
-"GTK_DOC_CHECK invocation."
+"make to your project root (or any directory specified by the "
+" option). It also checks you configure script for "
+"the GTK_DOC_CHECK invocation. This macro can be used to "
+"pass extra parameters to gtkdocize."
 msgstr ""
 "Beim Ausführen von gtkdocize wird gtk-"
 "doc.make in die Wurzel Ihres Projekts oder in jeden anderen durch "
 "die Option  festgelegten Ordner kopiert. Außerdem "
-"wird das configure-Skript daraufhin überprüft, ob function>GTK_DOC_CHECK enthalten ist."
+"wird das configure-Skript daraufhin überprüft, ob GTK_DOC_CHECK enthalten ist. Dieses Makro kann verwendet werden, um weitere "
+"Parameter an gtkdocize zu übergeben."
 
-#: C/gtk-doc-manual.xml:514(para)
+#: C/gtk-doc-manual.xml:527(para)
 msgid ""
-"Historically GTK-Doc was gerating template files where developers entered the "
-"docs. this turned out to be not so good. Since a few version GTK-Doc could "
-"also get all the information from source comments. Since GTK-Doc 1.9 the "
-"templates can be avoided. We encourage people to keep documentation in the "
-"code. gtkdocize supports now a  option that chooses a makefile that skips tmpl usage "
-"totally. Besides adding the option directly to the command invocation, they "
-"can be added also to a environment variable called GTKDOCIZE_FLAGS or set as a 2nd parameter in GTK_DOC_CHECK macro in "
-"the configure script. If you have never changed file in tmpl by hand and "
+"Historically GTK-Doc was generating template files where developers entered "
+"the docs. This turned out to be not so good (e.g. the need for having "
+"generated files under version control). Since GTK-Doc 1.9 the tools can get "
+"all the information from source comments and thus the templates can be "
+"avoided. We encourage people to keep documentation in the code. "
+"gtkdocize supports now a  option that chooses a makefile that skips tmpl usage totally. "
+"Besides adding the option directly to the command invocation, they can be "
+"added also to an environment variable called GTKDOCIZE_FLAGS "
+"or set as a 2nd parameter in GTK_DOC_CHECK macro in the "
+"configure script. If you have never changed file in tmpl by hand and "
 "migrating from older gtkdoc versions, please remove the dir (e.g. from "
 "version control system)."
 msgstr ""
 "In früherer Zeit erzeugte GTK-Doc die Vorlagendateien dort, wo die Entwickler "
-"die Dokumentaion platzierten. Das stellte sich als nicht optimal heraus. Seit "
+"die Dokumentaion platzierten. Das stellte sich als nicht optimal heraus, "
+"beispielsweise um generierte Dateien unter Versionskontrolle zu haben. Seit "
 "einigen Versionen kann GTK-Doc auch sämtliche Informationen aus Quellcode-"
 "Kommentaren ermitteln. Seit GTK-Doc 1.9 sind diese Vorlagen nicht mehr "
 "notwendig. Wir ermutigen die Entwickler, die Dokumentation innerhalb des "
@@ -662,11 +705,11 @@
 "importiert haben, sollten Sie den Ordner löschen, z.B. in der "
 "Versionsverwaltung."
 
-#: C/gtk-doc-manual.xml:530(title) C/gtk-doc-manual.xml:547(title)
+#: C/gtk-doc-manual.xml:544(title) C/gtk-doc-manual.xml:561(title)
 msgid "Running the doc build"
 msgstr "Erstellung der Dokumentation"
 
-#: C/gtk-doc-manual.xml:532(para)
+#: C/gtk-doc-manual.xml:546(para)
 msgid ""
 "After the previous steps it's time to run the build. First we need to rerun "
 "autogen.sh. If this script runs configure for you, then "
@@ -679,7 +722,7 @@
 " hinzufügen. Anderenfalls führen Sie danach "
 "configure manuell aus, ebenfalls mit dieser Option."
 
-#: C/gtk-doc-manual.xml:539(para)
+#: C/gtk-doc-manual.xml:553(para)
 msgid ""
 "The first make run generates several additional files in the doc-dirs. The "
 "important ones are: <package>.types, <"
@@ -691,7 +734,7 @@
 "package>.types, <package>-docs.sgml, "
 "<package>-sections.txt."
 
-#: C/gtk-doc-manual.xml:556(para)
+#: C/gtk-doc-manual.xml:570(para)
 msgid ""
 "Now you can point your browser to docs/reference/<package>/"
 "index.html. Yes, it's a bit disappointing still. But hang-on, "
@@ -702,11 +745,11 @@
 "enttäuschend. Im nächsten Abschnitt zeigen wir Ihnen, wie Sie die Seiten mit "
 "Leben füllen können."
 
-#: C/gtk-doc-manual.xml:564(title)
+#: C/gtk-doc-manual.xml:578(title)
 msgid "Integration with version control systems"
 msgstr "Integration in Versionsverwaltungssysteme"
 
-#: C/gtk-doc-manual.xml:566(para)
+#: C/gtk-doc-manual.xml:580(para)
 msgid ""
 "As a rule of the thumb, it's those files you edit, that should go under "
 "version control. For typical projects it's these files: <"
@@ -720,27 +763,27 @@
 "docs.sgml<package>-sections.txtMakefile.am"
 
-#: C/gtk-doc-manual.xml:579(title)
+#: C/gtk-doc-manual.xml:593(title)
 msgid "Documenting the code"
 msgstr "Dokumentieren des Codes"
 
-#: C/gtk-doc-manual.xml:581(para)
+#: C/gtk-doc-manual.xml:595(para)
 msgid ""
 "GTK-Doc uses source code comment with a special syntax for code "
 "documentation. Further it retrieves information about your project structure "
-"from other sources. During the next section you find all information about "
-"the syntax of the comments."
+"from other sources. During the next section you will find all information "
+"about the syntax of the comments."
 msgstr ""
 "GTK-Doc benutzt Quellcode-Kommentare mit einer speziellen Syntax für Code-"
 "Dokumentation. Weiterhin werden Informationen über Ihre Projektstruktur aus "
 "anderen Quellen geholt. Im nächsten Abschnitt finden sie umfassende "
 "Informationen über die Syntax der Kommentare."
 
-#: C/gtk-doc-manual.xml:589(title)
+#: C/gtk-doc-manual.xml:603(title)
 msgid "Documentation placement"
 msgstr "Platzierung der Dokumentation"
 
-#: C/gtk-doc-manual.xml:590(para)
+#: C/gtk-doc-manual.xml:604(para)
 msgid ""
 "In the past most documentation had to be filled into files residing inside "
 "the tmpl directory. This has the disadvantages that the "
@@ -752,7 +795,7 @@
 "Informationen oft nicht aktualisiert wurden und die Datei tendenziell "
 "Konflikte mit Versionsverwaltungssystemen verursachen kann."
 
-#: C/gtk-doc-manual.xml:596(para)
+#: C/gtk-doc-manual.xml:610(para)
 msgid ""
 "The avoid the aforementioned problems we suggest putting the documentation "
 "inside the sources. This manual will only describe this way of documenting "
@@ -762,15 +805,15 @@
 "Dokumentation innerhalb der Quellen zu halten. In diesem Handbuch wird "
 "ausschließlich dieser Weg des Dokumentierens des Quellcodes beschrieben."
 
-#: C/gtk-doc-manual.xml:606(title)
+#: C/gtk-doc-manual.xml:620(title)
 msgid "Documentation comments"
 msgstr "Kommentare zur Dokumentation"
 
-#: C/gtk-doc-manual.xml:611(title)
+#: C/gtk-doc-manual.xml:625(title)
 msgid "GTK-Doc comment block"
 msgstr "GTK-Doc-Kommentarblock"
 
-#: C/gtk-doc-manual.xml:608(para)
+#: C/gtk-doc-manual.xml:622(para)
 msgid ""
 "A multiline comment that starts with an additional '*' marks a documentation "
 "block that will be processed by the GTK-Doc tools. "
@@ -779,7 +822,7 @@
 "einen Kommentarblock, der von den Werkzeugen in GTK-Doc verarbeitet wird. "
 ""
 
-#: C/gtk-doc-manual.xml:623(para)
+#: C/gtk-doc-manual.xml:637(para)
 msgid ""
 "The 'identifier' is one line with the name of the item the comment is related "
 "to. The syntax differs a little depending on the item. (TODO add table "
@@ -788,7 +831,7 @@
 "Der »identifier« ist eine Zeile mit dem Namen des Objekts, auf das sich der "
 "Kommentar bezieht. Die Syntax kann abhängig von der Art des Objekts variieren."
 
-#: C/gtk-doc-manual.xml:629(para)
+#: C/gtk-doc-manual.xml:643(para)
 msgid ""
 "The 'documentation' block is also different for each symbol type. Symbol "
 "types that get parameters such as functions or macros have the parameter "
@@ -802,18 +845,18 @@
 "Symboltypen mit Parametern wie Funktionen oder Makros haben eine "
 "Parameterbeschreibung, auf die eine leere Zeile folgt (keine echte Leerzeile, "
 "sondern ein »*«).Danach folgt eine detaillierte Beschreibung. Alle Zeilen "
-"(außerhalb von Programmlistings und CDATA-Abschnitten, die nur ein solches »*« "
-"enthalten, werden in Absatzumbrüche umgewandelt. Falls Sie keinen "
+"(außerhalb von Programmlistings und CDATA-Abschnitten, die nur ein solches "
+"»*« enthalten, werden in Absatzumbrüche umgewandelt. Falls Sie keinen "
 "Absatzumbruch wünschen, verwenden sie stattdessen ein » * «, d.h. setzen Sie "
 "ein Leerzeichen jeweils davor und dahinter."
 
-#: C/gtk-doc-manual.xml:646(para)
+#: C/gtk-doc-manual.xml:660(para)
 msgid "Use function() to refer to functions or macros which take arguments."
 msgstr ""
 "Verwenden Sie function(), um einen Bezug zu Funktionen oder Makros "
 "herzustellen, die Argumente akzeptieren."
 
-#: C/gtk-doc-manual.xml:651(para)
+#: C/gtk-doc-manual.xml:665(para)
 msgid ""
 "Use @param to refer to parameters. Also use this when referring to parameters "
 "of other functions, related to the one being described."
@@ -822,13 +865,13 @@
 "Sie dies auch, wenn es um einen Bezug zu Parametern anderer Funktionen geht, "
 "bezogen auf jene, die Sie gerade beschreiben."
 
-#: C/gtk-doc-manual.xml:657(para)
+#: C/gtk-doc-manual.xml:671(para)
 msgid "Use %constant to refer to a constant, e.g. %G_TRAVERSE_LEAFS."
 msgstr ""
-"Benutzen Sie %constant, um einen Bezug auf eine Konstante herzustellen, z.B. %"
-"G_TRAVERSE_LEAFS."
+"Benutzen Sie %constant, um einen Bezug auf eine Konstante herzustellen, z.B. "
+"%G_TRAVERSE_LEAFS."
 
-#: C/gtk-doc-manual.xml:662(para)
+#: C/gtk-doc-manual.xml:676(para)
 msgid ""
 "Use #symbol to refer to other types of symbol, e.g. structs and enums and "
 "macros which don't take arguments."
@@ -836,34 +879,34 @@
 "Verwenden Sie #symbol, um auf andere Symboltypen zu verweisen, z.B. »structs« "
 "und »enums« und Makros, die keine Argumente benötigen."
 
-#: C/gtk-doc-manual.xml:668(para)
+#: C/gtk-doc-manual.xml:682(para)
 msgid "Use #Object::signal to refer to a GObject signal"
 msgstr "Verwenden Sie #Object::signal, um auf ein GObject-Signal zu verweisen"
 
-#: C/gtk-doc-manual.xml:673(para)
+#: C/gtk-doc-manual.xml:687(para)
 msgid "Use #Object:property to refer to a GObject property"
 msgstr ""
 "Verwenden Sie #Object:property, um auf eine GObject-Eigenschaft zu verweisen."
 
-#: C/gtk-doc-manual.xml:678(para)
+#: C/gtk-doc-manual.xml:692(para)
 msgid "Use #Struct.field to refer to a field inside a structure."
 msgstr ""
 "Verwenden Sie #Struct.field, um auf ein Feld innerhalb einer Struktur zu "
 "verweisen."
 
-#: C/gtk-doc-manual.xml:640(para)
+#: C/gtk-doc-manual.xml:654(para)
 msgid ""
 "One advantage of hyper-text over plain-text is the ability to have links in "
 "the document. Writing the correct markup for a link can be tedious though. "
-"GTK-Doc comes to help by providing several useful abbreviations. "
+"GTK-Doc comes to help by providing several useful abbreviations. "
+""
 msgstr ""
 "Ein Vorteil von Hypertext gegenüber Klartext ist die Möglichkeit, "
 "Verknüpfungen im Dokument zu verwenden. Das Schreiben eines korrekten Markups "
 "für eine solche Verknüpfung kann allerdings langatmig sein, deshalb stellt "
 "GTK-Doc eine Reihe von praktischen Abkürzungen bereit. "
 
-#: C/gtk-doc-manual.xml:686(para)
+#: C/gtk-doc-manual.xml:700(para)
 msgid ""
 "If you need to use the special characters '<', '>', '()', '@', '%', or "
 "'#' in your documentation without GTK-Doc changing them you can use the XML "
@@ -877,7 +920,7 @@
 "commat;«, »&percnt;« und »&num;« verwenden oder die Zeichen mit einem "
 "Backslash »\\« maskieren."
 
-#: C/gtk-doc-manual.xml:695(para)
+#: C/gtk-doc-manual.xml:709(para)
 msgid ""
 "DocBook can do more that just links. One can also have lists, tables and "
 "examples. To enable the usage of SGML/XML tags inside doc-comments you need "
@@ -890,7 +933,7 @@
 "MKDB_OPTIONS in der Datei Makefile.am "
 "die Option ."
 
-#: C/gtk-doc-manual.xml:703(para)
+#: C/gtk-doc-manual.xml:717(para)
 msgid ""
 "As already mentioned earlier GTK-Doc is for documenting public API. Thus one "
 "cannot write documentation for static symbols. Nevertheless it is good to "
@@ -910,11 +953,11 @@
 "hinzuzufügen und den Symbolnamen an der richtigen Stelle in die "
 "Abschnittsdatei einzubauen."
 
-#: C/gtk-doc-manual.xml:717(title)
+#: C/gtk-doc-manual.xml:731(title)
 msgid "Documenting sections"
-msgstr ""
+msgstr "Dokumentieren von Abschnitten"
 
-#: C/gtk-doc-manual.xml:719(para)
+#: C/gtk-doc-manual.xml:733(para)
 msgid ""
 "Each section of the documentation contains information about one class or "
 "module. To introduce the component one can write a section block. The short "
@@ -926,27 +969,31 @@
 "schreiben. Die Kurzbeschreibung wird auch im Inhaltsverzeichnis verwendet. "
 "Alle @-Felder sind optional."
 
-#: C/gtk-doc-manual.xml:727(title)
+#: C/gtk-doc-manual.xml:741(title)
 msgid "Section comment block"
 msgstr ""
 
-#: C/gtk-doc-manual.xml:749(term)
+#: C/gtk-doc-manual.xml:763(term)
 msgid "SECTION:<name>"
 msgstr "SECTION:<name>"
 
-#: C/gtk-doc-manual.xml:751(para)
+#: C/gtk-doc-manual.xml:765(para)
 msgid ""
 "The name links the section documentation to the respective part in the "
 "<package>-sections.txt file. The name give here "
 "should match the <FILE> tag in the <package>-sections."
 "txt file."
 msgstr ""
+"Der Name verweist auf die Abschnittsdokumentation des entsprechenden Teils "
+"der Datei <package>-sections.txt. Der hier "
+"angegebene Name sollte der Markierung <FILE> in der Datei <"
+"package>-sections.txt entsprechen."
 
-#: C/gtk-doc-manual.xml:760(term)
+#: C/gtk-doc-manual.xml:774(term)
 msgid "@short_description"
 msgstr "@short_description"
 
-#: C/gtk-doc-manual.xml:762(para)
+#: C/gtk-doc-manual.xml:776(para)
 msgid ""
 "A one line description of the section, that later will appear after the links "
 "in the TOC and at the top of the section page."
@@ -954,11 +1001,11 @@
 "Eine einzeilige Beschreibung des Abschnitts, die später hinter den Verweisen "
 "im Inhaltsverzeichnis und oben in der Abschnittsseite erscheint."
 
-#: C/gtk-doc-manual.xml:769(term)
+#: C/gtk-doc-manual.xml:783(term)
 msgid "@title"
 msgstr "@title"
 
-#: C/gtk-doc-manual.xml:771(para)
+#: C/gtk-doc-manual.xml:785(para)
 msgid ""
 "The section title defaults to <name> from the SECTION declaration. It "
 "can be overridden with the @title field."
@@ -966,30 +1013,30 @@
 "Der Abschnittstitel in der SECTION-Deklaration, Vorgabe ist <name>. Er "
 "kann im Feld @title überschrieben werden."
 
-#: C/gtk-doc-manual.xml:778(term)
+#: C/gtk-doc-manual.xml:792(term)
 msgid "@section_id"
 msgstr "@section_id"
 
-#: C/gtk-doc-manual.xml:780(para)
+#: C/gtk-doc-manual.xml:794(para)
 msgid ""
 "Overrides the use of title as a section identifier. For GObjects the <"
-"title> is used as a section_id and for other section it is <MODULE>-"
+"title> is used as a section_id and for other sections it is <MODULE>-"
 "<title>."
 msgstr ""
 
-#: C/gtk-doc-manual.xml:788(term)
+#: C/gtk-doc-manual.xml:802(term)
 msgid "@see_also"
 msgstr "@see_also"
 
-#: C/gtk-doc-manual.xml:790(para)
-msgid "A list of symbols that are related to this section.."
+#: C/gtk-doc-manual.xml:804(para)
+msgid "A list of symbols that are related to this section."
 msgstr "Eine Liste von Symbolen, welche sich auf diesen Abschnitt beziehen."
 
-#: C/gtk-doc-manual.xml:796(term)
+#: C/gtk-doc-manual.xml:810(term)
 msgid "@stability"
 msgstr "@stability"
 
-#: C/gtk-doc-manual.xml:803(para)
+#: C/gtk-doc-manual.xml:817(para)
 msgid ""
 "Stable - The intention of a Stable interface is to enable arbitrary third "
 "parties to develop applications to these interfaces, release them, and have "
@@ -999,7 +1046,7 @@
 "rare, and to have strong justifications."
 msgstr ""
 
-#: C/gtk-doc-manual.xml:815(para)
+#: C/gtk-doc-manual.xml:829(para)
 msgid ""
 "Unstable - Unstable interfaces are experimental or transitional. They are "
 "typically used to give outside developers early access to new or rapidly "
@@ -1008,21 +1055,21 @@
 "or binary compatibility from one minor release to the next."
 msgstr ""
 
-#: C/gtk-doc-manual.xml:827(para)
+#: C/gtk-doc-manual.xml:841(para)
 msgid ""
 "Private - An interface that can be used within the GNOME stack itself, but "
 "that is not documented for end-users. Such functions should only be used in "
 "specified and documented ways."
 msgstr ""
 
-#: C/gtk-doc-manual.xml:836(para)
+#: C/gtk-doc-manual.xml:850(para)
 msgid ""
 "Internal - An interface that is internal to a module and does not require end-"
 "user documentation. Functions that are undocumented are assumed to be "
 "Internal."
 msgstr ""
 
-#: C/gtk-doc-manual.xml:798(para)
+#: C/gtk-doc-manual.xml:812(para)
 msgid ""
 "A informal description of the stability level this API has. We recommend the "
 "use of one of these terms: "
@@ -1030,11 +1077,11 @@
 "Eine informelle Beschreibung der Stabilitätsstufe dieser API. Wir empfehlen "
 "dafür einen der folgenden Begriffe: "
 
-#: C/gtk-doc-manual.xml:848(term)
+#: C/gtk-doc-manual.xml:862(term)
 msgid "@include"
 msgstr "@include"
 
-#: C/gtk-doc-manual.xml:850(para)
+#: C/gtk-doc-manual.xml:864(para)
 msgid ""
 "The #include files to show in the section synopsis (a "
 "comma separated list), overriding the global value from the "
 msgstr "Bitte denken Sie an: "
 
-#: C/gtk-doc-manual.xml:967(para)
+#: C/gtk-doc-manual.xml:981(para)
 msgid ""
 "Gtk-doc assumes all symbols (macros, functions) starting with '_' are "
 "private. They are treated like static functions."
@@ -1159,7 +1207,7 @@
 "GTK-Doc nimmt an, dass alle Symbole (Makros, Funktionen), die mit »_« "
 "beginnen, privat sind. Sie werden wie statische Funktionen behandelt."
 
-#: C/gtk-doc-manual.xml:972(para)
+#: C/gtk-doc-manual.xml:986(para)
 msgid ""
 "Also, take a look at gobject introspection annotation tags: http://live.gnome."
 "org/GObjectIntrospection/Annotations"
@@ -1167,37 +1215,37 @@
 "Werfen Sie auch einen Blick auf die »gobject introspection annotation tags«: "
 "http://live.gnome.org/GObjectIntrospection/Annotations"
 
-#: C/gtk-doc-manual.xml:1003(title)
+#: C/gtk-doc-manual.xml:1017(title)
 msgid "Function tags"
 msgstr "Funktions-Tags"
 
-#: C/gtk-doc-manual.xml:1004(term)
+#: C/gtk-doc-manual.xml:1018(term)
 msgid "Returns:"
 msgstr "Returns:"
 
-#: C/gtk-doc-manual.xml:1006(para)
+#: C/gtk-doc-manual.xml:1020(para)
 msgid "Paragraph describing the returned result."
 msgstr "Abschnitt, der das zurückgegebene Ergebnis beschreibt."
 
-#: C/gtk-doc-manual.xml:1011(term)
+#: C/gtk-doc-manual.xml:1025(term)
 msgid "@...:"
 msgstr "@...:"
 
-#: C/gtk-doc-manual.xml:1013(para)
+#: C/gtk-doc-manual.xml:1027(para)
 msgid ""
 "In case the function has variadic arguments, you should use this tag "
 "(@Varargs: does also work for historic reasons)."
 msgstr ""
 
-#: C/gtk-doc-manual.xml:1023(title) C/gtk-doc-manual.xml:1025(title)
+#: C/gtk-doc-manual.xml:1037(title) C/gtk-doc-manual.xml:1039(title)
 msgid "Property comment block"
 msgstr "Property-Kommentarblock"
 
-#: C/gtk-doc-manual.xml:1040(title) C/gtk-doc-manual.xml:1059(title)
+#: C/gtk-doc-manual.xml:1054(title) C/gtk-doc-manual.xml:1073(title)
 msgid "Signal comment block"
 msgstr "Signal-Kommentarblock"
 
-#: C/gtk-doc-manual.xml:1046(para)
+#: C/gtk-doc-manual.xml:1060(para)
 msgid ""
 "Document when the signal is emitted and whether it is emitted before or after "
 "other signals."
@@ -1205,50 +1253,59 @@
 "Dokumentiert, wann ein Signal ausgegeben wird und ob es vor oder nach anderen "
 "Signalen ausgegeben wird."
 
-#: C/gtk-doc-manual.xml:1052(para)
+#: C/gtk-doc-manual.xml:1066(para)
 msgid "Document what an application might do in the signal handler."
 msgstr "Dokumentiert, was eine Anwendung in dem Signal-Handler tun könnte."
 
-#: C/gtk-doc-manual.xml:1079(title) C/gtk-doc-manual.xml:1080(title)
+#: C/gtk-doc-manual.xml:1093(title) C/gtk-doc-manual.xml:1094(title)
 msgid "Struct comment block"
 msgstr "Struct-Kommentarblock"
 
-#: C/gtk-doc-manual.xml:1100(para)
+#: C/gtk-doc-manual.xml:1114(para)
 msgid ""
 "Use /*< private >*/ before the private struct fields you "
-"want to hide. Use /*< public >*/ for the reverse "
-"behavirour."
+"want to hide. Use /*< public >*/ for the reverse behaviour."
 msgstr ""
 "Verwenden Sie /*< private >*/ vor den privaten »struct«-"
 "Feldern, die Sie verbergen wollen. Um das umgekehrte Verhalten zu erzielen, "
 "verwenden Sie /*< public >*/."
 
-#: C/gtk-doc-manual.xml:1108(title) C/gtk-doc-manual.xml:1109(title)
+#: C/gtk-doc-manual.xml:1120(para)
+msgid ""
+"Struct comment blocks can also be used for GObjects and GObjectClasses. It is "
+"usualy a good idea to add a comment blco for a class, if it has vmethods (as "
+"this is how they can be documented). For the GObject itself one can use the "
+"related section docs, having a separate block for the instance struct would "
+"be useful if the instance has public fields. One disadvantage here is that "
+"this creates two index entries of the same name (the structure and the "
+"section)."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1132(title) C/gtk-doc-manual.xml:1133(title)
 msgid "Enum comment block"
 msgstr "Enum-Kommentarblock"
 
-#: C/gtk-doc-manual.xml:1130(para)
+#: C/gtk-doc-manual.xml:1154(para)
 msgid ""
 "Use /*< private >*/ before the private enum values you "
-"want to hide. Use /*< public >*/ for the reverse "
-"behavirour."
+"want to hide. Use /*< public >*/ for the reverse behaviour."
 msgstr ""
 "Verwenden Sie /*< private >*/ vor den privaten »enum«-"
 "Werten, die Sie verbergen wollen. Um das umgekehrte Verhalten zu erzielen, "
 "verwenden Sie /*< public >*/."
 
-#: C/gtk-doc-manual.xml:1140(title)
+#: C/gtk-doc-manual.xml:1164(title)
 msgid "Useful DocBook tags"
 msgstr "Nützliche DocBook-Tags"
 
-#: C/gtk-doc-manual.xml:1142(para)
+#: C/gtk-doc-manual.xml:1166(para)
 msgid ""
 "Here are some DocBook tags which are most useful when documenting the code."
 msgstr ""
 "Nachfolgend finden Sie einige DocBook-Tags, die beim Dokumentieren von Code "
 "nützlich sein können."
 
-#: C/gtk-doc-manual.xml:1147(para)
+#: C/gtk-doc-manual.xml:1171(para)
 msgid ""
 "To link to another section in the GTK docs:  The linkend is "
 "the SGML/XML id on the top item of the page you want to link to. For most "
@@ -1263,14 +1320,14 @@
 "der Klassenname. Leerzeichen und Unterstriche werden SGML/XML-konform in »-« "
 "umgewandelt. "
 
-#: C/gtk-doc-manual.xml:1163(para)
+#: C/gtk-doc-manual.xml:1187(para)
 msgid ""
 "To refer to an external function, e.g. a standard C function: "
 msgstr ""
 "Für einen Bezug zu einer externen Funktion, z.B. einer C-Standardfunktion: "
 ""
 
-#: C/gtk-doc-manual.xml:1174(para)
+#: C/gtk-doc-manual.xml:1198(para)
 msgid ""
 "To include example code:  or possibly this, for very short "
 "code fragments which don't need a title:  For the latter GTK-"
@@ -1288,19 +1345,19 @@
 "]|\n"
 "]]>"
 
-#: C/gtk-doc-manual.xml:1208(para)
+#: C/gtk-doc-manual.xml:1232(para)
 msgid "To include bulleted lists: "
 msgstr "Für eine Liste mit Aufzählungszeichen: "
 
-#: C/gtk-doc-manual.xml:1230(para)
+#: C/gtk-doc-manual.xml:1254(para)
 msgid "To include a note which stands out from the text: "
 msgstr "Für eine nicht zum eigentlichen Text gehörende Notiz: "
 
-#: C/gtk-doc-manual.xml:1245(para)
+#: C/gtk-doc-manual.xml:1269(para)
 msgid "To refer to a type: "
 msgstr "Für einen Bezug zu einem Typ: "
 
-#: C/gtk-doc-manual.xml:1256(para)
+#: C/gtk-doc-manual.xml:1280(para)
 msgid ""
 "To refer to an external structure (not one described in the GTK docs): "
 ""
@@ -1308,11 +1365,11 @@
 "Für einen Bezug zu einer externen Struktur (die nicht in den GTK-Docs "
 "beschrieben wird: "
 
-#: C/gtk-doc-manual.xml:1267(para)
+#: C/gtk-doc-manual.xml:1291(para)
 msgid "To refer to a field of a structure: "
 msgstr "Für einen Bezug zu einem Feld einer Struktur: "
 
-#: C/gtk-doc-manual.xml:1278(para)
+#: C/gtk-doc-manual.xml:1302(para)
 msgid ""
 "To refer to a class name, we could possibly use:  but you'll "
 "probably be using #GtkWidget instead (to automatically create a link to the "
@@ -1320,35 +1377,39 @@
 "link>)."
 msgstr ""
 
-#: C/gtk-doc-manual.xml:1291(para)
+#: C/gtk-doc-manual.xml:1315(para)
 msgid "To emphasize text: "
 msgstr "Zum Hervorheben von Text: "
 
-#: C/gtk-doc-manual.xml:1302(para)
+#: C/gtk-doc-manual.xml:1326(para)
 msgid "For filenames use: "
 msgstr "Für Dateinamen: "
 
-#: C/gtk-doc-manual.xml:1313(para)
+#: C/gtk-doc-manual.xml:1337(para)
 msgid "To refer to keys use: "
 msgstr ""
 
-#: C/gtk-doc-manual.xml:1328(title)
+#: C/gtk-doc-manual.xml:1352(title)
 msgid "Filling the extra files"
-msgstr ""
+msgstr "Füllen der zusätzlichen Dateien"
 
-#: C/gtk-doc-manual.xml:1330(para)
+#: C/gtk-doc-manual.xml:1354(para)
 msgid ""
 "There are a couple of extra files, that need to be maintained along with the "
 "inline source code comments: <package>.types, "
 "<package>-docs.sgml, <package>-"
 "sections.txt."
 msgstr ""
+"Es gibt eine Menge zusätzlicher Dateien, die mit den eingebetteten Quellcode-"
+"Kommentaren verwaltet werden müssen: <package>.types, <package>-docs.sgml, <"
+"package>-sections.txt."
 
-#: C/gtk-doc-manual.xml:1339(title)
+#: C/gtk-doc-manual.xml:1363(title)
 msgid "Editing the types file"
 msgstr "Bearbeiten der Typendatei"
 
-#: C/gtk-doc-manual.xml:1341(para)
+#: C/gtk-doc-manual.xml:1365(para)
 msgid ""
 "If your library or application includes GtkObjects/GObjects, you want their "
 "signals, arguments/parameters and position in the hierarchy to be shown in "
@@ -1356,12 +1417,17 @@
 "function> functions together with their include inside the <"
 "package>.types file."
 msgstr ""
+"Falls Ihre Bibliothek oder Anwendung GtkObjects/GObjects beinhaltet, sollten "
+"deren Signale, Argumente/Parameter und Positionen in der Hierarchie in der "
+"Dokumentation erscheinen. Alles was Sie tun müssen, ist die "
+"xxx_get_typeFunktionen zusammen mit deren Includes in "
+"der Datei <package>.types aufzulisten."
 
-#: C/gtk-doc-manual.xml:1350(title)
+#: C/gtk-doc-manual.xml:1374(title)
 msgid "Example types file snippet"
 msgstr ""
 
-#: C/gtk-doc-manual.xml:1364(para)
+#: C/gtk-doc-manual.xml:1388(para)
 msgid ""
 "Since GTK-Doc 1.8 gtkdoc-scan can generate this "
 "list for you. Just add \"--rebuild-types\" to SCAN_OPTIONS in "
@@ -1369,19 +1435,19 @@
 "dist the types file nor have it under version control."
 msgstr ""
 
-#: C/gtk-doc-manual.xml:1373(title)
+#: C/gtk-doc-manual.xml:1397(title)
 msgid "Editing the master document"
 msgstr "Bearbeiten des Master-Dokuments"
 
-#: C/gtk-doc-manual.xml:1375(para)
+#: C/gtk-doc-manual.xml:1399(para)
 msgid ""
 "GTK-Doc produces documentation in DocBook SGML/XML. When processing the "
 "inline source comments, the GTK-Doc tools generate one documentation page per "
 "class or module as a separate file. The master document includes them and "
-"place them in a order."
+"place them in an order."
 msgstr ""
 
-#: C/gtk-doc-manual.xml:1382(para)
+#: C/gtk-doc-manual.xml:1406(para)
 msgid ""
 "While GTK-Doc creates a template master document for you, later run will not "
 "touch it again. This means that one can freely structure the documentation. "
@@ -1391,7 +1457,7 @@
 "introduced there."
 msgstr ""
 
-#: C/gtk-doc-manual.xml:1392(para)
+#: C/gtk-doc-manual.xml:1416(para)
 msgid ""
 "Do not create tutorials as extra documents. Just write extra chapters. The "
 "benefit of directly embedding the tutorial for your library into the API "
@@ -1406,7 +1472,7 @@
 "Symboldokumentation. Außerdem sind die Chancen größer, dass die Anleitung die "
 "gleichen Aktualisierungen erfährt wie die Bibliothek selbst."
 
-#: C/gtk-doc-manual.xml:1401(para)
+#: C/gtk-doc-manual.xml:1425(para)
 msgid ""
 "So what are the things to change inside the master document? For a start is "
 "only a little. There are some placeholders (text in square brackets) there "
@@ -1416,29 +1482,29 @@
 "wenig. Es gibt einige Platzhalter (Text in eckigen Klammern), die Sie "
 "beachten sollten."
 
-#: C/gtk-doc-manual.xml:1408(title)
+#: C/gtk-doc-manual.xml:1432(title)
 msgid "Master document header"
 msgstr "Kopfzeile des Master-Dokuments"
 
-#: C/gtk-doc-manual.xml:1430(title)
+#: C/gtk-doc-manual.xml:1454(title)
 msgid "Editing the section file"
 msgstr "Bearbeiten der Abschnittsdatei"
 
-#: C/gtk-doc-manual.xml:1432(para)
+#: C/gtk-doc-manual.xml:1456(para)
 msgid ""
 "The section file is used to organise the documentation output by GTK-Doc. "
 "Here one specifies which symbol belongs to which module or class and control "
 "the visibility (public or private)."
 msgstr ""
 
-#: C/gtk-doc-manual.xml:1438(para)
+#: C/gtk-doc-manual.xml:1462(para)
 msgid ""
 "The section file is a plain test file with xml like syntax (using tags). "
 "Blank lines are ignored and lines starting with a '#' are treated as comment "
 "lines."
 msgstr ""
 
-#: C/gtk-doc-manual.xml:1444(para)
+#: C/gtk-doc-manual.xml:1468(para)
 msgid ""
 "The <FILE> ... </FILE> tag is used to specify the file name, "
 "without any suffix. For example, using '<FILE>gnome-config</"
@@ -1451,7 +1517,7 @@
 "case)."
 msgstr ""
 
-#: C/gtk-doc-manual.xml:1456(para)
+#: C/gtk-doc-manual.xml:1480(para)
 msgid ""
 "The <TITLE> ... </TITLE> tag is used to specify the title of the "
 "section. It is only useful before the templates (if used) are initially "
@@ -1459,7 +1525,7 @@
 "uses SECTION comment in the sources, this is obsolete."
 msgstr ""
 
-#: C/gtk-doc-manual.xml:1463(para)
+#: C/gtk-doc-manual.xml:1487(para)
 msgid ""
 "You can group items in the section by using the <SUBSECTION> tag. "
 "Currently it outputs a blank line between subsections in the synopsis "
@@ -1470,10 +1536,12 @@
 "declarations which will not be output (It is a handy way to avoid warning "
 "messages about unused declarations.). If your library contains private types "
 "which you don't want to appear in the object hierarchy and the list of "
-"implemented or required interfaces, add them to a Private subsection."
+"implemented or required interfaces, add them to a Private subsection. Wheter "
+"you would place GObject and GObjectClass like structs in public or Standard "
+"section depends if they have public entries (variables, vmethods)."
 msgstr ""
 
-#: C/gtk-doc-manual.xml:1479(para)
+#: C/gtk-doc-manual.xml:1506(para)
 msgid ""
 "You can also use <INCLUDE> ... </INCLUDE> to specify the #include "
 "files which are shown in the synopsis sections. It contains a comma-separate "
@@ -1482,11 +1550,11 @@
 "it within a section, it only applies to that section."
 msgstr ""
 
-#: C/gtk-doc-manual.xml:1493(title)
+#: C/gtk-doc-manual.xml:1520(title)
 msgid "Controlling the result"
 msgstr "Überprüfung des Ergebnisses"
 
-#: C/gtk-doc-manual.xml:1495(para)
+#: C/gtk-doc-manual.xml:1522(para)
 msgid ""
 "A GTK-Doc run generates report files inside the documentation directory. The "
 "generated files are named: <package>-undocumented.txt<package>-unused.txt. Sie liegen alle als Klartext "
 "vor und können daher einfach betrachtet und weiterverarbeitet werden."
 
-#: C/gtk-doc-manual.xml:1504(para)
+#: C/gtk-doc-manual.xml:1531(para)
 msgid ""
 "The <package>-undocumented.txt file starts with "
 "the documentation coverage summary. Below are two sections divided by blank "
@@ -1509,14 +1577,14 @@
 "have documentation, but where e.g. a new parameter has been added."
 msgstr ""
 
-#: C/gtk-doc-manual.xml:1513(para)
+#: C/gtk-doc-manual.xml:1540(para)
 msgid ""
 "The <package>-undeclared.txt file lists symbols "
 "given in the <package>-sections.txt but not found "
 "in the sources. Check if they have been removed or if they are misspelled."
 msgstr ""
 
-#: C/gtk-doc-manual.xml:1520(para)
+#: C/gtk-doc-manual.xml:1547(para)
 msgid ""
 "The <package>-unused.txt file lists symbol names, "
 "where the GTK-Doc scanner has found documentation, but does not know where to "
@@ -1524,24 +1592,24 @@
 "<package>-sections.txt file."
 msgstr ""
 
-#: C/gtk-doc-manual.xml:1528(para)
+#: C/gtk-doc-manual.xml:1555(para)
 msgid ""
 "Enable or add the  line in Makefile.am. "
 "If at least GTK-Doc 1.9 is installed, this will run sanity checks during "
 "make check run."
 msgstr ""
 
-#: C/gtk-doc-manual.xml:1535(para)
+#: C/gtk-doc-manual.xml:1562(para)
 msgid ""
 "One can also look at the files produced by the source code scanner: "
 "<package>-decl-list.txt and <"
-"package>-decl.txt. The first and can be compared with the "
+"package>-decl.txt. The first one can be compared with the "
 "section file if that is manualy maintained. The second lists all declarations "
 "fromt he headers If a symbol is missing one could check if this file contains "
 "it."
 msgstr ""
 
-#: C/gtk-doc-manual.xml:1544(para)
+#: C/gtk-doc-manual.xml:1571(para)
 msgid ""
 "If the project is GObject based, one can also look into the files produced by "
 "the object scanner: <package>.args.txt, "
@@ -1553,31 +1621,93 @@
 "GTK_DOC_KEEP_INTERMEDIATE=1 make."
 msgstr ""
 
-#: C/gtk-doc-manual.xml:1559(title)
-msgid "Frequently asked question"
+#: C/gtk-doc-manual.xml:1586(title)
+msgid "Documenting other interfaces"
+msgstr "Dokumentieren anderer Schnittstellen"
+
+#: C/gtk-doc-manual.xml:1588(para)
+msgid ""
+"So far we have been using GTK-Doc to document the API of code. The next "
+"sections contain suggestions how the tools can be used to document other "
+"interfaces too."
+msgstr ""
+"Bis jetzt haben wir GTK-Doc nur dazu verwendet, die API des Codes zu "
+"dokumentieren. In den nächsten Abschnitten finden Sie Vorschläge, wie die "
+"Werkzeuge zum Dokumentieren anderer Schnittstellen eingesetzt werden können."
+
+#: C/gtk-doc-manual.xml:1595(title)
+msgid "Commandline options and man pages"
+msgstr "Befehlszeilenoptionen und Handbuchseiten"
+
+#: C/gtk-doc-manual.xml:1597(para)
+msgid ""
+"As one can generate man pages for a docbook refentry as well, it sounds like "
+"a good idea to use it for that purpose. This way the interface is part of the "
+"reference and one gets the man-page for free."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1604(title)
+msgid "Document the tool"
+msgstr "Dokumentieren des Werkzeuges"
+
+#: C/gtk-doc-manual.xml:1606(para)
+msgid ""
+"Create one refentry file per tool. Following our example we would call it meep/"
+"docs/reference/meeper/meep.xml. For the xml tags that should be "
+"used and can look at generated file in the xml subdirectory as well as "
+"examples e.g. in glib."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1616(title)
+msgid "Adding the extra configure check"
+msgstr "Hinzufügen der zusätzlichen Configure-Überprüfungen"
+
+#: C/gtk-doc-manual.xml:1619(title) C/gtk-doc-manual.xml:1639(title)
+msgid "Extra configure checks"
+msgstr "Zusätzliche Configure-Überprüfungen"
+
+#: C/gtk-doc-manual.xml:1636(title)
+msgid "Adding the extra makefile rules"
+msgstr "Hinzufügen der zusätzlichen Makefile-Regeln"
+
+#: C/gtk-doc-manual.xml:1664(title)
+msgid "DBus interfaces"
+msgstr "DBus-Schnittstellen"
+
+#: C/gtk-doc-manual.xml:1666(para)
+msgid ""
+"(FIXME: http://hal.freedesktop.org/docs/DeviceKit/DeviceKit.html, http://cgit."
+"freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus)"
+msgstr ""
+"(FIXME: http://hal.freedesktop.org/docs/DeviceKit/DeviceKit.html, http://cgit."
+"freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus)"
+
+#: C/gtk-doc-manual.xml:1675(title)
+msgid "Frequently asked questions"
 msgstr "Häufig gestellte Fragen"
 
-#: C/gtk-doc-manual.xml:1563(segtitle)
+#: C/gtk-doc-manual.xml:1679(segtitle)
 msgid "Question"
 msgstr "Frage"
 
-#: C/gtk-doc-manual.xml:1564(segtitle)
+#: C/gtk-doc-manual.xml:1680(segtitle)
 msgid "Answer"
 msgstr "Antwort"
 
-#: C/gtk-doc-manual.xml:1566(seg)
+#: C/gtk-doc-manual.xml:1682(seg)
 msgid "No class hierarchy."
 msgstr "Keine Klassenhierarchie."
 
-#: C/gtk-doc-manual.xml:1568(function)
+#: C/gtk-doc-manual.xml:1684(function)
 msgid "xxx_get_type()"
 msgstr "xxx_get_type()"
 
-#: C/gtk-doc-manual.xml:1569(filename)
+#: C/gtk-doc-manual.xml:1685(filename)
 msgid "<package>.types"
 msgstr "<package>.types"
 
-#: C/gtk-doc-manual.xml:1567(seg)
+#: C/gtk-doc-manual.xml:1683(seg)
 msgid ""
 "The objects  function has not been entered into the "
 " file."
@@ -1585,77 +1715,77 @@
 "Die -Funktion des Objekts wurde nicht in die Datei "
 " eingegeben."
 
-#: C/gtk-doc-manual.xml:1573(seg)
+#: C/gtk-doc-manual.xml:1689(seg)
 msgid "Still no class hierarchy."
 msgstr "Noch immer keine Klassenhierarchie."
 
-#: C/gtk-doc-manual.xml:1575(filename) C/gtk-doc-manual.xml:1614(filename)
-#: C/gtk-doc-manual.xml:1622(filename) C/gtk-doc-manual.xml:1644(filename)
+#: C/gtk-doc-manual.xml:1691(filename) C/gtk-doc-manual.xml:1730(filename)
+#: C/gtk-doc-manual.xml:1738(filename) C/gtk-doc-manual.xml:1760(filename)
 msgid "<package>-sections.txt"
 msgstr "<package>-sections.txt"
 
-#: C/gtk-doc-manual.xml:1576(ulink)
+#: C/gtk-doc-manual.xml:1692(ulink)
 msgid "explanation"
 msgstr "Erklärung"
 
-#: C/gtk-doc-manual.xml:1574(seg)
+#: C/gtk-doc-manual.xml:1690(seg)
 msgid "Missing or wrong naming in  file (see )."
 msgstr ""
 "Falsche oder fehlende Benennung in der Datei  (siehe "
 ")."
 
-#: C/gtk-doc-manual.xml:1580(seg)
+#: C/gtk-doc-manual.xml:1696(seg)
 msgid "Damn, I have still no class hierarchy."
 msgstr "Verdammt, ich habe immer noch keine Klassenhierarchie."
 
-#: C/gtk-doc-manual.xml:1582(type) C/gtk-doc-manual.xml:1623(type)
+#: C/gtk-doc-manual.xml:1698(type) C/gtk-doc-manual.xml:1739(type)
 msgid "GtkWidget"
 msgstr "GtkWidget"
 
-#: C/gtk-doc-manual.xml:1581(seg)
+#: C/gtk-doc-manual.xml:1697(seg)
 msgid ""
 "Is the object name (name of the instance struct, e.g. ) part "
 "of the normal section (don't put this into Standard or Private subsections)."
 msgstr ""
 
-#: C/gtk-doc-manual.xml:1588(seg)
+#: C/gtk-doc-manual.xml:1704(seg)
 msgid "No symbol index."
 msgstr "Kein Symbolindex."
 
-#: C/gtk-doc-manual.xml:1590(filename) C/gtk-doc-manual.xml:1605(filename)
-#: C/gtk-doc-manual.xml:1631(filename)
+#: C/gtk-doc-manual.xml:1706(filename) C/gtk-doc-manual.xml:1721(filename)
+#: C/gtk-doc-manual.xml:1747(filename)
 msgid "<package>-docs.{xml,sgml}"
 msgstr "<package>-docs.{xml,sgml}"
 
-#: C/gtk-doc-manual.xml:1589(seg)
+#: C/gtk-doc-manual.xml:1705(seg)
 msgid ""
 "Does the  contain a index that xi:includes the generated "
 "index?"
 msgstr ""
 
-#: C/gtk-doc-manual.xml:1595(seg)
+#: C/gtk-doc-manual.xml:1711(seg)
 msgid "Symbols are not linked to their doc-section."
 msgstr "Symbole werden nicht mit deren Dokumentationsbschnitt verknüpft."
 
-#: C/gtk-doc-manual.xml:1596(seg)
+#: C/gtk-doc-manual.xml:1712(seg)
 msgid ""
 "Is the doc-comment using the correct markup (added #,% or ())? Check if the "
 "gtkdoc-fixxref warns about unresolvable xrefs."
 msgstr ""
 
-#: C/gtk-doc-manual.xml:1602(seg)
+#: C/gtk-doc-manual.xml:1718(seg)
 msgid "A new class does not appear in the docs."
 msgstr "Eine neue Klasse erscheint nicht in der Dokumentation."
 
-#: C/gtk-doc-manual.xml:1603(seg)
+#: C/gtk-doc-manual.xml:1719(seg)
 msgid "Is the new page xi:included from ."
 msgstr ""
 
-#: C/gtk-doc-manual.xml:1609(seg)
+#: C/gtk-doc-manual.xml:1725(seg)
 msgid "A new symbol does not appear in the docs."
 msgstr "Ein neues Symbol erscheint nicht in der Dokumentation."
 
-#: C/gtk-doc-manual.xml:1610(seg)
+#: C/gtk-doc-manual.xml:1726(seg)
 msgid ""
 "Is the doc-comment properly formatted. Check for spelling mistakes in the "
 "begin of the comment. Check if the gtkdoc-fixxref warns about unresolvable "
@@ -1663,19 +1793,19 @@
 "public subsection."
 msgstr ""
 
-#: C/gtk-doc-manual.xml:1618(seg)
+#: C/gtk-doc-manual.xml:1734(seg)
 msgid "A type is missing from the class hierarchy."
 msgstr "Ein Typ fehlt in der Klassenhierarchie."
 
-#: C/gtk-doc-manual.xml:1620(filename)
+#: C/gtk-doc-manual.xml:1736(filename)
 msgid "<package>.hierarchy"
 msgstr "<package>.hierarchy"
 
-#: C/gtk-doc-manual.xml:1621(filename)
+#: C/gtk-doc-manual.xml:1737(filename)
 msgid "xml/tree_index.sgml"
 msgstr "xml/tree_index.sgml"
 
-#: C/gtk-doc-manual.xml:1619(seg)
+#: C/gtk-doc-manual.xml:1735(seg)
 msgid ""
 "If the type is listed in  but not in  then "
 "double check that the type is correctly placed in the . If "
@@ -1683,25 +1813,25 @@
 "makred private it will not be shown."
 msgstr ""
 
-#: C/gtk-doc-manual.xml:1628(seg)
+#: C/gtk-doc-manual.xml:1744(seg)
 msgid "I get foldoc links for all gobject annotations."
 msgstr ""
 
-#: C/gtk-doc-manual.xml:1630(filename)
+#: C/gtk-doc-manual.xml:1746(filename)
 msgid "xml/annotation-glossary.xml"
 msgstr "xml/annotation-glossary.xml"
 
-#: C/gtk-doc-manual.xml:1629(seg)
+#: C/gtk-doc-manual.xml:1745(seg)
 msgid "Check that  is xi:included from ."
 msgstr ""
 
-#: C/gtk-doc-manual.xml:1637(seg)
+#: C/gtk-doc-manual.xml:1753(seg)
 msgid "Parameter described in source code comment block but does not exist"
 msgstr ""
 "Parameter wird im Kommentarblock des Quellcodes beschrieben, aber existiert "
 "nicht"
 
-#: C/gtk-doc-manual.xml:1638(seg)
+#: C/gtk-doc-manual.xml:1754(seg)
 msgid ""
 "Check if the prototype in the header has different parameter names as in the "
 "source."
@@ -1709,15 +1839,15 @@
 "Überprüfen Sie, ob die Parameternamen der Prototypen in der Quelle und im "
 "Header unterschiedlich sind"
 
-#: C/gtk-doc-manual.xml:1643(seg)
+#: C/gtk-doc-manual.xml:1759(seg)
 msgid "multiple \"IDs\" for constraint linkend: XYZ"
 msgstr ""
 
-#: C/gtk-doc-manual.xml:1644(seg)
+#: C/gtk-doc-manual.xml:1760(seg)
 msgid "Symbol XYZ appears twice in  file."
 msgstr "Das Symbol XYZ erscheint zweifach in der Datei ."
 
-#: C/gtk-doc-manual.xml:1647(seg)
+#: C/gtk-doc-manual.xml:1763(seg)
 msgid ""
 "Element typename in namespace '' encountered in para, but no template matches."
 msgstr ""
@@ -2700,5 +2830,5 @@
 msgid "translator-credits"
 msgstr "Mario Blättermann , 2009, 2010"
 
-#~ msgid "22 March 2008"
-#~ msgstr "22. März 2008"
+#~ msgid "19 December 2009"
+#~ msgstr "19. Dezember 2009"
diff -Nru gtk-doc-1.14/help/manual/de/gtk-doc-manual.xml gtk-doc-1.17/help/manual/de/gtk-doc-manual.xml
--- gtk-doc-1.14/help/manual/de/gtk-doc-manual.xml	2010-03-28 17:28:00.000000000 +0000
+++ gtk-doc-1.17/help/manual/de/gtk-doc-manual.xml	2011-02-26 12:26:19.000000000 +0000
@@ -10,7 +10,7 @@
 
   
     GTK-Doc-Handbuch
-    1.12
+    1.15
     Benutzerhandbuch für Entwickler mit Anweisungen für die Benutzung von GTK-Doc.
     
       
@@ -61,13 +61,31 @@
       Das vorliegende Dokument kann gemäß den Bedingungen der GNU Free Documentation License (GFDL), Version 1.1 oder jeder späteren, von der Free Software Foundation veröffentlichten Version ohne unveränderbare Abschnitte sowie ohne Texte auf dem vorderen und hinteren Buchdeckel kopiert, verteilt und/oder modifiziert werden. Eine Kopie der GFDL finden Sie unter diesem Link oder in der mit diesem Handbuch gelieferten Datei COPYING-DOCS.
       Bei vielen der von Firmen zur Unterscheidung ihrer Produkte und Dienstleistungen verwendeten Namen handelt es sich um Marken. An den Stellen, an denen derartige Namen in einer GNOME-Dokumentation vorkommen und wenn die Mitglieder des GNOME-Dokumentationsprojekts über diese Marken informiert wurden, sind die Namen in Großbuchstaben oder mit großen Anfangsbuchstaben geschrieben.
     
-    
+
     
       
+        1.17
+        26 Feb 2011
+        sk
+        urgent bug fix update
+      
+      
+        1.16
+        14 Jan 2011
+        sk
+        bugfixes, layout improvements
+      
+      
+        1.15
+        21. Mai 2010
+        sk
+        Korrekturen von Fehlern und Einschränkungen
+      
+      
         1.14
-        28 March 2010
+        28. März 2010
         sk
-        bugfixes and performance improvements
+        Fehlerkorrekturen und Leistungssteigerung
       
       
         1.13
@@ -107,12 +125,7 @@
     
       Wie funktioniert GTK-Doc?
 
-      
-        GTK-Doc works by using documentation of functions placed inside the source files in
-        specially-formatted comment blocks, or documentation added to the template files
-        which GTK-Doc uses (though note that GTK-Doc will only document functions that
-        are declared in header files; it won't produce output for static functions).
-      
+      GTK-Doc verwendet Funktionsdokumentationen, die sich in den Quelldateien innerhalb speziell formatierter Kommentarblöcke befinden, oder Dokumentation, die zu den von GTK-Doc verwendeten Vorlagendateien hinzugefügt wurde. Beachten Sie jedoch, dass GTK-Doc nur Funktionen dokumentieren wird, die in den Header-Dateien deklariert sind. Es erstellt keine Ausgaben für statische Funktionen.
 
       GTK-Doc besteht aus einer Anzahl von Perl-Skripten, wovon jedes einen bestimmten Schritt in dem Prozess ausführt.
 
@@ -121,13 +134,7 @@
       
 
         
-          
-            Writing the documentation.
-
-            The author fills in the source files with the documentation for each
-            function, macro, union etc. (In the past information was entered in
-            generated template files, which is not recommended anymore).
-          
+          Schreiben der Dokumentation. Der Autor ergänzt die Quelldateien um die Dokumentation für jede Funktion, jedes Makro usw. In der Vergangenheit wurden diese Informationen in erstellte Vorlagendateien eingegeben. Dies wird nicht mehr empfohlen.
         
 
         
@@ -138,13 +145,13 @@
             code looking for declarations of functions, macros, enums, structs, and unions.
             It creates the file <module>-decl-list.txt containg a list of the
             declarations, placing them into sections according to which header file they
-            are in. On the first run this file is copied to <module>-sections.txt
+            are in. On the first run this file is copied to <module>-sections.txt.
             The author can rearrange the sections, and the order of the
             declarations within them, to produce the final desired order.
             The second file it generates is <module>-decl.txt.
             This file contains the full declarations found by the scanner. If for
-            some reason one would like some sybols to show up in the docs, where
-            the full declaration cannot be found by th scanner or the declaration
+            some reason one would like some symbols to show up in the docs, where
+            the full declaration cannot be found by the scanner or the declaration
             should appear differently, one can place enties similar to the ones in
             <module>-decl.txt into <module>-overrides.txt.
 
@@ -185,14 +192,10 @@
             or xml/ subdirectory.
             If the source code contains documentation on functions, using the
             special comment blocks, it gets merged in here. If there are no tmpl files used
-            it only reads takes docs from sources and introspection data.
-          
-          
-            gtkdoc-mkhtml turns the SGML/XML files into HTML
-            files in the html/ subdirectory.
-            Likewise gtkdoc-mkpdf turns the SGML/XML files into a PDF
-            docuemnt called <package>.pdf.
+            it only reads docs from sources and introspection data. We recommend
+            to use Docbook XML.
           
+          gtkdoc-mkhtml konvertiert die SGML/XML-Dateien in HTML-Dateien im Unterordner html/. Ebenso konvertiert gtkdoc-mkpdf die SGML/XML-Dateien in ein PDF-Dokument namens <package>.pdf.
           Dateien in sgml/ oder xml/ und html/-Ordnern werden immer überschrieben. Niemand sollte diese direkt bearbeiten.
         
 
@@ -273,9 +276,7 @@
 
       (FIXME)
 
-      
-        (who it is meant for, where you can get it, license)
-      
+      (wofür es bestimmt ist, wo Sie es erhalten können, Lizenz)
 
     
 
@@ -284,7 +285,7 @@
   
     Einrichten Ihre Projekts
 
-    Die nächsten Abschnitte beschreiben die notwendigen Schritte, um GTK-Doc in Ihr Projekt zu integrieren. Nehmen wir an, wir arbeiten an einem Projekt namens »meep«. Das Projekt enthält eine Bilbliothek namens »libmeep« sowie eine Endbenutzer-Anwendung namens »meeper«.
+    Die nächsten Abschnitte beschreiben die notwendigen Schritte, um GTK-Doc in Ihr Projekt zu integrieren. Nehmen wir an, wir arbeiten an einem Projekt namens »meep«. Das Projekt enthält eine Bibliothek namens »libmeep« sowie eine Endbenutzer-Anwendung namens »meeper«.
 
     
       Einrichten des Grundgerüsts der Dokumentation
@@ -322,7 +323,26 @@
           
         
       
-      
+
+      
+        This will require all developers to have gtk-doc installed. If it is
+        okay for your project to have optional api-doc build setup, you can
+        solve this as below. Keep it as is, as gtkdocize is looking for
+        GTK_DOC_CHECK  at the start of a line.
+        Keep gtk-doc optional
+          
+
+          
+        
+      
+
       Das erste Argument wird zur Überprüfung von gtkdocversion während des configure-Durchlaufs benutzt. Das zweite, optionale Argument wird von gtkdocize verwendet. Das Makro GTK_DOC_CHECK fügt verschiedene Schalter für configure hinzu:
       
         --with-html-dir=PATH : Pfad zur installierten Dokumentation
@@ -386,9 +406,9 @@
         
       
 
-      Beim Ausführen von gtkdocize wird gtk-doc.make in die Wurzel Ihres Projekts oder in jeden anderen durch die Option  festgelegten Ordner kopiert. Außerdem wird das configure-Skript daraufhin überprüft, ob function>GTK_DOC_CHECK
+      Beim Ausführen von gtkdocize wird gtk-doc.make in die Wurzel Ihres Projekts oder in jeden anderen durch die Option  festgelegten Ordner kopiert. Außerdem wird das configure-Skript daraufhin überprüft, ob GTK_DOC_CHECK enthalten ist. Dieses Makro kann verwendet werden, um weitere Parameter an gtkdocize zu übergeben.
 
-      In früherer Zeit erzeugte GTK-Doc die Vorlagendateien dort, wo die Entwickler die Dokumentaion platzierten. Das stellte sich als nicht optimal heraus. Seit einigen Versionen kann GTK-Doc auch sämtliche Informationen aus Quellcode-Kommentaren ermitteln. Seit GTK-Doc 1.9 sind diese Vorlagen nicht mehr notwendig. Wir ermutigen die Entwickler, die Dokumentation innerhalb des Codes zu halten. gtkdocize unterstützt nun die Option , wodurch ein Makefile gewählt wird, welches die Verwendung der Vorlagen komplett umgeht. Neben der Möglichkeit, diese Option direkt beim Befehlsaufruf zu übergeben, kann Sie auch zu einer Umgebungsvariable namens GTKDOCIZE_FLAGS hinzugefügt oder als zweiter Parameter im GTK_DOC_CHECK-Makro im Konfigurationsskript aufgeführt werden. Falls Sie niemals Dateien im Vorlagenordner manuell bearbeitet oder aus älteren GTK-Doc-Versionen importiert haben, sollten Sie den Ordner löschen, z.B. in der Versionsverwaltung.
+      In früherer Zeit erzeugte GTK-Doc die Vorlagendateien dort, wo die Entwickler die Dokumentaion platzierten. Das stellte sich als nicht optimal heraus, beispielsweise um generierte Dateien unter Versionskontrolle zu haben. Seit einigen Versionen kann GTK-Doc auch sämtliche Informationen aus Quellcode-Kommentaren ermitteln. Seit GTK-Doc 1.9 sind diese Vorlagen nicht mehr notwendig. Wir ermutigen die Entwickler, die Dokumentation innerhalb des Codes zu halten. gtkdocize unterstützt nun die Option , wodurch ein Makefile gewählt wird, welches die Verwendung der Vorlagen komplett umgeht. Neben der Möglichkeit, diese Option direkt beim Befehlsaufruf zu übergeben, kann Sie auch zu einer Umgebungsvariable namens GTKDOCIZE_FLAGS hinzugefügt oder als zweiter Parameter im GTK_DOC_CHECK-Makro im Konfigurationsskript aufgeführt werden. Falls Sie niemals Dateien im Vorlagenordner manuell bearbeitet oder aus älteren GTK-Doc-Versionen importiert haben, sollten Sie den Ordner löschen, z.B. in der Versionsverwaltung.
     
 
     
@@ -428,6 +448,21 @@
       Um die bereits genannten Probleme zu vermeiden, empfehlen wir, die Dokumentation innerhalb der Quellen zu halten. In diesem Handbuch wird ausschließlich dieser Weg des Dokumentierens des Quellcodes beschrieben.
     
 
+    
+      The scanner can handle the majority of c headers fine. In the case of
+      receiving warnings from the scanner that look like a special case, one can
+      hint GTK-Doc to skip over them.
+      GTK-Doc-Kommentarblock
+        
+
+        
+      
+    
+
     
 
     
@@ -473,10 +508,16 @@
         
 
       
-	Falls Sie die Sonderzeichen »<«, »>«, »()«, »@«, »%« oder »#« in Ihrer Dokumentation verwenden wollen, ohne dass GTK-Doc diese ändert, können Sie die XML-Entitäten »&lt;«, »&gt;«, »&lpar;«, »&rpar;«, »&commat;«, »&percnt;« und »&num;« verwenden oder die Zeichen mit einem Backslash »\« maskieren.
+	  Falls Sie die Sonderzeichen »<«, »>«, »()«, »@«, »%« oder »#« in Ihrer Dokumentation verwenden wollen, ohne dass GTK-Doc diese ändert, können Sie die XML-Entitäten »&lt;«, »&gt;«, »&lpar;«, »&rpar;«, »&commat;«, »&percnt;« und »&num;« verwenden oder die Zeichen mit einem Backslash »\« maskieren.
       
 
-      DocBook kann mehr als nur verknüpfen. Sie können auch Listen, Tabellen und Beispiele einbauen. Um die Nutzung der SGML/XML-Tags innerhalb der Dokumentationskommentare zu aktivieren, übergeben Sie der Variable MKDB_OPTIONS in der Datei Makefile.am die Option .
+      
+        DocBook can do more that just links. One can also have lists, tables and
+        examples. To enable the usage of SGML/XML tags inside doc-comments you
+        need to have  or 
+        in the variable MKDB_OPTIONS inside
+        Makefile.am.
+      
 
       
 	Wie an früherer Stelle bereits erwähnt, ist GTK-Doc für das Dokumentieren der öffentlichen API gedacht. Daher kann man keine Dokumentation für statische Symbole schreiben. Nichtsdestotrotz ist es jedoch gut, diese Symbole trotzdem zu dokumentieren. Dies hilft anderen, Ihren Code besser zu verstehen. Deswegen empfehlen wir, hierfür normale Kommentare zu verwenden, ohne das zweite »*« in der ersten Zeile. Falls später die Funktion veröffentlicht werden soll, ist es lediglich nötig, im Kommentarblock ein zweites »*« hinzuzufügen und den Symbolnamen an der richtigen Stelle in die Abschnittsdatei einzubauen.
@@ -484,7 +525,7 @@
     
 
     
-      Documenting sections
+      Dokumentieren von Abschnitten
 
       Jeder Abschnitt der Dokumentation enthält Informationen über eine Klasse oder ein Modul. Um eine Komponente hinzuzufügen, können Sie einen Abschnittsblock schreiben. Die Kurzbeschreibung wird auch im Inhaltsverzeichnis verwendet. Alle @-Felder sind optional.
 
@@ -500,7 +541,7 @@
  * @see_also: #MeepSettings
  * @stability: Stable
  * @include: meep/app.h
- * @Image: application.png
+ * @image: application.png
  *
  * The application class handles ...
  */
@@ -513,12 +554,7 @@
         
           SECTION:<name>
           
-            
-              The name links the section documentation to the respective part in
-              the <package>-sections.txt file. The
-              name give here should match the <FILE> tag in the 
-              <package>-sections.txt file.
-            
+            Der Name verweist auf die Abschnittsdokumentation des entsprechenden Teils der Datei <package>-sections.txt. Der hier angegebene Name sollte der Markierung <FILE> in der Datei <package>-sections.txt entsprechen.
           
         
         
@@ -538,8 +574,8 @@
           
             
               Overrides the use of title as a section identifier. For GObjects
-              the <title> is used as a section_id and for other section it
-              is <MODULE>-<title>.
+              the <title> is used as a section_id and for other sections
+              it is <MODULE>-<title>.
             
           
         
@@ -625,13 +661,13 @@
     
       Dokumentieren von Symbolen
 
-      Jedes Symbol (function, macro, struct, enum, signal und property) wird in einem separaten Block dokumentiert. Der Block wird am besten nahe der Definition der  Symbole paltziert, so dass es leichter ist, diese synchron zu halten. Die Funktion wird üblicherweise in den C-Quellen und Makros definiert, »struct« und »enum« dagegen in der Header-Datei.
+      Jedes Symbol (function, macro, struct, enum, signal und property) wird in einem separaten Block dokumentiert. Der Block wird am besten nahe der Definition der  Symbole platziert, so dass es leichter ist, diese synchron zu halten. Die Funktion wird üblicherweise in den C-Quellen definiert, »macro«, »struct« und »enum« dagegen in der Header-Datei.
 
-      General tags
+      Allgemeine Markierungen
 
         Sie können Versionsinformationen zu allen Dokumentationselementen hinzufügen, um darauf hinzuweisen, wann eine API eingeführt oder wann sie als veraltet markiert wurde.
 
-        Versioning Tags
+        Versionierungs-Markierungen
           Since:
             
               Beschreibung, seit welcher Version des Codes die API verfügbar ist.
@@ -644,11 +680,9 @@
           
         
 
-          
-            (FIXME : Stability information)
-          
+          (FIXME : Stabilitätsinformation)
 
-        General tags
+        Allgemeine Markierungen
           
 
       
 
-      Function comment block
+      Kommentarblock einer Funktion
 
         Bitte denken Sie an: 
             
@@ -681,9 +715,7 @@
               
             
             
-              
-                Document whether parameters can be NULL, and what happens if they are.
-              
+              Dokumentiert, ob Parameter NULL sein können, und was in diesem Fall geschieht.
             
             
               Erwähnen Sie interessante Vorbedingungen (und nachfolgende Bedingungen), wo es nützlich erscheint.
@@ -694,7 +726,7 @@
 
         Werfen Sie auch einen Blick auf die »gobject introspection annotation tags«: http://live.gnome.org/GObjectIntrospection/Annotations
 
-        Function comment block
+        Kommentarblock einer Funktion
           
 Verwenden Sie /*< private >*/ vor den privaten »struct«-Feldern, die Sie verbergen wollen. Um das umgekehrte Verhalten zu erzielen, verwenden Sie /*< public >*/.
 
+        
+          Struct comment blocks can also be used for GObjects and GObjectClasses.
+          It is usualy a good idea to add a comment blco for a class, if it has
+          vmethods (as this is how they can be documented). For the GObject
+          itself one can use the related section docs, having a separate block
+          for the instance struct would be useful if the instance has public
+          fields. One disadvantage here is that this creates two index entries
+          of the same name (the structure and the section).
+        
+
       
 
       Enum-Kommentarblock
@@ -983,26 +1025,14 @@
   
 
   
-    Filling the extra files
+    Füllen der zusätzlichen Dateien
 
-    
-      There are a couple of extra files, that need to be maintained along with
-      the inline source code comments:
-      <package>.types,
-      <package>-docs.sgml,
-      <package>-sections.txt.
-    
+    Es gibt eine Menge zusätzlicher Dateien, die mit den eingebetteten Quellcode-Kommentaren verwaltet werden müssen: <package>.types, <package>-docs.sgml, <package>-sections.txt.
 
     
       Bearbeiten der Typendatei
 
-      
-        If your library or application includes GtkObjects/GObjects, you want
-        their signals, arguments/parameters and position in the hierarchy to be
-        shown in the documentation. All you need to do, is to list the
-        xxx_get_type functions together with their include
-        inside the <package>.types file.
-      
+      Falls Ihre Bibliothek oder Anwendung GtkObjects/GObjects beinhaltet, sollten deren Signale, Argumente/Parameter und Positionen in der Hierarchie in der Dokumentation erscheinen. Alles was Sie tun müssen, ist die xxx_get_typeFunktionen zusammen mit deren Includes in der Datei <package>.types aufzulisten.
 
       
         Example types file snippet
@@ -1034,7 +1064,7 @@
         GTK-Doc produces documentation in DocBook SGML/XML. When processing the
         inline source comments, the GTK-Doc tools generate one documentation
         page per class or module as a separate file. The master document
-        includes them and place them in a order.
+        includes them and place them in an order.
       
 
       
@@ -1122,6 +1152,9 @@
         If your library contains private types which you don't want to appear in
         the object hierarchy and the list of implemented or required interfaces,
         add them to a Private subsection.
+        Wheter you would place GObject and GObjectClass like structs in public
+        or Standard section depends if they have public entries (variables,
+        vmethods).
       
 
       
@@ -1172,11 +1205,11 @@
         make check run.
       
     
-    
+
     
       One can also look at the files produced by the source code scanner:
       <package>-decl-list.txt and
-      <package>-decl.txt. The first and can be
+      <package>-decl.txt. The first one can be
       compared with the section file if that is manualy maintained. The second
       lists all declarations fromt he headers If a symbol is missing one could
       check if this file contains it.
@@ -1191,11 +1224,93 @@
       <package>.prerequisites.txt and
       <package>.signals.txt. If there are missing
       symbols in any of those, one can ask gtkdoc to keep the intermedia scanner
-      file for further analysis, but running it as 
+      file for further analysis, but running it as
       GTK_DOC_KEEP_INTERMEDIATE=1 make.
     
   
 
+  
+    Dokumentieren anderer Schnittstellen
+
+    Bis jetzt haben wir GTK-Doc nur dazu verwendet, die API des Codes zu dokumentieren. In den nächsten Abschnitten finden Sie Vorschläge, wie die Werkzeuge zum Dokumentieren anderer Schnittstellen eingesetzt werden können.
+
+    
+      Befehlszeilenoptionen und Handbuchseiten
+
+      
+        As one can generate man pages for a docbook refentry as well, it sounds
+        like a good idea to use it for that purpose. This way the interface is
+        part of the reference and one gets the man-page for free.
+      
+
+      
+        Dokumentieren des Werkzeuges
+
+        
+          Create one refentry file per tool. Following
+          our example we would call it
+          meep/docs/reference/meeper/meep.xml. For the xml
+          tags that should be used and can look at generated file in the xml
+          subdirectory as well as examples e.g. in glib.
+        
+      
+
+      
+        Hinzufügen der zusätzlichen Configure-Überprüfungen
+
+        
+          Zusätzliche Configure-Überprüfungen
+            
+
+            
+          
+        
+      
+
+      
+        Hinzufügen der zusätzlichen Makefile-Regeln
+
+        
+          Zusätzliche Configure-Überprüfungen
+            
+
+            
+          
+        
+      
+    
+
+    
+      DBus-Schnittstellen
+
+      (FIXME: http://hal.freedesktop.org/docs/DeviceKit/DeviceKit.html, http://cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus)
+    
+
+  
+
   
     Häufig gestellte Fragen
 
@@ -1236,7 +1351,7 @@
       
         Eine neue Klasse erscheint nicht in der Dokumentation.
         
-          Is the new page xi:included from 
+          Is the new page xi:included from
           <package>-docs.{xml,sgml}.
         
       
@@ -1284,7 +1399,22 @@
       
     
   
-    
+
+  
+    Tools related to gtk-doc
+
+    
+      GtkDocPlugin - a Trac GTK-Doc
+      integration plugin, that adds api docs to a trac site and integrates with
+      the trac search.
+    
+    
+      Gtkdoc-depscan - a tool (part of gtk-doc) to check used API against since
+      tags in the api to determine the minimum required version.
+    
+
+  
+
   
   
 
@@ -348,6 +379,16 @@
       Για να αποφύγετε αυτά τα προβλήματα, σας προτείνουμε να ενσωματώνετε την τεκμηρίωση στον πηγαίο κώδικα. Αυτή είναι και η μόνη μέθοδος που θα περιγράψουμε σε αυτό το εγχειρίδιο.
     
 
+    Ο σαρωτής μπορεί να χειριστεί άνετα την πλειοψηφία των κεφαλίδων c . Σε περίπτωση που λαμβάνετε προειδοποιήσεις από τον σαρωτή οι οποίες μοιάζουν με έναν ειδικό χαρακτήρα, μπορείτε να υποδείξετε το GTK-Doc να τους παραλείψει. Μπλοκ σχολίου GTK-Doc
+        
+
+        
+      
+
     
 
     
@@ -393,7 +434,7 @@
         
 
       
-	Αν θέλετε να χρησιμοποιήσετε τους ειδικούς χαρακτήρες «<», «>», «()», «@», «%» ή «#» στην τεκμηρίωση, χωρίς να φοβάστε ότι θα τους αλλάξει το GTK-Doc, μπορείτε να χρησιμοποιήσετε τις οντότητες XML «&lt;», «&gt;», «&lpar;», «&rpar;», «&commat;», «&percnt;» και «&num;», αντίστοιχα, ή να χρησιμοποιήσετε την ανάποδη κάθετο «\» ως χαρακτήρα διαφυγής.
+	  Αν θέλετε να χρησιμοποιήσετε τους ειδικούς χαρακτήρες «<», «>», «()», «@», «%» ή «#» στην τεκμηρίωση, χωρίς να φοβάστε ότι θα τους αλλάξει το GTK-Doc, μπορείτε να χρησιμοποιήσετε τις οντότητες XML «&lt;», «&gt;», «&lpar;», «&rpar;», «&commat;», «&percnt;» και «&num;», αντίστοιχα, ή να χρησιμοποιήσετε την ανάποδη κάθετο «\» ως χαρακτήρα διαφυγής.
       
 
       Το DocBook σας προσφέρει και άλλες δυνατότητες πέρα από τους συνδέσμους. Μπορεί να περιλαμβάνει λίστες, πίνακες και παραδείγματα. Για να επιτρέπεται η χρήση ετικετών SGML/XML στα σχόλια τεκμηρίωσης, θα πρέπει να έχει προστεθεί η επιλογή  στη μεταβλητή MKDB_OPTIONS του Makefile.am.
@@ -420,7 +461,7 @@
  * @see_also: #MeepSettings
  * @stability: Stable
  * @include: meep/app.h
- * @Image: application.png
+ * @image: application.png
  *
  * The application class handles ...
  */
@@ -674,6 +715,16 @@
 
         Χρησιμοποιήστε το /*< private >*/ πριν από πεδία ιδιωτικών δομών που θέλετε να αποκρύψετε. Χρησιμοποιήστε το /*< public >*/για την αντίστροφη συμπεριφορά.
 
+        
+          Struct comment blocks can also be used for GObjects and GObjectClasses.
+          It is usualy a good idea to add a comment blco for a class, if it has
+          vmethods (as this is how they can be documented). For the GObject
+          itself one can use the related section docs, having a separate block
+          for the instance struct would be useful if the instance has public
+          fields. One disadvantage here is that this creates two index entries
+          of the same name (the structure and the section).
+        
+
       
 
       Μπλοκ σχολίου Enum
@@ -938,12 +989,97 @@
     
       Ενεργοποιήστε ή προσθέστε τη γραμμή  στο Makefile.am. Αν έχετε εγκατεστημένη την έκδοση 1.9 ή μεταγενέστερη, θα πραγματοποιεί διάφορους ελέγχους κατά την εκτέλεση του make check.
     
-    
+
     Μπορείτε επίσης να δείτε τα αρχεία που παράγονται από το σαρωτή του πηγαίου κώδικα: <package>-decl-list.txt και <package>-decl.txt. Το πρώτο μπορεί να συγκριθεί με το αρχείο της ενότητας, αν αυτό συντηρείται χειροκίνητα. Το δεύτερο περιέχει μια λίστα με από τις κεφαλίδες. Αν ένα σύμβολο λείπει, μπορείτε να ελέγξετε αν περιέχεται σε αυτό το αρχείο.
 
     Αν το έργο βασίζεται στο GObject, μπορείτε επίσης να δείτε τα αρχεία που παράγονται από το σαρωτή αντικειμένων: <package>.args.txt, <package>.hierarchy.txt, <package>.interfaces.txt, <package>.prerequisites.txt και <package>.signals.txt. Αν λείπουν σύμβολα από οποιοδήποτε από αυτά, μπορείτε να ζητήσετε από το gtkdoc να κρατήσει το ενδιάμεσο αρχείο σάρωσης για περαιτέρω ανάλυση, αλλά εκτελώντας το ως GTK_DOC_KEEP_INTERMEDIATE=1 make.
   
 
+  
+    Τεκμηρίωση άλλων επιφανειών
+
+    Τόσο καιρό χρησιμοποιούσαμε το GTK-Doc για να καταγράψουμε το API του κώδικα. Οι επόμενες συνεδρίες περιέχουν προτάσεις για το πώς τα εργαλεία μπορούν να χρησιμοποιηθούν ώστε να καταγράψετε και άλλες επιφάνειες.
+
+    
+      Commandline options and man pages
+
+      
+        As one can generate man pages for a docbook refentry as well, it sounds
+        like a good idea to use it for that purpose. This way the interface is
+        part of the reference and one gets the man-page for free.
+      
+
+      
+        Τεκμηρίωση του εργαλείου
+
+        
+          Create one refentry file per tool. Following
+          our example we would call it
+          meep/docs/reference/meeper/meep.xml. For the xml
+          tags that should be used and can look at generated file in the xml
+          subdirectory as well as examples e.g. in glib.
+        
+      
+
+      
+        Προσθήκη του έξτρα ελέγχου διαμόρφωσης
+
+        
+          Έξτρα έλεγχοι διαμόρφωσης
+            
+
+            
+          
+        
+      
+
+      
+        Προσθήκη των έξτρα κανόνων makefile
+
+        
+          Έξτρα έλεγχοι διαμόρφωσης
+            
+
+            
+          
+        
+      
+    
+
+    
+      DBus interfaces
+
+      
+        (FIXME: http://hal.freedesktop.org/docs/DeviceKit/DeviceKit.html,
+http://cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus)
+      
+    
+
+  
+
   
     Συχνές ερωτήσεις
 
@@ -1005,7 +1141,22 @@
       
     
   
-    
+
+  
+    Tools related to gtk-doc
+
+    
+      GtkDocPlugin - a Trac GTK-Doc
+      integration plugin, that adds api docs to a trac site and integrates with
+      the trac search.
+    
+    
+      Gtkdoc-depscan - a tool (part of gtk-doc) to check used API against since
+      tags in the api to determine the minimum required version.
+    
+
+  
+
   
   
 
       
-        You may also want to enable GTK-Doc for the distcheckmake target. Just
-        add then one-liner show in the next example to you top-level
+        You may also want to enable GTK-Doc for the distcheck make target. Just
+        add the one line shown in the next example to your top-level
         Makefile.am:
       
 
@@ -363,21 +437,23 @@
 
       
         When running gtkdocize it copies
-        gtk-doc.make to you project root (or any directory
+        gtk-doc.make to your project root (or any directory
         specified by the  option).
-        If also check you configure script for the GTK_DOC_CHECK
-        invocation.
+        It also checks you configure script for the GTK_DOC_CHECK
+        invocation. This macro can be used to pass extra parameters to
+        gtkdocize.
       
 
       
-        Historically GTK-Doc was gerating template files where developers entered the docs.
-        this turned out to be not so good. Since a few version GTK-Doc could also get all
-        the information from source comments.
-        Since GTK-Doc 1.9 the templates can be avoided. We encourage people to keep
+        Historically GTK-Doc was generating template files where developers entered the docs.
+        This turned out to be not so good (e.g. the need for having generated
+        files under version control).
+        Since GTK-Doc 1.9 the tools can get all the information from source comments
+        and thus the templates can be avoided. We encourage people to keep
         documentation in the code. gtkdocize supports now
         a  option that chooses a makefile that skips
         tmpl usage totally. Besides adding the option directly to the command
-        invocation, they can be added also to a environment variable called GTKDOCIZE_FLAGS
+        invocation, they can be added also to an environment variable called GTKDOCIZE_FLAGS
         or set as a 2nd parameter in GTK_DOC_CHECK macro in the configure script.
         If you have never changed file in tmpl by hand and migrating from older gtkdoc versions,
         please remove the dir (e.g. from version control system).
@@ -413,7 +489,12 @@
   
     Documenting the code
 
-    GTK-Doc uses source code comment with a special syntax for code documentation. Furthermore, it retrieves information about your project structure from other sources. During the next section you will find all the information about the syntax of the comments.
+    
+      GTK-Doc uses source code comment with a special syntax for code documentation.
+      Further it retrieves information about your project structure from other
+      sources. During the next section you will find all information about the
+      syntax of the comments.
+    
 
     
       Documentation placement
@@ -421,6 +502,21 @@
       To avoid the aforementioned problems we suggest putting the documentation inside the sources. This manual will only describe this way of documenting code.
     
 
+    
+      The scanner can handle the majority of c headers fine. In the case of
+      receiving warnings from the scanner that look like a special case, one can
+      hint GTK-Doc to skip over them.
+      GTK-Doc comment block
+        
+
+        
+      
+    
+
     
 
     
@@ -475,16 +571,22 @@
       
 
       
-	
-          If you need to use the special characters '<', '>', '()', '@',
-          '%', or '#' in your documentation without GTK-Doc changing them you
-          can use the XML entities "&lt;", "&gt;", "&lpar;",
-          "&rpar;", "&commat;", "&percnt;" and "&num;"
-          respectively or escape them with a backslash '\'.
-	
+	  
+        If you need to use the special characters '<', '>', '()', '@',
+        '%', or '#' in your documentation without GTK-Doc changing them you
+        can use the XML entities "&lt;", "&gt;", "&lpar;",
+        "&rpar;", "&commat;", "&percnt;" and "&num;"
+        respectively or escape them with a backslash '\'.
+	  
       
 
-      DocBook can do more that just links. One can also have lists, tables and examples. To enable the usage of SGML/XML tags inside doc-comments you need to have  in the variable MKDB_OPTIONS inside Makefile.am.
+      
+        DocBook can do more that just links. One can also have lists, tables and
+        examples. To enable the usage of SGML/XML tags inside doc-comments you
+        need to have  or 
+        in the variable MKDB_OPTIONS inside
+        Makefile.am.
+      
 
       
 	
@@ -522,7 +624,7 @@
  * @see_also: #MeepSettings
  * @stability: Stable
  * @include: meep/app.h
- * @Image: application.png
+ * @image: application.png
  *
  * The application class handles ...
  */
@@ -538,7 +640,7 @@
             
               The name links the section documentation to the respective part in
               the <package>-sections.txt file. The
-              name give here should match the <FILE> tag in the 
+              name give here should match the <FILE> tag in the
               <package>-sections.txt file.
             
           
@@ -563,15 +665,17 @@
           
             
               Overrides the use of title as a section identifier. For GObjects
-              the <title> is used as a section_id and for other section it
-              is <MODULE>-<title>.
+              the <title> is used as a section_id and for other sections
+              it is <MODULE>-<title>.
             
           
         
         
           @see_also
           
-            A list of symbols that are related to this section.
+            
+              A list of symbols that are related to this section.
+            
           
         
         
@@ -621,7 +725,13 @@
     
       Documenting symbols
 
-      Each symbol (function, macro, struct, enum, signal and property) is documented in a separate block. The block is best placed close to the definition of the symbols so that it is easy to keep them in synchronisation. Thus functions are usually documented in the C source and macros, structs and enums in the header files.
+      
+        Each symbol (function, macro, struct, enum, signal and property) is
+        documented in a separate block. The block is best placed close to the
+        definition of the symbols so that it is easy to keep them in sync.
+        Thus functions are usually documented in the c-source and macros,
+        structs and enums in the header file.
+      
 
       General tags
 
@@ -824,7 +934,17 @@
         
           Use /*< private >*/ before the private struct fields
           you want to hide. Use /*< public >*/ for the reverse
-          behavirour.
+          behaviour.
+        
+
+        
+          Struct comment blocks can also be used for GObjects and GObjectClasses.
+          It is usualy a good idea to add a comment blco for a class, if it has
+          vmethods (as this is how they can be documented). For the GObject
+          itself one can use the related section docs, having a separate block
+          for the instance struct would be useful if the instance has public
+          fields. One disadvantage here is that this creates two index entries
+          of the same name (the structure and the section).
         
 
       
@@ -854,7 +974,7 @@
         
           Use /*< private >*/ before the private enum values
           you want to hide. Use /*< public >*/ for the reverse
-          behavirour.
+          behaviour.
         
 
       
@@ -1062,7 +1182,7 @@
         GTK-Doc produces documentation in DocBook SGML/XML. When processing the
         inline source comments, the GTK-Doc tools generate one documentation
         page per class or module as a separate file. The master document
-        includes them and place them in a order.
+        includes them and place them in an order.
       
 
       
@@ -1132,7 +1252,24 @@
         this. Also if one uses SECTION comment in the sources, this is obsolete.
       
 
-      You can group items in the section by using the <SUBSECTION> tag. Currently it outputs a blank line between subsections in the synopsis section. You can also use <SUBSECTION Standard> for standard GObject declarations (e.g. the functions like g_object_get_type and macros like G_OBJECT(), G_IS_OBJECT() etc.). Currently these are left out of the documentation. You can also use <SUBSECTION Private> for private declarations which will not be output (it is a handy way to avoid warning messages about unused declarations). If your library contains private types which you don't want to appear in the object hierarchy and the list of implemented or required interfaces, add them to a Private subsection.
+      
+        You can group items in the section by using the <SUBSECTION> tag.
+        Currently it outputs a blank line between subsections in the synopsis
+        section.
+        You can also use <SUBSECTION Standard> for standard GObject
+        declarations (e.g. the functions like g_object_get_type and macros like
+        G_OBJECT(), G_IS_OBJECT() etc.).
+        Currently these are left out of the documentation.
+        You can also use <SUBSECTION Private> for private declarations
+        which will not be output (It is a handy way to avoid warning messages
+        about unused declarations.).
+        If your library contains private types which you don't want to appear in
+        the object hierarchy and the list of implemented or required interfaces,
+        add them to a Private subsection.
+        Wheter you would place GObject and GObjectClass like structs in public
+        or Standard section depends if they have public entries (variables,
+        vmethods).
+      
 
       You can also use <INCLUDE> ... </INCLUDE> to specify the #include files which are shown in the synopsis sections. It contains a comma-separated list of #include files, without the angle brackets. If you set it outside of any sections, it acts for all sections until the end of the file. If you set it within a section, it only applies to that section.
 
@@ -1175,11 +1312,11 @@
         make check run.
       
     
-    
+
     
       One can also look at the files produced by the source code scanner:
       <package>-decl-list.txt and
-      <package>-decl.txt. The first and can be
+      <package>-decl.txt. The first one can be
       compared with the section file if that is manualy maintained. The second
       lists all declarations fromt he headers If a symbol is missing one could
       check if this file contains it.
@@ -1194,11 +1331,100 @@
       <package>.prerequisites.txt and
       <package>.signals.txt. If there are missing
       symbols in any of those, one can ask gtkdoc to keep the intermedia scanner
-      file for further analysis, but running it as 
+      file for further analysis, but running it as
       GTK_DOC_KEEP_INTERMEDIATE=1 make.
     
   
 
+  
+    Documenting other interfaces
+
+    
+      So far we have been using GTK-Doc to document the API of code. The next
+      sections contain suggestions how the tools can be used to document other
+      interfaces too.
+    
+
+    
+      Commandline options and man pages
+
+      
+        As one can generate man pages for a docbook refentry as well, it sounds
+        like a good idea to use it for that purpose. This way the interface is
+        part of the reference and one gets the man-page for free.
+      
+
+      
+        Document the tool
+
+        
+          Create one refentry file per tool. Following
+          our example we would call it
+          meep/docs/reference/meeper/meep.xml. For the xml
+          tags that should be used and can look at generated file in the xml
+          subdirectory as well as examples e.g. in glib.
+        
+      
+
+      
+        Adding the extra configure check
+
+        
+          Extra configure checks
+            
+
+            
+          
+        
+      
+
+      
+        Adding the extra makefile rules
+
+        
+          Extra configure checks
+            
+
+            
+          
+        
+      
+    
+
+    
+      DBus interfaces
+
+      
+        (FIXME: http://hal.freedesktop.org/docs/DeviceKit/DeviceKit.html,
+http://cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus)
+      
+    
+
+  
+
   
     Frequently asked questions
 
@@ -1245,7 +1471,7 @@
       
         A new class does not appear in the docs.
         
-          Is the new page xi:included from 
+          Is the new page xi:included from
           <package>-docs.{xml,sgml}.
         
       
@@ -1293,7 +1519,22 @@
       
     
   
-    
+
+  
+    Tools related to gtk-doc
+
+    
+      GtkDocPlugin - a Trac GTK-Doc
+      integration plugin, that adds api docs to a trac site and integrates with
+      the trac search.
+    
+    
+      Gtkdoc-depscan - a tool (part of gtk-doc) to check used API against since
+      tags in the api to determine the minimum required version.
+    
+
+  
+
   
   
 
     
@@ -393,10 +434,10 @@
         
 
       
-	Si necesita usar los caracteres especiales «<», «>», «()», «@», «%», o «#» en su documentación sin que GTK-Doc los cambie, puede usar las entidades XML «&lt;», «&gt;», «amp;lpar;», «amp;rpar;», «amp;commat;» «&percnt;» y «&num;» respectivamente o escaparlas con una contrabarra doble «\».
+	  Si necesita usar los caracteres especiales «<», «>», «()», «@», «%», o «#» en su documentación sin que GTK-Doc los cambie, puede usar las entidades XML «&lt;», «&gt;», «amp;lpar;», «amp;rpar;», «amp;commat;» «&percnt;» y «&num;» respectivamente o escaparlas con una contrabarra doble «\».
       
 
-      DocBook puede hacer más que insertar enlaces. Puede tener listas, tablas y ejemplos. Para activar el uso de etiquetas SGML/XML dentro de comentarios en la documentación debe tener  en la variable MKDB_OPTIONS dentro de Makefile.am.
+      DocBook puede hacer más que insertar enlaces. Puede tener listas, tablas y ejemplos. Para activar el uso de etiquetas SGML/XML dentro de comentarios en la documentación debe tener  o  en la variable MKDB_OPTIONS dentro de Makefile.am.
 
       
 	Tal y como se ha mencionado antes, la documentación anterior de GTK-Doc es para documentar la API pública .Por ello, no se puede escribir documentación para los símbolos estáticos. No obstante es una buena práctica comentar los símbolos. Esto ayuda a que otros entiendan su código. Por ello se recomienda comentarlos usando comentarios normales (sin el segundo «*» en la primera línea). Si la función, posteriormente, se debe hacer pública, todo lo que el programador debe hacer es añadir otro «*» en el bloque de comentario e introducir el nombre del símbolo en la parte derecha dentro del archivo de secciones.
@@ -420,7 +461,7 @@
  * @see_also: #MeepSettings
  * @stability: Stable
  * @include: meep/app.h
- * @Image: application.png
+ * @image: application.png
  *
  * The application class handles ...
  */
@@ -451,7 +492,7 @@
         
           @section_id
           
-            Sobreescribe el uso del título como el identificador de sección. El <title> se usa en GObjects como el identificador de sección y para otra sección es <MÓDULO>-<title>.
+            Sobreescribe el uso del título como el identificador de sección. <title> se usa en GObjects como el identificador de sección (section_id) y para otra sección es <MÓDULO>-<title>.
           
         
         
@@ -674,6 +715,8 @@
 
         Use /*< private >*/ antes de campos de estructuras privadas que quiera ocultar. Use /*< public >*/ para revertir el comportamiento anterior.
 
+        También se pueden usar bloques de comentario para GObjects y GObjectClasses. Generalmente es buena idea añadir un bloque de comentario para una clase, si tiene «vmethods» (ya que así se pueden documentar). Para el GObject en si, se puede usar la sección relativa a la documentación, tener un bloque separado para la estructura de la instancia sería útil si la instancia tiene campos públicos. Una desventaja aquí es que esto crea dos entradas de índice con el mismo nombre (la estructura y la sección).
+
       
 
       Enumerar bloques de comentarios
@@ -916,7 +959,7 @@
 
       La etiqueta <TITLE> ... </TITLE> se usa para especificar el título de una sección. Sólo es útil antes de que las plantillas (si se usan) se creen inicialmente, ya que el título configurado en la plantilla lo sobreescribe. Además, si una usa comentarios SECTION en los fuentes, se queda obsoleto.
 
-      Puede agrupar elementos en la sección usando la etiqueta <SUBSECTION>. Actualmente esto genera una línea en blanco entre subsecciones en la sección de resumen. También puede usar <SUBSECTION Standard> para declaraciones estándar de GObject (ej. funciones como g_object_get_type and macros como G_OBJECT(), G_IS_OBJECT() etc.). Actualmente éstas se han dejado fuera de la documentación. También puede usar <SUBSECTION Private> para declaraciones privadas que no producirán ninguna salida (esta es una manera práctica de evitar mensajes de advertencia sobre declaraciones sin usar). Si sus bibliotecas contienen tipos privados que no quiere que aparezcan en la jerarquía de objetos o en la lista de interfaces implementados o necesarios, añádalos a una subsección Privada.
+      Puede agrupar elementos en la sección usando la etiqueta <SUBSECTION>. Actualmente esto genera una línea en blanco entre subsecciones en la sección de resumen. También puede usar <SUBSECTION Standard> para declaraciones estándar de GObject (ej. funciones como g_object_get_type and macros como G_OBJECT(), G_IS_OBJECT() etc.). Actualmente éstas se han dejado fuera de la documentación. También puede usar <SUBSECTION Private> para declaraciones privadas que no producirán ninguna salida (s una manera práctica de evitar mensajes de advertencia sobre declaraciones sin usar). Si sus bibliotecas contienen tipos privados que no quiere que aparezcan en la jerarquía de objetos o en la lista de interfaces implementados o necesarios, añádalos a una subsección Privada. Si ubica GObject y GObjectClass como estructuras en la sección pública o estándar, depende de si tienen entradas públicas (variables, vmethods).
 
       También puede usar <INCLUDE> ... </INCLUDE> para especificar qué archivos #include se muestran en la sección de resumen. Contiene una lista de archivos #include separados por comas, sin las almohadillas. Si lo configura fuera de cualquier sección, actúa para todas las secciones hasta el final del archivo. Si lo configura dentro de una sección, sólo se aplica a esa sección.
 
@@ -938,12 +981,84 @@
     
       Activar o añadir la línea  en Makefile.am. Si como mínimo está instalado GTK-Doc 1.9, esto ejecutará comprobaciones de integridad durante la ejecución de make check.
     
-    
+
     También puede mirar los archivos producidos por el analizador del código fuente: <paquete>-decl-list.txt y <paquete>-decl.txt. El primero se puede comparar con el archivo de sección si se mantiene manualmente. El segundo lista todas las declaraciones desde las cabeceras. Si falta un símbolo, se puede comprobar si este archivo lo contiene.
 
     Si el proyecto está basado en GObject, también se puede mirar en los archivos producidos por el analizador de objetos: <paquete>.args.txt, <paquete>.hierarchy.txt, <paquete>.interfaces.txt, <paquete>.prerequisites.txt y <paquete>.signals.txt. Si faltan símbolos en cualquiera de ellos, puede hacer que gtkdoc guarde el análisis de archivos para futuros análisis, pero ejecutándolo como GTK_DOC_KEEP_INTERMEDIATE=1 make.
   
 
+  
+    Documentar otras interfaces
+
+    Hasta ahora se ha usado GTK-Doc para documentar la API del código. Las siguientes secciones contienen sugerencias acerca de cómo se pueden usar las herramientas para documentar otras interfaces.
+
+    
+      Opciones de la línea de comandos y las páginas man
+
+      Ya que también se pueden generar páginas man para referencias de entrada docbook, parece buena idea usarlas para ese propósito. De esta forma la interfaz es parte de la referencia y se obtienen las páginas man sin trabajo.
+
+      
+        Documentar la herramienta
+
+        Cree un archivo de entrada de referencia para cada herramienta. Siguiendo el ejemplo se llamará meep/docs/reference/meeper/meep.xml. Para las etiquetas xml que se deben usar puede mirar al archivo generado en el subdirectorio xml así como los ejemplos en, por ejemplo, glib.
+      
+
+      
+        Añadir la comprobación de configuración adicional
+
+        
+          Comprobaciones de configuración adicionales
+            
+
+            
+          
+        
+      
+
+      
+        Añadir reglas de makefile adicionales
+
+        
+          Comprobaciones de configuración adicionales
+            
+
+            
+          
+        
+      
+    
+
+    
+      Interfaces de DBus
+
+      (ARREGLAR: http://hal.freedesktop.org/docs/DeviceKit/DeviceKit.html, http://cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus)
+    
+
+  
+
   
     Preguntas más frecuentes
 
@@ -1005,7 +1120,22 @@
       
     
   
-    
+
+  
+    Tools related to gtk-doc
+
+    
+      GtkDocPlugin - a Trac GTK-Doc
+      integration plugin, that adds api docs to a trac site and integrates with
+      the trac search.
+    
+    
+      Gtkdoc-depscan - a tool (part of gtk-doc) to check used API against since
+      tags in the api to determine the minimum required version.
+    
+
+  
+
   
   
 
     
-      Permission vous est donnée de copier, distribuer et/ou modifier ce document selon les termes de la licence de documentation libre GNU, Version 1.1 ou ultérieure publiée par la Free Software Foundation sans section inaltérable, sans texte de première page de couverture ni texte de dernière page de couverture. Vous trouverez un exemplaire de cette licence en suivant ce 
+      Permission vous est donnée de copier, distribuer et/ou modifier ce document selon les termes de la licence de documentation libre GNU, version 1.1 ou ultérieure publiée par la Free Software Foundation sans section inaltérable, sans texte de première page de couverture ni texte de dernière page de couverture. Vous trouverez un exemplaire de cette licence en suivant ce lien.
       La plupart des noms utilisés par les entreprises pour distinguer leurs produits et services sont des marques déposées. Lorsque ces noms apparaissent dans la documentation GNOME et que les membres du projet de Documentation GNOME sont informés de l'existence de ces marques déposées, soit ces noms entiers, soit leur première lettre est en majuscule.
     
-    
+
     
       
+        1.17
+        26 Feb 2011
+        sk
+        urgent bug fix update
+      
+      
+        1.16
+        14 Jan 2011
+        sk
+        bugfixes, layout improvements
+      
+      
+        1.15
+        21 mai 2010
+        sk
+        corrections d'anomalies et de régressions
+      
+      
         1.14
-        28 March 2010
+        28 mars 2010
         sk
-        bugfixes and performance improvements
+        correctifs et amélioration de performances
       
       
         1.13
@@ -131,8 +149,8 @@
         
 
         
-          Génération du SGML/XML et du HTML/PDF. gtkdoc-mkdb transforme les fichiers prototypes en fichiers SGML ou XML dans le répertoire sgml/ ou xml/. Si le code source contient de la documentation sur les fonctions, en utilisant les blocs de commentaires spéciaux, elle sera fusionnée ici. Si aucun fichier tmpl n'est utilisé, seule la documentation contenue dans les sources et les données d'introspection seront lues.
-           gtkdoc-mkhtml transforme les fichiers SGML/XML en fichiers HTML dans le répertoire html/. De même gtkdoc-mkpdf transforme les fichiers SGML/XML en documents PDF appelés <package>.pdf.
+          Génération du SGML/XML et du HTML/PDF. gtkdoc-mkdb transforme les fichiers prototypes en fichiers SGML ou XML dans le répertoire sgml/ ou xml/. Si le code source contient de la documentation sur les fonctions, en utilisant les blocs de commentaires spéciaux, elle sera fusionnée ici. Si aucun fichier tmpl n'est utilisé, seule la documentation contenue dans les sources et les données d'introspection seront lues. Nous recommandons l'utilisation de XML DocBook.
+          gtkdoc-mkhtml transforme les fichiers SGML/XML en fichiers HTML dans le répertoire html/. De même gtkdoc-mkpdf transforme les fichiers SGML/XML en documents PDF appelés <package>.pdf.
           Les fichiers dans les répertoires sgml/ ou xml/ et html/ sont toujours écrasés. Il ne faut pas les modifier directement.
         
 
@@ -242,7 +260,20 @@
           
         
       
-      
+
+      Cela impose à tous les développeurs d'installer gtk-doc. Si pour votre projet, vous pouvez avoir une configuration de construction api-doc optionnelle, vous pouvez résoudre ce problème comme ci-dessous. Ne le modifiez pas car gtkdocize recherche GTK_DOC_CHECK au début d'une ligne. Laisser gtk-doc optionnel
+          
+
+          
+        
+
       Le premier argument est utilisé pour vérifier le paramètre gtkdocversion au moment de la configuration. Le second, en option, est utilisé par gtkdocize. La macro GTK_DOC_CHECK ajoute également plusieurs drapeaux de configuration :
       
         --with-html-dir=CHEMIN : répertoire d'installation de la documentation,
@@ -277,7 +308,7 @@
 
       
 
-      Il est possible d'activer GTK-Doc pour la cible distcheckmake. Il faut juste ajouter la ligne suivante au fichier Makefile.am du répertoire racine :
+      Il est aussi possible d'activer GTK-Doc pour la cible distcheck de make. Il faut juste ajouter la ligne suivante au fichier Makefile.am du répertoire racine :
 
       
         Activation de GTK-Doc pendant le « make distcheck »
@@ -306,9 +337,9 @@
         
       
 
-      Lorsque gtkdocize est exécuté, il copie gtk-doc.make vers le répertoire racine de votre projet (ou tout autre répertoire désigné par l'option --docdir). Il vérifie également l'invocation de GTK_DOC_CHECK dans le script configure.
+      Lorsque gtkdocize est exécuté, il copie gtk-doc.make vers le répertoire racine de votre projet (ou tout autre répertoire désigné par l'option --docdir). Il vérifie également l'invocation de GTK_DOC_CHECK dans le script configure. Cette macro peut être utilisée pour transmettre des paramètres supplémentaires à gtkdocize.
 
-      Historiquement, GTK-Doc générait des fichiers prototypes dans lesquels les développeurs saisissaient la documentation. Il s'est avéré que ce n'était pas une bonne idée. Depuis quelques versions, GTK-Doc peut aussi récupérer toutes les informations à partir des commentaires dans les sources. Depuis GTK-Doc 1.9, les prototypes peuvent être évités. Nous vous encourageons à conserver la documentation dans le code. gtkdocize prend maintenant en charge une option  qui choisit un makefile qui s'affranchit totalement de l'utilisation des fichiers prototypes (tmpl). En plus d'ajouter les options directement au moment de l'appel de la commande, elles peuvent être ajoutées également dans une variable d'environnement appellée GTKDOCIZE_FLAGS ou choisies comme deuxième paramètre dans la macro GTK_DOC_CHECK dans le script de configuration. Si aucune modification n'a été faite à la main dans les fichiers prototypes et si vous migrez à partir d'anciennes versions de gtkdoc, supprimez le répertoire (par ex. à partir du système de gestion de versions).
+      Historiquement, GTK-Doc générait des fichiers prototypes dans lesquels les développeurs saisissaient la documentation. Il s'est avéré que ce n'était pas une bonne idée (comme le besoin de placer les fichiers générés dans le gestionnaire de versions). Depuis GTK-Doc 1.9, les outils peuvent récupérer toutes les informations à partir des commentaires dans les sources, ce qui permet d'éviter d'avoir des prototypes. Nous vous encourageons à conserver la documentation dans le code. gtkdocize prend maintenant en charge une option  qui choisit un makefile qui s'affranchit totalement de l'utilisation des fichiers prototypes (tmpl). En plus d'ajouter les options directement au moment de l'appel de la commande, elles peuvent être ajoutées également dans une variable d'environnement appelée GTKDOCIZE_FLAGS ou choisies comme deuxième paramètre dans la macro GTK_DOC_CHECK dans le script de configuration. Si aucune modification n'a été faite à la main dans les fichiers prototypes et si vous migrez à partir d'anciennes versions de gtkdoc, supprimez le répertoire (par ex. à partir du système de gestion de versions).
     
 
     
@@ -348,6 +379,16 @@
       Pour éviter ces problèmes, il est conseillé de placer la documentation dans le code source. Ce manuel ne décrit que cette manière de documenter du code.
     
 
+    L'analyse peut prendre en charge de manière correcte la majorité des en-têtes C. Au cours de l'analyse, en cas d'apparition d'avertissements qui ont l'air d'être des cas spéciaux, vous pouvez indiquer à GTK-Doc de les passer. Bloc de commentaire GTK-Doc
+        
+
+        
+      
+
     
 
     
@@ -393,10 +434,10 @@
         
 
       
-	Si vous avez besoin d'utiliser les caractères spéciaux « '<', '> », « () », « @ », « % » ou « # » dans votre documentation sans que GTK-Doc ne les interprète, vous pouvez utiliser les entités XML « &lt; », « &gt; », « &lpar; », « &rpar; », « &commat; », « &percnt; », « &num; » ou les échapper en les précédant d'un antislash « \ ».
+	  Si vous avez besoin d'utiliser les caractères spéciaux « '<', '> », « () », « @ », « % » ou « # » dans votre documentation sans que GTK-Doc ne les interprète, vous pouvez utiliser les entités XML « &lt; », « &gt; », « &lpar; », « &rpar; », « &commat; », « &percnt; », « &num; » ou les échapper en les précédant d'un antislash « \ ».
       
 
-      DocBook peut faire plus que des liens. Il peut aussi générer des listes, des tableaux et des exemples. Pour activer l'utilisation des étiquettes SGML/XML dans les commentaires de documentation, vous devez avoir l'option  dans la variable MKDB_OPTIONS du fichier Makefile.am.
+      DocBook peut faire plus que des liens. Il peut aussi générer des listes, des tableaux et des exemples. Pour activer l'utilisation des étiquettes SGML/XML dans les commentaires de documentation, vous devez avoir une des options  ou  dans la variable MKDB_OPTIONS du fichier Makefile.am.
 
       
 	Comme indiqué plus tôt, GTK-Doc est fait pour documenter les API publiques. On ne peut donc pas écrire de la documentation pour les symboles statiques. Néanmoins, il est bon de commenter ces symboles aussi. Cela aide les autres à comprendre votre code. Par conséquent, nous recommandons de les documenter à l'aide de commentaires normaux (sans le second « * » à la première ligne). Si, plus tard, la fonction doit être rendue publique, il suffira juste d'ajouter un « * » dans le bloc de commentaires et d'ajouter le nom du symbole à la bonne place à l'intérieur du fichier des sections.
@@ -420,7 +461,7 @@
  * @see_also: #MeepSettings
  * @stability: Stable
  * @include: meep/app.h
- * @Image: application.png
+ * @image: application.png
  *
  * The application class handles ...
  */
@@ -674,6 +715,8 @@
 
         Utilisez /*< private >*/ avant les champs de structures privées que vous voulez cacher. Utilisez /*< public >*/ dans le cas contraire.
 
+        Les blocs de commentaire pour les structures peuvent aussi être utilisés avec GObjects et GObjectClasses. Il est normalement recommandé d'ajouter un bloc de commentaire pour une classe, si elle contient des vmethods (car c'est la manière de les documenter). Pour GObject, il est possible d'utiliser la documentation de section correspondante ; la présence d'un bloc séparé pour la structure de l'instance serait utile si l'instance possède des champs publics. Le désavantage ici étant que cela crée deux entrées d'index pour le même nom (la structure et la section).
+
       
 
       Bloc de commentaire pour les énumérations
@@ -916,7 +959,7 @@
 
       La balise <TITLE> ... </TITLE> est utilisée pour indiquer le titre de la section. C'est utile seulement avant la création initiale des prototypes, car ensuite le titre défini dans le prototype est prioritaire. Elle est également obsolète si des commentaires de SECTION sont utilisés dans les fichiers sources.
 
-      Vous pouvez regrouper les éléments dans la section en utilisant la balise <SUBSECTION>. Actuellement, une ligne blanche est ajoutée entre les sous-sections dans la section résumé. Vous pouvez également utiliser <SUBSECTION Standard> pour les déclarations GObject standards (par exemple, les fonctions comme g_object_get_type et les macros comme G_OBJECT(), G_IS_OBJECT(), etc.). Actuellement, elles ne sont pas intégrées dans la documentation. Vous pouvez utiliser <SUBSECTION Private> pour les déclarations privées qui ne seront pas affichées (c'est un moyen pratique d'éviter les messages d'avertissement sur les déclarations inutilisées). Si votre bibliothèque contient des types privés que vous ne souhaitez pas voir apparaître dans la hiérarchie des objets et dans la liste des interfaces implémentées ou nécessaires, ajoutez-les à une sous-section privée.
+      Vous pouvez regrouper les éléments dans la section en utilisant la balise <SUBSECTION>. Actuellement, une ligne blanche est ajoutée entre les sous-sections dans la section résumé. Vous pouvez également utiliser <SUBSECTION Standard> pour les déclarations GObject standards (par exemple, les fonctions comme g_object_get_type et les macros comme G_OBJECT(), G_IS_OBJECT(), etc.). Actuellement, elles ne sont pas intégrées dans la documentation. Vous pouvez utiliser <SUBSECTION Private> pour les déclarations privées qui ne seront pas affichées (c'est un moyen pratique d'éviter les messages d'avertissement sur les déclarations inutilisées). Si votre bibliothèque contient des types privés que vous ne souhaitez pas voir apparaître dans la hiérarchie des objets et dans la liste des interfaces implémentées ou nécessaires, ajoutez-les à une sous-section privée. Le choix de placer des GObject ou GObjectClass comme des structures dans une section standard ou publique dépend de la présence d'éléments publics (variables, vmethods).
 
       Vous pouvez utiliser les balises <INCLUDE> ... </INCLUDE> pour indiquer les fichiers #include qui sont affichés dans les sections résumé. Elles contiennent une liste de fichiers #include, séparés par des virgules, sans les chevrons. Si vous les placez en dehors d'une section, elles s'appliquent à toutes les sections jusqu'à la fin du fichier. Si vous les placez dans une section, elles s'appliquent seulement à cette section.
 
@@ -938,12 +981,84 @@
     
       Activez ou ajoutez la ligne  dans le fichier Makefile.am. Si la version installée de GTK-Doc est supérieure à 1.9, des contrôles de validité seront lancés pendant l'exécution de make check.
     
-    
+
     Vous pouvez également regarder les fichiers produits par le scanneur de code source : <package>-decl-list.txt et <package>-decl.txt. Le premier peut être comparé avec le fichier section s'il est maintenu manuellement. Le second liste toutes les déclarations contenues dans les fichiers en-tête. Si un symbole est manquant, il faut vérifier si ce fichier le contient.
 
     Si le projet est basé sur GObject, il est possible de regarder dans les fichiersgénérés par le scanneur d'objet : <package>.args.txt, <package>.hierarchy.txt, <package>.interfaces.txt, <package>.prerequisites.txt et <package>.signals.txt. S'il manque des symboles dans l'un d'eux, il est possible de demander à gtkdoc de conserver le fichier de scanneur intermédiaire pour en faire une analyse ultérieure mais en le lançant comme GTK_DOC_KEEP_INTERMEDIATE=1 make.
   
 
+  
+    Documentation d'autres interfaces
+
+    Nous avons jusqu'ici utilisé GTK-Doc pour documenter les API du code. Les sections qui suivent contiennent des suggestions sur la manière d'utiliser les outils pour documenter aussi d'autres interfaces.
+
+    
+      Options de ligne de commande et pages de manuel
+
+      Comme il est possible de générer aussi des pages de manuel à partir d'une « refentry » DocBook, il semble donc intéressant de l'utiliser dans ce but. Ainsi, l'interface fait partie de la référence et l'on obtient en cadeau la page de manuel.
+
+      
+        Documentation de l'outil
+
+        Créez un fichier « refentry » par outil. En suivant notre exemple, nous l'appellerons meep/docs/reference/meeper/meep.xml. Pour connaître les balises XML pouvant être utilisées, on peut observer le fichier généré dans le sous-répertoire xml ou des exemples comme dans glib.
+      
+
+      
+        Ajout de contrôles « configure » supplémentaires
+
+        
+          Contrôles « configure » supplémentaires
+            
+
+            
+          
+        
+      
+
+      
+        Ajout de règles « makefile » supplémentaires
+
+        
+          Contrôles « configure » supplémentaires
+            
+
+            
+          
+        
+      
+    
+
+    
+      Interfaces DBus
+
+      (À_CORRIGER : http://hal.freedesktop.org/docs/DeviceKit/DeviceKit.html, http://cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus)
+    
+
+  
+
   
     Foire aux questions
 
@@ -969,7 +1084,7 @@
       
       
         Les symboles ne sont pas liés à leur section de documentation.
-        Est-ce que doc_comment utilise le markup correct (ajout d'un #, % ou ()) ? Contrôlez si gtkdoc-fixxref affiche des avertissements à propos de xrefs non résolus.
+        Est-ce que doc-comment utilise le markup correct (ajout d'un #, % ou ()) ? Contrôlez si gtkdoc-fixxref affiche des avertissements à propos de xrefs non résolus.
       
       
         Une nouvelle classe n'apparaît pas dans les documents.
@@ -977,7 +1092,7 @@
       
       
         Un nouveau symbole n'apparaît pas dans les documents.
-        Est-ce que le doc-comment est correctement formatté. Vérifiez qu'il n'y a pas d'erreur de frappe au début du commentaire. Vérifiez que gtkdoc-fixxref ne vous indique pas de xrefs non résolus. Vérifiez que le symbole est correctement listé dans une section publique de <package>-sections.txt.
+        Est-ce que le doc-comment est correctement formaté. Vérifiez qu'il n'y a pas d'erreur de frappe au début du commentaire. Vérifiez que gtkdoc-fixxref ne vous indique pas de xrefs non résolus. Vérifiez que le symbole est correctement listé dans une section publique de <package>-sections.txt.
       
       
         Un type est absent dans la hiérarchie de classe.
@@ -1005,7 +1120,22 @@
       
     
   
-    
+
+  
+    Tools related to gtk-doc
+
+    
+      GtkDocPlugin - a Trac GTK-Doc
+      integration plugin, that adds api docs to a trac site and integrates with
+      the trac search.
+    
+    
+      Gtkdoc-depscan - a tool (part of gtk-doc) to check used API against since
+      tags in the api to determine the minimum required version.
+    
+
+  
+
   
   
 
-      તમે distcheckmake લક્ષ્ય માટે GTK-Doc ને સક્રિય કરવા માટે પણ ઇચ્છા રાખી શકો છો. ફક્ત ઉમેરો પછી એક-લાઇનર એ તમને ટોચનાં સ્તર Makefile.am માટે આગળનાં ઉદાહરણમાં બતાવે છે:
+      
+        You may also want to enable GTK-Doc for the distcheck make target. Just
+        add the one line shown in the next example to your top-level
+        Makefile.am:
+      
 
       
         distcheck ને બનાવવા દરમ્યાન GTK-Doc ને સક્રિય કરો
@@ -324,17 +416,25 @@
         
       
 
-      જ્યારે gtkdocize ચલાવી રહ્યા હોય ત્યારે તે તમારા પ્રોજેક્ટ રુટ માટે gtk-doc.make ની નકલ કરે છે (અથવા  વિકલ્પ દ્દારા સ્પષ્ટ થયેલ કોઇપણ ડિરેક્ટરી). જો GTK_DOC_CHECK વિનંતી માટે તમે સ્ક્રિપ્ટને રૂપરેખાંકિત કરવાનું પણ ચકાસો.
+      
+        When running gtkdocize it copies
+        gtk-doc.make to your project root (or any directory
+        specified by the  option).
+        It also checks you configure script for the GTK_DOC_CHECK
+        invocation. This macro can be used to pass extra parameters to
+        gtkdocize.
+      
 
       
-        Historically GTK-Doc was gerating template files where developers entered the docs.
-        this turned out to be not so good. Since a few version GTK-Doc could also get all
-        the information from source comments.
-        Since GTK-Doc 1.9 the templates can be avoided. We encourage people to keep
+        Historically GTK-Doc was generating template files where developers entered the docs.
+        This turned out to be not so good (e.g. the need for having generated
+        files under version control).
+        Since GTK-Doc 1.9 the tools can get all the information from source comments
+        and thus the templates can be avoided. We encourage people to keep
         documentation in the code. gtkdocize supports now
         a  option that chooses a makefile that skips
         tmpl usage totally. Besides adding the option directly to the command
-        invocation, they can be added also to a environment variable called GTKDOCIZE_FLAGS
+        invocation, they can be added also to an environment variable called GTKDOCIZE_FLAGS
         or set as a 2nd parameter in GTK_DOC_CHECK macro in the configure script.
         If you have never changed file in tmpl by hand and migrating from older gtkdoc versions,
         please remove the dir (e.g. from version control system).
@@ -370,7 +470,12 @@
   
     કોડને દસ્તાવેજ કરી રહ્યા છે
 
-    GTK-Doc એ કોડ દસ્તાવેજીકરણ માટે ચોક્કસ સિન્ટેક્ષ સાથે સ્ત્રોત કોડ ટિપ્પણીને વાપરે છે. આગળ તે બીજા સ્ત્રોતમાંથી તમારા પ્રોજેક્ટ બંધારણ વિશે જાણકારીને મેળવે છે. આગળનાં વિભાગ દરમ્યાન તમે ટિપ્પણીઓનાં સિન્ટેક્ષ વિશે બધી જાણકારી ને શોધે છે.
+    
+      GTK-Doc uses source code comment with a special syntax for code documentation.
+      Further it retrieves information about your project structure from other
+      sources. During the next section you will find all information about the
+      syntax of the comments.
+    
 
     
       દસ્તાવેજીકરણ નિયુક્તિ
@@ -387,6 +492,21 @@
       
     
 
+    
+      The scanner can handle the majority of c headers fine. In the case of
+      receiving warnings from the scanner that look like a special case, one can
+      hint GTK-Doc to skip over them.
+      GTK-Doc ટિપ્પણી બ્લોક
+        
+
+        
+      
+    
+
     
 
     
@@ -450,10 +570,16 @@
       
 
       
-	જો તમારે તેઓને બદલ્યા વગર GTK-Doc વગર તમારાં દસ્તાવેજીકરણમાં વિશિષ્ટ અક્ષરો '<', '>', '()', '@', '%', or '#' ને વાપરવાનું ઇચ્છતા હોય તો તમે XML વસ્તુઓ "&lt;", "&gt;", "&lpar;", "&rpar;", "&commat;", "&percnt;" અને "&num;" ને વાપરી શકો છો અથવા બેકસ્લેશ '\' સાથે તેઓમાંથી બહાર નીકળી જાઓ.
+	  જો તમારે તેઓને બદલ્યા વગર GTK-Doc વગર તમારાં દસ્તાવેજીકરણમાં વિશિષ્ટ અક્ષરો '<', '>', '()', '@', '%', or '#' ને વાપરવાનું ઇચ્છતા હોય તો તમે XML વસ્તુઓ "&lt;", "&gt;", "&lpar;", "&rpar;", "&commat;", "&percnt;" અને "&num;" ને વાપરી શકો છો અથવા બેકસ્લેશ '\' સાથે તેઓમાંથી બહાર નીકળી જાઓ.
       
 
-      DocBook એ ફક્ત વધારે કડીઓને કરી શકે છે. એક પાસે પણ યાદીઓ, કોષ્ટકો અને ઉદાહરણો હોઇ શકે છે. દસ્તાવેજ-ટિપ્પણીઓની અંદર SGML/XML ટેગનાં વપરાશને સક્રિય કરવા માટે તમારી પાસે Makefile.am માં ચલ MKDB_OPTIONS માં હોવુ જરૂરી છે.
+      
+        DocBook can do more that just links. One can also have lists, tables and
+        examples. To enable the usage of SGML/XML tags inside doc-comments you
+        need to have  or 
+        in the variable MKDB_OPTIONS inside
+        Makefile.am.
+      
 
       
 	પહેલાનાં GTK-Doc માં પહેલેથી જણાવેલ પ્રમાણે સાર્વજનિક API દસ્તાવેજીકરણ માટે છે. છતાં એક એ સ્થિર સંકેતો માટે દસ્તાવેજીકરણ ને લખી શકતુ નથી. તેમ છતાં તે પેલાં સંકેતો પર ટિપ્પણી કરવા માટે સારુ છે. આ તમારાં કોડને સમજવા માટે બીજાને મદદ કરે છે. માટે આપણે સામાન્ય ટિપ્પણીઓની મદદથી આ ટિપ્પણી એ અગ્રહણીય કરેલ છે (પહેલાં વાક્યમાં બીજા '*' વગર). જો પછી વિધેયને સાર્વજનિક બનાવવાની જરૂર છે, ટિપ્પણી બ્લોકમાં બીજા '*' ઉમેરવા માટે બધાને કરવાની જરૂર છે અને ફાઇલ વિભાગોની અંદર જમણી જગ્યા પર સંકેત નામને દાખલ કરો.
@@ -477,7 +603,7 @@
  * @see_also: #MeepSettings
  * @stability: Stable
  * @include: meep/app.h
- * @Image: application.png
+ * @image: application.png
  *
  * The application class handles ...
  */
@@ -493,7 +619,7 @@
             
               The name links the section documentation to the respective part in
               the <package>-sections.txt file. The
-              name give here should match the <FILE> tag in the 
+              name give here should match the <FILE> tag in the
               <package>-sections.txt file.
             
           
@@ -515,15 +641,17 @@
           
             
               Overrides the use of title as a section identifier. For GObjects
-              the <title> is used as a section_id and for other section it
-              is <MODULE>-<title>.
+              the <title> is used as a section_id and for other sections
+              it is <MODULE>-<title>.
             
           
         
         
           @seealso (_a)
           
-            સંકેતોની યાદી કે જે આ વિભાગને સંબંધિત છે..
+            
+              A list of symbols that are related to this section.
+            
           
         
         
@@ -607,8 +735,8 @@
         Each symbol (function, macro, struct, enum, signal and property) is
         documented in a separate block. The block is best placed close to the
         definition of the symbols so that it is easy to keep them in sync.
-        Thus function are usually documented in the c-source and macros, struct
-        and enum in the header file.
+        Thus functions are usually documented in the c-source and macros,
+        structs and enums in the header file.
       
 
       સામાન્ય ટેગ
@@ -802,7 +930,17 @@
         
           Use /*< private >*/ before the private struct fields
           you want to hide. Use /*< public >*/ for the reverse
-          behavirour.
+          behaviour.
+        
+
+        
+          Struct comment blocks can also be used for GObjects and GObjectClasses.
+          It is usualy a good idea to add a comment blco for a class, if it has
+          vmethods (as this is how they can be documented). For the GObject
+          itself one can use the related section docs, having a separate block
+          for the instance struct would be useful if the instance has public
+          fields. One disadvantage here is that this creates two index entries
+          of the same name (the structure and the section).
         
 
       
@@ -832,7 +970,7 @@
         
           Use /*< private >*/ before the private enum values
           you want to hide. Use /*< public >*/ for the reverse
-          behavirour.
+          behaviour.
         
 
       
@@ -1031,7 +1169,12 @@
     
       મુખ્ય દસ્તાવેજને સુધારી રહ્યા છે
 
-      GTK-Doc એ DocBook SGML/XML માં દસ્તાવેજીકરણને ઉત્પન્ન કરે છે. જ્યારે ઇનલાઇન સ્ત્રોત ટિપ્પણીઓની પ્રક્રિયા કરી રહ્યુ હોય, GTK-Doc સાધનો વર્ગ પ્રતિ એક દસ્તાવેજીકરણ અથવા અલગ ફાઇલ પ્રતિ મોડ્યુવ પાનાંને ઉત્પન્ન કરે છે. મુખ્ય દસ્તાવેજ તેઓને સમાવે છે અને ક્રમમાં તેમને સ્થિત કરે છે.
+      
+        GTK-Doc produces documentation in DocBook SGML/XML. When processing the
+        inline source comments, the GTK-Doc tools generate one documentation
+        page per class or module as a separate file. The master document
+        includes them and place them in an order.
+      
 
       
         While GTK-Doc creates a template master document for you, later run will
@@ -1128,6 +1271,9 @@
         If your library contains private types which you don't want to appear in
         the object hierarchy and the list of implemented or required interfaces,
         add them to a Private subsection.
+        Wheter you would place GObject and GObjectClass like structs in public
+        or Standard section depends if they have public entries (variables,
+        vmethods).
       
 
       
@@ -1171,11 +1317,11 @@
     
       સક્રિય કરો અથવા Makefile.am માં  વાક્ય ને ઉમેરો. જો ઓછામાં ઓછુ GTK-Doc 1.9 સ્થાપિત થયેલ હોય તો, આ make check ને ચલાવવા દરમ્યાન સેનિટિ ચકાસણીને ચલાવશે.
     
-    
+
     
       One can also look at the files produced by the source code scanner:
       <package>-decl-list.txt and
-      <package>-decl.txt. The first and can be
+      <package>-decl.txt. The first one can be
       compared with the section file if that is manualy maintained. The second
       lists all declarations fromt he headers If a symbol is missing one could
       check if this file contains it.
@@ -1184,8 +1330,97 @@
     જો પ્રોજેક્ટ એ GObject આધારિત હોય તો, એક ઓબ્જેક્ટ સ્કેનર દ્દારા ઉત્પન્ન થયેલ ફાઇલોમાં પણ જોઇ શકો છો: <package>.args.txt, <package>.hierarchy.txt, <package>.interfaces.txt, <package>.prerequisites.txt અને <package>.signals.txt. જો ત્યાં પેલાનાં કોઇપણમાં ગુમ થયેલ સંકેતો છે તો, આગળ પૃથ્થકરણ માટે અંતર્માધ્યમ સ્કેનર ફાઇલને રાખવા માટે એકજણ gtkdoc ને પૂછી શકે છે, પરંતુ GTK_DOC_KEEP_INTERMEDIATE=1 make તરીકે તેને ચલાવી રહ્યા છે.
   
 
+  
+    Documenting other interfaces
+
+    
+      So far we have been using GTK-Doc to document the API of code. The next
+      sections contain suggestions how the tools can be used to document other
+      interfaces too.
+    
+
+    
+      Commandline options and man pages
+
+      
+        As one can generate man pages for a docbook refentry as well, it sounds
+        like a good idea to use it for that purpose. This way the interface is
+        part of the reference and one gets the man-page for free.
+      
+
+      
+        Document the tool
+
+        
+          Create one refentry file per tool. Following
+          our example we would call it
+          meep/docs/reference/meeper/meep.xml. For the xml
+          tags that should be used and can look at generated file in the xml
+          subdirectory as well as examples e.g. in glib.
+        
+      
+
+      
+        Adding the extra configure check
+
+        
+          Extra configure checks
+            
+
+            
+          
+        
+      
+
+      
+        Adding the extra makefile rules
+
+        
+          Extra configure checks
+            
+
+            
+          
+        
+      
+    
+
+    
+      DBus interfaces
+
+      
+        (FIXME: http://hal.freedesktop.org/docs/DeviceKit/DeviceKit.html,
+http://cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus)
+      
+    
+
+  
+
   
-    વારંવાર પૂછાતા પ્રશ્ર્ન
+    Frequently asked questions
 
     
       
@@ -1266,7 +1501,22 @@
       
     
   
-    
+
+  
+    Tools related to gtk-doc
+
+    
+      GtkDocPlugin - a Trac GTK-Doc
+      integration plugin, that adds api docs to a trac site and integrates with
+      the trac search.
+    
+    
+      Gtkdoc-depscan - a tool (part of gtk-doc) to check used API against since
+      tags in the api to determine the minimum required version.
+    
+
+  
+
   
   
+
+included">
+]>
+
+
+  
+    GTK-Doc Manual
+    1.15
+    User manual for developers with instructions of GTK-Doc usage.
+    
+      
+        Chris
+        Lyttle
+        
+          

+            chris@wilddev.net
+          

+        
+      
+      
+        Dan
+        Mueth
+        
+          

+            d-mueth@uchicago.edu
+          

+        
+      
+      
+        Stefan
+        Kost
+        
+          

+            ensonic@users.sf.net
+          

+        
+      
+    
+    
+      GTK-Doc project
+      
gtk-doc-list@gnome.org

+    
+    
+      2000, 2005, 2007-2009
+      Dan Mueth and Chris Lyttle and Stefan Kost
+    
+
+    
+
+    
+      
+        Permission is granted to copy, distribute and/or modify this
+        document under the terms of the GNU Free Documentation
+        License, Version 1.1 or any later version published
+        by the Free Software Foundation with no Invariant Sections, no
+        Front-Cover Texts, and no Back-Cover Texts. A copy of the license
+        is included.
+      
+      
+        Many of the names used by companies to distinguish their products and
+        services are claimed as trademarks. Where those names appear in any
+        GNOME documentation, and those trademarks are made aware to the members
+        of the GNOME Documentation Project, the names have been printed in caps
+        or initial caps.
+      
+    
+
+    
+      
+        1.17
+        26 Feb 2011
+        sk
+        urgent bug fix update
+      
+      
+        1.16
+        14 Jan 2011
+        sk
+        bugfixes, layout improvements
+      
+      
+        1.15
+        21 May 2010
+        sk
+        bug and regression fixes
+      
+      
+        1.14
+        28 March 2010
+        sk
+        bugfixes and performance improvements
+      
+      
+        1.13
+        18 December 2009
+        sk
+        broken tarball update
+      
+      
+        1.12
+        18 December 2009
+        sk
+        new tool features and bugfixes
+      
+      
+        1.11
+        16 Novemebr 2008
+        mal
+        GNOME doc-utils migration
+      
+    
+
+  
+
+  
+
+  
+    Uvod
+
+    
+      This chapter introduces GTK-Doc and gives an overview of what it is and
+      how it is used.
+    
+
+    
+      What is GTK-Doc?
+
+      
+        GTK-Doc is used to document C code. It is typically used to document the public
+        API of libraries, such as the GTK+ and GNOME libraries. But it can also be
+        used to document application code.
+      
+    
+
+    
+      How Does GTK-Doc Work?
+
+      
+        GTK-Doc works by using documentation of functions placed inside the source files in
+        specially-formatted comment blocks, or documentation added to the template files
+        which GTK-Doc uses (though note that GTK-Doc will only document functions that
+        are declared in header files; it won't produce output for static functions).
+      
+
+      
+        GTK-Doc consists of a number of perl scripts, each performing a different step
+        in the process.
+      
+
+      
+        There are 5 main steps in the process:
+      
+
+      
+
+        
+          
+            Writing the documentation.
+
+            The author fills in the source files with the documentation for each
+            function, macro, union etc. (In the past information was entered in
+            generated template files, which is not recommended anymore).
+          
+        
+
+        
+          
+            Gathering information about the code.
+
+            gtkdoc-scan scans the header files of the
+            code looking for declarations of functions, macros, enums, structs, and unions.
+            It creates the file <module>-decl-list.txt containg a list of the
+            declarations, placing them into sections according to which header file they
+            are in. On the first run this file is copied to <module>-sections.txt.
+            The author can rearrange the sections, and the order of the
+            declarations within them, to produce the final desired order.
+            The second file it generates is <module>-decl.txt.
+            This file contains the full declarations found by the scanner. If for
+            some reason one would like some symbols to show up in the docs, where
+            the full declaration cannot be found by the scanner or the declaration
+            should appear differently, one can place enties similar to the ones in
+            <module>-decl.txt into <module>-overrides.txt.
+
+            gtkdoc-scanobj can also be used to dynamically query a library about
+            any GtkObject subclasses it exports. It saves information about each
+            object's position in the class hierarchy and about any GTK Args and Signals it
+            provides.
+          
+        
+
+        
+          
+            Generating the "template" files.
+
+            gtkdoc-mktmpl creates a number of files in
+            the tmpl/ subdirectory, using the
+            information gathered in the first step. (Note that this can be run
+            repeatedly. It will try to ensure that no documentation is ever lost.)
+          
+          
+            
+              Since GTK-Doc 1.9 the templates can be avoided. We encourage people to keep
+              documentation in the code. gtkdocize supports now
+              a  option that chooses a makefile that
+              skips tmpl usage totally.
+              If you have never changed file in tmpl by hand, please remove the dir
+              (e.g. from version control system).
+            
+          
+        
+
+        
+          
+            Generating the SGML/XML and HTML/PDF.
+
+            gtkdoc-mkdb turns the template files into
+            SGML or XML files in the sgml/
+            or xml/ subdirectory.
+            If the source code contains documentation on functions, using the
+            special comment blocks, it gets merged in here. If there are no tmpl files used
+            it only reads docs from sources and introspection data. We recommend
+            to use Docbook XML.
+          
+          
+            gtkdoc-mkhtml turns the SGML/XML files into HTML
+            files in the html/ subdirectory.
+            Likewise gtkdoc-mkpdf turns the SGML/XML files into a PDF
+            document called <package>.pdf.
+          
+          
+            Files in sgml/ or
+            xml/ and html/
+            directories are always overwritten. One should never edit them directly.
+          
+        
+
+        
+          
+            Fixing up cross-references between documents.
+
+            After installing the HTML files, gtkdoc-fixxref can be run to fix up any
+            cross-references between separate documents. For example, the GTK+
+            documentation contains many cross-references to types documented in the GLib manual.
+
+            When creating the source tarball for distribution, gtkdoc-rebase
+            turns all external links into web-links. When installing distributed (pregenerated) docs
+            the same application will try to turn links back to local links
+            (where those docs are installed).
+          
+        
+      
+
+    
+
+    
+      Getting GTK-Doc
+
+      
+        Requirements
+        
+          Perl v5 - the main scripts are in Perl.
+        
+        
+          DocBook DTD v3.0 - This is the DocBook SGML DTD.
+          http://www.ora.com/davenport
+        
+        
+          Jade v1.1 - This is a DSSSL processor for converting SGML to various formats.
+          http://www.jclark.com/jade
+        
+        
+          Modular DocBook Stylesheets
+          This is the DSSSL code to convert DocBook to HTML (and a few other
+          formats). It's used together with jade.
+          I've customized the DSSSL code slightly, in gtk-doc.dsl, to colour
+          the program code listings/declarations, and to support global
+          cross-reference indices in the generated HTML.
+          http://nwalsh.com/docbook/dsssl
+        
+        
+          docbook-to-man - if you want to create man pages from the DocBook.
+          I've customized the 'translation spec' slightly, to capitalise section
+          headings and add the 'GTK Library' title at the top of the pages and the
+          revision date at the bottom.
+          There is a link to this on http://www.ora.com/davenport
+          NOTE: This does not work yet.
+        
+      
+
+      
+        Installation
+        
+          There is no standard place where the DocBook Modular Stylesheets are installed.
+        
+        
+          GTK-Doc's configure script searches these 3 directories automatically:
+        
+        
+           /usr/lib/sgml/stylesheets/nwalsh-modular        (used by RedHat)
+        
+        
+            /usr/lib/dsssl/stylesheets/docbook              (used by Debian)
+        
+        
+            /usr/share/sgml/docbkdsl                        (used by SuSE)
+        
+        
+          If you have the stylesheets installed somewhere else, you need to configure
+          GTK-Doc using the option:
+           --with-dsssl-dir=<PATH_TO_TOPLEVEL_STYLESHEETS_DIR> 
+        
+      
+
+    
+
+    
+
+    
+      About GTK-Doc
+
+      
+        (FIXME)
+      
+
+      
+        (History, authors, web pages, license, future plans,
+        comparison with other similar systems.)
+      
+
+    
+
+    
+      About this Manual
+
+      
+        (FIXME)
+      
+
+      
+        (who it is meant for, where you can get it, license)
+      
+
+    
+
+  
+
+  
+    Setting up your project
+
+    
+      The next sections describe what steps to perform to integrate GTK-Doc into
+      your project. Theses sections assume we work on a project called 'meep'.
+      This project contains a library called 'libmeep' and
+      an end-user app called 'meeper'.
+    
+
+    
+      Setting up a skeleton documentation
+
+      
+        Under your top-level project directory create folders called docs/reference
+        (this way you can also have docs/help for end-user documentation).
+        It is recommended to create another subdirectory with the name of the doc-package.
+        For packages with just one library this step is not necessary.
+      
+
+      
+        This can then look as shown below:
+        Example directory structure
+          
+
+          
+        
+      
+    
+
+    
+      Integration with autoconf
+
+      
+        Very easy! Just add one line to your configure.ac script.
+      
+
+      
+        Integration with autoconf
+          
+
+          
+        
+      
+
+      
+        This will require all developers to have gtk-doc installed. If it is
+        okay for your project to have optional api-doc build setup, you can
+        solve this as below. Keep it as is, as gtkdocize is looking for
+        GTK_DOC_CHECK  at the start of a line.
+        Keep gtk-doc optional
+          
+
+          
+        
+      
+
+      
+        The first argument is used to check for the gtkdocversion at configure time.
+        The 2nd, optional argument is used by gtkdocize.
+        The GTK_DOC_CHECK macro also adds several configure switches:
+      
+      
+        --with-html-dir=PATH : path to installed docs
+        --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]
+      
+
+      
+      	
+          GTK-Doc is disabled by default! Remember to pass the option
+           to the next
+          configure run. Otherwise pregenerated documentation is installed
+          (which makes sense for users but not for developers).
+        
+      
+
+      
+        Furthermore it is recommended that you have the following line inside
+        you configure.ac script.
+        This allows gtkdocize to automatically copy the
+        macro definition for GTK_DOC_CHECK to your project.
+      
+
+      
+        Preparation for gtkdocize
+          
+
+          
+        
+      
+    
+
+    
+      Integration with automake
+
+      
+        First copy the Makefile.am from the examples subdirectory of the gtkdoc-sources
+        to your project's API documentation directory (
+        ./docs/reference/<package>).
+        If you have multiple doc-packages repeat this for each one.
+      
+
+      
+        The next step is to edit the settings inside the Makefile.am.
+        All the settings have a comment above that describes their purpose.
+        Most settings are extra flags passed to the respective tools. Every tool
+        has a variable of the form .
+        All the tools support  to list the supported
+        parameters.
+      
+
+      
+
+      
+        You may also want to enable GTK-Doc for the distcheck make target. Just
+        add the one line shown in the next example to your top-level
+        Makefile.am:
+      
+
+      
+        Enable GTK-Doc during make distcheck
+          
+
+          
+        
+      
+
+    
+
+    
+      Integration with autogen
+
+      
+        Most projects will have an autogen.sh script to
+        setup the build infrastructure after a checkout from version control
+        system (such as cvs/svn/git). GTK-Doc comes with a tool called
+        gtkdocize which can be used in such a script.
+        It should be run before autoheader, automake or autoconf.
+      
+
+      
+        Running gtkdocize from autogen.sh
+          
+
+          
+        
+      
+
+      
+        When running gtkdocize it copies
+        gtk-doc.make to your project root (or any directory
+        specified by the  option).
+        It also checks you configure script for the GTK_DOC_CHECK
+        invocation. This macro can be used to pass extra parameters to
+        gtkdocize.
+      
+
+      
+        Historically GTK-Doc was generating template files where developers entered the docs.
+        This turned out to be not so good (e.g. the need for having generated
+        files under version control).
+        Since GTK-Doc 1.9 the tools can get all the information from source comments
+        and thus the templates can be avoided. We encourage people to keep
+        documentation in the code. gtkdocize supports now
+        a  option that chooses a makefile that skips
+        tmpl usage totally. Besides adding the option directly to the command
+        invocation, they can be added also to an environment variable called GTKDOCIZE_FLAGS
+        or set as a 2nd parameter in GTK_DOC_CHECK macro in the configure script.
+        If you have never changed file in tmpl by hand and migrating from older gtkdoc versions,
+        please remove the dir (e.g. from version control system).
+      
+    
+
+    
+      Running the doc build
+
+      
+        After the previous steps it's time to run the build. First we need to
+	rerun autogen.sh. If this script runs configure for
+	you, then give it the  option.
+	Otherwise manually run configure with this option
+	afterwards.
+      
+      
+        The first make run generates several additional files in the doc-dirs.
+        The important ones are:
+        <package>.types,
+        <package>-docs.sgml,
+        <package>-sections.txt.
+      
+      
+        Running the doc build
+          
+
+          
+        
+      
+      
+        Now you can point your browser to docs/reference/<package>/index.html.
+	Yes, it's a bit disappointing still. But hang-on, during the next chapter we
+	tell you how to fill the pages with life.
+      
+    
+
+    
+      Integration with version control systems
+
+      
+        As a rule of the thumb, it's those files you edit, that should go under
+        version control. For typical projects it's these files:
+        <package>.types
+        <package>-docs.sgml
+        <package>-sections.txt
+        Makefile.am
+      
+    
+
+  
+
+  
+    Documenting the code
+
+    
+      GTK-Doc uses source code comment with a special syntax for code documentation.
+      Further it retrieves information about your project structure from other
+      sources. During the next section you will find all information about the
+      syntax of the comments.
+    
+
+    
+      Documentation placement
+      
+        In the past most documentation had to be filled into files residing
+	inside the tmpl directory. This has the
+	disadvantages that the information is often not updated and also that
+	the file tend to cause conflicts with version control systems.
+      
+      
+        The avoid the aforementioned problems we suggest putting the
+	documentation inside the sources. This manual will only describe this
+	way of documenting code.
+      
+    
+
+    
+      The scanner can handle the majority of c headers fine. In the case of
+      receiving warnings from the scanner that look like a special case, one can
+      hint GTK-Doc to skip over them.
+      GTK-Doc comment block
+        
+
+        
+      
+    
+
+    
+
+    
+      Documentation comments
+
+      
+        A multiline comment that starts with an additional '*' marks a
+        documentation block that will be processed by the GTK-Doc tools.
+        GTK-Doc comment block
+          
+
+          
+        
+      
+
+      
+        The 'identifier' is one line with the name of the item the comment is
+        related to. The	syntax differs a little depending on the item.
+        (TODO add table showing identifiers)
+      
+
+      
+        The 'documentation' block is also different for each symbol type. Symbol
+        types that get parameters such as functions or macros have the parameter
+        description first followed by a blank line (just a '*').
+        Afterwards follows the detailed description. All lines (outside program-
+        listings and CDATA sections) just containing a ' *' (blank-asterisk) are
+        converted to paragraph breaks.
+        If you don't want a paragraph break, change that into ' *  '
+        (blank-asterisk-blank-blank).
+      
+
+      
+        One advantage of hyper-text over plain-text is the ability to have links
+        in the document. Writing the correct markup for a link can be tedious
+        though. GTK-Doc comes to help by providing several useful abbreviations.
+        
+          
+            
+              Use function() to refer to functions or macros which take arguments.
+            
+          
+          
+            
+              Use @param to refer to parameters. Also use this when referring to
+              parameters of other functions, related to the one being described.
+            
+          
+          
+            
+              Use %constant to refer to a constant, e.g. %G_TRAVERSE_LEAFS.
+            
+          
+          
+            
+              Use #symbol to refer to other types of symbol, e.g. structs and
+              enums and macros which don't take arguments.
+            
+          
+          
+            
+              Use #Object::signal to refer to a GObject signal
+            
+          
+          
+            
+              Use #Object:property to refer to a GObject property
+            
+          
+          
+            
+              Use #Struct.field to refer to a field inside a structure.
+            
+          
+        
+      
+
+      
+	  
+        If you need to use the special characters '<', '>', '()', '@',
+        '%', or '#' in your documentation without GTK-Doc changing them you
+        can use the XML entities "&lt;", "&gt;", "&lpar;",
+        "&rpar;", "&commat;", "&percnt;" and "&num;"
+        respectively or escape them with a backslash '\'.
+	  
+      
+
+      
+        DocBook can do more that just links. One can also have lists, tables and
+        examples. To enable the usage of SGML/XML tags inside doc-comments you
+        need to have  or 
+        in the variable MKDB_OPTIONS inside
+        Makefile.am.
+      
+
+      
+	
+	  As already mentioned earlier GTK-Doc is for documenting public API. Thus
+	  one cannot write documentation for static symbols. Nevertheless it is good
+	  to comment those symbols too. This helps other to understand you code.
+	  Therefore we recommend to comment these using normal comments (without the
+	  2nd '*' in the first line).
+	  If later the function needs to be made public, all one needs to do is to
+	  add another '*' in the comment block and insert the symbol name at the
+	  right place inside the sections file.
+	
+      
+    
+
+    
+      Documenting sections
+
+      
+        Each section of the documentation contains information about one class
+        or module. To introduce the component one can write a section block.
+        The short description is also used inside the table of contents.
+        All the @fields are optional.
+      
+
+      
+        Section comment block
+          
+
+          
+        
+      
+
+      
+        
+          SECTION:<name>
+          
+            
+              The name links the section documentation to the respective part in
+              the <package>-sections.txt file. The
+              name give here should match the <FILE> tag in the
+              <package>-sections.txt file.
+            
+          
+        
+        
+          @short_description
+          
+            
+              A one line description of the section, that later will appear after
+              the links in the TOC and at the top of the section page.
+            
+          
+        
+        
+          @title
+          
+            
+              The section title defaults to <name> from the SECTION
+              declaration. It can be overridden with the @title field.
+            
+          
+        
+        
+          @section_id
+          
+            
+              Overrides the use of title as a section identifier. For GObjects
+              the <title> is used as a section_id and for other sections
+              it is <MODULE>-<title>.
+            
+          
+        
+        
+          @see_also
+          
+            
+              A list of symbols that are related to this section.
+            
+          
+        
+        
+          @stability
+          
+            
+              A informal description of the stability level this API has.
+              We recommend the use of one of these terms:
+              
+                
+                  
+                    Stable
+                    - The intention of a Stable interface is to enable arbitrary
+                    third parties to develop applications to these interfaces,
+                    release them, and have confidence that they will run on all
+                    minor releases of the product (after the one in which the
+                    interface was introduced, and within the same major release).
+                    Even at a major release, incompatible changes are expected
+                    to be rare, and to have strong justifications.
+                  
+                
+                
+                  
+                    Unstable
+                    - Unstable interfaces are experimental or transitional.
+                    They are typically used to give outside developers early
+                    access to new or rapidly changing technology, or to provide
+                    an interim solution to a problem where a more general
+                    solution is anticipated.
+                    No claims are made about either source or binary
+                    compatibility from one minor release to the next.
+                  
+                
+                
+                  
+                    Private
+                    - An interface that can be used within the GNOME stack
+                    itself, but that is not documented for end-users. Such
+                    functions should only be used in specified and documented
+                    ways.
+                  
+                
+                
+                  
+                    Internal
+                    - An interface that is internal to a module and does not
+                    require end-user documentation. Functions that are
+                    undocumented are assumed to be Internal.
+                  
+                
+              
+            
+          
+        
+        
+          @include
+          
+            
+              The #include files to show in the section
+              synopsis (a comma separated list), overriding the global
+              value from the section
+              file or command line.  This item is optional.
+            
+          
+        
+        
+          @image
+          
+            
+              The image to display at the top of the reference page for this
+              section.  This will often be some sort of a diagram to illustrate
+              the visual appearance of a class or a diagram of its relationship
+              to other classes.  This item is optional.
+            
+          
+        
+      
+
+      
+        
+          To avoid unnecessary recompilation after doc-changes put the section
+          docs into the c-source where possible.
+        
+      
+
+    
+
+    
+      Documenting symbols
+
+      
+        Each symbol (function, macro, struct, enum, signal and property) is
+        documented in a separate block. The block is best placed close to the
+        definition of the symbols so that it is easy to keep them in sync.
+        Thus functions are usually documented in the c-source and macros,
+        structs and enums in the header file.
+      
+
+      General tags
+
+        
+          You can add versioning information to all documentation elements to tell
+          when an api was introduced, or when it was deprecated.
+        
+
+        Versioning Tags
+          Since:
+            
+              
+                Description since which version of the code the API is available.
+              
+            
+          
+          Deprecated:
+            
+              
+                Paragraph denoting that this function should no be used anymore.
+                The description should point the reader to the new API.
+              
+            
+          
+        
+
+          
+            (FIXME : Stability information)
+          
+
+        General tags
+          
+
+          
+        
+      
+
+      Function comment block
+
+        
+          Please remember to:
+          
+            
+              
+                Document whether returned objects, lists, strings, etc, should be
+                freed/unrefed/released.
+              
+            
+            
+              
+                Document whether parameters can be NULL, and what happens if they are.
+              
+            
+            
+              
+                Mention interesting pre-conditions and post-conditions where appropriate.
+              
+            
+          
+        
+
+        
+          Gtk-doc assumes all symbols (macros, functions) starting with '_' are
+          private. They are treated like static functions.
+        
+
+        
+          
+          Also, take a look at gobject introspection annotation tags:
+          http://live.gnome.org/GObjectIntrospection/Annotations
+        
+
+        Function comment block
+          
+
+          
+        
+
+        Function tags
+          Returns:
+            
+              
+                Paragraph describing the returned result.
+              
+            
+          
+          @...:
+            
+              
+                In case the function has variadic arguments, you should use this
+                tag (@Varargs: does also work for historic reasons).
+              
+            
+          
+        
+
+      
+
+      Property comment block
+
+        Property comment block
+          
+
+          
+        
+
+      
+
+      Signal comment block
+
+        
+          Please remember to:
+          
+            
+              
+                Document when the signal is emitted and whether it is emitted before
+                or after other signals.
+              
+            
+            
+              
+                Document what an application might do in the signal handler.
+              
+            
+          
+        
+
+        Signal comment block
+          
+
+          
+        
+
+      
+
+      Struct comment block
+        Struct comment block
+          
+*/
+  GtkWidget parent;
+
+  /*< public >*/
+  gboolean bar;
+} FooWidget;
+]]>
+          
+        
+
+        
+          Use /*< private >*/ before the private struct fields
+          you want to hide. Use /*< public >*/ for the reverse
+          behaviour.
+        
+
+        
+          Struct comment blocks can also be used for GObjects and GObjectClasses.
+          It is usualy a good idea to add a comment blco for a class, if it has
+          vmethods (as this is how they can be documented). For the GObject
+          itself one can use the related section docs, having a separate block
+          for the instance struct would be useful if the instance has public
+          fields. One disadvantage here is that this creates two index entries
+          of the same name (the structure and the section).
+        
+
+      
+
+      Enum comment block
+        Enum comment block
+          
+*/
+  SOMETHING_COUNT
+} Something;
+]]>
+          
+        
+
+        
+          Use /*< private >*/ before the private enum values
+          you want to hide. Use /*< public >*/ for the reverse
+          behaviour.
+        
+
+      
+    
+
+    
+      Useful DocBook tags
+
+      
+        Here are some DocBook tags which are most useful when documenting the
+        code.
+      
+
+      
+        To link to another section in the GTK docs:
+
+        
+          
+Hash Tables
+]]>
+          
+        
+        The linkend is the SGML/XML id on the top item of the page you want to link to.
+        For most pages this is currently the part ("gtk", "gdk", "glib") and then
+        the page title ("Hash Tables"). For widgets it is just the class name.
+        Spaces and underscores are converted to '-' to conform to SGML/XML.
+      
+
+      
+        To refer to an external function, e.g. a standard C function:
+        
+          
+...
+]]>
+          
+        
+      
+
+      
+        To include example code:
+        
+          
+
+  Using a GHashTable.
+  
+      ...
+  
+
+]]>
+          
+        
+        or possibly this, for very short code fragments which don't need a title:
+        
+          
+
+  
+  ...
+  
+
+]]>
+          
+        
+        For the latter GTK-Doc also supports an abbreviation:
+
+      
+
+      
+        To include bulleted lists:
+        
+          
+
+  
+    
+      ...
+    
+  
+  
+    
+      ...
+    
+  
+
+]]>
+          
+        
+      
+
+      
+        To include a note which stands out from the text:
+        
+          
+
+  
+    Make sure you free the data after use.
+  
+
+]]>
+          
+        
+      
+
+      
+        To refer to a type:
+        
+          
+unsigned char
+]]>
+          
+        
+      
+
+      
+        To refer to an external structure (not one described in the GTK docs):
+        
+          
+XFontStruct
+]]>
+          
+        
+      
+
+      
+        To refer to a field of a structure:
+        
+          
+len
+]]>
+          
+        
+      
+
+      
+        To refer to a class name, we could possibly use:
+        
+          
+GtkWidget
+]]>
+          
+        
+        but you'll probably be using #GtkWidget instead (to automatically create
+        a link to the GtkWidget page - see the abbreviations).
+      
+
+      
+        To emphasize text:
+        
+          
+This is important
+]]>
+          
+        
+      
+
+      
+        For filenames use:
+        
+          
+/home/user/documents
+]]>
+          
+        
+      
+
+      
+        To refer to keys use:
+        
+          
+ControlL
+]]>
+          
+        
+      
+
+    
+  
+
+  
+    Filling the extra files
+
+    
+      There are a couple of extra files, that need to be maintained along with
+      the inline source code comments:
+      <package>.types,
+      <package>-docs.sgml,
+      <package>-sections.txt.
+    
+
+    
+      Editing the types file
+
+      
+        If your library or application includes GtkObjects/GObjects, you want
+        their signals, arguments/parameters and position in the hierarchy to be
+        shown in the documentation. All you need to do, is to list the
+        xxx_get_type functions together with their include
+        inside the <package>.types file.
+      
+
+      
+        Example types file snippet
+          
+
+
+gtk_accel_label_get_type
+gtk_adjustment_get_type
+gtk_alignment_get_type
+gtk_arrow_get_type
+]]>
+          
+        
+      
+
+      
+        Since GTK-Doc 1.8 gtkdoc-scan can generate this list for you.
+        Just add "--rebuild-types" to SCAN_OPTIONS in Makefile.am. If you
+        use this approach you should not dist the types file nor have it under version control.
+      
+
+    
+
+    
+      Editing the master document
+
+      
+        GTK-Doc produces documentation in DocBook SGML/XML. When processing the
+        inline source comments, the GTK-Doc tools generate one documentation
+        page per class or module as a separate file. The master document
+        includes them and place them in an order.
+      
+
+      
+        While GTK-Doc creates a template master document for you, later run will
+        not touch it again. This means that one can freely structure the
+        documentation. That includes grouping pages and adding extra pages.
+        GTK-Doc has now a test suite, where also the master-document is recreated from scratch.
+        Its a good idea to look at this from time to time to see if there are some new goodies
+        introduced there.
+      
+
+      
+        
+          Do not create tutorials as extra documents. Just write extra chapters.
+          The benefit of directly embedding the tutorial for your library into
+          the API documentation is that it is easy to link for the tutorial to
+          symbol documentation. Apart chances are higher that the tutorial gets
+          updates along with the library.
+        
+      
+
+      
+        So what are the things to change inside the master document? For a start
+        is only a little. There are some placeholders (text in square brackets)
+        there which you should take care of.
+      
+
+      
+        Master document header
+          
+
+  MODULENAME Reference Manual
+  
+    for MODULENAME [VERSION]
+    The latest version of this documentation can be found on-line at
+    http://[SERVER]/MODULENAME/.
+  
+
+
+
+  [Insert title here]
+]]>
+          
+        
+      
+
+    
+
+    
+      Editing the section file
+
+      
+        The section file is used to organise the documentation output by
+        GTK-Doc. Here one specifies which symbol belongs to which module or
+        class and control the visibility (public or private).
+      
+
+      
+        The section file is a plain test file with xml like syntax (using tags).
+        Blank lines are ignored and lines starting with a '#' are treated as
+        comment lines.
+      
+
+      
+        The <FILE> ... </FILE> tag is used to specify the file name,
+        without any suffix. For example, using '<FILE>gnome-config</FILE>'
+        will result in the section declarations being output in the template
+        file tmpl/gnome-config.sgml, which will be
+        converted into the DocBook SGML/XML file sgml/gnome-config.sgml
+        or .DocBook XML file xml/gnome-config.xml.
+        (The name of the html file is based on the module name and the section
+        title, or for gobjects it is based on the gobjects class name converted
+        to lower case).
+      
+
+      
+        The <TITLE> ... </TITLE> tag is used to specify the title of
+        the section. It is only useful before the templates (if used) are
+        initially created, since the title set in the template file overrides
+        this. Also if one uses SECTION comment in the sources, this is obsolete.
+      
+
+      
+        You can group items in the section by using the <SUBSECTION> tag.
+        Currently it outputs a blank line between subsections in the synopsis
+        section.
+        You can also use <SUBSECTION Standard> for standard GObject
+        declarations (e.g. the functions like g_object_get_type and macros like
+        G_OBJECT(), G_IS_OBJECT() etc.).
+        Currently these are left out of the documentation.
+        You can also use <SUBSECTION Private> for private declarations
+        which will not be output (It is a handy way to avoid warning messages
+        about unused declarations.).
+        If your library contains private types which you don't want to appear in
+        the object hierarchy and the list of implemented or required interfaces,
+        add them to a Private subsection.
+        Wheter you would place GObject and GObjectClass like structs in public
+        or Standard section depends if they have public entries (variables,
+        vmethods).
+      
+
+      
+        You can also use <INCLUDE> ... </INCLUDE> to specify the
+        #include files which are shown in the synopsis sections.
+        It contains a comma-separate list of #include files, without the angle
+        brackets. If you set it outside of any sections, it acts for all
+        sections until the end of the file. If you set it within a section, it
+        only applies to that section.
+      
+
+    
+
+  
+
+  
+    Controlling the result
+
+    
+      A GTK-Doc run generates report files inside the documentation directory.
+      The generated files are named:
+      <package>-undocumented.txt,
+      <package>-undeclared.txt and
+      <package>-unused.txt.
+      All those are plain text files that can be viewed and postprocessed easily.
+    
+
+    
+      The <package>-undocumented.txt file starts with
+      the documentation coverage summary. Below are two sections divided by
+      blank lines. The first section lists undocumented or incomplete symbols.
+      The second section does the same for section docs. Incomplete entries are
+      those, which have documentation, but where e.g. a new parameter has been
+      added.
+    
+
+    
+      The <package>-undeclared.txt file lists symbols
+      given in the <package>-sections.txt but not
+      found in the sources. Check if they have been removed or if they are
+      misspelled.
+    
+
+    
+      The <package>-unused.txt file lists symbol
+      names, where the GTK-Doc scanner has found documentation, but does not
+      know where to put it. This means that the symbol has not yet been added to
+      the <package>-sections.txt file.
+    
+
+    
+      
+        Enable or add the  line in Makefile.am.
+        If at least GTK-Doc 1.9 is installed, this will run sanity checks during
+        make check run.
+      
+    
+
+    
+      One can also look at the files produced by the source code scanner:
+      <package>-decl-list.txt and
+      <package>-decl.txt. The first one can be
+      compared with the section file if that is manualy maintained. The second
+      lists all declarations fromt he headers If a symbol is missing one could
+      check if this file contains it.
+    
+
+    
+      If the project is GObject based, one can also look into the files produced
+      by the object scanner:
+      <package>.args.txt,
+      <package>.hierarchy.txt,
+      <package>.interfaces.txt,
+      <package>.prerequisites.txt and
+      <package>.signals.txt. If there are missing
+      symbols in any of those, one can ask gtkdoc to keep the intermedia scanner
+      file for further analysis, but running it as
+      GTK_DOC_KEEP_INTERMEDIATE=1 make.
+    
+  
+
+  
+    Documenting other interfaces
+
+    
+      So far we have been using GTK-Doc to document the API of code. The next
+      sections contain suggestions how the tools can be used to document other
+      interfaces too.
+    
+
+    
+      Commandline options and man pages
+
+      
+        As one can generate man pages for a docbook refentry as well, it sounds
+        like a good idea to use it for that purpose. This way the interface is
+        part of the reference and one gets the man-page for free.
+      
+
+      
+        Document the tool
+
+        
+          Create one refentry file per tool. Following
+          our example we would call it
+          meep/docs/reference/meeper/meep.xml. For the xml
+          tags that should be used and can look at generated file in the xml
+          subdirectory as well as examples e.g. in glib.
+        
+      
+
+      
+        Adding the extra configure check
+
+        
+          Extra configure checks
+            
+
+            
+          
+        
+      
+
+      
+        Adding the extra makefile rules
+
+        
+          Extra configure checks
+            
+
+            
+          
+        
+      
+    
+
+    
+      DBus interfaces
+
+      
+        (FIXME: http://hal.freedesktop.org/docs/DeviceKit/DeviceKit.html,
+http://cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus)
+      
+    
+
+  
+
+  
+    Frequently asked questions
+
+    
+      
+      Vprašanje
+      Odgovor
+      
+        No class hierarchy.
+        
+          The objects xxx_get_type() function has not been
+          entered into the <package>.types file.
+        
+      
+      
+        Still no class hierarchy.
+        
+          Missing or wrong naming in <package>-sections.txt
+          file (see pojasnilo).
+        
+      
+      
+        Damn, I have still no class hierarchy.
+        
+          Is the object name (name of the instance struct, e.g. Gradnik Gtk)
+          part of the normal section (don't put this into Standard or Private
+          subsections).
+        
+      
+      
+        No symbol index.
+        
+          Does the <package>-docs.{xml,sgml} contain a
+          index that xi:includes the generated index?
+        
+      
+      
+        Symbols are not linked to their doc-section.
+        
+          Is the doc-comment using the correct markup (added #,% or ())?
+          Check if the gtkdoc-fixxref warns about unresolvable xrefs.
+        
+      
+      
+        A new class does not appear in the docs.
+        
+          Is the new page xi:included from
+          <package>-docs.{xml,sgml}.
+        
+      
+      
+        A new symbol does not appear in the docs.
+        
+          Is the doc-comment properly formatted. Check for spelling mistakes in
+          the begin of the comment. Check if the gtkdoc-fixxref warns about
+          unresolvable xrefs. Check if the symbol is correctly listed in the
+          <package>-sections.txt in a public subsection.
+        
+      
+      
+        A type is missing from the class hierarchy.
+        
+          If the type is listed in <package>.hierarchy
+          but not in xml/tree_index.sgml then double check
+          that the type is correctly placed in the <package>-sections.txt.
+          If the type instance (e.g. Gradnik Gtk) is not listed or
+          incidentialy makred private it will not be shown.
+        
+      
+      
+        I get foldoc links for all gobject annotations.
+        
+          Check that xml/annotation-glossary.xml is
+          xi:included from <package>-docs.{xml,sgml}.
+        
+      
+
+      
+      
+        Parameter described in source code comment block but does not exist
+        Check if the prototype in the header has different parameter names as in the source.
+      
+
+      
+      
+        multiple "IDs" for constraint linkend: XYZ
+        Symbol XYZ appears twice in <package>-sections.txt file.
+      
+      
+        Element typename in namespace '' encountered in para, but no template matches.
+        
+      
+    
+  
+
+  
+    Tools related to gtk-doc
+
+    
+      GtkDocPlugin - a Trac GTK-Doc
+      integration plugin, that adds api docs to a trac site and integrates with
+      the trac search.
+    
+    
+      Gtkdoc-depscan - a tool (part of gtk-doc) to check used API against since
+      tags in the api to determine the minimum required version.
+    
+
+  
+
+  
+  
+
+
+  
+    
+      Version 1.1, March 2000
+    
+    
+      2000Free Software Foundation, Inc.
+    
+    
+      
+	
Free Software Foundation, Inc. 51 Franklin Street, 
+        Suite 330, Boston, MA  
+        02110-1301  USA
 
+	Everyone is permitted to copy and distribute verbatim copies of this 
+        license document, but changing it is not allowed.
+      
+    
+  
+  GNU Free Documentation License
+
+  
+    0. PREAMBLE
+    
+      The purpose of this License is to make a manual, textbook, or
+      other written document free in the sense of
+      freedom: to assure everyone the effective freedom to copy and
+      redistribute it, with or without modifying it, either
+      commercially or noncommercially. Secondarily, this License
+      preserves for the author and publisher a way to get credit for
+      their work, while not being considered responsible for
+      modifications made by others.
+    
+    
+    
+      This License is a kind of copyleft, which means
+      that derivative works of the document must themselves be free in
+      the same sense. It complements the GNU General Public License,
+      which is a copyleft license designed for free software.
+    
+    
+    
+      We have designed this License in order to use it for manuals for
+      free software, because free software needs free documentation: a
+      free program should come with manuals providing the same
+      freedoms that the software does. But this License is not limited
+      to software manuals; it can be used for any textual work,
+      regardless of subject matter or whether it is published as a
+      printed book. We recommend this License principally for works
+      whose purpose is instruction or reference.
+    
+  
+  
+    1. APPLICABILITY AND DEFINITIONS
+    
+      This License applies to any manual or other work that contains a
+      notice placed by the copyright holder saying it can be
+      distributed under the terms of this License. The
+      Document, below, refers to any such manual or
+      work. Any member of the public is a licensee, and is addressed
+      as you.
+    
+    
+    
+      A Modified Version of the Document means any work
+      containing the Document or a portion of it, either copied
+      verbatim, or with modifications and/or translated into another
+      language.
+    
+	
+    
+      A Secondary Section is a named appendix or a
+      front-matter section of the Document that deals exclusively
+      with the relationship of the publishers or authors of the
+      Document to the Document's overall subject (or to related
+      matters) and contains nothing that could fall directly within
+      that overall subject. (For example, if the Document is in part a
+      textbook of mathematics, a Secondary Section may not explain any
+      mathematics.)  The relationship could be a matter of historical
+      connection with the subject or with related matters, or of
+      legal, commercial, philosophical, ethical or political position
+      regarding them.
+    
+
+    
+      The Invariant Sections are certain  Secondary Sections whose titles
+      are designated, as being those of Invariant Sections, in the
+      notice that says that the Document is released under this
+      License.
+    
+    
+    
+      The Cover Texts are certain short passages of
+      text that are listed, as Front-Cover Texts or Back-Cover Texts,
+      in the notice that says that the Document is released under this
+      License.
+    
+	
+    
+      A Transparent copy of the  Document means a machine-readable
+      copy, represented in a format whose specification is available
+      to the general public, whose contents can be viewed and edited
+      directly and straightforwardly with generic text editors or (for
+      images composed of pixels) generic paint programs or (for
+      drawings) some widely available drawing editor, and that is
+      suitable for input to text formatters or for automatic
+      translation to a variety of formats suitable for input to text
+      formatters. A copy made in an otherwise Transparent file format
+      whose markup has been designed to thwart or discourage
+      subsequent modification by readers is not Transparent.  A copy
+      that is not Transparent is called
+      Opaque.
+    
+    
+    
+      Examples of suitable formats for Transparent copies include
+      plain ASCII without markup, Texinfo input format, LaTeX input
+      format, SGML or XML using a publicly available DTD, and
+      standard-conforming simple HTML designed for human
+      modification. Opaque formats include PostScript, PDF,
+      proprietary formats that can be read and edited only by
+      proprietary word processors, SGML or XML for which the DTD
+      and/or processing tools are not generally available, and the
+      machine-generated HTML produced by some word processors for
+      output purposes only.
+    
+    
+    
+      The Title Page means, for a printed book, the
+      title page itself, plus such following pages as are needed to
+      hold, legibly, the material this License requires to appear in
+      the title page. For works in formats which do not have any title
+      page as such, Title Page means the text near the
+      most prominent appearance of the work's title, preceding the
+      beginning of the body of the text.
+    
+  
+    
+  
+    2. VERBATIM COPYING
+    
+      You may copy and distribute the Document in any medium, either
+      commercially or noncommercially, provided that this License, the
+      copyright notices, and the license notice saying this License
+      applies to the Document are reproduced in all copies, and that
+      you add no other conditions whatsoever to those of this
+      License. You may not use technical measures to obstruct or
+      control the reading or further copying of the copies you make or
+      distribute. However, you may accept compensation in exchange for
+      copies. If you distribute a large enough number of copies you
+      must also follow the conditions in section 3.
+    
+    
+    
+      You may also lend copies, under the same conditions stated
+      above, and you may publicly display copies.
+    
+    
+    
+  
+    3. COPYING IN QUANTITY
+    
+      If you publish printed copies of the Document numbering more than 100,
+      and the Document's license notice requires Cover Texts, you must enclose
+      the copies in covers that carry, clearly and legibly, all these
+      Cover Texts: Front-Cover Texts on the front cover, and
+      Back-Cover Texts on the back cover. Both covers must also
+      clearly and legibly identify you as the publisher of these
+      copies. The front cover must present the full title with all
+      words of the title equally prominent and visible. You may add
+      other material on the covers in addition. Copying with changes
+      limited to the covers, as long as they preserve the title of the
+      Document and satisfy these
+      conditions, can be treated as verbatim copying in other
+      respects.
+    
+    
+    
+      If the required texts for either cover are too voluminous to fit
+      legibly, you should put the first ones listed (as many as fit
+      reasonably) on the actual cover, and continue the rest onto
+      adjacent pages.
+    
+    
+    
+      If you publish or distribute Opaque copies of the Document numbering more than 100,
+      you must either include a machine-readable Transparent copy along with
+      each Opaque copy, or state in or with each Opaque copy a
+      publicly-accessible computer-network location containing a
+      complete Transparent copy of the Document, free of added
+      material, which the general network-using public has access to
+      download anonymously at no charge using public-standard network
+      protocols. If you use the latter option, you must take
+      reasonably prudent steps, when you begin distribution of Opaque
+      copies in quantity, to ensure that this Transparent copy will
+      remain thus accessible at the stated location until at least one
+      year after the last time you distribute an Opaque copy (directly
+      or through your agents or retailers) of that edition to the
+      public.
+    
+    
+    
+      It is requested, but not required, that you contact the authors
+      of the Document well before
+      redistributing any large number of copies, to give them a chance
+      to provide you with an updated version of the Document.
+    
+    
+    
+  
+    4. MODIFICATIONS
+    
+      You may copy and distribute a Modified Version of the Document under the conditions of
+      sections 2 and 3 above, provided that you release
+      the Modified Version under precisely this License, with the
+      Modified Version filling the role of the Document, thus
+      licensing distribution and modification of the Modified Version
+      to whoever possesses a copy of it. In addition, you must do
+      these things in the Modified Version:
+    
+    
+    
+      
+	
+	  A
+	  
+	    Use in the Title
+	    Page (and on the covers, if any) a title distinct
+	    from that of the Document, and from those of
+	    previous versions (which should, if there were any, be
+	    listed in the History section of the Document). You may
+	    use the same title as a previous version if the original
+	    publisher of that version gives permission.
+	  
+	
+      
+      
+      
+	
+	  B
+	  
+	    List on the Title
+	    Page, as authors, one or more persons or entities
+	    responsible for authorship of the modifications in the
+	    Modified Version,
+	    together with at least five of the principal authors of
+	    the Document (all of
+	    its principal authors, if it has less than five).
+	  
+	
+      
+      
+      
+	
+	  C
+	  
+	    State on the Title
+	    Page the name of the publisher of the Modified Version, as the
+	    publisher.
+	  
+	
+      
+      
+      
+	
+	  D
+	  
+	    Preserve all the copyright notices of the Document.
+	  
+	
+      
+      
+      
+	
+	  E
+	  
+	    Add an appropriate copyright notice for your modifications
+	    adjacent to the other copyright notices.
+	  
+	
+      
+      
+      
+	
+	  F
+	  
+	    Include, immediately after the copyright notices, a
+	    license notice giving the public permission to use the
+	    Modified Version under
+	    the terms of this License, in the form shown in the
+	    Addendum below.
+	  
+	
+      
+      
+      
+	
+	  G
+	  
+	    Preserve in that license notice the full lists of  Invariant Sections and
+	    required Cover
+	    Texts given in the Document's license notice.
+	  
+	
+      
+      
+      
+	
+	  H
+	  
+	    Include an unaltered copy of this License.
+	  
+	
+      
+      
+      
+	
+	  I
+	  
+	    Preserve the section entitled History, and
+	    its title, and add to it an item stating at least the
+	    title, year, new authors, and publisher of the Modified Version as given on
+	    the Title Page.  If
+	    there is no section entitled History in the
+	    Document, create one
+	    stating the title, year, authors, and publisher of the
+	    Document as given on its Title Page, then add an item
+	    describing the Modified Version as stated in the previous
+	    sentence.
+	  
+	
+      
+      
+      
+	
+	  J
+	  
+	    Preserve the network location, if any, given in the Document for public access
+	    to a Transparent
+	    copy of the Document, and likewise the network locations
+	    given in the Document for previous versions it was based
+	    on. These may be placed in the History
+	    section.  You may omit a network location for a work that
+	    was published at least four years before the Document
+	    itself, or if the original publisher of the version it
+	    refers to gives permission.
+	  
+	
+      
+      
+      
+	
+	  K
+	  
+	    In any section entitled Acknowledgements or
+	    Dedications, preserve the section's title,
+	    and preserve in the section all the substance and tone of
+	    each of the contributor acknowledgements and/or
+	    dedications given therein.
+	  
+	
+      
+      
+      
+	
+	  L
+	  
+	    Preserve all the Invariant
+	    Sections of the Document, unaltered in their
+	    text and in their titles.  Section numbers or the
+	    equivalent are not considered part of the section titles.
+	  
+	
+      
+      
+      
+	
+	  M
+	  
+	    Delete any section entitled
+	    Endorsements. Such a section may not be
+	    included in the Modified
+	    Version.
+	  
+	
+      
+      
+      
+	
+	  N
+	  
+	    Do not retitle any existing section as
+	    Endorsements or to conflict in title with
+	    any Invariant
+	    Section.
+	  
+	
+      
+    
+    
+    
+      If the Modified Version
+      includes new front-matter sections or appendices that qualify as
+      Secondary Sections and
+      contain no material copied from the Document, you may at your
+      option designate some or all of these sections as invariant. To
+      do this, add their titles to the list of Invariant Sections in the
+      Modified Version's license notice.  These titles must be
+      distinct from any other section titles.
+    
+    
+    
+      You may add a section entitled Endorsements,
+      provided it contains nothing but endorsements of your Modified Version by various
+      parties--for example, statements of peer review or that the text
+      has been approved by an organization as the authoritative
+      definition of a standard.
+    
+    
+    
+      You may add a passage of up to five words as a Front-Cover Text, and a passage
+      of up to 25 words as a Back-Cover Text, to the end of
+      the list of Cover Texts
+      in the Modified Version.
+      Only one passage of Front-Cover Text and one of Back-Cover Text
+      may be added by (or through arrangements made by) any one
+      entity. If the Document
+      already includes a cover text for the same cover, previously
+      added by you or by arrangement made by the same entity you are
+      acting on behalf of, you may not add another; but you may
+      replace the old one, on explicit permission from the previous
+      publisher that added the old one.
+    
+    
+    
+      The author(s) and publisher(s) of the Document do not by this License
+      give permission to use their names for publicity for or to
+      assert or imply endorsement of any Modified Version .
+    
+  
+    
+  
+    5. COMBINING DOCUMENTS
+    
+      You may combine the Document
+      with other documents released under this License, under the
+      terms defined in section 4
+      above for modified versions, provided that you include in the
+      combination all of the Invariant
+      Sections of all of the original documents, unmodified,
+      and list them all as Invariant Sections of your combined work in
+      its license notice.
+    
+    
+    
+      The combined work need only contain one copy of this License,
+      and multiple identical Invariant
+      Sections may be replaced with a single copy. If there are
+      multiple Invariant Sections with the same name but different
+      contents, make the title of each such section unique by adding
+      at the end of it, in parentheses, the name of the original
+      author or publisher of that section if known, or else a unique
+      number. Make the same adjustment to the section titles in the
+      list of Invariant Sections in the license notice of the combined
+      work.
+    
+    
+    
+      In the combination, you must combine any sections entitled
+      History in the various original documents,
+      forming one section entitled History; likewise
+      combine any sections entitled Acknowledgements,
+      and any sections entitled Dedications.  You must
+      delete all sections entitled Endorsements.
+    
+    
+    
+  
+    6. COLLECTIONS OF DOCUMENTS
+    
+      You may make a collection consisting of the Document and other documents
+      released under this License, and replace the individual copies
+      of this License in the various documents with a single copy that
+      is included in the collection, provided that you follow the
+      rules of this License for verbatim copying of each of the
+      documents in all other respects.
+    
+    
+    
+      You may extract a single document from such a collection, and
+      dispbibute it individually under this License, provided you
+      insert a copy of this License into the extracted document, and
+      follow this License in all other respects regarding verbatim
+      copying of that document.
+    
+    
+    
+  
+    7. AGGREGATION WITH INDEPENDENT WORKS
+    
+      A compilation of the Document or its derivatives with
+      other separate and independent documents or works, in or on a
+      volume of a storage or distribution medium, does not as a whole
+      count as a Modified Version
+      of the Document, provided no compilation copyright is claimed
+      for the compilation.  Such a compilation is called an
+      aggregate, and this License does not apply to the
+      other self-contained works thus compiled with the Document , on
+      account of their being thus compiled, if they are not themselves
+      derivative works of the Document.  If the Cover Text requirement of section 3 is applicable to these
+      copies of the Document, then if the Document is less than one
+      quarter of the entire aggregate, the Document's Cover Texts may
+      be placed on covers that surround only the Document within the
+      aggregate. Otherwise they must appear on covers around the whole
+      aggregate.
+    
+    
+    
+  
+    8. TRANSLATION
+    
+      Translation is considered a kind of modification, so you may
+      distribute translations of the Document under the terms of section 4. Replacing  Invariant Sections with
+      translations requires special permission from their copyright
+      holders, but you may include translations of some or all
+      Invariant Sections in addition to the original versions of these
+      Invariant Sections. You may include a translation of this
+      License provided that you also include the original English
+      version of this License. In case of a disagreement between the
+      translation and the original English version of this License,
+      the original English version will prevail.
+    
+    
+    
+  
+    9. TERMINATION
+    
+      You may not copy, modify, sublicense, or distribute the Document except as expressly
+      provided for under this License. Any other attempt to copy,
+      modify, sublicense or distribute the Document is void, and will
+      automatically terminate your rights under this License. However,
+      parties who have received copies, or rights, from you under this
+      License will not have their licenses terminated so long as such
+      parties remain in full compliance.
+    
+    
+    
+  
+    10. FUTURE REVISIONS OF THIS LICENSE
+    
+      The Free Software
+      Foundation may publish new, revised versions of the GNU
+      Free Documentation License from time to time. Such new versions
+      will be similar in spirit to the present version, but may differ
+      in detail to address new problems or concerns. See http://www.gnu.org/copyleft/.
+    
+    
+    
+      Each version of the License is given a distinguishing version
+      number. If the Document
+      specifies that a particular numbered version of this License
+      or any later version applies to it, you have the
+      option of following the terms and conditions either of that
+      specified version or of any later version that has been
+      published (not as a draft) by the Free Software Foundation. If
+      the Document does not specify a version number of this License,
+      you may choose any version ever published (not as a draft) by
+      the Free Software Foundation.
+    
+  
+
+  
+    Addendum
+    
+      To use this License in a document you have written, include a copy of
+      the License in the document and put the following copyright and
+      license notices just after the title page:
+    
+    
+    

+      
+	Copyright YEAR YOUR NAME.
+      
+      
+	Permission is granted to copy, distribute and/or modify this
+	document under the terms of the GNU Free Documentation
+	License, Version 1.1 or any later version published by the
+	Free Software Foundation; with the Invariant Sections being LIST
+	THEIR TITLES, with the Front-Cover Texts being LIST,
+	and with the Back-Cover
+	Texts being LIST.  A copy of the license is included in
+	the section entitled GNU Free Documentation
+	License.
+      
+    

+      
+    
+      If you have no Invariant
+      Sections, write with no Invariant Sections
+      instead of saying which ones are invariant.  If you have no
+      Front-Cover Texts, write
+      no Front-Cover Texts instead of
+      Front-Cover Texts being LIST; likewise for Back-Cover Texts.
+    
+    
+    
+      If your document contains nontrivial examples of program code,
+      we recommend releasing these examples in parallel under your
+      choice of free software license, such as the  GNU General Public
+      License, to permit their use in free software.
+    
+  
+  
+
+
+
+
+
+
+
+
+
diff -Nru gtk-doc-1.14/help/manual/sl/sl.po gtk-doc-1.17/help/manual/sl/sl.po
--- gtk-doc-1.14/help/manual/sl/sl.po	1970-01-01 00:00:00.000000000 +0000
+++ gtk-doc-1.17/help/manual/sl/sl.po	2011-02-26 12:26:19.000000000 +0000
@@ -0,0 +1,1460 @@
+# Slovenian translation for gtk-doc.
+# Copyright (C) 2010 gtk-doc's COPYRIGHT HOLDER
+# This file is distributed under the same license as the gtk-doc package.
+#
+# FIRST AUTHOR , YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gtk-doc help master\n"
+"POT-Creation-Date: 2010-10-16 21:38+0000\n"
+"PO-Revision-Date: 2010-10-17 21:03+0100\n"
+"Last-Translator: Matej Urbančič \n"
+"Language-Team: Slovenian GNOME Translation Team \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
+"X-Poedit-Language: Slovenian\n"
+"X-Poedit-Country: SLOVENIA\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: C/gtk-doc-manual.xml:12(title)
+msgid "GTK-Doc Manual"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:13(edition)
+#: C/gtk-doc-manual.xml:86(revnumber)
+msgid "1.15"
+msgstr "1.15"
+
+#: C/gtk-doc-manual.xml:14(para)
+msgid "User manual for developers with instructions of GTK-Doc usage."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:17(firstname)
+msgid "Chris"
+msgstr "Chris"
+
+#: C/gtk-doc-manual.xml:18(surname)
+msgid "Lyttle"
+msgstr "Lyttle"
+
+#: C/gtk-doc-manual.xml:21(email)
+msgid "chris@wilddev.net"
+msgstr "chris@wilddev.net"
+
+#: C/gtk-doc-manual.xml:26(firstname)
+msgid "Dan"
+msgstr "Dan"
+
+#: C/gtk-doc-manual.xml:27(surname)
+msgid "Mueth"
+msgstr "Mueth"
+
+#: C/gtk-doc-manual.xml:30(email)
+msgid "d-mueth@uchicago.edu"
+msgstr "d-mueth@uchicago.edu"
+
+#: C/gtk-doc-manual.xml:35(firstname)
+msgid "Stefan"
+msgstr "Stefan"
+
+#: C/gtk-doc-manual.xml:36(surname)
+msgid "Kost"
+msgstr "Kost"
+
+#: C/gtk-doc-manual.xml:39(email)
+msgid "ensonic@users.sf.net"
+msgstr "ensonic@users.sf.net"
+
+#: C/gtk-doc-manual.xml:45(publishername)
+msgid "GTK-Doc project"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:46(email)
+msgid "gtk-doc-list@gnome.org"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:49(year)
+msgid "2000, 2005, 2007-2009"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:50(holder)
+msgid "Dan Mueth and Chris Lyttle and Stefan Kost"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:61(para)
+msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:69(para)
+msgid "Many of the names used by companies to distinguish their products and services are claimed as trademarks. Where those names appear in any GNOME documentation, and those trademarks are made aware to the members of the GNOME Documentation Project, the names have been printed in caps or initial caps."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:80(revnumber)
+msgid "1.15.1"
+msgstr "1.15.1"
+
+#: C/gtk-doc-manual.xml:81(date)
+msgid "24 May 2010"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:82(authorinitials)
+#: C/gtk-doc-manual.xml:88(authorinitials)
+#: C/gtk-doc-manual.xml:94(authorinitials)
+#: C/gtk-doc-manual.xml:100(authorinitials)
+#: C/gtk-doc-manual.xml:106(authorinitials)
+msgid "sk"
+msgstr "sk"
+
+#: C/gtk-doc-manual.xml:83(revremark)
+msgid "development version"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:87(date)
+msgid "21 May 2010"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:89(revremark)
+msgid "bug and regression fixes"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:92(revnumber)
+msgid "1.14"
+msgstr "1.14"
+
+#: C/gtk-doc-manual.xml:93(date)
+msgid "28 March 2010"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:95(revremark)
+msgid "bugfixes and performance improvements"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:98(revnumber)
+msgid "1.13"
+msgstr "1.13"
+
+#: C/gtk-doc-manual.xml:99(date)
+#: C/gtk-doc-manual.xml:105(date)
+msgid "18 December 2009"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:101(revremark)
+msgid "broken tarball update"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:104(revnumber)
+msgid "1.12"
+msgstr "1.12"
+
+#: C/gtk-doc-manual.xml:107(revremark)
+msgid "new tool features and bugfixes"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:110(revnumber)
+msgid "1.11"
+msgstr "1.11"
+
+#: C/gtk-doc-manual.xml:111(date)
+msgid "16 Novemebr 2008"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:112(authorinitials)
+msgid "mal"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:113(revremark)
+msgid "GNOME doc-utils migration"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:122(title)
+msgid "Introduction"
+msgstr "Uvod"
+
+#: C/gtk-doc-manual.xml:124(para)
+msgid "This chapter introduces GTK-Doc and gives an overview of what it is and how it is used."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:130(title)
+msgid "What is GTK-Doc?"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:132(para)
+msgid "GTK-Doc is used to document C code. It is typically used to document the public API of libraries, such as the GTK+ and GNOME libraries. But it can also be used to document application code."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:140(title)
+msgid "How Does GTK-Doc Work?"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:142(para)
+msgid "GTK-Doc works by using documentation of functions placed inside the source files in specially-formatted comment blocks, or documentation added to the template files which GTK-Doc uses (though note that GTK-Doc will only document functions that are declared in header files; it won't produce output for static functions)."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:149(para)
+msgid "GTK-Doc consists of a number of perl scripts, each performing a different step in the process."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:154(para)
+msgid "There are 5 main steps in the process:"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:161(para)
+msgid "Writing the documentation. The author fills in the source files with the documentation for each function, macro, union etc. (In the past information was entered in generated template files, which is not recommended anymore)."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:171(para)
+msgid "Gathering information about the code.gtkdoc-scan scans the header files of the code looking for declarations of functions, macros, enums, structs, and unions. It creates the file <module>-decl-list.txt containg a list of the declarations, placing them into sections according to which header file they are in. On the first run this file is copied to <module>-sections.txt. The author can rearrange the sections, and the order of the declarations within them, to produce the final desired order. The second file it generates is <module>-decl.txt. This file contains the full declarations found by the scanner. If for some reason one would like some symbols to show up in the docs, where the full declaration cannot be found by the scanner or the declaration should appear differently, one can place enties similar to the ones in <module>-decl.txt into <module>-overrides.txt. gtkdoc-scanobj can also be used to dynamically query a library about any GtkObject subclasses it exports. It saves information about each object's position in the class hierarchy and about any GTK Args and Signals it provides."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:196(para)
+msgid "Generating the \"template\" files.gtkdoc-mktmpl creates a number of files in the tmpl/ subdirectory, using the information gathered in the first step. (Note that this can be run repeatedly. It will try to ensure that no documentation is ever lost.)"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:205(para)
+msgid "Since GTK-Doc 1.9 the templates can be avoided. We encourage people to keep documentation in the code. gtkdocize supports now a  option that chooses a makefile that skips tmpl usage totally. If you have never changed file in tmpl by hand, please remove the dir (e.g. from version control system)."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:217(para)
+msgid "Generating the SGML/XML and HTML/PDF.gtkdoc-mkdb turns the template files into SGML or XML files in the sgml/ or xml/ subdirectory. If the source code contains documentation on functions, using the special comment blocks, it gets merged in here. If there are no tmpl files used it only reads docs from sources and introspection data. We recommend to use Docbook XML."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:228(para)
+msgid "gtkdoc-mkhtml turns the SGML/XML files into HTML files in the html/ subdirectory. Likewise gtkdoc-mkpdf turns the SGML/XML files into a PDF document called <package>.pdf."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:234(para)
+msgid "Files in sgml/ or xml/ and html/ directories are always overwritten. One should never edit them directly."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:242(para)
+msgid "Fixing up cross-references between documents. After installing the HTML files, gtkdoc-fixxref can be run to fix up any cross-references between separate documents. For example, the GTK+ documentation contains many cross-references to types documented in the GLib manual. When creating the source tarball for distribution, gtkdoc-rebase turns all external links into web-links. When installing distributed (pregenerated) docs the same application will try to turn links back to local links (where those docs are installed)."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:260(title)
+msgid "Getting GTK-Doc"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:263(title)
+msgid "Requirements"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:264(para)
+msgid "Perl v5 - the main scripts are in Perl."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:267(para)
+msgid "DocBook DTD v3.0 - This is the DocBook SGML DTD. http://www.ora.com/davenport"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:271(para)
+msgid "Jade v1.1 - This is a DSSSL processor for converting SGML to various formats. http://www.jclark.com/jade"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:275(para)
+msgid "Modular DocBook Stylesheets This is the DSSSL code to convert DocBook to HTML (and a few other formats). It's used together with jade. I've customized the DSSSL code slightly, in gtk-doc.dsl, to colour the program code listings/declarations, and to support global cross-reference indices in the generated HTML. http://nwalsh.com/docbook/dsssl"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:284(para)
+msgid "docbook-to-man - if you want to create man pages from the DocBook. I've customized the 'translation spec' slightly, to capitalise section headings and add the 'GTK Library' title at the top of the pages and the revision date at the bottom. There is a link to this on http://www.ora.com/davenport NOTE: This does not work yet."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:295(title)
+msgid "Installation"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:296(para)
+msgid "There is no standard place where the DocBook Modular Stylesheets are installed."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:299(para)
+msgid "GTK-Doc's configure script searches these 3 directories automatically:"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:302(para)
+msgid " /usr/lib/sgml/stylesheets/nwalsh-modular  (used by RedHat)"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:305(para)
+msgid " /usr/lib/dsssl/stylesheets/docbook  (used by Debian)"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:308(para)
+msgid " /usr/share/sgml/docbkdsl  (used by SuSE)"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:311(para)
+msgid "If you have the stylesheets installed somewhere else, you need to configure GTK-Doc using the option:  --with-dsssl-dir=<PATH_TO_TOPLEVEL_STYLESHEETS_DIR> "
+msgstr ""
+
+#: C/gtk-doc-manual.xml:335(title)
+msgid "About GTK-Doc"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:337(para)
+#: C/gtk-doc-manual.xml:351(para)
+msgid "(FIXME)"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:341(para)
+msgid "(History, authors, web pages, license, future plans, comparison with other similar systems.)"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:349(title)
+msgid "About this Manual"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:355(para)
+msgid "(who it is meant for, where you can get it, license)"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:364(title)
+msgid "Setting up your project"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:366(para)
+msgid "The next sections describe what steps to perform to integrate GTK-Doc into your project. Theses sections assume we work on a project called 'meep'. This project contains a library called 'libmeep' and an end-user app called 'meeper'."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:374(title)
+msgid "Setting up a skeleton documentation"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:376(para)
+msgid "Under your top-level project directory create folders called docs/reference (this way you can also have docs/help for end-user documentation). It is recommended to create another subdirectory with the name of the doc-package. For packages with just one library this step is not necessary."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:385(title)
+msgid "Example directory structure"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:383(para)
+msgid "This can then look as shown below: "
+msgstr ""
+
+#: C/gtk-doc-manual.xml:403(title)
+#: C/gtk-doc-manual.xml:410(title)
+msgid "Integration with autoconf"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:405(para)
+msgid "Very easy! Just add one line to your configure.ac script."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:425(title)
+msgid "Keep gtk-doc optional"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:420(para)
+msgid "This will require all developers to have gtk-doc installed. If it is okay for your project to have optional api-doc build setup, you can solve this as below. Keep it as is, as gtkdocize is looking for GTK_DOC_CHECK at the start of a line. "
+msgstr ""
+
+#: C/gtk-doc-manual.xml:437(para)
+msgid "The first argument is used to check for the gtkdocversion at configure time. The 2nd, optional argument is used by gtkdocize. The GTK_DOC_CHECK macro also adds several configure switches:"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:443(para)
+msgid "--with-html-dir=PATH : path to installed docs"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:444(para)
+msgid "--enable-gtk-doc : use gtk-doc to build documentation [default=no]"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:445(para)
+msgid "--enable-gtk-doc-html : build documentation in html format [default=yes]"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:446(para)
+msgid "--enable-gtk-doc-pdf : build documentation in pdf format [default=no]"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:450(para)
+msgid "GTK-Doc is disabled by default! Remember to pass the option  to the next configure run. Otherwise pregenerated documentation is installed (which makes sense for users but not for developers)."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:458(para)
+msgid "Furthermore it is recommended that you have the following line inside you configure.ac script. This allows gtkdocize to automatically copy the macro definition for GTK_DOC_CHECK to your project."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:466(title)
+msgid "Preparation for gtkdocize"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:477(title)
+msgid "Integration with automake"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:479(para)
+msgid "First copy the Makefile.am from the examples subdirectory of the gtkdoc-sources to your project's API documentation directory ( ./docs/reference/<package>). If you have multiple doc-packages repeat this for each one."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:486(para)
+msgid "The next step is to edit the settings inside the Makefile.am. All the settings have a comment above that describes their purpose. Most settings are extra flags passed to the respective tools. Every tool has a variable of the form . All the tools support  to list the supported parameters."
+msgstr ""
+
+#. FIXME: explain options ?
+#: C/gtk-doc-manual.xml:497(para)
+msgid "You may also want to enable GTK-Doc for the distcheck make target. Just add the one line shown in the next example to your top-level Makefile.am:"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:504(title)
+msgid "Enable GTK-Doc during make distcheck"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:516(title)
+msgid "Integration with autogen"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:518(para)
+msgid "Most projects will have an autogen.sh script to setup the build infrastructure after a checkout from version control system (such as cvs/svn/git). GTK-Doc comes with a tool called gtkdocize which can be used in such a script. It should be run before autoheader, automake or autoconf."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:527(title)
+msgid "Running gtkdocize from autogen.sh"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:536(para)
+msgid "When running gtkdocize it copies gtk-doc.make to your project root (or any directory specified by the  option). It also checks you configure script for the GTK_DOC_CHECK invocation. This macro can be used to pass extra parameters to gtkdocize."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:545(para)
+msgid "Historically GTK-Doc was generating template files where developers entered the docs. This turned out to be not so good (e.g. the need for having generated files under version control). Since GTK-Doc 1.9 the tools can get all the information from source comments and thus the templates can be avoided. We encourage people to keep documentation in the code. gtkdocize supports now a  option that chooses a makefile that skips tmpl usage totally. Besides adding the option directly to the command invocation, they can be added also to an environment variable called GTKDOCIZE_FLAGS or set as a 2nd parameter in GTK_DOC_CHECK macro in the configure script. If you have never changed file in tmpl by hand and migrating from older gtkdoc versions, please remove the dir (e.g. from version control system)."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:562(title)
+#: C/gtk-doc-manual.xml:579(title)
+msgid "Running the doc build"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:564(para)
+msgid "After the previous steps it's time to run the build. First we need to rerun autogen.sh. If this script runs configure for you, then give it the  option. Otherwise manually run configure with this option afterwards."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:571(para)
+msgid "The first make run generates several additional files in the doc-dirs. The important ones are: <package>.types, <package>-docs.sgml, <package>-sections.txt."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:588(para)
+msgid "Now you can point your browser to docs/reference/<package>/index.html. Yes, it's a bit disappointing still. But hang-on, during the next chapter we tell you how to fill the pages with life."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:596(title)
+msgid "Integration with version control systems"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:598(para)
+msgid "As a rule of the thumb, it's those files you edit, that should go under version control. For typical projects it's these files: <package>.types<package>-docs.sgml<package>-sections.txtMakefile.am"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:611(title)
+msgid "Documenting the code"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:613(para)
+msgid "GTK-Doc uses source code comment with a special syntax for code documentation. Further it retrieves information about your project structure from other sources. During the next section you will find all information about the syntax of the comments."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:621(title)
+msgid "Documentation placement"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:622(para)
+msgid "In the past most documentation had to be filled into files residing inside the tmpl directory. This has the disadvantages that the information is often not updated and also that the file tend to cause conflicts with version control systems."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:628(para)
+msgid "The avoid the aforementioned problems we suggest putting the documentation inside the sources. This manual will only describe this way of documenting code."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:639(title)
+#: C/gtk-doc-manual.xml:658(title)
+msgid "GTK-Doc comment block"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:635(para)
+msgid "The scanner can handle the majority of c headers fine. In the case of receiving warnings from the scanner that look like a special case, one can hint GTK-Doc to skip over them. "
+msgstr ""
+
+#: C/gtk-doc-manual.xml:653(title)
+msgid "Documentation comments"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:655(para)
+msgid "A multiline comment that starts with an additional '*' marks a documentation block that will be processed by the GTK-Doc tools. "
+msgstr ""
+
+#: C/gtk-doc-manual.xml:670(para)
+msgid "The 'identifier' is one line with the name of the item the comment is related to. The syntax differs a little depending on the item. (TODO add table showing identifiers)"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:676(para)
+msgid "The 'documentation' block is also different for each symbol type. Symbol types that get parameters such as functions or macros have the parameter description first followed by a blank line (just a '*'). Afterwards follows the detailed description. All lines (outside program- listings and CDATA sections) just containing a ' *' (blank-asterisk) are converted to paragraph breaks. If you don't want a paragraph break, change that into ' * ' (blank-asterisk-blank-blank)."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:693(para)
+msgid "Use function() to refer to functions or macros which take arguments."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:698(para)
+msgid "Use @param to refer to parameters. Also use this when referring to parameters of other functions, related to the one being described."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:704(para)
+msgid "Use %constant to refer to a constant, e.g. %G_TRAVERSE_LEAFS."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:709(para)
+msgid "Use #symbol to refer to other types of symbol, e.g. structs and enums and macros which don't take arguments."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:715(para)
+msgid "Use #Object::signal to refer to a GObject signal"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:720(para)
+msgid "Use #Object:property to refer to a GObject property"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:725(para)
+msgid "Use #Struct.field to refer to a field inside a structure."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:687(para)
+msgid "One advantage of hyper-text over plain-text is the ability to have links in the document. Writing the correct markup for a link can be tedious though. GTK-Doc comes to help by providing several useful abbreviations. "
+msgstr ""
+
+#: C/gtk-doc-manual.xml:733(para)
+msgid "If you need to use the special characters '<', '>', '()', '@', '%', or '#' in your documentation without GTK-Doc changing them you can use the XML entities \"&lt;\", \"&gt;\", \"&lpar;\", \"&rpar;\", \"&commat;\", \"&percnt;\" and \"&num;\" respectively or escape them with a backslash '\\'."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:742(para)
+msgid "DocBook can do more that just links. One can also have lists, tables and examples. To enable the usage of SGML/XML tags inside doc-comments you need to have  or  in the variable MKDB_OPTIONS inside Makefile.am."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:751(para)
+msgid "As already mentioned earlier GTK-Doc is for documenting public API. Thus one cannot write documentation for static symbols. Nevertheless it is good to comment those symbols too. This helps other to understand you code. Therefore we recommend to comment these using normal comments (without the 2nd '*' in the first line). If later the function needs to be made public, all one needs to do is to add another '*' in the comment block and insert the symbol name at the right place inside the sections file."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:765(title)
+msgid "Documenting sections"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:767(para)
+msgid "Each section of the documentation contains information about one class or module. To introduce the component one can write a section block. The short description is also used inside the table of contents. All the @fields are optional."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:775(title)
+msgid "Section comment block"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:797(term)
+msgid "SECTION:<name>"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:799(para)
+msgid "The name links the section documentation to the respective part in the <package>-sections.txt file. The name give here should match the <FILE> tag in the <package>-sections.txt file."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:808(term)
+msgid "@short_description"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:810(para)
+msgid "A one line description of the section, that later will appear after the links in the TOC and at the top of the section page."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:817(term)
+msgid "@title"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:819(para)
+msgid "The section title defaults to <name> from the SECTION declaration. It can be overridden with the @title field."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:826(term)
+msgid "@section_id"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:828(para)
+msgid "Overrides the use of title as a section identifier. For GObjects the <title> is used as a section_id and for other sections it is <MODULE>-<title>."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:836(term)
+msgid "@see_also"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:838(para)
+msgid "A list of symbols that are related to this section."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:844(term)
+msgid "@stability"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:851(para)
+msgid "Stable - The intention of a Stable interface is to enable arbitrary third parties to develop applications to these interfaces, release them, and have confidence that they will run on all minor releases of the product (after the one in which the interface was introduced, and within the same major release). Even at a major release, incompatible changes are expected to be rare, and to have strong justifications."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:863(para)
+msgid "Unstable - Unstable interfaces are experimental or transitional. They are typically used to give outside developers early access to new or rapidly changing technology, or to provide an interim solution to a problem where a more general solution is anticipated. No claims are made about either source or binary compatibility from one minor release to the next."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:875(para)
+msgid "Private - An interface that can be used within the GNOME stack itself, but that is not documented for end-users. Such functions should only be used in specified and documented ways."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:884(para)
+msgid "Internal - An interface that is internal to a module and does not require end-user documentation. Functions that are undocumented are assumed to be Internal."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:846(para)
+msgid "A informal description of the stability level this API has. We recommend the use of one of these terms: "
+msgstr ""
+
+#: C/gtk-doc-manual.xml:896(term)
+msgid "@include"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:898(para)
+msgid "The #include files to show in the section synopsis (a comma separated list), overriding the global value from the section file or command line. This item is optional."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:907(term)
+msgid "@image"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:909(para)
+msgid "The image to display at the top of the reference page for this section. This will often be some sort of a diagram to illustrate the visual appearance of a class or a diagram of its relationship to other classes. This item is optional."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:920(para)
+msgid "To avoid unnecessary recompilation after doc-changes put the section docs into the c-source where possible."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:929(title)
+msgid "Documenting symbols"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:931(para)
+msgid "Each symbol (function, macro, struct, enum, signal and property) is documented in a separate block. The block is best placed close to the definition of the symbols so that it is easy to keep them in sync. Thus functions are usually documented in the c-source and macros, structs and enums in the header file."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:939(title)
+#: C/gtk-doc-manual.xml:968(title)
+msgid "General tags"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:941(para)
+msgid "You can add versioning information to all documentation elements to tell when an api was introduced, or when it was deprecated."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:946(title)
+msgid "Versioning Tags"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:947(term)
+msgid "Since:"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:949(para)
+msgid "Description since which version of the code the API is available."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:954(term)
+msgid "Deprecated:"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:956(para)
+msgid "Paragraph denoting that this function should no be used anymore. The description should point the reader to the new API."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:964(para)
+msgid "(FIXME : Stability information)"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:991(title)
+#: C/gtk-doc-manual.xml:1027(title)
+msgid "Function comment block"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:997(para)
+msgid "Document whether returned objects, lists, strings, etc, should be freed/unrefed/released."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1003(para)
+msgid "Document whether parameters can be NULL, and what happens if they are."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1008(para)
+msgid "Mention interesting pre-conditions and post-conditions where appropriate."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:993(para)
+#: C/gtk-doc-manual.xml:1090(para)
+msgid "Please remember to: "
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1015(para)
+msgid "Gtk-doc assumes all symbols (macros, functions) starting with '_' are private. They are treated like static functions."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1020(para)
+msgid "Also, take a look at gobject introspection annotation tags: http://live.gnome.org/GObjectIntrospection/Annotations"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1051(title)
+msgid "Function tags"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1052(term)
+msgid "Returns:"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1054(para)
+msgid "Paragraph describing the returned result."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1059(term)
+msgid "@...:"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1061(para)
+msgid "In case the function has variadic arguments, you should use this tag (@Varargs: does also work for historic reasons)."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1071(title)
+#: C/gtk-doc-manual.xml:1073(title)
+msgid "Property comment block"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1088(title)
+#: C/gtk-doc-manual.xml:1107(title)
+msgid "Signal comment block"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1094(para)
+msgid "Document when the signal is emitted and whether it is emitted before or after other signals."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1100(para)
+msgid "Document what an application might do in the signal handler."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1127(title)
+#: C/gtk-doc-manual.xml:1128(title)
+msgid "Struct comment block"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1148(para)
+msgid "Use /*< private >*/ before the private struct fields you want to hide. Use /*< public >*/ for the reverse behaviour."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1154(para)
+msgid "Struct comment blocks can also be used for GObjects and GObjectClasses. It is usualy a good idea to add a comment blco for a class, if it has vmethods (as this is how they can be documented). For the GObject itself one can use the related section docs, having a separate block for the instance struct would be useful if the instance has public fields. One disadvantage here is that this creates two index entries of the same name (the structure and the section)."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1166(title)
+#: C/gtk-doc-manual.xml:1167(title)
+msgid "Enum comment block"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1188(para)
+msgid "Use /*< private >*/ before the private enum values you want to hide. Use /*< public >*/ for the reverse behaviour."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1198(title)
+msgid "Useful DocBook tags"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1200(para)
+msgid "Here are some DocBook tags which are most useful when documenting the code."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1205(para)
+msgid "To link to another section in the GTK docs:  The linkend is the SGML/XML id on the top item of the page you want to link to. For most pages this is currently the part (\"gtk\", \"gdk\", \"glib\") and then the page title (\"Hash Tables\"). For widgets it is just the class name. Spaces and underscores are converted to '-' to conform to SGML/XML."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1221(para)
+msgid "To refer to an external function, e.g. a standard C function: "
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1232(para)
+msgid ""
+"To include example code:  or possibly this, for very short code fragments which don't need a title:  For the latter GTK-Doc also supports an abbreviation: "
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1266(para)
+msgid "To include bulleted lists: "
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1288(para)
+msgid "To include a note which stands out from the text: "
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1303(para)
+msgid "To refer to a type: "
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1314(para)
+msgid "To refer to an external structure (not one described in the GTK docs): "
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1325(para)
+msgid "To refer to a field of a structure: "
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1336(para)
+msgid "To refer to a class name, we could possibly use:  but you'll probably be using #GtkWidget instead (to automatically create a link to the GtkWidget page - see the abbreviations)."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1349(para)
+msgid "To emphasize text: "
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1360(para)
+msgid "For filenames use: "
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1371(para)
+msgid "To refer to keys use: "
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1386(title)
+msgid "Filling the extra files"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1388(para)
+msgid "There are a couple of extra files, that need to be maintained along with the inline source code comments: <package>.types, <package>-docs.sgml, <package>-sections.txt."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1397(title)
+msgid "Editing the types file"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1399(para)
+msgid "If your library or application includes GtkObjects/GObjects, you want their signals, arguments/parameters and position in the hierarchy to be shown in the documentation. All you need to do, is to list the xxx_get_type functions together with their include inside the <package>.types file."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1408(title)
+msgid "Example types file snippet"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1422(para)
+msgid "Since GTK-Doc 1.8 gtkdoc-scan can generate this list for you. Just add \"--rebuild-types\" to SCAN_OPTIONS in Makefile.am. If you use this approach you should not dist the types file nor have it under version control."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1431(title)
+msgid "Editing the master document"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1433(para)
+msgid "GTK-Doc produces documentation in DocBook SGML/XML. When processing the inline source comments, the GTK-Doc tools generate one documentation page per class or module as a separate file. The master document includes them and place them in an order."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1440(para)
+msgid "While GTK-Doc creates a template master document for you, later run will not touch it again. This means that one can freely structure the documentation. That includes grouping pages and adding extra pages. GTK-Doc has now a test suite, where also the master-document is recreated from scratch. Its a good idea to look at this from time to time to see if there are some new goodies introduced there."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1450(para)
+msgid "Do not create tutorials as extra documents. Just write extra chapters. The benefit of directly embedding the tutorial for your library into the API documentation is that it is easy to link for the tutorial to symbol documentation. Apart chances are higher that the tutorial gets updates along with the library."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1459(para)
+msgid "So what are the things to change inside the master document? For a start is only a little. There are some placeholders (text in square brackets) there which you should take care of."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1466(title)
+msgid "Master document header"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1488(title)
+msgid "Editing the section file"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1490(para)
+msgid "The section file is used to organise the documentation output by GTK-Doc. Here one specifies which symbol belongs to which module or class and control the visibility (public or private)."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1496(para)
+msgid "The section file is a plain test file with xml like syntax (using tags). Blank lines are ignored and lines starting with a '#' are treated as comment lines."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1502(para)
+msgid "The <FILE> ... </FILE> tag is used to specify the file name, without any suffix. For example, using '<FILE>gnome-config</FILE>' will result in the section declarations being output in the template file tmpl/gnome-config.sgml, which will be converted into the DocBook SGML/XML file sgml/gnome-config.sgml or .DocBook XML file xml/gnome-config.xml. (The name of the html file is based on the module name and the section title, or for gobjects it is based on the gobjects class name converted to lower case)."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1514(para)
+msgid "The <TITLE> ... </TITLE> tag is used to specify the title of the section. It is only useful before the templates (if used) are initially created, since the title set in the template file overrides this. Also if one uses SECTION comment in the sources, this is obsolete."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1521(para)
+msgid "You can group items in the section by using the <SUBSECTION> tag. Currently it outputs a blank line between subsections in the synopsis section. You can also use <SUBSECTION Standard> for standard GObject declarations (e.g. the functions like g_object_get_type and macros like G_OBJECT(), G_IS_OBJECT() etc.). Currently these are left out of the documentation. You can also use <SUBSECTION Private> for private declarations which will not be output (It is a handy way to avoid warning messages about unused declarations.). If your library contains private types which you don't want to appear in the object hierarchy and the list of implemented or required interfaces, add them to a Private subsection. Wheter you would place GObject and GObjectClass like structs in public or Standard section depends if they have public entries (variables, vmethods)."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1540(para)
+msgid "You can also use <INCLUDE> ... </INCLUDE> to specify the #include files which are shown in the synopsis sections. It contains a comma-separate list of #include files, without the angle brackets. If you set it outside of any sections, it acts for all sections until the end of the file. If you set it within a section, it only applies to that section."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1554(title)
+msgid "Controlling the result"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1556(para)
+msgid "A GTK-Doc run generates report files inside the documentation directory. The generated files are named: <package>-undocumented.txt, <package>-undeclared.txt and <package>-unused.txt. All those are plain text files that can be viewed and postprocessed easily."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1565(para)
+msgid "The <package>-undocumented.txt file starts with the documentation coverage summary. Below are two sections divided by blank lines. The first section lists undocumented or incomplete symbols. The second section does the same for section docs. Incomplete entries are those, which have documentation, but where e.g. a new parameter has been added."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1574(para)
+msgid "The <package>-undeclared.txt file lists symbols given in the <package>-sections.txt but not found in the sources. Check if they have been removed or if they are misspelled."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1581(para)
+msgid "The <package>-unused.txt file lists symbol names, where the GTK-Doc scanner has found documentation, but does not know where to put it. This means that the symbol has not yet been added to the <package>-sections.txt file."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1589(para)
+msgid "Enable or add the  line in Makefile.am. If at least GTK-Doc 1.9 is installed, this will run sanity checks during make check run."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1596(para)
+msgid "One can also look at the files produced by the source code scanner: <package>-decl-list.txt and <package>-decl.txt. The first one can be compared with the section file if that is manualy maintained. The second lists all declarations fromt he headers If a symbol is missing one could check if this file contains it."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1605(para)
+msgid "If the project is GObject based, one can also look into the files produced by the object scanner: <package>.args.txt, <package>.hierarchy.txt, <package>.interfaces.txt, <package>.prerequisites.txt and <package>.signals.txt. If there are missing symbols in any of those, one can ask gtkdoc to keep the intermedia scanner file for further analysis, but running it as GTK_DOC_KEEP_INTERMEDIATE=1 make."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1620(title)
+msgid "Documenting other interfaces"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1622(para)
+msgid "So far we have been using GTK-Doc to document the API of code. The next sections contain suggestions how the tools can be used to document other interfaces too."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1629(title)
+msgid "Commandline options and man pages"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1631(para)
+msgid "As one can generate man pages for a docbook refentry as well, it sounds like a good idea to use it for that purpose. This way the interface is part of the reference and one gets the man-page for free."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1638(title)
+msgid "Document the tool"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1640(para)
+msgid "Create one refentry file per tool. Following our example we would call it meep/docs/reference/meeper/meep.xml. For the xml tags that should be used and can look at generated file in the xml subdirectory as well as examples e.g. in glib."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1650(title)
+msgid "Adding the extra configure check"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1653(title)
+#: C/gtk-doc-manual.xml:1673(title)
+msgid "Extra configure checks"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1670(title)
+msgid "Adding the extra makefile rules"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1698(title)
+msgid "DBus interfaces"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1700(para)
+msgid "(FIXME: http://hal.freedesktop.org/docs/DeviceKit/DeviceKit.html, http://cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus)"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1709(title)
+msgid "Frequently asked questions"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1713(segtitle)
+msgid "Question"
+msgstr "Vprašanje"
+
+#: C/gtk-doc-manual.xml:1714(segtitle)
+msgid "Answer"
+msgstr "Odgovor"
+
+#: C/gtk-doc-manual.xml:1716(seg)
+msgid "No class hierarchy."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1718(function)
+msgid "xxx_get_type()"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1719(filename)
+msgid "<package>.types"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1717(seg)
+msgid "The objects  function has not been entered into the  file."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1723(seg)
+msgid "Still no class hierarchy."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1725(filename)
+#: C/gtk-doc-manual.xml:1764(filename)
+#: C/gtk-doc-manual.xml:1772(filename)
+#: C/gtk-doc-manual.xml:1794(filename)
+msgid "<package>-sections.txt"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1726(ulink)
+msgid "explanation"
+msgstr "pojasnilo"
+
+#: C/gtk-doc-manual.xml:1724(seg)
+msgid "Missing or wrong naming in  file (see )."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1730(seg)
+msgid "Damn, I have still no class hierarchy."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1732(type)
+#: C/gtk-doc-manual.xml:1773(type)
+msgid "GtkWidget"
+msgstr "Gradnik Gtk"
+
+#: C/gtk-doc-manual.xml:1731(seg)
+msgid "Is the object name (name of the instance struct, e.g. ) part of the normal section (don't put this into Standard or Private subsections)."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1738(seg)
+msgid "No symbol index."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1740(filename)
+#: C/gtk-doc-manual.xml:1755(filename)
+#: C/gtk-doc-manual.xml:1781(filename)
+msgid "<package>-docs.{xml,sgml}"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1739(seg)
+msgid "Does the  contain a index that xi:includes the generated index?"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1745(seg)
+msgid "Symbols are not linked to their doc-section."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1746(seg)
+msgid "Is the doc-comment using the correct markup (added #,% or ())? Check if the gtkdoc-fixxref warns about unresolvable xrefs."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1752(seg)
+msgid "A new class does not appear in the docs."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1753(seg)
+msgid "Is the new page xi:included from ."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1759(seg)
+msgid "A new symbol does not appear in the docs."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1760(seg)
+msgid "Is the doc-comment properly formatted. Check for spelling mistakes in the begin of the comment. Check if the gtkdoc-fixxref warns about unresolvable xrefs. Check if the symbol is correctly listed in the  in a public subsection."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1768(seg)
+msgid "A type is missing from the class hierarchy."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1770(filename)
+msgid "<package>.hierarchy"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1771(filename)
+msgid "xml/tree_index.sgml"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1769(seg)
+msgid "If the type is listed in  but not in  then double check that the type is correctly placed in the . If the type instance (e.g. ) is not listed or incidentialy makred private it will not be shown."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1778(seg)
+msgid "I get foldoc links for all gobject annotations."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1780(filename)
+msgid "xml/annotation-glossary.xml"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1779(seg)
+msgid "Check that  is xi:included from ."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1787(seg)
+msgid "Parameter described in source code comment block but does not exist"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1788(seg)
+msgid "Check if the prototype in the header has different parameter names as in the source."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1793(seg)
+msgid "multiple \"IDs\" for constraint linkend: XYZ"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1794(seg)
+msgid "Symbol XYZ appears twice in  file."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:1797(seg)
+msgid "Element typename in namespace '' encountered in para, but no template matches."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:12(releaseinfo)
+msgid "Version 1.1, March 2000"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:16(year)
+msgid "2000"
+msgstr "2000"
+
+#: C/gtk-doc-manual.xml:16(holder)
+msgid "Free Software Foundation, Inc."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:19(para)
+msgid "
Free Software Foundation, Inc. 51 Franklin Street, Suite 330, Boston, MA02110-1301USA
 Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:28(title)
+msgid "GNU Free Documentation License"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:31(title)
+msgid "0. PREAMBLE"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:32(para)
+msgid "The purpose of this License is to make a manual, textbook, or other written document free in the sense of freedom: to assure everyone the effective freedom to copy and redistribute it, with or without modifying it, either commercially or noncommercially. Secondarily, this License preserves for the author and publisher a way to get credit for their work, while not being considered responsible for modifications made by others."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:43(para)
+msgid "This License is a kind of copyleft, which means that derivative works of the document must themselves be free in the same sense. It complements the GNU General Public License, which is a copyleft license designed for free software."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:50(para)
+msgid "We have designed this License in order to use it for manuals for free software, because free software needs free documentation: a free program should come with manuals providing the same freedoms that the software does. But this License is not limited to software manuals; it can be used for any textual work, regardless of subject matter or whether it is published as a printed book. We recommend this License principally for works whose purpose is instruction or reference."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:62(title)
+msgid "1. APPLICABILITY AND DEFINITIONS"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:63(para)
+msgid "This License applies to any manual or other work that contains a notice placed by the copyright holder saying it can be distributed under the terms of this License. The Document, below, refers to any such manual or work. Any member of the public is a licensee, and is addressed as you."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:72(para)
+msgid "A Modified Version of the Document means any work containing the Document or a portion of it, either copied verbatim, or with modifications and/or translated into another language."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:79(para)
+msgid "A Secondary Section is a named appendix or a front-matter section of the Document that deals exclusively with the relationship of the publishers or authors of the Document to the Document's overall subject (or to related matters) and contains nothing that could fall directly within that overall subject. (For example, if the Document is in part a textbook of mathematics, a Secondary Section may not explain any mathematics.) The relationship could be a matter of historical connection with the subject or with related matters, or of legal, commercial, philosophical, ethical or political position regarding them."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:94(para)
+msgid "The Invariant Sections are certain  Secondary Sections whose titles are designated, as being those of Invariant Sections, in the notice that says that the Document is released under this License."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:103(para)
+msgid "The Cover Texts are certain short passages of text that are listed, as Front-Cover Texts or Back-Cover Texts, in the notice that says that the Document is released under this License."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:111(para)
+msgid "A Transparent copy of the  Document means a machine-readable copy, represented in a format whose specification is available to the general public, whose contents can be viewed and edited directly and straightforwardly with generic text editors or (for images composed of pixels) generic paint programs or (for drawings) some widely available drawing editor, and that is suitable for input to text formatters or for automatic translation to a variety of formats suitable for input to text formatters. A copy made in an otherwise Transparent file format whose markup has been designed to thwart or discourage subsequent modification by readers is not Transparent. A copy that is not Transparent is called Opaque."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:128(para)
+msgid "Examples of suitable formats for Transparent copies include plain ASCII without markup, Texinfo input format, LaTeX input format, SGML or XML using a publicly available DTD, and standard-conforming simple HTML designed for human modification. Opaque formats include PostScript, PDF, proprietary formats that can be read and edited only by proprietary word processors, SGML or XML for which the DTD and/or processing tools are not generally available, and the machine-generated HTML produced by some word processors for output purposes only."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:141(para)
+msgid "The Title Page means, for a printed book, the title page itself, plus such following pages as are needed to hold, legibly, the material this License requires to appear in the title page. For works in formats which do not have any title page as such, Title Page means the text near the most prominent appearance of the work's title, preceding the beginning of the body of the text."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:153(title)
+msgid "2. VERBATIM COPYING"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:154(para)
+msgid "You may copy and distribute the Document in any medium, either commercially or noncommercially, provided that this License, the copyright notices, and the license notice saying this License applies to the Document are reproduced in all copies, and that you add no other conditions whatsoever to those of this License. You may not use technical measures to obstruct or control the reading or further copying of the copies you make or distribute. However, you may accept compensation in exchange for copies. If you distribute a large enough number of copies you must also follow the conditions in section 3."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:169(para)
+msgid "You may also lend copies, under the same conditions stated above, and you may publicly display copies."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:176(title)
+msgid "3. COPYING IN QUANTITY"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:177(para)
+msgid "If you publish printed copies of the Document numbering more than 100, and the Document's license notice requires Cover Texts, you must enclose the copies in covers that carry, clearly and legibly, all these Cover Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on the back cover. Both covers must also clearly and legibly identify you as the publisher of these copies. The front cover must present the full title with all words of the title equally prominent and visible. You may add other material on the covers in addition. Copying with changes limited to the covers, as long as they preserve the title of the Document and satisfy these conditions, can be treated as verbatim copying in other respects."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:195(para)
+msgid "If the required texts for either cover are too voluminous to fit legibly, you should put the first ones listed (as many as fit reasonably) on the actual cover, and continue the rest onto adjacent pages."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:202(para)
+msgid "If you publish or distribute Opaque copies of the Document numbering more than 100, you must either include a machine-readable Transparent copy along with each Opaque copy, or state in or with each Opaque copy a publicly-accessible computer-network location containing a complete Transparent copy of the Document, free of added material, which the general network-using public has access to download anonymously at no charge using public-standard network protocols. If you use the latter option, you must take reasonably prudent steps, when you begin distribution of Opaque copies in quantity, to ensure that this Transparent copy will remain thus accessible at the stated location until at least one year after the last time you distribute an Opaque copy (directly or through your agents or retailers) of that edition to the public."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:222(para)
+msgid "It is requested, but not required, that you contact the authors of the Document well before redistributing any large number of copies, to give them a chance to provide you with an updated version of the Document."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:231(title)
+msgid "4. MODIFICATIONS"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:232(para)
+msgid "You may copy and distribute a Modified Version of the Document under the conditions of sections 2 and 3 above, provided that you release the Modified Version under precisely this License, with the Modified Version filling the role of the Document, thus licensing distribution and modification of the Modified Version to whoever possesses a copy of it. In addition, you must do these things in the Modified Version:"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:248(title)
+msgid "A"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:249(para)
+msgid "Use in the Title Page (and on the covers, if any) a title distinct from that of the Document, and from those of previous versions (which should, if there were any, be listed in the History section of the Document). You may use the same title as a previous version if the original publisher of that version gives permission."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:264(title)
+msgid "B"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:265(para)
+msgid "List on the Title Page, as authors, one or more persons or entities responsible for authorship of the modifications in the Modified Version, together with at least five of the principal authors of the Document (all of its principal authors, if it has less than five)."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:279(title)
+msgid "C"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:280(para)
+msgid "State on the Title Page the name of the publisher of the Modified Version, as the publisher."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:291(title)
+msgid "D"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:292(para)
+msgid "Preserve all the copyright notices of the Document."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:301(title)
+msgid "E"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:302(para)
+msgid "Add an appropriate copyright notice for your modifications adjacent to the other copyright notices."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:311(title)
+msgid "F"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:312(para)
+msgid "Include, immediately after the copyright notices, a license notice giving the public permission to use the Modified Version under the terms of this License, in the form shown in the Addendum below."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:324(title)
+msgid "G"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:325(para)
+msgid "Preserve in that license notice the full lists of  Invariant Sections and required Cover Texts given in the Document's license notice."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:337(title)
+msgid "H"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:338(para)
+msgid "Include an unaltered copy of this License."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:346(title)
+msgid "I"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:347(para)
+msgid "Preserve the section entitled History, and its title, and add to it an item stating at least the title, year, new authors, and publisher of the Modified Version as given on the Title Page. If there is no section entitled History in the Document, create one stating the title, year, authors, and publisher of the Document as given on its Title Page, then add an item describing the Modified Version as stated in the previous sentence."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:365(title)
+msgid "J"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:366(para)
+msgid "Preserve the network location, if any, given in the Document for public access to a Transparent copy of the Document, and likewise the network locations given in the Document for previous versions it was based on. These may be placed in the History section. You may omit a network location for a work that was published at least four years before the Document itself, or if the original publisher of the version it refers to gives permission."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:383(title)
+msgid "K"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:384(para)
+msgid "In any section entitled Acknowledgements or Dedications, preserve the section's title, and preserve in the section all the substance and tone of each of the contributor acknowledgements and/or dedications given therein."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:396(title)
+msgid "L"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:397(para)
+msgid "Preserve all the Invariant Sections of the Document, unaltered in their text and in their titles. Section numbers or the equivalent are not considered part of the section titles."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:409(title)
+msgid "M"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:410(para)
+msgid "Delete any section entitled Endorsements. Such a section may not be included in the Modified Version."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:421(title)
+msgid "N"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:422(para)
+msgid "Do not retitle any existing section as Endorsements or to conflict in title with any Invariant Section."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:432(para)
+msgid "If the Modified Version includes new front-matter sections or appendices that qualify as Secondary Sections and contain no material copied from the Document, you may at your option designate some or all of these sections as invariant. To do this, add their titles to the list of Invariant Sections in the Modified Version's license notice. These titles must be distinct from any other section titles."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:444(para)
+msgid "You may add a section entitled Endorsements, provided it contains nothing but endorsements of your Modified Version by various parties--for example, statements of peer review or that the text has been approved by an organization as the authoritative definition of a standard."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:453(para)
+msgid "You may add a passage of up to five words as a Front-Cover Text, and a passage of up to 25 words as a Back-Cover Text, to the end of the list of Cover Texts in the Modified Version. Only one passage of Front-Cover Text and one of Back-Cover Text may be added by (or through arrangements made by) any one entity. If the Document already includes a cover text for the same cover, previously added by you or by arrangement made by the same entity you are acting on behalf of, you may not add another; but you may replace the old one, on explicit permission from the previous publisher that added the old one."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:470(para)
+msgid "The author(s) and publisher(s) of the Document do not by this License give permission to use their names for publicity for or to assert or imply endorsement of any Modified Version ."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:480(title)
+msgid "5. COMBINING DOCUMENTS"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:481(para)
+msgid "You may combine the Document with other documents released under this License, under the terms defined in section 4 above for modified versions, provided that you include in the combination all of the Invariant Sections of all of the original documents, unmodified, and list them all as Invariant Sections of your combined work in its license notice."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:492(para)
+msgid "The combined work need only contain one copy of this License, and multiple identical Invariant Sections may be replaced with a single copy. If there are multiple Invariant Sections with the same name but different contents, make the title of each such section unique by adding at the end of it, in parentheses, the name of the original author or publisher of that section if known, or else a unique number. Make the same adjustment to the section titles in the list of Invariant Sections in the license notice of the combined work."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:505(para)
+msgid "In the combination, you must combine any sections entitled History in the various original documents, forming one section entitled History; likewise combine any sections entitled Acknowledgements, and any sections entitled Dedications. You must delete all sections entitled Endorsements."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:516(title)
+msgid "6. COLLECTIONS OF DOCUMENTS"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:517(para)
+msgid "You may make a collection consisting of the Document and other documents released under this License, and replace the individual copies of this License in the various documents with a single copy that is included in the collection, provided that you follow the rules of this License for verbatim copying of each of the documents in all other respects."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:527(para)
+msgid "You may extract a single document from such a collection, and dispbibute it individually under this License, provided you insert a copy of this License into the extracted document, and follow this License in all other respects regarding verbatim copying of that document."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:537(title)
+msgid "7. AGGREGATION WITH INDEPENDENT WORKS"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:538(para)
+msgid "A compilation of the Document or its derivatives with other separate and independent documents or works, in or on a volume of a storage or distribution medium, does not as a whole count as a Modified Version of the Document, provided no compilation copyright is claimed for the compilation. Such a compilation is called an aggregate, and this License does not apply to the other self-contained works thus compiled with the Document , on account of their being thus compiled, if they are not themselves derivative works of the Document. If the Cover Text requirement of section 3 is applicable to these copies of the Document, then if the Document is less than one quarter of the entire aggregate, the Document's Cover Texts may be placed on covers that surround only the Document within the aggregate. Otherwise they must appear on covers around the whole aggregate."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:561(title)
+msgid "8. TRANSLATION"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:562(para)
+msgid "Translation is considered a kind of modification, so you may distribute translations of the Document under the terms of section 4. Replacing  Invariant Sections with translations requires special permission from their copyright holders, but you may include translations of some or all Invariant Sections in addition to the original versions of these Invariant Sections. You may include a translation of this License provided that you also include the original English version of this License. In case of a disagreement between the translation and the original English version of this License, the original English version will prevail."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:580(title)
+msgid "9. TERMINATION"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:581(para)
+msgid "You may not copy, modify, sublicense, or distribute the Document except as expressly provided for under this License. Any other attempt to copy, modify, sublicense or distribute the Document is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:594(title)
+msgid "10. FUTURE REVISIONS OF THIS LICENSE"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:595(para)
+msgid "The Free Software Foundation may publish new, revised versions of the GNU Free Documentation License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. See http://www.gnu.org/copyleft/."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:606(para)
+msgid "Each version of the License is given a distinguishing version number. If the Document specifies that a particular numbered version of this License or any later version applies to it, you have the option of following the terms and conditions either of that specified version or of any later version that has been published (not as a draft) by the Free Software Foundation. If the Document does not specify a version number of this License, you may choose any version ever published (not as a draft) by the Free Software Foundation."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:621(title)
+msgid "Addendum"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:622(para)
+msgid "To use this License in a document you have written, include a copy of the License in the document and put the following copyright and license notices just after the title page:"
+msgstr ""
+
+#: C/gtk-doc-manual.xml:629(para)
+msgid "Copyright YEAR YOUR NAME."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:632(para)
+msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later version published by the Free Software Foundation; with the Invariant Sections being LIST THEIR TITLES, with the Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST. A copy of the license is included in the section entitled GNU Free Documentation License."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:647(para)
+msgid "If you have no Invariant Sections, write with no Invariant Sections instead of saying which ones are invariant. If you have no Front-Cover Texts, write no Front-Cover Texts instead of Front-Cover Texts being LIST; likewise for Back-Cover Texts."
+msgstr ""
+
+#: C/gtk-doc-manual.xml:657(para)
+msgid "If your document contains nontrivial examples of program code, we recommend releasing these examples in parallel under your choice of free software license, such as the  GNU General Public License, to permit their use in free software."
+msgstr ""
+
+#. Put one translator per line, in the form of NAME , YEAR1, YEAR2
+#: C/gtk-doc-manual.xml:0(None)
+msgid "translator-credits"
+msgstr ""
+
diff -Nru gtk-doc-1.14/help/manual/sv/gtk-doc-manual.xml gtk-doc-1.17/help/manual/sv/gtk-doc-manual.xml
--- gtk-doc-1.14/help/manual/sv/gtk-doc-manual.xml	2010-03-28 17:28:00.000000000 +0000
+++ gtk-doc-1.17/help/manual/sv/gtk-doc-manual.xml	2011-02-26 12:26:19.000000000 +0000
@@ -10,7 +10,7 @@
 
   
     Handbok för GTK-Doc
-    1.12
+    1.15
     Användarhandbok för utvecklare med användningsinstruktioner för GTK-Doc.
     
       
@@ -61,9 +61,27 @@
       Tillstånd att kopiera, distribuera och/eller modifiera detta dokument ges under villkoren i GNU Free Documentation License, version 1.1 eller senare, utgivet av Free Software Foundation utan standardavsnitt och omslagstexter.  En kopia av licensen finns inkluderad.
       Flera namn på produkter och tjänster är registrerade varumärken. I de fall dessa namn förekommer i GNOME-dokumentation - och medlemmarna i GNOME-dokumentationsprojektet är medvetna om dessa varumärken - är de skrivna med versaler eller med inledande versal.
     
-    
+
     
       
+        1.17
+        26 Feb 2011
+        sk
+        urgent bug fix update
+      
+      
+        1.16
+        14 Jan 2011
+        sk
+        bugfixes, layout improvements
+      
+      
+        1.15
+        21 May 2010
+        sk
+        bug and regression fixes
+      
+      
         1.14
         28 March 2010
         sk
@@ -150,13 +168,13 @@
             code looking for declarations of functions, macros, enums, structs, and unions.
             It creates the file <module>-decl-list.txt containg a list of the
             declarations, placing them into sections according to which header file they
-            are in. On the first run this file is copied to <module>-sections.txt
+            are in. On the first run this file is copied to <module>-sections.txt.
             The author can rearrange the sections, and the order of the
             declarations within them, to produce the final desired order.
             The second file it generates is <module>-decl.txt.
             This file contains the full declarations found by the scanner. If for
-            some reason one would like some sybols to show up in the docs, where
-            the full declaration cannot be found by th scanner or the declaration
+            some reason one would like some symbols to show up in the docs, where
+            the full declaration cannot be found by the scanner or the declaration
             should appear differently, one can place enties similar to the ones in
             <module>-decl.txt into <module>-overrides.txt.
 
@@ -197,13 +215,14 @@
             or xml/ subdirectory.
             If the source code contains documentation on functions, using the
             special comment blocks, it gets merged in here. If there are no tmpl files used
-            it only reads takes docs from sources and introspection data.
+            it only reads docs from sources and introspection data. We recommend
+            to use Docbook XML.
           
           
             gtkdoc-mkhtml turns the SGML/XML files into HTML
             files in the html/ subdirectory.
             Likewise gtkdoc-mkpdf turns the SGML/XML files into a PDF
-            docuemnt called <package>.pdf.
+            document called <package>.pdf.
           
           
             Files in sgml/ or
@@ -339,7 +358,7 @@
 
     
       The next sections describe what steps to perform to integrate GTK-Doc into
-      your project. Theses section assume we work on a project called 'meep'.
+      your project. Theses sections assume we work on a project called 'meep'.
       This project contains a library called 'libmeep' and
       an end-user app called 'meeper'.
     
@@ -355,7 +374,7 @@
       
 
       
-        This can then look as show below:
+        This can then look as shown below:
         Example directory structure
           
 
         
       
-      
+
+      
+        This will require all developers to have gtk-doc installed. If it is
+        okay for your project to have optional api-doc build setup, you can
+        solve this as below. Keep it as is, as gtkdocize is looking for
+        GTK_DOC_CHECK  at the start of a line.
+        Keep gtk-doc optional
+          
+
+          
+        
+      
+
       
         The first argument is used to check for the gtkdocversion at configure time.
         The 2nd, optional argument is used by gtkdocize.
@@ -441,7 +479,7 @@
       
 
       
-        The next step is to edit the setting inside the Makefile.am.
+        The next step is to edit the settings inside the Makefile.am.
         All the settings have a comment above that describes their purpose.
         Most settings are extra flags passed to the respective tools. Every tool
         has a variable of the form .
@@ -452,8 +490,8 @@
       
 
       
-        You may also want to enable GTK-Doc for the distcheckmake target. Just
-        add then one-liner show in the next example to you top-level
+        You may also want to enable GTK-Doc for the distcheck make target. Just
+        add the one line shown in the next example to your top-level
         Makefile.am:
       
 
@@ -492,21 +530,23 @@
 
       
         When running gtkdocize it copies
-        gtk-doc.make to you project root (or any directory
+        gtk-doc.make to your project root (or any directory
         specified by the  option).
-        If also check you configure script for the GTK_DOC_CHECK
-        invocation.
+        It also checks you configure script for the GTK_DOC_CHECK
+        invocation. This macro can be used to pass extra parameters to
+        gtkdocize.
       
 
       
-        Historically GTK-Doc was gerating template files where developers entered the docs.
-        this turned out to be not so good. Since a few version GTK-Doc could also get all
-        the information from source comments.
-        Since GTK-Doc 1.9 the templates can be avoided. We encourage people to keep
+        Historically GTK-Doc was generating template files where developers entered the docs.
+        This turned out to be not so good (e.g. the need for having generated
+        files under version control).
+        Since GTK-Doc 1.9 the tools can get all the information from source comments
+        and thus the templates can be avoided. We encourage people to keep
         documentation in the code. gtkdocize supports now
         a  option that chooses a makefile that skips
         tmpl usage totally. Besides adding the option directly to the command
-        invocation, they can be added also to a environment variable called GTKDOCIZE_FLAGS
+        invocation, they can be added also to an environment variable called GTKDOCIZE_FLAGS
         or set as a 2nd parameter in GTK_DOC_CHECK macro in the configure script.
         If you have never changed file in tmpl by hand and migrating from older gtkdoc versions,
         please remove the dir (e.g. from version control system).
@@ -568,8 +608,8 @@
     
       GTK-Doc uses source code comment with a special syntax for code documentation.
       Further it retrieves information about your project structure from other
-      sources. During the next section you find all information about the syntax
-      of the comments.
+      sources. During the next section you will find all information about the
+      syntax of the comments.
     
 
     
@@ -587,6 +627,21 @@
       
     
 
+    
+      The scanner can handle the majority of c headers fine. In the case of
+      receiving warnings from the scanner that look like a special case, one can
+      hint GTK-Doc to skip over them.
+      GTK-Doc comment block
+        
+
+        
+      
+    
+
     
 
     
@@ -670,20 +725,21 @@
       
 
       
-	
-          If you need to use the special characters '<', '>', '()', '@',
-          '%', or '#' in your documentation without GTK-Doc changing them you
-          can use the XML entities "&lt;", "&gt;", "&lpar;",
-          "&rpar;", "&commat;", "&percnt;" and "&num;"
-          respectively or escape them with a backslash '\'.
-	
+	  
+        If you need to use the special characters '<', '>', '()', '@',
+        '%', or '#' in your documentation without GTK-Doc changing them you
+        can use the XML entities "&lt;", "&gt;", "&lpar;",
+        "&rpar;", "&commat;", "&percnt;" and "&num;"
+        respectively or escape them with a backslash '\'.
+	  
       
 
       
         DocBook can do more that just links. One can also have lists, tables and
         examples. To enable the usage of SGML/XML tags inside doc-comments you
-        need to have  in the variable
-        MKDB_OPTIONS inside Makefile.am.
+        need to have  or 
+        in the variable MKDB_OPTIONS inside
+        Makefile.am.
       
 
       
@@ -722,7 +778,7 @@
  * @see_also: #MeepSettings
  * @stability: Stable
  * @include: meep/app.h
- * @Image: application.png
+ * @image: application.png
  *
  * The application class handles ...
  */
@@ -738,7 +794,7 @@
             
               The name links the section documentation to the respective part in
               the <package>-sections.txt file. The
-              name give here should match the <FILE> tag in the 
+              name give here should match the <FILE> tag in the
               <package>-sections.txt file.
             
           
@@ -766,8 +822,8 @@
           
             
               Overrides the use of title as a section identifier. For GObjects
-              the <title> is used as a section_id and for other section it
-              is <MODULE>-<title>.
+              the <title> is used as a section_id and for other sections
+              it is <MODULE>-<title>.
             
           
         
@@ -775,7 +831,7 @@
           @see_also
           
             
-              A list of symbols that are related to this section..
+              A list of symbols that are related to this section.
             
           
         
@@ -871,8 +927,8 @@
         Each symbol (function, macro, struct, enum, signal and property) is
         documented in a separate block. The block is best placed close to the
         definition of the symbols so that it is easy to keep them in sync.
-        Thus function are usually documented in the c-source and macros, struct
-        and enum in the header file.
+        Thus functions are usually documented in the c-source and macros,
+        structs and enums in the header file.
       
 
       General tags
@@ -1086,7 +1142,17 @@
         
           Use /*< private >*/ before the private struct fields
           you want to hide. Use /*< public >*/ for the reverse
-          behavirour.
+          behaviour.
+        
+
+        
+          Struct comment blocks can also be used for GObjects and GObjectClasses.
+          It is usualy a good idea to add a comment blco for a class, if it has
+          vmethods (as this is how they can be documented). For the GObject
+          itself one can use the related section docs, having a separate block
+          for the instance struct would be useful if the instance has public
+          fields. One disadvantage here is that this creates two index entries
+          of the same name (the structure and the section).
         
 
       
@@ -1116,7 +1182,7 @@
         
           Use /*< private >*/ before the private enum values
           you want to hide. Use /*< public >*/ for the reverse
-          behavirour.
+          behaviour.
         
 
       
@@ -1362,7 +1428,7 @@
         GTK-Doc produces documentation in DocBook SGML/XML. When processing the
         inline source comments, the GTK-Doc tools generate one documentation
         page per class or module as a separate file. The master document
-        includes them and place them in a order.
+        includes them and place them in an order.
       
 
       
@@ -1460,6 +1526,9 @@
         If your library contains private types which you don't want to appear in
         the object hierarchy and the list of implemented or required interfaces,
         add them to a Private subsection.
+        Wheter you would place GObject and GObjectClass like structs in public
+        or Standard section depends if they have public entries (variables,
+        vmethods).
       
 
       
@@ -1517,11 +1586,11 @@
         make check run.
       
     
-    
+
     
       One can also look at the files produced by the source code scanner:
       <package>-decl-list.txt and
-      <package>-decl.txt. The first and can be
+      <package>-decl.txt. The first one can be
       compared with the section file if that is manualy maintained. The second
       lists all declarations fromt he headers If a symbol is missing one could
       check if this file contains it.
@@ -1536,13 +1605,102 @@
       <package>.prerequisites.txt and
       <package>.signals.txt. If there are missing
       symbols in any of those, one can ask gtkdoc to keep the intermedia scanner
-      file for further analysis, but running it as 
+      file for further analysis, but running it as
       GTK_DOC_KEEP_INTERMEDIATE=1 make.
     
   
 
+  
+    Documenting other interfaces
+
+    
+      So far we have been using GTK-Doc to document the API of code. The next
+      sections contain suggestions how the tools can be used to document other
+      interfaces too.
+    
+
+    
+      Commandline options and man pages
+
+      
+        As one can generate man pages for a docbook refentry as well, it sounds
+        like a good idea to use it for that purpose. This way the interface is
+        part of the reference and one gets the man-page for free.
+      
+
+      
+        Document the tool
+
+        
+          Create one refentry file per tool. Following
+          our example we would call it
+          meep/docs/reference/meeper/meep.xml. For the xml
+          tags that should be used and can look at generated file in the xml
+          subdirectory as well as examples e.g. in glib.
+        
+      
+
+      
+        Adding the extra configure check
+
+        
+          Extra configure checks
+            
+
+            
+          
+        
+      
+
+      
+        Adding the extra makefile rules
+
+        
+          Extra configure checks
+            
+
+            
+          
+        
+      
+    
+
+    
+      DBus interfaces
+
+      
+        (FIXME: http://hal.freedesktop.org/docs/DeviceKit/DeviceKit.html,
+http://cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus)
+      
+    
+
+  
+
   
-    Frågor och svar
+    Frequently asked questions
 
     
       
@@ -1587,7 +1745,7 @@
       
         A new class does not appear in the docs.
         
-          Is the new page xi:included from 
+          Is the new page xi:included from
           <package>-docs.{xml,sgml}.
         
       
@@ -1635,7 +1793,22 @@
       
     
   
-    
+
+  
+    Tools related to gtk-doc
+
+    
+      GtkDocPlugin - a Trac GTK-Doc
+      integration plugin, that adds api docs to a trac site and integrates with
+      the trac search.
+    
+    
+      Gtkdoc-depscan - a tool (part of gtk-doc) to check used API against since
+      tags in the api to determine the minimum required version.
+    
+
+  
+
   
   
 
-      ஜிடிகே டாக் (GTK-Doc) ஐdistcheckmake க்கு இலக்காக்க நீங்கள் விரும்பலாம். அடுத்த உதாரணத்தில் உள்ள ஒரு வரி காட்டலை உங்கள் மேல் மட்ட Makefile.am க்கு சேர்கவும்:
+      
+        You may also want to enable GTK-Doc for the distcheck make target. Just
+        add the one line shown in the next example to your top-level
+        Makefile.am:
+      
 
       
         distcheck போது ஜிடிகே- டாக் ஐ செயலாக்குக
@@ -343,9 +414,29 @@
         
       
 
-       gtkdocize நிரலை இயக்கும்போது  gtk-doc.make ஐ உங்கள் திட்டத்தின் மூலத்திற்கு அல்லது  தேர்வில்  நீங்கள் குறிப்பிடும் அடைவுக்கு பிரதி எடுக்கிறது.   அது   GTK_DOC_CHECK அழைப்புக்கும் உங்கள் அமைப்பு குறுநிரலை சோதிக்கிறது .
+      
+        When running gtkdocize it copies
+        gtk-doc.make to your project root (or any directory
+        specified by the  option).
+        It also checks you configure script for the GTK_DOC_CHECK
+        invocation. This macro can be used to pass extra parameters to
+        gtkdocize.
+      
 
-      முன்னெல்லாம் ஜிடிகே டாக்(GTK-Doc) வார்ப்புரு கோப்புக்களை உருவாக்கிக்கொண்டு இருந்தது. இதில் உருவாக்குவோர் ஆவணங்களை உள்ளிட்டுக்கொண்டு இருந்தனர். இது அவ்வளவு சரியாக வேலை செய்யவில்லை. சில பதிப்புக்களாக ஜிடிகே டாக்(GTK-Doc)  மூலத்தின் விமர்சனங்களிலிருந்து எல்லா தகவல்களையும் பெற் முடிகிறது.  GTK-Doc 1.9 முதல் வார்புருக்களை தவிர்க்கலாம். ஆகவே நாங்கள் மூல குறியாக்கத்தில் ஆவணங்களுக்கு தேவையான  எல்லா தகவல்களையும் வைக்க வேண்டுகிறோம். gtkdocizeஇப்போது ஒரு  தேர்ர்வை ஆதரிக்கிறது. இதனால் மேக்பைல் (makefile) வார்ப்புரு பயனை முற்றும் தவிர்த்துவிடுகிறது. நேரடியாக கட்டளை அழைப்புக்கு இந்த தேர்வை சேர்ப்பதுடன்  GTKDOCIZE_FLAGS எனும் சூழ்நிலை மாறிகளுக்கும் சேர்க்கலாம். அலல்து இரண்டாம் பாராமிட்டராக GTK_DOC_CHECK இல் அமைக்கலாம். நீங்கள் இதுவரை கைமுறையாக  tmpl இல் கோப்பை மாற்றியது இல்லை; பழைய ஜிடாக் பதிப்பிலிருந்து இடம் மாறுகிறீர்கள் எனில் தயை செய்து அந்த அடைவை  நீக்கி விடுங்கள் (எ.கா. வெர்ஷன் கன்ட்ரோல் அமைப்பு).
+      
+        Historically GTK-Doc was generating template files where developers entered the docs.
+        This turned out to be not so good (e.g. the need for having generated
+        files under version control).
+        Since GTK-Doc 1.9 the tools can get all the information from source comments
+        and thus the templates can be avoided. We encourage people to keep
+        documentation in the code. gtkdocize supports now
+        a  option that chooses a makefile that skips
+        tmpl usage totally. Besides adding the option directly to the command
+        invocation, they can be added also to an environment variable called GTKDOCIZE_FLAGS
+        or set as a 2nd parameter in GTK_DOC_CHECK macro in the configure script.
+        If you have never changed file in tmpl by hand and migrating from older gtkdoc versions,
+        please remove the dir (e.g. from version control system).
+      
     
 
     
@@ -377,7 +468,12 @@
   
     குறியாக்கத்தை ஆவணப்படுத்துதல்
 
-    ஜிடிகே டாக்(GTK-Doc) குறீயீட்டை ஆவணமாக்க மூல குறியீட்டின் விமர்சனத்தை சிறப்பு இலக்கணத்துடன் பயன்படுத்துகிறது.  மற்ற மூலங்களிலிருந்தும் அது உங்கள் திட்டத்தின் கட்டுமானத்தை அறிகிறது. அடுத்த தொகுதியில் இந்த விமர்சனன்களின்  சிறப்பு இலக்கணம் குறித்து முழுதும் அறியலாம்.
+    
+      GTK-Doc uses source code comment with a special syntax for code documentation.
+      Further it retrieves information about your project structure from other
+      sources. During the next section you will find all information about the
+      syntax of the comments.
+    
 
     
       ஆவணம் இடுதல்
@@ -385,6 +481,21 @@
       மேற்கூறிய காரணங்களால் நாங்கள் ஆவணங்களை மூலத்துடன் வைக்கு மாறூ சொல்கிறோம். இந்த கையேடு இந்த முறையை மட்டுமே விவாதிக்கும்.
     
 
+    
+      The scanner can handle the majority of c headers fine. In the case of
+      receiving warnings from the scanner that look like a special case, one can
+      hint GTK-Doc to skip over them.
+      ஜிடிகே டாக் விமரிசன தொகுப்பு
+        
+
+        
+      
+    
+
     
 
     
@@ -408,14 +519,15 @@
       ஜிடிகே டாக் 
 
       
-	சிறப்பு குறிகளான  '<', '>', '()', '@', '%', அல்லது '#' ஐ  ஜிடிகே டாக் மாற்றாமல் அப்படியே ஆவணத்தில் பயன்படுத்த அவற்றுக்கான ஹெச்எம்எல் ஐ பயன்படுத்துக: "&lt;", "&gt;", "&lpar;", "&rpar;", "&commat;", "&percnt;" மற்றும் "&num;"  அல்லது பின் சாய்வு கோடால் அவற்றை தனியாக்கலாம்.'\'. 
+	  சிறப்பு குறிகளான  '<', '>', '()', '@', '%', அல்லது '#' ஐ  ஜிடிகே டாக் மாற்றாமல் அப்படியே ஆவணத்தில் பயன்படுத்த அவற்றுக்கான ஹெச்எம்எல் ஐ பயன்படுத்துக: "&lt;", "&gt;", "&lpar;", "&rpar;", "&commat;", "&percnt;" மற்றும் "&num;"  அல்லது பின் சாய்வு கோடால் அவற்றை தனியாக்கலாம்.'\'. 
       
 
       
         DocBook can do more that just links. One can also have lists, tables and
         examples. To enable the usage of SGML/XML tags inside doc-comments you
-        need to have  in the variable
-        MKDB_OPTIONS inside Makefile.am.
+        need to have  or 
+        in the variable MKDB_OPTIONS inside
+        Makefile.am.
       
 
       
@@ -440,7 +552,7 @@
  * @see_also: #MeepSettings
  * @stability: Stable
  * @include: meep/app.h
- * @Image: application.png
+ * @image: application.png
  *
  * The application class handles ...
  */
@@ -471,13 +583,19 @@
         
           @section_id
           
-            தொகுதியை இனம் காண தலைப்பைஉதாசீனப்படுத்தும். GObjects ஆகிய <title> வற்றுக்கு  section_id பயன்படும். ஏனைய தொகுதிகளுக்கு அது <MODULE>-<title>.
+            
+              Overrides the use of title as a section identifier. For GObjects
+              the <title> is used as a section_id and for other sections
+              it is <MODULE>-<title>.
+            
           
         
         
           @see_also
           
-            இந்த தொகுதியுடன் சம்பந்தப்பட்ட சிம்பல் சின்னங்களின் பட்டியல். 
+            
+              A list of symbols that are related to this section.
+            
           
         
         
@@ -557,8 +675,8 @@
         Each symbol (function, macro, struct, enum, signal and property) is
         documented in a separate block. The block is best placed close to the
         definition of the symbols so that it is easy to keep them in sync.
-        Thus function are usually documented in the c-source and macros, struct
-        and enum in the header file.
+        Thus functions are usually documented in the c-source and macros,
+        structs and enums in the header file.
       
 
       பொது டேக் ஒட்டுகள்
@@ -761,7 +879,17 @@
         
           Use /*< private >*/ before the private struct fields
           you want to hide. Use /*< public >*/ for the reverse
-          behavirour.
+          behaviour.
+        
+
+        
+          Struct comment blocks can also be used for GObjects and GObjectClasses.
+          It is usualy a good idea to add a comment blco for a class, if it has
+          vmethods (as this is how they can be documented). For the GObject
+          itself one can use the related section docs, having a separate block
+          for the instance struct would be useful if the instance has public
+          fields. One disadvantage here is that this creates two index entries
+          of the same name (the structure and the section).
         
 
       
@@ -791,7 +919,7 @@
         
           Use /*< private >*/ before the private enum values
           you want to hide. Use /*< public >*/ for the reverse
-          behavirour.
+          behaviour.
         
 
       
@@ -997,7 +1125,12 @@
     
       முதன்மை ஆவணத்தை திருத்துதல்
 
-      ஜிடிகே டாக் ஜிடிகே டாக் 
+      
+        GTK-Doc produces documentation in DocBook SGML/XML. When processing the
+        inline source comments, the GTK-Doc tools generate one documentation
+        page per class or module as a separate file. The master document
+        includes them and place them in an order.
+      
 
       ஜிடிகே டாக் 
 
@@ -1083,6 +1216,9 @@
         If your library contains private types which you don't want to appear in
         the object hierarchy and the list of implemented or required interfaces,
         add them to a Private subsection.
+        Wheter you would place GObject and GObjectClass like structs in public
+        or Standard section depends if they have public entries (variables,
+        vmethods).
       
 
       
@@ -1124,11 +1260,11 @@
     
       ஜிடிகே டாக் 
     
-    
+
     
       One can also look at the files produced by the source code scanner:
       <package>-decl-list.txt and
-      <package>-decl.txt. The first and can be
+      <package>-decl.txt. The first one can be
       compared with the section file if that is manualy maintained. The second
       lists all declarations fromt he headers If a symbol is missing one could
       check if this file contains it.
@@ -1143,13 +1279,102 @@
       <package>.prerequisites.txt and
       <package>.signals.txt. If there are missing
       symbols in any of those, one can ask gtkdoc to keep the intermedia scanner
-      file for further analysis, but running it as 
+      file for further analysis, but running it as
       GTK_DOC_KEEP_INTERMEDIATE=1 make.
     
   
 
+  
+    Documenting other interfaces
+
+    
+      So far we have been using GTK-Doc to document the API of code. The next
+      sections contain suggestions how the tools can be used to document other
+      interfaces too.
+    
+
+    
+      Commandline options and man pages
+
+      
+        As one can generate man pages for a docbook refentry as well, it sounds
+        like a good idea to use it for that purpose. This way the interface is
+        part of the reference and one gets the man-page for free.
+      
+
+      
+        Document the tool
+
+        
+          Create one refentry file per tool. Following
+          our example we would call it
+          meep/docs/reference/meeper/meep.xml. For the xml
+          tags that should be used and can look at generated file in the xml
+          subdirectory as well as examples e.g. in glib.
+        
+      
+
+      
+        Adding the extra configure check
+
+        
+          Extra configure checks
+            
+
+            
+          
+        
+      
+
+      
+        Adding the extra makefile rules
+
+        
+          Extra configure checks
+            
+
+            
+          
+        
+      
+    
+
+    
+      DBus interfaces
+
+      
+        (FIXME: http://hal.freedesktop.org/docs/DeviceKit/DeviceKit.html,
+http://cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus)
+      
+    
+
+  
+
   
-    அடிக்கடி கேட்கும் கேள்விகள்
+    Frequently asked questions
 
     
       
@@ -1188,7 +1413,7 @@
       
         A new class does not appear in the docs.
         
-          Is the new page xi:included from 
+          Is the new page xi:included from
           <package>-docs.{xml,sgml}.
         
       
@@ -1231,12 +1456,27 @@
         Symbol XYZ appears twice in <package>-sections.txt file.
       
       
-        குறி XYZ  இல் இரு முறை காண்கிறது.
+        குறி XYZ இல் இரு முறை காண்கிறது.
         
       
     
   
-    
+
+  
+    Tools related to gtk-doc
+
+    
+      GtkDocPlugin - a Trac GTK-Doc
+      integration plugin, that adds api docs to a trac site and integrates with
+      the trac search.
+    
+    
+      Gtkdoc-depscan - a tool (part of gtk-doc) to check used API against since
+      tags in the api to determine the minimum required version.
+    
+
+  
+
   
   
 
-      మీరు GTK-Docను distcheckmake లక్ష్యము కొరకు చేతనము చేయవచ్చు. జతచేయి అప్పుడు తర్వాత వుదాహరణనందు one-liner మీకు పై-స్థాయి Makefile.amను చూపును:
+      
+        You may also want to enable GTK-Doc for the distcheck make target. Just
+        add the one line shown in the next example to your top-level
+        Makefile.am:
+      
 
       
         distcheck చేయునప్పుడు GTK-Doc చేతనము చేయి
@@ -306,9 +398,29 @@
         
       
 
-      gtkdocize నడుపుచున్నప్పుడు అది gtk-doc.makeను మీ ప్రోజెక్టు root (లేదా  ద్వారా తెలుపబడిన డైరెక్టరీ)కు నకలుతీయును. GTK_DOC_CHECK ఆమంత్రణం కొరకు యిది మీ ఆకృతీకరణ స్క్రిప్టును పరిశీలించును.
+      
+        When running gtkdocize it copies
+        gtk-doc.make to your project root (or any directory
+        specified by the  option).
+        It also checks you configure script for the GTK_DOC_CHECK
+        invocation. This macro can be used to pass extra parameters to
+        gtkdocize.
+      
 
-      చారిత్రకంగా GTK-Doc అనునది మాదిరి ఫైళ్ళను అభివృద్దికారులు పత్రములు ప్రవేశపెట్టినచోట జనియింపచేయుచున్నది. ఇది అంత మంచిగా లేదు. కొద్ది GTK-Docవర్షన్లు మాత్రమే సమాచారమునంతటిని మూలపు వ్యాఖ్యలనుండి పొందగలిగివున్నవి కావున. GTK-Doc 1.9 నుండి మాదిరిలు వదిలివేయబడినవి. పత్రికీకరణనుకోడ్‌నందు కలిగివుంచుటకే మేము అందరిని ప్రోత్సహిస్తున్నాము. tmpl వినియోగాన్ని పూర్తిగా వదిలివేసే  ఐచ్చికాన్ని యిప్పుడు gtkdocize మద్దతించుచున్నది. ఐచ్చికాన్ని నేరుగా ఆదేశ ఆమంత్రీకరణకు జతచేయుటకు బదులుగా, అవి యెన్విరాన్మెంట్ వేరియబుల్‌ GTKDOCIZE_FLAGSకు జతచేయవచ్చును లేదా ఆకృతీకరణ స్క్రిప్టునందలి GTK_DOC_CHECK మాక్రో నందు 2వ పారామితిగా అమర్చుము. మీరు యెప్పుడూ tmpl నందలి ఫైలు మార్చివుండకపోతే మరియు gtkdoc వర్షన్లనుండి మైగ్రేట్ అవుతుంటే, దయచేసి dirను తీసివేయుము (ఉ.దా. వర్షన్ కంట్రోల్ సిస్టమ్ నుండి).
+      
+        Historically GTK-Doc was generating template files where developers entered the docs.
+        This turned out to be not so good (e.g. the need for having generated
+        files under version control).
+        Since GTK-Doc 1.9 the tools can get all the information from source comments
+        and thus the templates can be avoided. We encourage people to keep
+        documentation in the code. gtkdocize supports now
+        a  option that chooses a makefile that skips
+        tmpl usage totally. Besides adding the option directly to the command
+        invocation, they can be added also to an environment variable called GTKDOCIZE_FLAGS
+        or set as a 2nd parameter in GTK_DOC_CHECK macro in the configure script.
+        If you have never changed file in tmpl by hand and migrating from older gtkdoc versions,
+        please remove the dir (e.g. from version control system).
+      
     
 
     
@@ -340,7 +452,12 @@
   
     కోడ్‌ను పత్రికీకరణ చేయుట
 
-    కోడ్ పత్రికీకరణ కొరకు GTK-Doc అనునది సోర్స్ కోడ్ కామెంట్‌ను ప్రత్యేక సిన్టాక్సుతో వుపయోగిస్తుంది. ఇంకా యిది యితర మూలములనుండి మీ ప్రోజెక్టు ఆకృతి గురించి సమాచారమును వెలికితీయును. తరువాతి విభాగమునందు మీరు మీ వ్యాఖ్యల యొక్క సిన్టాక్సు గురించి సమాచారమును అంతటిని కనుగొంటారు.
+    
+      GTK-Doc uses source code comment with a special syntax for code documentation.
+      Further it retrieves information about your project structure from other
+      sources. During the next section you will find all information about the
+      syntax of the comments.
+    
 
     
       పత్రికీకరణ స్థానము
@@ -348,6 +465,21 @@
       ముందుగా తెలిపిన సమస్యలను తప్పించుటకు మేము పత్రికీకరణను మూలముల లోపలే వుంచమని సూచించుచున్నాము. ఈ మాన్యుయల్ ఈ విధంగా కోడ్ పత్రికీకరణను మాత్రమే వివరించును.
     
 
+    
+      The scanner can handle the majority of c headers fine. In the case of
+      receiving warnings from the scanner that look like a special case, one can
+      hint GTK-Doc to skip over them.
+      GTK-Doc వ్యాఖ్య బ్లాక్
+        
+
+        
+      
+    
+
     
 
     
@@ -393,10 +525,16 @@
         
 
       
-	మీరు ప్రత్యేక ఆక్షరములు '<', '>', '()', '@', '%', or '#'ను మీ పత్రికీకరణనందు GTK-Doc వాటిని మార్చకుండా వుపయోగించాలి అంటే మీరు XML మూలకములు "&lt;", "&gt;", "&lpar;", "&rpar;", "&commat;", "&percnt;" మరియు "&num;" వుపయోగించవచ్చు లేదా వాటిని '\' బాక్‌స్లాష్‌తో ఎస్కేప్ చేయుము.
+	  మీరు ప్రత్యేక ఆక్షరములు '<', '>', '()', '@', '%', or '#'ను మీ పత్రికీకరణనందు GTK-Doc వాటిని మార్చకుండా వుపయోగించాలి అంటే మీరు XML మూలకములు "&lt;", "&gt;", "&lpar;", "&rpar;", "&commat;", "&percnt;" మరియు "&num;" వుపయోగించవచ్చు లేదా వాటిని '\' బాక్‌స్లాష్‌తో ఎస్కేప్ చేయుము.
       
 
-      DocBook లింకుల వలె చాలా చేయగలదు. ఒకరు జాబితాలనుకూడా కలిగివుండగలరు, పట్టికలు మరియు వుదాహరణలు కూడా. doc-comments లోపల SGML/XML టాగ్స్ యొక్క వినియోగాన్ని చేతనము చేయుటకు మీరు Makefile.am నందలి MKDB_OPTIONS వేరియబుల్ నందు  కలిగివుండాలి.
+      
+        DocBook can do more that just links. One can also have lists, tables and
+        examples. To enable the usage of SGML/XML tags inside doc-comments you
+        need to have  or 
+        in the variable MKDB_OPTIONS inside
+        Makefile.am.
+      
 
       
 	ముందుగా చెప్పినట్లుగా GTK-Doc అనునది పబ్లిక్ API పత్రికీకరణ కొరకు. స్థిర చిహ్నములకు వొక్కరే పత్రికీకరణ వ్రాయలేరు. ఆ చిహ్నములను కూడా వ్యాఖ్యానించుట మంచిది. ఇది యితరులు కూడా మీ కోడ్‌ను అర్ధము చేసుకొనుటకు సహాయపడును. అందుకని వీటిని సాదారణ వ్యాఖ్యలు (మొదటి వరుసనందు 2వ '*' లేకుండా) వుపయోగించి వ్యాఖ్యానించమని సూచించడమైంది. తరువాత ఆ ఫంక్షన్ పబ్లిక్‌గా మార్చవలసివుంటే, చేయవలసినదల్లా వేరొక '*'ను వ్యాఖ్య బ్లాక్ నందు చేర్చి మరియు చిహ్నపు నామాన్నివిభగాముల ఫైలునందు సరైన స్థానములో వుంచడమే.
@@ -420,7 +558,7 @@
  * @see_also: #MeepSettings
  * @stability: Stable
  * @include: meep/app.h
- * @Image: application.png
+ * @image: application.png
  *
  * The application class handles ...
  */
@@ -451,13 +589,19 @@
         
           @section_id
           
-            శీర్షిక యొక్క వుపయోగాన్ని విభాగపు గుర్తింపుకారి వలె దిద్దివ్రాయును. GObjects కొరకు <title> అనునది section_id వలె మరియు యితర విభాగమునకు <MODULE>-<title> వలె వుపయోగించబడును.
+            
+              Overrides the use of title as a section identifier. For GObjects
+              the <title> is used as a section_id and for other sections
+              it is <MODULE>-<title>.
+            
           
         
         
           @see_also
           
-            ఈ విభాగమునకు సంభందించిన చిహ్నముల యొక్క జాబితా...
+            
+              A list of symbols that are related to this section.
+            
           
         
         
@@ -502,7 +646,13 @@
     
       చిహ్నముల పత్రికీకరణ
 
-      ప్రతి చిహ్నము (function, macro, struct, enum, signal మరియు property) విడివిడి బ్లాక్ నందు పత్రికీకరణ చేయబడినవి. బ్లాక్ అనునది చిహ్నము యొక్క నిర్వచనముకు దగ్గరా వుంచబడినది అలా వాటిని సింక్‌లో వుంచుట సులువు. ఫంక్షన్ సాధారణంగా c-source నందు మరియు macros, stuct మరియు enumలు హెడర్ ఫైలునందు పత్రికీకరణ చేయబడతాయి.
+      
+        Each symbol (function, macro, struct, enum, signal and property) is
+        documented in a separate block. The block is best placed close to the
+        definition of the symbols so that it is easy to keep them in sync.
+        Thus functions are usually documented in the c-source and macros,
+        structs and enums in the header file.
+      
 
       సాధారణ టాగ్లు
 
@@ -672,7 +822,21 @@
           
         
 
-        మీరు మరుగున వుంచాలని అనుకొంటే private struct క్షేత్రముల ముందు /*< private >*/ వుపయోగించు. విలోమ ప్రవర్తన కొరకు /*< public >*/ వుపయోగించు.
+        
+          Use /*< private >*/ before the private struct fields
+          you want to hide. Use /*< public >*/ for the reverse
+          behaviour.
+        
+
+        
+          Struct comment blocks can also be used for GObjects and GObjectClasses.
+          It is usualy a good idea to add a comment blco for a class, if it has
+          vmethods (as this is how they can be documented). For the GObject
+          itself one can use the related section docs, having a separate block
+          for the instance struct would be useful if the instance has public
+          fields. One disadvantage here is that this creates two index entries
+          of the same name (the structure and the section).
+        
 
       
 
@@ -698,7 +862,11 @@
           
         
 
-        మీరు మరుగున వుంచాలని అనుకొంటే private enum విలువుల ముందు /*< private >*/ వుపయోగించు. విలోమ ప్రవర్తన కొరకు /*< public >*/ వుపయోగించు.
+        
+          Use /*< private >*/ before the private enum values
+          you want to hide. Use /*< public >*/ for the reverse
+          behaviour.
+        
 
       
     
@@ -922,7 +1090,7 @@
         GTK-Doc produces documentation in DocBook SGML/XML. When processing the
         inline source comments, the GTK-Doc tools generate one documentation
         page per class or module as a separate file. The master document
-        includes them and place them in a order.
+        includes them and place them in an order.
       
 
       
@@ -1020,6 +1188,9 @@
         If your library contains private types which you don't want to appear in
         the object hierarchy and the list of implemented or required interfaces,
         add them to a Private subsection.
+        Wheter you would place GObject and GObjectClass like structs in public
+        or Standard section depends if they have public entries (variables,
+        vmethods).
       
 
       
@@ -1077,11 +1248,11 @@
         make check run.
       
     
-    
+
     
       One can also look at the files produced by the source code scanner:
       <package>-decl-list.txt and
-      <package>-decl.txt. The first and can be
+      <package>-decl.txt. The first one can be
       compared with the section file if that is manualy maintained. The second
       lists all declarations fromt he headers If a symbol is missing one could
       check if this file contains it.
@@ -1096,13 +1267,102 @@
       <package>.prerequisites.txt and
       <package>.signals.txt. If there are missing
       symbols in any of those, one can ask gtkdoc to keep the intermedia scanner
-      file for further analysis, but running it as 
+      file for further analysis, but running it as
       GTK_DOC_KEEP_INTERMEDIATE=1 make.
     
   
 
+  
+    Documenting other interfaces
+
+    
+      So far we have been using GTK-Doc to document the API of code. The next
+      sections contain suggestions how the tools can be used to document other
+      interfaces too.
+    
+
+    
+      Commandline options and man pages
+
+      
+        As one can generate man pages for a docbook refentry as well, it sounds
+        like a good idea to use it for that purpose. This way the interface is
+        part of the reference and one gets the man-page for free.
+      
+
+      
+        Document the tool
+
+        
+          Create one refentry file per tool. Following
+          our example we would call it
+          meep/docs/reference/meeper/meep.xml. For the xml
+          tags that should be used and can look at generated file in the xml
+          subdirectory as well as examples e.g. in glib.
+        
+      
+
+      
+        Adding the extra configure check
+
+        
+          Extra configure checks
+            
+
+            
+          
+        
+      
+
+      
+        Adding the extra makefile rules
+
+        
+          Extra configure checks
+            
+
+            
+          
+        
+      
+    
+
+    
+      DBus interfaces
+
+      
+        (FIXME: http://hal.freedesktop.org/docs/DeviceKit/DeviceKit.html,
+http://cgit.freedesktop.org/DeviceKit/DeviceKit/tree/doc/dbus)
+      
+    
+
+  
+
   
-    Frequently asked question
+    Frequently asked questions
 
     
       
@@ -1147,7 +1407,7 @@
       
         A new class does not appear in the docs.
         
-          Is the new page xi:included from 
+          Is the new page xi:included from
           <package>-docs.{xml,sgml}.
         
       
@@ -1195,7 +1455,22 @@
       
     
   
-    
+
+  
+    Tools related to gtk-doc
+
+    
+      GtkDocPlugin - a Trac GTK-Doc
+      integration plugin, that adds api docs to a trac site and integrates with
+      the trac search.
+    
+    
+      Gtkdoc-depscan - a tool (part of gtk-doc) to check used API against since
+      tags in the api to determine the minimum required version.
+    
+
+  
+
   
   
   
     
       Glossary
diff -Nru gtk-doc-1.14/tests/annotations/docs/tester-sections.txt gtk-doc-1.17/tests/annotations/docs/tester-sections.txt
--- gtk-doc-1.14/tests/annotations/docs/tester-sections.txt	2009-10-20 20:20:11.000000000 +0000
+++ gtk-doc-1.17/tests/annotations/docs/tester-sections.txt	2010-10-04 08:53:08.000000000 +0000
@@ -5,8 +5,11 @@
 annotation_array_length
 annotation_nullable
 annotation_elementtype
+annotation_elementtype_transfer
 annotation_elementtype_returns
 annotation_outparams
+annotation_skip
+annotation_scope
 
 
 
diff -Nru gtk-doc-1.14/tests/annotations/Makefile.in gtk-doc-1.17/tests/annotations/Makefile.in
--- gtk-doc-1.14/tests/annotations/Makefile.in	2010-01-03 12:15:10.000000000 +0000
+++ gtk-doc-1.17/tests/annotations/Makefile.in	2011-02-26 12:26:03.000000000 +0000
@@ -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,
@@ -96,7 +96,6 @@
   done; \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
@@ -158,6 +157,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
@@ -285,7 +285,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]*);; \
@@ -310,7 +310,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]*);; \
diff -Nru gtk-doc-1.14/tests/annotations/src/Makefile.in gtk-doc-1.17/tests/annotations/src/Makefile.in
--- gtk-doc-1.14/tests/annotations/src/Makefile.in	2010-01-03 12:15:10.000000000 +0000
+++ gtk-doc-1.17/tests/annotations/src/Makefile.in	2011-02-26 12:26:03.000000000 +0000
@@ -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,
@@ -88,7 +88,6 @@
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
@@ -150,6 +149,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
diff -Nru gtk-doc-1.14/tests/annotations/src/tester.c gtk-doc-1.17/tests/annotations/src/tester.c
--- gtk-doc-1.14/tests/annotations/src/tester.c	2010-03-28 15:42:14.000000000 +0000
+++ gtk-doc-1.17/tests/annotations/src/tester.c	2010-09-08 18:07:13.000000000 +0000
@@ -59,6 +59,20 @@
 }
 
 /**
+ * annotation_elementtype_transfer:
+ * @list: (element-type utf8) (transfer full): list of #GObject instances to search
+ *
+ * Document optional parameters.
+ *
+ * Returns: %TRUE for success
+ */
+gboolean
+annotation_elementtype_transfer (const GList *list)
+{
+   return TRUE;
+}
+
+/**
  * annotation_elementtype_returns:
  *
  * Document optional parameters.
@@ -85,3 +99,25 @@
    return TRUE;
 }
 
+/**
+ * annotation_skip: (skip)
+ * @list: a pointer to take a list
+ *
+ * Documentation for this function.
+ */
+void
+annotation_skip (GList *list)
+{
+}
+
+/**
+ * annotation_scope:
+ * @callback: (scope async): a callback
+ * @user_data: data to pass to callback
+ *
+ * Documentation for this function.
+ */
+void
+annotation_scope (GCallback *callback, gpointer user_data)
+{
+}
diff -Nru gtk-doc-1.14/tests/annotations/src/tester.h gtk-doc-1.17/tests/annotations/src/tester.h
--- gtk-doc-1.14/tests/annotations/src/tester.h	2009-10-20 20:20:11.000000000 +0000
+++ gtk-doc-1.17/tests/annotations/src/tester.h	2010-09-08 18:02:50.000000000 +0000
@@ -19,9 +19,14 @@
 extern gchar * annotation_nullable (const gchar *uri, const gchar *label);
 
 extern gboolean annotation_elementtype (const GList *list);
+extern gboolean annotation_elementtype_transfer (const GList *list);
 extern GList *annotation_elementtype_returns (void);
 
 extern gboolean annotation_outparams (GList **list);
 
+extern void annotation_skip (GList *list);
+
+extern void annotation_scope (GCallback *callback, gpointer user_data);
+
 #endif // GTKDOC_TESTER_H
 
diff -Nru gtk-doc-1.14/tests/bugs/docs/Makefile.am gtk-doc-1.17/tests/bugs/docs/Makefile.am
--- gtk-doc-1.14/tests/bugs/docs/Makefile.am	2010-01-01 22:00:31.000000000 +0000
+++ gtk-doc-1.17/tests/bugs/docs/Makefile.am	2010-10-04 08:53:08.000000000 +0000
@@ -24,7 +24,7 @@
   2>&1 | tee gtkdoc-scan.log
 
 # Extra options to supply to gtkdoc-mkdb.
-MKDB_OPTIONS=--sgml-mode 2>&1 | tee gtkdoc-mkdb.log
+MKDB_OPTIONS=--xml-mode 2>&1 | tee gtkdoc-mkdb.log
 
 # Extra options to supply to gtkdoc-mktmpl
 # e.g. MKTMPL_OPTIONS=--only-section-tmpl
@@ -79,6 +79,7 @@
 
 if BUILD_TESTS
 TESTS_ENVIRONMENT = \
+	DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
 	PATH=$(abs_top_builddir):$(srcdir):$(PATH) \
 	PERL5LIB=$(abs_top_builddir):$(PERL5LIB)
 endif
diff -Nru gtk-doc-1.14/tests/bugs/docs/Makefile.in gtk-doc-1.17/tests/bugs/docs/Makefile.in
--- gtk-doc-1.14/tests/bugs/docs/Makefile.in	2010-01-04 19:42:33.000000000 +0000
+++ gtk-doc-1.17/tests/bugs/docs/Makefile.in	2011-02-26 12:26:03.000000000 +0000
@@ -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,
@@ -63,7 +63,6 @@
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
@@ -125,6 +124,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
@@ -230,7 +230,7 @@
 
 
 # Extra options to supply to gtkdoc-mkdb.
-MKDB_OPTIONS = --sgml-mode 2>&1 | tee gtkdoc-mkdb.log
+MKDB_OPTIONS = --xml-mode 2>&1 | tee gtkdoc-mkdb.log
 
 # Extra options to supply to gtkdoc-mktmpl
 # e.g. MKTMPL_OPTIONS=--only-section-tmpl
@@ -316,6 +316,7 @@
 	gtkdoc-fixxref.log
 
 @BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = \
+@BUILD_TESTS_TRUE@	DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
 @BUILD_TESTS_TRUE@	PATH=$(abs_top_builddir):$(srcdir):$(PATH) \
 @BUILD_TESTS_TRUE@	PERL5LIB=$(abs_top_builddir):$(PERL5LIB)
 
@@ -558,9 +559,9 @@
 	@-chmod -R u+w $(srcdir)
 	@rm -rf $(srcdir)/html
 	@mkdir $(srcdir)/html
-	@cd $(srcdir)/html && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
+	@cd $(srcdir)/html && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) ABS_TOP_SRCDIR=$(abs_top_srcdir) \
 	gtkdoc-mkhtml --uninstalled --path="$(abs_srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)  $(MKHTML_OPTIONS)
-	@test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+	@test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html/ )
 	@echo "gtk-doc: `date +%H:%M:%S.%N`: Fixing cross-references"
 	@cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
 	gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
@@ -582,7 +583,7 @@
 	    fi; \
 	  done; \
 	fi; \
-	cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
+	cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) ABS_TOP_SRCDIR=$(abs_top_srcdir) \
 	gtkdoc-mkpdf --uninstalled --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
 	@touch pdf-build.stamp
 
diff -Nru gtk-doc-1.14/tests/bugs/docs/tester-docs.xml gtk-doc-1.17/tests/bugs/docs/tester-docs.xml
--- gtk-doc-1.14/tests/bugs/docs/tester-docs.xml	2009-04-22 19:36:57.000000000 +0000
+++ gtk-doc-1.17/tests/bugs/docs/tester-docs.xml	2010-10-04 08:53:08.000000000 +0000
@@ -27,5 +27,9 @@
     Index of deprecated API
     
   
+  
+    Index of new API in 0.1
+    
+  
 
 
diff -Nru gtk-doc-1.14/tests/bugs/docs/tester-sections.txt gtk-doc-1.17/tests/bugs/docs/tester-sections.txt
--- gtk-doc-1.14/tests/bugs/docs/tester-sections.txt	2010-03-05 16:44:25.000000000 +0000
+++ gtk-doc-1.17/tests/bugs/docs/tester-sections.txt	2011-01-14 21:29:47.000000000 +0000
@@ -19,6 +19,7 @@
 bug_460127
 bug_471014
 bug_477532
+bug_481811
 bug_501038
 bug_512155a_function_pointer_t
 bug_512155b_function_pointer_t
@@ -34,11 +35,18 @@
 bug_580300b_get_type
 bug_580300c_get_type
 bug_580300d_get_type
+bug_597937
 bug_602518a
 bug_602518b
 bug_602518c
 bug_607445
 bug_610257
+bug_623968a
+bug_623968b
+bug_623968c
+bug_624200a
+bug_624200b
+bug_638330
 
 
 GTKDOC_GNUC_CONST
diff -Nru gtk-doc-1.14/tests/bugs/Makefile.in gtk-doc-1.17/tests/bugs/Makefile.in
--- gtk-doc-1.14/tests/bugs/Makefile.in	2010-01-03 12:15:10.000000000 +0000
+++ gtk-doc-1.17/tests/bugs/Makefile.in	2011-02-26 12:26:03.000000000 +0000
@@ -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,
@@ -96,7 +96,6 @@
   done; \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
@@ -158,6 +157,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
@@ -285,7 +285,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]*);; \
@@ -310,7 +310,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]*);; \
diff -Nru gtk-doc-1.14/tests/bugs/src/Makefile.in gtk-doc-1.17/tests/bugs/src/Makefile.in
--- gtk-doc-1.14/tests/bugs/src/Makefile.in	2010-01-03 12:15:10.000000000 +0000
+++ gtk-doc-1.17/tests/bugs/src/Makefile.in	2011-02-26 12:26:03.000000000 +0000
@@ -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,
@@ -88,7 +88,6 @@
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
@@ -150,6 +149,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
diff -Nru gtk-doc-1.14/tests/bugs/src/tester.c gtk-doc-1.17/tests/bugs/src/tester.c
--- gtk-doc-1.14/tests/bugs/src/tester.c	2010-03-05 16:44:25.000000000 +0000
+++ gtk-doc-1.17/tests/bugs/src/tester.c	2011-01-14 21:29:47.000000000 +0000
@@ -7,7 +7,11 @@
  * As described in http://bugzilla.gnome.org/show_bug.cgi?id=457077 it
  * returns nothing.
  *
+ * Some special characters need escaping. The tests should pass 100\%.
+ * Try a link containing a # char.
+ *
  * 
+ * more details
  * 
  * Second paragraph inside subsection.
  * 
@@ -25,6 +29,8 @@
  * http://bugzilla.gnome.org/show_bug.cgi?id=141869
  */
 void bug_141869_a (unsigned pid) {
+  /* just silence a compiler warning */
+  bug_481811((double)pid);
 }
 
 /**
@@ -177,8 +183,15 @@
  *
  * Returns: result
  */
-int bug_580300d_get_type() { }
+int bug_580300d_get_type() { return 0; }
 
+/**
+ * bug_597937:
+ * @function_arg: value
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=597937
+ */
+void bug_597937(void (*function_arg)(int arg1, char arg2, void *)) { }
 
 /**
  * bug_602518a:
@@ -232,8 +245,95 @@
  * http://bugzilla.gnome.org/show_bug.cgi?id=610257
  */
 signed long
-bug_610257 (const unsigned char *der, int *len)
+bug_610257(const unsigned char *der, int *len)
 {
   return 1L;
 }
 
+
+/**
+ * bug_623968a:
+ *
+ * test
+ * 
+ *   subsect
+ *   test
+ * 
+ **/
+void
+bug_623968a(void)
+{
+}
+
+/**
+ * bug_623968b:
+ *
+ * test
+ *
+ * 
+ *   subsect
+ *   test
+ * 
+ **/
+void
+bug_623968b(void)
+{
+}
+
+/**
+ * bug_623968c:
+ *
+ * test
+ **/
+void
+bug_623968c(void)
+{
+}
+
+
+/**
+ * bug_624200a:
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=624200
+ *
+ * Returns: result
+ */
+const char * const *
+bug_624200a(void)
+{
+  return NULL;
+}
+
+/**
+ * bug_624200b:
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=624200
+ *
+ * Returns: result
+ */
+const char ** const
+bug_624200b(void)
+{
+  return NULL;
+}
+
+/**
+ * bug_638330:
+ * @arg1: arg1
+ * @data: data
+ * @length: length
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=638330
+ */
+void (*bug_638330) (void *arg1,
+     const unsigned char *data,
+     unsigned int length) = NULL;
+
+
+/* internal function */
+gchar *
+_bug_000000a (const gchar *name)
+{
+  return NULL;
+}
+
diff -Nru gtk-doc-1.14/tests/bugs/src/tester.h gtk-doc-1.17/tests/bugs/src/tester.h
--- gtk-doc-1.14/tests/bugs/src/tester.h	2010-03-05 16:44:25.000000000 +0000
+++ gtk-doc-1.17/tests/bugs/src/tester.h	2011-01-14 21:29:47.000000000 +0000
@@ -20,6 +20,20 @@
 } Bug324535;
 
 
+
+/**
+ * bug_481811:
+ * @x: argument
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=481811
+ **/
+static inline double
+bug_481811(double x)
+{
+    return g_random_double_range(x,x*x);
+}
+
+
 /**
  * bug_501038:
  * @a: value
@@ -155,7 +169,7 @@
  * BUG_530758:
  *
  * 
- * 
+ *
  * Test
  */
 #define BUG_530758 "dummy"
@@ -233,6 +247,7 @@
 void bug_580300c_get_type();
 extern int bug_580300d_get_type();
 
+void bug_597937(void (*function_arg)(int arg1, char arg2, void *));
 
 long int bug_602518a(void);
 unsigned long int bug_602518b(void);
@@ -247,7 +262,7 @@
  */
 union _Bug165425a {
   int i;
-  float f; 
+  float f;
 };
 typedef union _Bug165425a Bug165425a;
 
@@ -286,5 +301,42 @@
 signed long bug_610257(const unsigned char *der, int *len);
 
 
+void bug_623968a(void);
+void bug_623968b(void);
+void bug_623968c(void);
+
+
+#define _BUG_624199(struct_type, n_structs, func) \
+  (struct_type *) (__extension__ ({			\
+    gsize __n = (gsize) (n_structs);			\
+    gsize __s = sizeof (struct_type);			\
+    gpointer __p;					\
+    if (__s == 1)					\
+      __p = g_##func (__n);				\
+    else if (__builtin_constant_p (__n) &&			\
+             (__s == 0 || __n <= G_MAXSIZE / __s))		\
+      __p = g_##func (__n * __s);				\
+    else							\
+      __p = g_##func##_n (__n, __s);			\
+    __p;							\
+  }))
+
+
+const char * const * bug_624200a(void);
+const char ** const bug_624200b(void);
+
+
+/* internal function and macro */
+gchar *_bug_000000a (const gchar *name);
+#define _BUG_000000b (a) (a*a);
+
+#ifndef __GTK_DOC_IGNORE__
+extern int bug_512565(void);
+#endif
+
+void (*bug_638330) (void *arg1,
+     const unsigned char *data,
+     unsigned int length);
+
 #endif // GTKDOC_TESTER_H
 
diff -Nru gtk-doc-1.14/tests/empty/docs/Makefile.am gtk-doc-1.17/tests/empty/docs/Makefile.am
--- gtk-doc-1.14/tests/empty/docs/Makefile.am	2010-01-03 13:23:09.000000000 +0000
+++ gtk-doc-1.17/tests/empty/docs/Makefile.am	2011-01-14 21:29:47.000000000 +0000
@@ -1,5 +1,11 @@
 ## Process this file with automake to produce Makefile.in
 
+# this tests bootstraps gtk-doc, that includes generating a default 
+# DOC_MAIN_SGML_FILE
+# right now that fails with parallel make, as make cannot see that what is a
+# dependency for another target is generated as needed
+MAKEFLAGS = -j1
+
 # We require automake 1.6 at least.
 AUTOMAKE_OPTIONS = 1.6
 
@@ -23,7 +29,7 @@
   2>&1 | tee gtkdoc-scan.log
 
 # Extra options to supply to gtkdoc-mkdb.
-MKDB_OPTIONS=--sgml-mode 2>&1 | tee gtkdoc-mkdb.log
+MKDB_OPTIONS=--xml-mode 2>&1 | tee gtkdoc-mkdb.log
 
 # Extra options to supply to gtkdoc-mktmpl
 # e.g. MKTMPL_OPTIONS=--only-section-tmpl
@@ -44,7 +50,7 @@
 IGNORE_HFILES=config.h
 
 # Images to copy into HTML directory.
-HTML_IMAGES = $(top_srcdir)/home.png
+HTML_IMAGES = 
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 # e.g. content_files=running.sgml building.sgml changes-2.0.sgml
@@ -78,8 +84,13 @@
 
 if BUILD_TESTS
 TESTS_ENVIRONMENT = \
+	DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
 	PATH=$(abs_top_builddir):$(srcdir):$(PATH) \
 	PERL5LIB=$(abs_top_builddir):$(PERL5LIB)
 endif
 
+GITIGNOREFILES = \
+	tester-docs.xml \
+	tester-sections.txt
+
 -include $(top_srcdir)/git.mk
diff -Nru gtk-doc-1.14/tests/empty/docs/Makefile.in gtk-doc-1.17/tests/empty/docs/Makefile.in
--- gtk-doc-1.14/tests/empty/docs/Makefile.in	2010-01-04 19:42:37.000000000 +0000
+++ gtk-doc-1.17/tests/empty/docs/Makefile.in	2011-02-26 12:26:03.000000000 +0000
@@ -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,
@@ -63,7 +63,6 @@
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
@@ -125,6 +124,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
@@ -205,6 +205,12 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
+# this tests bootstraps gtk-doc, that includes generating a default 
+# DOC_MAIN_SGML_FILE
+# right now that fails with parallel make, as make cannot see that what is a
+# dependency for another target is generated as needed
+MAKEFLAGS = -j1
+
 # We require automake 1.6 at least.
 AUTOMAKE_OPTIONS = 1.6
 
@@ -229,7 +235,7 @@
 
 
 # Extra options to supply to gtkdoc-mkdb.
-MKDB_OPTIONS = --sgml-mode 2>&1 | tee gtkdoc-mkdb.log
+MKDB_OPTIONS = --xml-mode 2>&1 | tee gtkdoc-mkdb.log
 
 # Extra options to supply to gtkdoc-mktmpl
 # e.g. MKTMPL_OPTIONS=--only-section-tmpl
@@ -250,7 +256,7 @@
 IGNORE_HFILES = config.h
 
 # Images to copy into HTML directory.
-HTML_IMAGES = $(top_srcdir)/home.png
+HTML_IMAGES = 
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 # e.g. content_files=running.sgml building.sgml changes-2.0.sgml
@@ -315,9 +321,14 @@
 	gtkdoc-fixxref.log
 
 @BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = \
+@BUILD_TESTS_TRUE@	DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
 @BUILD_TESTS_TRUE@	PATH=$(abs_top_builddir):$(srcdir):$(PATH) \
 @BUILD_TESTS_TRUE@	PERL5LIB=$(abs_top_builddir):$(PERL5LIB)
 
+GITIGNOREFILES = \
+	tester-docs.xml \
+	tester-sections.txt
+
 all: all-am
 
 .SUFFIXES:
@@ -557,9 +568,9 @@
 	@-chmod -R u+w $(srcdir)
 	@rm -rf $(srcdir)/html
 	@mkdir $(srcdir)/html
-	@cd $(srcdir)/html && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
+	@cd $(srcdir)/html && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) ABS_TOP_SRCDIR=$(abs_top_srcdir) \
 	gtkdoc-mkhtml --uninstalled --path="$(abs_srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)  $(MKHTML_OPTIONS)
-	@test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+	@test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html/ )
 	@echo "gtk-doc: `date +%H:%M:%S.%N`: Fixing cross-references"
 	@cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
 	gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
@@ -581,7 +592,7 @@
 	    fi; \
 	  done; \
 	fi; \
-	cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
+	cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) ABS_TOP_SRCDIR=$(abs_top_srcdir) \
 	gtkdoc-mkpdf --uninstalled --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
 	@touch pdf-build.stamp
 
diff -Nru gtk-doc-1.14/tests/empty/docs/tester-docs.xml gtk-doc-1.17/tests/empty/docs/tester-docs.xml
--- gtk-doc-1.14/tests/empty/docs/tester-docs.xml	2010-03-28 17:11:46.000000000 +0000
+++ gtk-doc-1.17/tests/empty/docs/tester-docs.xml	2011-01-14 21:36:17.000000000 +0000
@@ -27,6 +27,10 @@
     API Index
     
   
+  
+    Index of deprecated API
+    
+  
 
   
 
diff -Nru gtk-doc-1.14/tests/empty/Makefile.in gtk-doc-1.17/tests/empty/Makefile.in
--- gtk-doc-1.14/tests/empty/Makefile.in	2010-01-03 13:08:06.000000000 +0000
+++ gtk-doc-1.17/tests/empty/Makefile.in	2011-02-26 12:26:03.000000000 +0000
@@ -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,
@@ -96,7 +96,6 @@
   done; \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
@@ -158,6 +157,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
@@ -285,7 +285,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]*);; \
@@ -310,7 +310,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]*);; \
diff -Nru gtk-doc-1.14/tests/empty/src/Makefile.in gtk-doc-1.17/tests/empty/src/Makefile.in
--- gtk-doc-1.14/tests/empty/src/Makefile.in	2010-01-03 12:15:11.000000000 +0000
+++ gtk-doc-1.17/tests/empty/src/Makefile.in	2011-02-26 12:26:03.000000000 +0000
@@ -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,
@@ -88,7 +88,6 @@
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
@@ -150,6 +149,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
diff -Nru gtk-doc-1.14/tests/fail/docs/Makefile.am gtk-doc-1.17/tests/fail/docs/Makefile.am
--- gtk-doc-1.14/tests/fail/docs/Makefile.am	2009-09-30 21:16:49.000000000 +0000
+++ gtk-doc-1.17/tests/fail/docs/Makefile.am	2010-10-04 08:53:08.000000000 +0000
@@ -23,7 +23,7 @@
   2>&1 | tee gtkdoc-scan.log
 
 # Extra options to supply to gtkdoc-mkdb.
-MKDB_OPTIONS=--sgml-mode 2>&1 | tee gtkdoc-mkdb.log
+MKDB_OPTIONS=--xml-mode 2>&1 | tee gtkdoc-mkdb.log
 
 # Extra options to supply to gtkdoc-mktmpl
 # e.g. MKTMPL_OPTIONS=--only-section-tmpl
@@ -78,6 +78,7 @@
 
 if BUILD_TESTS
 TESTS_ENVIRONMENT = \
+	DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
 	PATH=$(abs_top_builddir):$(srcdir):$(PATH) \
 	PERL5LIB=$(abs_top_builddir):$(PERL5LIB)
 endif
diff -Nru gtk-doc-1.14/tests/fail/docs/Makefile.in gtk-doc-1.17/tests/fail/docs/Makefile.in
--- gtk-doc-1.14/tests/fail/docs/Makefile.in	2010-01-04 19:42:36.000000000 +0000
+++ gtk-doc-1.17/tests/fail/docs/Makefile.in	2011-02-26 12:26:03.000000000 +0000
@@ -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,
@@ -63,7 +63,6 @@
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
@@ -125,6 +124,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
@@ -229,7 +229,7 @@
 
 
 # Extra options to supply to gtkdoc-mkdb.
-MKDB_OPTIONS = --sgml-mode 2>&1 | tee gtkdoc-mkdb.log
+MKDB_OPTIONS = --xml-mode 2>&1 | tee gtkdoc-mkdb.log
 
 # Extra options to supply to gtkdoc-mktmpl
 # e.g. MKTMPL_OPTIONS=--only-section-tmpl
@@ -315,6 +315,7 @@
 	gtkdoc-fixxref.log
 
 @BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = \
+@BUILD_TESTS_TRUE@	DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
 @BUILD_TESTS_TRUE@	PATH=$(abs_top_builddir):$(srcdir):$(PATH) \
 @BUILD_TESTS_TRUE@	PERL5LIB=$(abs_top_builddir):$(PERL5LIB)
 
@@ -557,9 +558,9 @@
 	@-chmod -R u+w $(srcdir)
 	@rm -rf $(srcdir)/html
 	@mkdir $(srcdir)/html
-	@cd $(srcdir)/html && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
+	@cd $(srcdir)/html && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) ABS_TOP_SRCDIR=$(abs_top_srcdir) \
 	gtkdoc-mkhtml --uninstalled --path="$(abs_srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)  $(MKHTML_OPTIONS)
-	@test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+	@test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html/ )
 	@echo "gtk-doc: `date +%H:%M:%S.%N`: Fixing cross-references"
 	@cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
 	gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
@@ -581,7 +582,7 @@
 	    fi; \
 	  done; \
 	fi; \
-	cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
+	cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) ABS_TOP_SRCDIR=$(abs_top_srcdir) \
 	gtkdoc-mkpdf --uninstalled --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
 	@touch pdf-build.stamp
 
diff -Nru gtk-doc-1.14/tests/fail/Makefile.in gtk-doc-1.17/tests/fail/Makefile.in
--- gtk-doc-1.14/tests/fail/Makefile.in	2010-01-03 12:15:11.000000000 +0000
+++ gtk-doc-1.17/tests/fail/Makefile.in	2011-02-26 12:26:03.000000000 +0000
@@ -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,
@@ -96,7 +96,6 @@
   done; \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
@@ -158,6 +157,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
@@ -285,7 +285,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]*);; \
@@ -310,7 +310,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]*);; \
diff -Nru gtk-doc-1.14/tests/fail/src/Makefile.in gtk-doc-1.17/tests/fail/src/Makefile.in
--- gtk-doc-1.14/tests/fail/src/Makefile.in	2010-01-03 12:15:11.000000000 +0000
+++ gtk-doc-1.17/tests/fail/src/Makefile.in	2011-02-26 12:26:03.000000000 +0000
@@ -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,
@@ -88,7 +88,6 @@
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
@@ -150,6 +149,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
diff -Nru gtk-doc-1.14/tests/fail.sh gtk-doc-1.17/tests/fail.sh
--- gtk-doc-1.14/tests/fail.sh	2009-12-30 22:25:37.000000000 +0000
+++ gtk-doc-1.17/tests/fail.sh	2010-06-13 10:58:16.000000000 +0000
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 dir=`dirname $0`
 suite="fail"
diff -Nru gtk-doc-1.14/tests/gobject/docs/Makefile.am gtk-doc-1.17/tests/gobject/docs/Makefile.am
--- gtk-doc-1.14/tests/gobject/docs/Makefile.am	2010-01-21 21:06:23.000000000 +0000
+++ gtk-doc-1.17/tests/gobject/docs/Makefile.am	2010-10-04 08:53:08.000000000 +0000
@@ -23,7 +23,7 @@
   2>&1 | tee gtkdoc-scan.log
 
 # Extra options to supply to gtkdoc-mkdb.
-MKDB_OPTIONS=--sgml-mode 2>&1 | tee gtkdoc-mkdb.log
+MKDB_OPTIONS=--xml-mode 2>&1 | tee gtkdoc-mkdb.log
 
 # Extra options to supply to gtkdoc-mktmpl
 # e.g. MKTMPL_OPTIONS=--only-section-tmpl
@@ -45,7 +45,6 @@
 
 # Images to copy into HTML directory.
 HTML_IMAGES = \
-	$(top_srcdir)/home.png			\
 	$(srcdir)/images/object.png
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
@@ -80,6 +79,7 @@
 
 if BUILD_TESTS
 TESTS_ENVIRONMENT = \
+	DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
 	PATH=$(abs_top_builddir):$(srcdir):$(PATH) \
 	PERL5LIB=$(abs_top_builddir):$(PERL5LIB)
 endif
diff -Nru gtk-doc-1.14/tests/gobject/docs/Makefile.in gtk-doc-1.17/tests/gobject/docs/Makefile.in
--- gtk-doc-1.14/tests/gobject/docs/Makefile.in	2010-01-21 21:25:32.000000000 +0000
+++ gtk-doc-1.17/tests/gobject/docs/Makefile.in	2011-02-26 12:26:04.000000000 +0000
@@ -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,
@@ -63,7 +63,6 @@
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
@@ -125,6 +124,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
@@ -229,7 +229,7 @@
 
 
 # Extra options to supply to gtkdoc-mkdb.
-MKDB_OPTIONS = --sgml-mode 2>&1 | tee gtkdoc-mkdb.log
+MKDB_OPTIONS = --xml-mode 2>&1 | tee gtkdoc-mkdb.log
 
 # Extra options to supply to gtkdoc-mktmpl
 # e.g. MKTMPL_OPTIONS=--only-section-tmpl
@@ -251,7 +251,6 @@
 
 # Images to copy into HTML directory.
 HTML_IMAGES = \
-	$(top_srcdir)/home.png			\
 	$(srcdir)/images/object.png
 
 
@@ -318,6 +317,7 @@
 	gtkdoc-fixxref.log
 
 @BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = \
+@BUILD_TESTS_TRUE@	DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
 @BUILD_TESTS_TRUE@	PATH=$(abs_top_builddir):$(srcdir):$(PATH) \
 @BUILD_TESTS_TRUE@	PERL5LIB=$(abs_top_builddir):$(PERL5LIB)
 
@@ -560,9 +560,9 @@
 	@-chmod -R u+w $(srcdir)
 	@rm -rf $(srcdir)/html
 	@mkdir $(srcdir)/html
-	@cd $(srcdir)/html && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
+	@cd $(srcdir)/html && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) ABS_TOP_SRCDIR=$(abs_top_srcdir) \
 	gtkdoc-mkhtml --uninstalled --path="$(abs_srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)  $(MKHTML_OPTIONS)
-	@test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+	@test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html/ )
 	@echo "gtk-doc: `date +%H:%M:%S.%N`: Fixing cross-references"
 	@cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
 	gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
@@ -584,7 +584,7 @@
 	    fi; \
 	  done; \
 	fi; \
-	cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
+	cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) ABS_TOP_SRCDIR=$(abs_top_srcdir) \
 	gtkdoc-mkpdf --uninstalled --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
 	@touch pdf-build.stamp
 
diff -Nru gtk-doc-1.14/tests/gobject/docs/tester-docs.xml gtk-doc-1.17/tests/gobject/docs/tester-docs.xml
--- gtk-doc-1.14/tests/gobject/docs/tester-docs.xml	2009-12-25 21:40:59.000000000 +0000
+++ gtk-doc-1.17/tests/gobject/docs/tester-docs.xml	2010-10-04 08:53:08.000000000 +0000
@@ -48,7 +48,9 @@
     
       Tests
       
+      
       
+      
       
     
   
@@ -61,6 +63,11 @@
        
     
 
+    
+      Object Index
+       
+    
+
     
       API Index
       
diff -Nru gtk-doc-1.14/tests/gobject/docs/tester-sections.txt gtk-doc-1.17/tests/gobject/docs/tester-sections.txt
--- gtk-doc-1.14/tests/gobject/docs/tester-sections.txt	2009-12-30 22:25:37.000000000 +0000
+++ gtk-doc-1.17/tests/gobject/docs/tester-sections.txt	2010-10-04 08:53:08.000000000 +0000
@@ -19,6 +19,15 @@
 
 
 

+object2
+GtkdocObject2
+GtkdocObject2Class
+
+GTKDOC_TYPE_OBJECT2
+gtkdoc_object2_get_type
+

+
+

 iface
 GtkdocIface
 GtkdocIfaceInterface
@@ -34,6 +43,14 @@
 

 
 

+iface2
+GtkdocIface2
+
+GTKDOC_TYPE_IFACE2
+gtkdoc_iface2_get_type
+

+
+

 types
 GtkdocEnum
 
diff -Nru gtk-doc-1.14/tests/gobject/docs/tester.types gtk-doc-1.17/tests/gobject/docs/tester.types
--- gtk-doc-1.14/tests/gobject/docs/tester.types	2010-03-28 15:43:39.000000000 +0000
+++ gtk-doc-1.17/tests/gobject/docs/tester.types	2010-06-19 09:41:34.000000000 +0000
@@ -1,4 +1,6 @@
 gtkdoc_boxed_get_type
 gtkdoc_enum_get_type
+gtkdoc_iface2_get_type
 gtkdoc_iface_get_type
+gtkdoc_object2_get_type
 gtkdoc_object_get_type
Binary files /tmp/UY5RFPQtYR/gtk-doc-1.14/tests/gobject/docs-tmpl/images/object.png and /tmp/ONZXuBu4mE/gtk-doc-1.17/tests/gobject/docs-tmpl/images/object.png differ
diff -Nru gtk-doc-1.14/tests/gobject/docs-tmpl/Makefile.am gtk-doc-1.17/tests/gobject/docs-tmpl/Makefile.am
--- gtk-doc-1.14/tests/gobject/docs-tmpl/Makefile.am	2009-09-30 21:16:49.000000000 +0000
+++ gtk-doc-1.17/tests/gobject/docs-tmpl/Makefile.am	2010-10-04 08:53:08.000000000 +0000
@@ -21,7 +21,7 @@
 SCAN_OPTIONS=--deprecated-guards="GTKDOC_TESTER_DISABLE_DEPRECATED" 2>&1 | tee gtkdoc-scan.log
 
 # Extra options to supply to gtkdoc-mkdb.
-MKDB_OPTIONS=--sgml-mode 2>&1 | tee gtkdoc-mkdb.log
+MKDB_OPTIONS=--xml-mode 2>&1 | tee gtkdoc-mkdb.log
 
 # Extra options to supply to gtkdoc-mktmpl
 # e.g. MKTMPL_OPTIONS=--only-section-tmpl
@@ -42,7 +42,8 @@
 IGNORE_HFILES=config.h
 
 # Images to copy into HTML directory.
-HTML_IMAGES = $(top_srcdir)/home.png
+HTML_IMAGES =  \
+	$(srcdir)/images/object.png
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 # e.g. content_files=running.sgml building.sgml changes-2.0.sgml
@@ -76,8 +77,12 @@
 
 if BUILD_TESTS
 TESTS_ENVIRONMENT = \
+	DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
 	PATH=$(abs_top_builddir):$(srcdir):$(PATH) \
 	PERL5LIB=$(abs_top_builddir):$(PERL5LIB)
 endif
 
+GITIGNOREFILES = \
+	tmpl
+
 -include $(top_srcdir)/git.mk
diff -Nru gtk-doc-1.14/tests/gobject/docs-tmpl/Makefile.in gtk-doc-1.17/tests/gobject/docs-tmpl/Makefile.in
--- gtk-doc-1.14/tests/gobject/docs-tmpl/Makefile.in	2010-01-04 19:42:31.000000000 +0000
+++ gtk-doc-1.17/tests/gobject/docs-tmpl/Makefile.in	2011-02-26 12:26:04.000000000 +0000
@@ -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,
@@ -63,7 +63,6 @@
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
@@ -125,6 +124,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
@@ -226,7 +226,7 @@
 SCAN_OPTIONS = --deprecated-guards="GTKDOC_TESTER_DISABLE_DEPRECATED" 2>&1 | tee gtkdoc-scan.log
 
 # Extra options to supply to gtkdoc-mkdb.
-MKDB_OPTIONS = --sgml-mode 2>&1 | tee gtkdoc-mkdb.log
+MKDB_OPTIONS = --xml-mode 2>&1 | tee gtkdoc-mkdb.log
 
 # Extra options to supply to gtkdoc-mktmpl
 # e.g. MKTMPL_OPTIONS=--only-section-tmpl
@@ -247,7 +247,9 @@
 IGNORE_HFILES = config.h
 
 # Images to copy into HTML directory.
-HTML_IMAGES = $(top_srcdir)/home.png
+HTML_IMAGES = \
+	$(srcdir)/images/object.png
+
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 # e.g. content_files=running.sgml building.sgml changes-2.0.sgml
@@ -313,9 +315,13 @@
 	gtkdoc-fixxref.log
 
 @BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = \
+@BUILD_TESTS_TRUE@	DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
 @BUILD_TESTS_TRUE@	PATH=$(abs_top_builddir):$(srcdir):$(PATH) \
 @BUILD_TESTS_TRUE@	PERL5LIB=$(abs_top_builddir):$(PERL5LIB)
 
+GITIGNOREFILES = \
+	tmpl
+
 all: all-am
 
 .SUFFIXES:
@@ -570,9 +576,9 @@
 	@-chmod -R u+w $(srcdir)
 	@rm -rf $(srcdir)/html
 	@mkdir $(srcdir)/html
-	@cd $(srcdir)/html && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
+	@cd $(srcdir)/html && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) ABS_TOP_SRCDIR=$(abs_top_srcdir) \
 	gtkdoc-mkhtml --uninstalled --path="$(abs_srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)  $(MKHTML_OPTIONS)
-	@test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+	@test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html/ )
 	@echo "gtk-doc: `date +%H:%M:%S.%N`: Fixing cross-references"
 	@cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
 	gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
@@ -594,7 +600,7 @@
 	    fi; \
 	  done; \
 	fi; \
-	cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
+	cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) ABS_TOP_SRCDIR=$(abs_top_srcdir) \
 	gtkdoc-mkpdf --uninstalled --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
 	@touch pdf-build.stamp
 
diff -Nru gtk-doc-1.14/tests/gobject/docs-tmpl/tester-docs.xml gtk-doc-1.17/tests/gobject/docs-tmpl/tester-docs.xml
--- gtk-doc-1.14/tests/gobject/docs-tmpl/tester-docs.xml	2009-12-26 20:25:27.000000000 +0000
+++ gtk-doc-1.17/tests/gobject/docs-tmpl/tester-docs.xml	2010-10-04 08:53:08.000000000 +0000
@@ -35,7 +35,9 @@
     
       Tests
       
+      
       
+      
       
     
   
@@ -47,7 +49,12 @@
       Object Hierarchy
        
     
-  
+
+    
+      Object Index
+       
+    
+
     
       API Index
       
diff -Nru gtk-doc-1.14/tests/gobject/docs-tmpl/tester-sections.txt gtk-doc-1.17/tests/gobject/docs-tmpl/tester-sections.txt
--- gtk-doc-1.14/tests/gobject/docs-tmpl/tester-sections.txt	2009-12-30 22:25:37.000000000 +0000
+++ gtk-doc-1.17/tests/gobject/docs-tmpl/tester-sections.txt	2010-10-04 08:53:08.000000000 +0000
@@ -19,6 +19,15 @@
 

 
 

+object2
+GtkdocObject2
+GtkdocObject2Class
+
+GTKDOC_TYPE_OBJECT2
+gtkdoc_object2_get_type
+

+
+

 iface
 GtkdocIface
 GtkdocIfaceInterface
@@ -34,6 +43,14 @@
 

 
 

+iface2
+GtkdocIface2
+
+GTKDOC_TYPE_IFACE2
+gtkdoc_iface2_get_type
+

+
+

 types
 GtkdocEnum
 
diff -Nru gtk-doc-1.14/tests/gobject/docs-tmpl/tester.types gtk-doc-1.17/tests/gobject/docs-tmpl/tester.types
--- gtk-doc-1.14/tests/gobject/docs-tmpl/tester.types	2009-12-25 21:42:37.000000000 +0000
+++ gtk-doc-1.17/tests/gobject/docs-tmpl/tester.types	2010-10-04 08:53:08.000000000 +0000
@@ -1,6 +1,8 @@
 #include 
 
 gtkdoc_object_get_type
+gtkdoc_object2_get_type
 gtkdoc_iface_get_type
+gtkdoc_iface2_get_type
 gtkdoc_enum_get_type
 gtkdoc_boxed_get_type
diff -Nru gtk-doc-1.14/tests/gobject/Makefile.in gtk-doc-1.17/tests/gobject/Makefile.in
--- gtk-doc-1.14/tests/gobject/Makefile.in	2010-01-15 16:14:21.000000000 +0000
+++ gtk-doc-1.17/tests/gobject/Makefile.in	2011-02-26 12:26:03.000000000 +0000
@@ -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,
@@ -96,7 +96,6 @@
   done; \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
@@ -158,6 +157,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
@@ -286,7 +286,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]*);; \
@@ -311,7 +311,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]*);; \
diff -Nru gtk-doc-1.14/tests/gobject/src/giface.c gtk-doc-1.17/tests/gobject/src/giface.c
--- gtk-doc-1.14/tests/gobject/src/giface.c	2009-12-22 23:17:04.000000000 +0000
+++ gtk-doc-1.17/tests/gobject/src/giface.c	2010-06-02 20:19:44.000000000 +0000
@@ -15,6 +15,14 @@
  *   Home sweet home.
  * 
  */
+/**
+ * SECTION:iface2
+ * @title: GtkdocIface2
+ * @short_description: interface with a prerequisite for gtk-doc unit test
+ * @see_also: #GtkdocObject, #GtkdocIface
+ *
+ * This file contains non-sense code for the sole purpose of testing the docs.
+ */
 
 #include 
 #include 
@@ -90,3 +98,24 @@
   return type;
 }
 
+GType gtkdoc_iface2_get_type (void) {
+  static GType type = 0;
+  if (type == 0) {
+    static const GTypeInfo info = {
+      (guint16)sizeof(GtkdocIfaceInterface),
+      NULL, // base_init
+      NULL, // base_finalize
+      NULL, // class_init
+      NULL, // class_finalize
+      NULL, // class_data
+      0,
+      0,   // n_preallocs
+      NULL, // instance_init
+      NULL // value_table
+    };
+    type = g_type_register_static(G_TYPE_INTERFACE,"GtkdocIface2",&info,0);
+    g_type_interface_add_prerequisite(type, GTKDOC_TYPE_IFACE);
+  }
+  return type;
+}
+
diff -Nru gtk-doc-1.14/tests/gobject/src/giface.h gtk-doc-1.17/tests/gobject/src/giface.h
--- gtk-doc-1.14/tests/gobject/src/giface.h	2009-12-25 21:32:35.000000000 +0000
+++ gtk-doc-1.17/tests/gobject/src/giface.h	2010-06-02 20:16:17.000000000 +0000
@@ -11,6 +11,8 @@
 #define GTKDOC_IS_IFACE(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTKDOC_TYPE_IFACE))
 #define GTKDOC_IFACE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTKDOC_TYPE_IFACE, GtkdocIfaceInterface))
 
+#define GTKDOC_TYPE_IFACE2              (gtkdoc_iface2_get_type ())
+
 /* type structs */
 
 /**
@@ -22,6 +24,13 @@
 typedef struct _GtkdocIfaceInterface GtkdocIfaceInterface;
 
 /**
+ * GtkdocIface2:
+ *
+ * opaque instance of gtk-doc unit test interface
+ */
+typedef struct _GtkdocIface2 GtkdocIface2;
+
+/**
  * GtkdocIfaceInterface:
  * @parent: this is a bug :/
  * @test: overideable method
@@ -36,6 +45,7 @@
 };
 
 GType  gtkdoc_iface_get_type(void) G_GNUC_CONST;
+GType  gtkdoc_iface2_get_type(void) G_GNUC_CONST;
 
 gboolean gtkdoc_iface_configure (gchar *config);
 
diff -Nru gtk-doc-1.14/tests/gobject/src/gobject.c gtk-doc-1.17/tests/gobject/src/gobject.c
--- gtk-doc-1.14/tests/gobject/src/gobject.c	2010-03-28 15:42:14.000000000 +0000
+++ gtk-doc-1.17/tests/gobject/src/gobject.c	2010-07-12 20:04:57.000000000 +0000
@@ -37,11 +37,20 @@
  * 
  * 
  */
+/**
+ * SECTION:object2
+ * @title: GtkdocObject2
+ * @short_description: class with interface for gtk-doc unit test
+ * @see_also: #GtkdocIface
+ *
+ * This file contains non-sense code for the sole purpose of testing the docs.
+ */
 
 #include 
 #include 
 
 #include "gobject.h"
+#include "giface.h"
 
 /* property ids */
 
@@ -50,6 +59,10 @@
   GTKDOC_OBJECT_DEP_TEST
 };
 
+enum {
+  GTKDOC_OBJECT2_ITEST=1
+};
+
 /* constructor methods */
 
 /**
@@ -170,6 +183,36 @@
                 0); // n_params
 
   /**
+   * GtkdocObject::strings-changed:
+   * 
+   * Something has happened.
+   */
+  g_signal_new ("strings-changed", G_TYPE_FROM_CLASS (klass),
+                G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS,
+                0,
+                NULL, // accumulator
+                NULL, // acc data
+                g_cclosure_marshal_VOID__BOXED,
+                G_TYPE_NONE, // return type
+                1, G_TYPE_STRV); // n_params
+  
+#if GLIB_CHECK_VERSION (2, 25, 9)
+  /**
+   * GtkdocObject::variant-changed:
+   * 
+   * Something has happened.
+   */
+  g_signal_new ("variant-changed", G_TYPE_FROM_CLASS (klass),
+                G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS,
+                0,
+                NULL, // accumulator
+                NULL, // acc data
+                g_cclosure_marshal_VOID__VARIANT,
+                G_TYPE_NONE, // return type
+                1, G_TYPE_VARIANT); // n_params
+#endif
+
+  /**
    * GtkdocObject:otest:
    *
    * Since: 0.1
@@ -205,12 +248,48 @@
       NULL, // class_finalize
       NULL, // class_data
       (guint16)sizeof(GtkdocObject),
-      0,   // n_preallocs
+      0,    // n_preallocs
       NULL, // instance_init
-      NULL // value_table
+      NULL  // value_table
     };
     type = g_type_register_static(G_TYPE_OBJECT,"GtkdocObject",&info,0);
   }
   return type;
 }
 
+
+static void gtkdoc_object2_class_init (GtkdocObjectClass *klass) {
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+  gobject_class->set_property = gtkdoc_object_set_property;
+  gobject_class->get_property = gtkdoc_object_get_property;
+
+  g_object_class_override_property (gobject_class, GTKDOC_OBJECT2_ITEST, "itest");
+}
+
+GType gtkdoc_object2_get_type (void) {
+  static GType type = 0;
+  if (type == 0) {
+    static const GTypeInfo info = {
+      (guint16)sizeof(GtkdocObject2Class),
+      NULL, // base_init
+      NULL, // base_finalize
+      (GClassInitFunc)gtkdoc_object2_class_init, // class_init
+      NULL, // class_finalize
+      NULL, // class_data
+      (guint16)sizeof(GtkdocObject2),
+      0,    // n_preallocs
+      NULL, // instance_init
+      NULL  // value_table
+    };
+    static const GInterfaceInfo interface_info = {
+      NULL,  // interface_init
+      NULL,  // interface_finalize
+      NULL   // interface_data 
+    };
+    type = g_type_register_static(G_TYPE_OBJECT,"GtkdocObject2",&info,0);
+    g_type_add_interface_static(type, GTKDOC_TYPE_IFACE, &interface_info);
+  }
+  return type;
+}
+
diff -Nru gtk-doc-1.14/tests/gobject/src/gobject.h gtk-doc-1.17/tests/gobject/src/gobject.h
--- gtk-doc-1.14/tests/gobject/src/gobject.h	2010-03-04 21:55:27.000000000 +0000
+++ gtk-doc-1.17/tests/gobject/src/gobject.h	2010-06-02 20:33:38.000000000 +0000
@@ -13,11 +13,16 @@
 #define GTKDOC_IS_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTKDOC_TYPE_OBJECT))
 #define GTKDOC_OBJECT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTKDOC_TYPE_OBJECT, GtkdocObjectClass))
 
+#define GTKDOC_TYPE_OBJECT2           (gtkdoc_object2_get_type ())
+
 /* type structs */
 
 typedef struct _GtkdocObject GtkdocObject;
 typedef struct _GtkdocObjectClass GtkdocObjectClass;
 
+typedef struct _GtkdocObject2 GtkdocObject2;
+typedef struct _GtkdocObject2Class GtkdocObject2Class;
+
 /* in gtkdoc-scan::ScanHeader() we currently skip the enums, but output a decl
 * to -decl.txt and -decl-list.txt for the struct
 * If the symbol has no docs, we get a warning in -unused.txt for the struct, but
@@ -53,6 +58,26 @@
   void (*test)(const GtkdocObject * const self, gconstpointer const user_data);
 };
 
+/**
+ * GtkdocObject2:
+ *
+ * instance data of gtk-doc unit test class
+ */
+struct _GtkdocObject2 {
+  GObject parent;
+};
+
+/**
+ * GtkdocObject2Class:
+ * @parent: this is a bug :/
+ *
+ * class data of gtk-doc unit test class
+ */
+struct _GtkdocObject2Class {
+  GObjectClass parent;
+};
+
+
 struct GtkdocHelperStruct {
   int a;
 };
@@ -63,6 +88,7 @@
 };
 
 GType  gtkdoc_object_get_type(void) G_GNUC_CONST;
+GType  gtkdoc_object2_get_type(void) G_GNUC_CONST;
 
 GtkdocObject *gtkdoc_object_new(void);
 #ifndef GTKDOC_TESTER_DISABLE_DEPRECATED
diff -Nru gtk-doc-1.14/tests/gobject/src/gtypes.c gtk-doc-1.17/tests/gobject/src/gtypes.c
--- gtk-doc-1.14/tests/gobject/src/gtypes.c	2009-12-25 21:39:33.000000000 +0000
+++ gtk-doc-1.17/tests/gobject/src/gtypes.c	2010-10-19 19:01:34.000000000 +0000
@@ -20,6 +20,7 @@
     static const GEnumValue values[] = {
       { GTKDOC_ENUM_V1,          "GTKDOC_ENUM_V1",          "first" },
       { GTKDOC_ENUM_V2,          "GTKDOC_ENUM_V2",          "second" },
+      { GTKDOC_ENUM_V3,          "GTKDOC_ENUM_V3",          "third" },
       { 0, NULL, NULL},
     };
     type = g_enum_register_static ("GtkdocEnum", values);
diff -Nru gtk-doc-1.14/tests/gobject/src/gtypes.h gtk-doc-1.17/tests/gobject/src/gtypes.h
--- gtk-doc-1.14/tests/gobject/src/gtypes.h	2009-12-25 21:38:47.000000000 +0000
+++ gtk-doc-1.17/tests/gobject/src/gtypes.h	2010-10-19 19:01:53.000000000 +0000
@@ -18,7 +18,9 @@
  */
 typedef enum {
   GTKDOC_ENUM_V1=0,
-  GTKDOC_ENUM_V2
+  GTKDOC_ENUM_V2,
+  /*< private >*/
+  GTKDOC_ENUM_V3
 } GtkdocEnum;
 
 GType  gtkdoc_enum_get_type(void) G_GNUC_CONST;
diff -Nru gtk-doc-1.14/tests/gobject/src/Makefile.in gtk-doc-1.17/tests/gobject/src/Makefile.in
--- gtk-doc-1.14/tests/gobject/src/Makefile.in	2010-01-03 12:15:11.000000000 +0000
+++ gtk-doc-1.17/tests/gobject/src/Makefile.in	2011-02-26 12:26:04.000000000 +0000
@@ -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,
@@ -90,7 +90,6 @@
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
@@ -152,6 +151,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
diff -Nru gtk-doc-1.14/tests/gtk-doc.make gtk-doc-1.17/tests/gtk-doc.make
--- gtk-doc-1.14/tests/gtk-doc.make	2010-01-04 19:39:29.000000000 +0000
+++ gtk-doc-1.17/tests/gtk-doc.make	2010-05-21 08:57:19.000000000 +0000
@@ -112,9 +112,9 @@
 	@-chmod -R u+w $(srcdir)
 	@rm -rf $(srcdir)/html
 	@mkdir $(srcdir)/html
-	@cd $(srcdir)/html && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
+	@cd $(srcdir)/html && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) ABS_TOP_SRCDIR=$(abs_top_srcdir) \
 	gtkdoc-mkhtml --uninstalled --path="$(abs_srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)  $(MKHTML_OPTIONS)
-	@test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+	@test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html/ )
 	@echo "gtk-doc: `date +%H:%M:%S.%N`: Fixing cross-references"
 	@cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
 	gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
@@ -136,7 +136,7 @@
 	    fi; \
 	  done; \
 	fi; \
-	cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
+	cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) ABS_TOP_SRCDIR=$(abs_top_srcdir) \
 	gtkdoc-mkpdf --uninstalled --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
 	@touch pdf-build.stamp
 
diff -Nru gtk-doc-1.14/tests/gtk-doc.notmpl.make gtk-doc-1.17/tests/gtk-doc.notmpl.make
--- gtk-doc-1.14/tests/gtk-doc.notmpl.make	2010-01-04 19:39:29.000000000 +0000
+++ gtk-doc-1.17/tests/gtk-doc.notmpl.make	2010-05-21 08:57:19.000000000 +0000
@@ -96,9 +96,9 @@
 	@-chmod -R u+w $(srcdir)
 	@rm -rf $(srcdir)/html
 	@mkdir $(srcdir)/html
-	@cd $(srcdir)/html && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
+	@cd $(srcdir)/html && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) ABS_TOP_SRCDIR=$(abs_top_srcdir) \
 	gtkdoc-mkhtml --uninstalled --path="$(abs_srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)  $(MKHTML_OPTIONS)
-	@test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+	@test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html/ )
 	@echo "gtk-doc: `date +%H:%M:%S.%N`: Fixing cross-references"
 	@cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
 	gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
@@ -120,7 +120,7 @@
 	    fi; \
 	  done; \
 	fi; \
-	cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
+	cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) ABS_TOP_SRCDIR=$(abs_top_srcdir) \
 	gtkdoc-mkpdf --uninstalled --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
 	@touch pdf-build.stamp
 
diff -Nru gtk-doc-1.14/tests/Makefile.am gtk-doc-1.17/tests/Makefile.am
--- gtk-doc-1.14/tests/Makefile.am	2010-03-28 16:58:58.000000000 +0000
+++ gtk-doc-1.17/tests/Makefile.am	2010-05-21 07:56:05.000000000 +0000
@@ -4,7 +4,7 @@
 
 if BUILD_TESTS
 
-TESTS = tools.sh gobject.sh bugs.sh annotations.sh fail.sh empty.sh
+TESTS = tools.sh gobject.sh bugs.sh annotations.sh fail.sh empty.sh sanity.sh
 TESTS_ENVIRONMENT = \
 	ABS_TOP_BUILDDIR=$(abs_top_builddir) \
 	ABS_TOP_SRCDIR=$(abs_top_srcdir) \
@@ -14,7 +14,7 @@
 endif
 
 EXTRA_DIST = gtkdoctest.sh tools.sh \
-	gobject.sh bugs.sh annotations.sh fail.sh empty.sh
+	gobject.sh bugs.sh annotations.sh fail.sh empty.sh sanity.sh
 
 # run any given test by running make .check
 %.check: %
diff -Nru gtk-doc-1.14/tests/Makefile.in gtk-doc-1.17/tests/Makefile.in
--- gtk-doc-1.14/tests/Makefile.in	2010-03-28 16:59:08.000000000 +0000
+++ gtk-doc-1.17/tests/Makefile.in	2011-02-26 12:26:03.000000000 +0000
@@ -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,
@@ -99,7 +99,6 @@
   done; \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
@@ -161,6 +160,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
@@ -241,7 +241,7 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = gobject bugs annotations fail empty .
-@BUILD_TESTS_TRUE@TESTS = tools.sh gobject.sh bugs.sh annotations.sh fail.sh empty.sh
+@BUILD_TESTS_TRUE@TESTS = tools.sh gobject.sh bugs.sh annotations.sh fail.sh empty.sh sanity.sh
 @BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = \
 @BUILD_TESTS_TRUE@	ABS_TOP_BUILDDIR=$(abs_top_builddir) \
 @BUILD_TESTS_TRUE@	ABS_TOP_SRCDIR=$(abs_top_srcdir) \
@@ -249,7 +249,7 @@
 @BUILD_TESTS_TRUE@	PERL5LIB=$(abs_top_builddir):$(PERL5LIB)
 
 EXTRA_DIST = gtkdoctest.sh tools.sh \
-	gobject.sh bugs.sh annotations.sh fail.sh empty.sh
+	gobject.sh bugs.sh annotations.sh fail.sh empty.sh sanity.sh
 
 all: all-recursive
 
@@ -300,7 +300,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]*);; \
@@ -325,7 +325,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]*);; \
diff -Nru gtk-doc-1.14/tests/sanity.sh gtk-doc-1.17/tests/sanity.sh
--- gtk-doc-1.14/tests/sanity.sh	1970-01-01 00:00:00.000000000 +0000
+++ gtk-doc-1.17/tests/sanity.sh	2010-06-13 10:58:16.000000000 +0000
@@ -0,0 +1,63 @@
+#!/bin/sh
+
+dir=`dirname $0`
+suite="sanity"
+
+failed=0
+tested=0
+
+echo "Running suite(s): gtk-doc-$suite";
+
+# check the presence and non-emptyness of certain files
+nok=0
+for path in $dir/*/docs*/html; do
+  if test ! -s $path/index.html ; then nok=$(($nok + 1)); break; fi
+  if test ! -s $path/index.sgml ; then nok=$(($nok + 1)); break; fi
+  if test ! -s $path/home.png ; then nok=$(($nok + 1)); break; fi
+done
+if test $nok -gt 0 ; then failed=$(($failed + 1)); fi
+tested=$(($tested + 1))
+
+
+# check online tags
+nok=0
+for file in $dir/*/docs*/html/index.sgml; do
+  grep >/dev/null "tester-docs.ps
    unrtf -t latex tester-docs.rtf >tester-docs.tex
    - bad output
-* man
-  we shouldn't convert the whole document to man. We should convert e.g. tool
-  sections to man pages.
-
-= Indexes =
-* http://www.w3.org/TR/2003/WD-xinclude-20031110/#syntax
-
-  
-
-* index terms
-  http://sourceforge.net/tracker/index.php?func=detail&aid=1986587&group_id=21935&atid=373747
-
-* we could add smart navigation for index/glossary pages
-  (like the subsections on the doc-pages)
-  
-= Cleanup =
-* can we deprecate title in the sectionfile and request people to have this in
-  the SECTION comment?
+
 
 = Warnings =
-* add some -Wxxx parameters to help qa work
+Bugzilla has some requests for extra warnings. We should support a common
+commandline option(s) in all tools to enable/disable the warnings. The makefiles
+should pass the flags from an env-var (GTKDOC_OPTIONS). The env-var should be
+used after the regular flags, so that the env-var can override hardcoded
+settings (in Makefile.am).
+
+Lets take this warning for the example:
+  "Symbol name not found at the start of the comment block."
+
+Version 1: (template "warn-xxx!, warn-yyy!")
+--warn-missing-symbol-at-comment-start
+--no-warn-missing-symbol-at-comment-start
+
+Version 2: (template "warn:s@")
+-Wmissing-symbol-at-comment-start
+-Wno-missing-symbol-at-comment-start
+-warn missing-symbol-at-comment-start
+-warn no-missing-symbol-at-comment-start
+
+more warnings:
   - 'deprecated' deprecating 'features'
   - 'dummy-docs' check if symbol docs are very short and repeat mainly words
     from the symbol.
+  - possible xrefs (e.g. adding a # or () would make it a successful xref)
+
 
 = Markup =
 * protected scope
@@ -149,8 +145,10 @@
   * if gir-files would have the comments too (they are getting this now):
     * we could even drop scanning the sources
     * IDEs could use the gir-files to show doc-tooltips for symbols
+  * we might need yet another makefile flavour to use gir files
 * perl and xml
   * http://www.xml.com/pub/a/2001/04/18/perlxmlqstart1.html
+ 
 == binding docs ==
 * simmillar workflow to gettext
 * add gtkdoc-mk??? to generate binding doc templates
@@ -167,19 +165,12 @@
     language={C,C++,JavaScript,Perl,Python,...}
   * devhelp could show a selector for the language
   * need to get existing python/~mm docs to use it, gtk-doc could output
-    language=C for own docs 
+    language=C for own docs
 == installation ==
 * need to install each book with a prefix
 * would be good to have a language attribute in book tag to allow filter by language
 * look at /usr/share/gtk-doc/html/pygobject/index.html
 
-= linking to sources =
-- what about a template URL containing a %s for the "path/file". 
-  http://svn.gnome.org/viewvc/gtk-doc/trunk/tests/gobject/src/gobject.c?view=markup
-  http://buzztard.svn.sourceforge.net/viewvc/buzztard/trunk/buzztard/src/lib/core/core.c?view=markup
-  - unfortunately we can't link to symbols
-  - linking to files is difficult as in gtkdoc we have modules
-
 
 = docbook xml =
 Its tedious to write large amounts of docbook.
@@ -196,9 +187,13 @@
   - and replace the macro with it
 The changes could be made in gtkdoc-mkdb::ExpandAbbreviations()
 === example macros ===
-|highlight(c)[...]| - highlight source code for a specific language
-|dot(abc.svg)[...]| - format dot graph and include result as mediaobject
-|ditta(abc.svg)[...]| - parse ascii art and include result as mediaobject
+|highlight(c)[...]| - highlight source code for a specific language (c)
+  - what will this output? preformatted html to be xincluded?
+  - we could have macros for each format, the docbook xml macro would leave
+    enough traces in the html so that a html macro can continue
+|dot(svg)[...]| - format dot graph and include result as mediaobject (in svg format)
+|ditta(svg)[...]| - parse ascii art and include result as mediaobject (in svg format)
+  - we need to generate a filename for the image or use anoter parameter
 
 === where to define macros ===
 * system wide and with the package, /share/gtk-doc/macros, $(srcdir)
@@ -243,7 +238,7 @@
 === process docbook ===
 if we highlight to docbook, we just get emphasis (bold)
 === process html ===
-if we hightlight to html we get colors, we need to check what tags we should process though:
+if we highlight to html we get colors, we need to check what tags we should process though:
 
 is used for all code boxes.
 
 is used for examples.
 problems:
@@ -259,7 +254,7 @@
   emacs: http://www.delorie.com/gnu/docs/emacs/emacs_486.html
 * allow  comments after |[
 * we need to catch those when processing the docbook and expanding the |[
-
+* require new macro syntax
 
 
 = syntax =
@@ -336,6 +331,7 @@
 * gobject: uses a  for introductions
 * gobject: uses  as a parent for the xi:includeed  docs
 
+
 = extra link for symbols =
 need options for configure:
 --enable-gtk-doc-codesearch-links
@@ -344,6 +340,12 @@
 - link to some online service for the code
 - problem: most don't have local anchors for the symbols
 - where to set the uri (in the document, like for online url)?
+- what about a template URL containing a %s for the "path/file" or a special macro
+  http://svn.gnome.org/viewvc/gtk-doc/trunk/tests/gobject/src/gobject.c?view=markup
+  http://buzztard.svn.sourceforge.net/viewvc/buzztard/trunk/buzztard/src/lib/core/core.c?view=markup
+  - unfortunately we can't link to symbols (only lines)
+  - linking to files is difficult as in gtkdoc we have modules
+
 == codesearch ==
 - google (code) link : http://www.google.com/codesearch?q=g_object_unref
 == live editing ==
@@ -358,6 +360,7 @@
 - support for xi:included examples
 - updating the checkout could be slow
 
+
 = fix missing since docs =
 cd gstreamer/gstreamer/docs/gst
 gtkdoc-mkdb --module=gstreamer --source-dir=../../gst --outputsymbolswithoutsince
@@ -401,8 +404,8 @@
         0m33.282s   0m29.266s	0m4.012s
       - removing the gentext calls for nav-bar alt tags does not help
 
-      
-  - try plain docbook xslt to see if maybe we have bad xslt templates in the 
+
+  - try plain docbook xslt to see if maybe we have bad xslt templates in the
     customisation layer (gtk-doc.xsl)
 
   - we could do the xinlcude processing once and use it for both html and pdf
@@ -410,32 +413,32 @@
     real        user       sys
     0m4.846s    0m4.434s   0m0.147s
     0m4.842s    0m4.386s   0m0.145s
-    
-    
+
+
     time xmllint --nonet --xinclude ../tester-docs.xml >./tester-docs-all.xml
     real        user       sys
     0m0.596s    0m0.546s   0m0.023s
-    
+
     time /usr/bin/xsltproc 2>../xslt5.log --path /home/ensonic/projects/gnome/gtk-doc/gtk-doc/tests/gobject/docs --nonet --stringparam gtkdoc.bookname tester --stringparam gtkdoc.version 1.14 /home/ensonic/projects/gnome/gtk-doc/gtk-doc/gtk-doc.xsl ./tester-docs-all.xml
     real        user       sys
     0m4.167s    0m3.834s   0m0.106s
     0m4.248s    0m3.851s   0m0.114s
-    
-    
+
+
     time xmllint --nonet --c14n --xinclude ../tester-docs.xml >./tester-docs-all2.xml
-    
+
     real        user       sys
     0m0.700s    0m0.636s   0m0.034s
-    
+
     time /usr/bin/xsltproc 2>../xslt6.log --path /home/ensonic/projects/gnome/gtk-doc/gtk-doc/tests/gobject/docs --nonet --stringparam gtkdoc.bookname tester --stringparam gtkdoc.version 1.14 /home/ensonic/projects/gnome/gtk-doc/gtk-doc/gtk-doc.xsl ./tester-docs-all2.xml
-    
+
     real        user       sys
     0m3.344s    0m3.026s   0m0.109s
     0m3.372s    0m3.037s   0m0.115s
-    
-    
+
+
     l ../tester-docs.xml ./tester-docs-all*.xml
-    
+
   - we could also try to compact the installed xslt
     xmllint --nonet --c14n --xinclude gtk-doc.xsl | sed -ne '//! { N; b c; }; /-->/s///g }; /^  *$/!p;' | sed '/^$/d' >gtk-doc.pre.xsl
     - unfortunately there is no way to ask xsltproc to pre-transform an xslt, that could
@@ -444,7 +447,14 @@
   - compile xslt
     http://sourceforge.net/projects/xsltc/
     http://www.xmlhack.com/read.php?item=618
+  - extra xsltproc options:
+    --novalid: saves ~ 0.12 sec
 
 - perl regexps
-  not really an issue, but we can improve by compiling the regexps
-  http://stackoverflow.com/questions/550258/does-the-o-modifier-for-perl-regular-expressions-still-provide-any-benefit
+  - not really an issue, but we can improve by compiling the regexps
+    http://stackoverflow.com/questions/550258/does-the-o-modifier-for-perl-regular-expressions-still-provide-any-benefit
+  - we use $&, $', and $` in several places (comple match, pre-match and post-match).
+    Those are slow and once they are used a single time perl prepares them for every match operation.
+    Since perl 5.10 one can use the /p flag for matches where this is needed and then use
+    ${^PREMATCH} , ${^MATCH}  and ${^POSTMATCH}
+