Fix automagic highlighting program detection, bug #334489. Handle multi-slot python. Clean up old revisions.

(Portage version: 2.2.0_alpha4/cvs/Linux x86_64)

7 files changed, 86 insertions, 684 deletions

diff --git a/dev-util/gtk-doc/files/gtk-doc-1.10-no-m4.patch b/dev-util/gtk-doc/files/gtk-doc-1.10-no-m4.patch
deleted file mode 100644
index 8c71c3cc5484..000000000000
--- a/dev-util/gtk-doc/files/gtk-doc-1.10-no-m4.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtk-doc-1.9.orig/Makefile.am gtk-doc-1.9/Makefile.am
---- gtk-doc-1.9.orig/Makefile.am	2007-09-24 15:16:20.000000000 -0400
-+++ gtk-doc-1.9/Makefile.am	2008-03-24 10:29:24.000000000 -0400
-@@ -35,16 +35,12 @@ gtkdocdata_DATA = \
- pkgconfigdir = $(datadir)/pkgconfig
- pkgconfig_DATA = gtk-doc.pc
- 
--aclocaldir = $(datadir)/aclocal
--aclocal_DATA = gtk-doc.m4
--
- sgmldir = $(datadir)/sgml/gtk-doc
- sgml_DATA = gtk-doc.cat
- 
- EXTRA_DIST = \
-   MAINTAINERS     \
-   gtk-doc.pc.in   \
--  gtk-doc.m4      \
-   gtk-doc.make    \
-   gtk-doc.notmpl.make \
-   gtk-doc.spec.in \
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtk-doc-1.9.orig/Makefile.in gtk-doc-1.9/Makefile.in
---- gtk-doc-1.9.orig/Makefile.in	2007-09-24 15:18:36.000000000 -0400
-+++ gtk-doc-1.9/Makefile.in	2008-03-24 10:29:22.000000000 -0400
-@@ -260,14 +260,11 @@ gtkdocdata_DATA = \
- 
- pkgconfigdir = $(datadir)/pkgconfig
- pkgconfig_DATA = gtk-doc.pc
--aclocaldir = $(datadir)/aclocal
--aclocal_DATA = gtk-doc.m4
- sgmldir = $(datadir)/sgml/gtk-doc
- sgml_DATA = gtk-doc.cat
- EXTRA_DIST = \
-   MAINTAINERS     \
-   gtk-doc.pc.in   \
--  gtk-doc.m4      \
-   gtk-doc.make    \
-   gtk-doc.notmpl.make \
-   gtk-doc.spec.in \
diff --git a/dev-util/gtk-doc/files/gtk-doc-1.11-fix-index-id-gen.patch b/dev-util/gtk-doc/files/gtk-doc-1.11-fix-index-id-gen.patch
deleted file mode 100644
index 9b96096511eb..000000000000
--- a/dev-util/gtk-doc/files/gtk-doc-1.11-fix-index-id-gen.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 420db2513f558083f9b8c35315d7708b8a3700d8 Mon Sep 17 00:00:00 2001
-From: Stefan Kost <stefkost@src.gnome.org>
-Date: Mon, 1 Dec 2008 09:22:32 +0000
-Subject: [PATCH 1/3] 	patch by: Matthias Clasen  <mclasen@redhat.com>
- 	* gtkdoc-mkdb.in:
- 	  Fix index-id generation for child and style properties. Fixes #562064.
-
-svn path=/trunk/; revision=621
-(cherry picked from commit 455a93571bf807f0a273c57fda81bb4956e4bcca)
----
- ChangeLog      |    7 +++++++
- gtkdoc-mkdb.in |   18 ++++++++++++------
- 2 files changed, 19 insertions(+), 6 deletions(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index b315ad5..63fa517 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,10 @@
-+2008-12-01  Stefan Kost  <ensonic@users.sf.net>
-+
-+	patch by: Matthias Clasen  <mclasen@redhat.com>
-+
-+	* gtkdoc-mkdb.in:
-+	  Fix index-id generation for child and style properties. Fixes #562064.
-+
- 2008-11-16  Stefan Kost  <ensonic@users.sf.net>
- 
- 	* HACKING:
-diff --git a/gtkdoc-mkdb.in b/gtkdoc-mkdb.in
-index fa67316..bd2f465 100755
---- a/gtkdoc-mkdb.in
-+++ b/gtkdoc-mkdb.in
-@@ -311,6 +311,13 @@ for my $dir (@SOURCE_DIRS) {
-     &ReadSourceDocumentation ($dir);
- }
- 
-+# FIXME: can we scan for a common prefix?
-+# DEBUG
-+# check $Declarations{$key} to first '_', we would need to count
-+#my %prefixes = map { m/^(.*?)\_.*/;uc($1) => 1 } grep { m/\_/ } keys (%Declarations);
-+#foreach (keys %prefixes) { print "$_\n"; }
-+# DEBUG
-+
- my $changed = &OutputSGML ("$ROOT_DIR/$MODULE-sections.txt");
- 
- # If any of the DocBook SGML files have changed, update the timestamp file (so
-@@ -823,15 +830,15 @@ sub OutputIndex {
-             $short_symbol = $symbol;
-         }
- 
--        my $xref = &MakeXRef ($symbol);
-         my $curletter = uc(substr($short_symbol,0,1));
-         my $id = $apiindex{$symbol};
--        
-+        my $xref = &MakeXRef ($id, $symbol);
-+
-         #print "  add symbol $symbol with $id to index in section $curletter\n";
- 
-         if ($curletter ne $lastletter) {
-             $lastletter = $curletter;
--      
-+
-             if ($divopen == 1) {
-                 print (OUTPUT "</indexdiv>\n");
-             }
-@@ -2122,12 +2129,11 @@ EOF
- sub CreateValidSGMLID {
-     my ($id) = $_[0];
- 
--    # Append ":CAPS" to all all-caps identifiers
--
-     # Special case, '_' would end up as '' so we use 'gettext-macro' instead.
-     if ($id eq "_") { return "gettext-macro"; }
- 
--    if ($id !~ /[a-z]/) { $id .= ":CAPS" };
-+    # Append ":CAPS" to all all-caps identifiers
-+    if ($id !~ /[a-z]/ && $id !~ /-CAPS$/) { $id .= ":CAPS" };
- 
-     $id =~ s/[_ ]/-/g;
-     $id =~ s/[,\.]//g;
--- 
-1.6.1.3
-
diff --git a/dev-util/gtk-doc/files/gtk-doc-1.11-quote-filenames-with-space.patch b/dev-util/gtk-doc/files/gtk-doc-1.11-quote-filenames-with-space.patch
deleted file mode 100644
index 104d4ef94b7a..000000000000
--- a/dev-util/gtk-doc/files/gtk-doc-1.11-quote-filenames-with-space.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From d31d3e9a0733ccf229526b70b38b73889240b0ba Mon Sep 17 00:00:00 2001
-From: Stefan Kost <stefkost@src.gnome.org>
-Date: Tue, 17 Mar 2009 11:20:01 +0000
-Subject: [PATCH 3/3] 	patch by: Vincent Untz <vuntz@nome.org>
- 	* gtkdoc-common.pl.in:
- 	  Be more friendly for files with a space in their name. Fixes #575574.
-
-svn path=/trunk/; revision=705
-(cherry picked from commit 390599e14a7fc65945e3966e32ae06e2148089e2)
----
- ChangeLog           |    8 ++++++++
- gtkdoc-common.pl.in |    2 +-
- 2 files changed, 9 insertions(+), 1 deletions(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index bc14efa..25430b8 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,11 @@
-+2009-03-17  Stefan Kost  <ensonic@users.sf.net>
-+
-+	patch by: Vincent Untz <vuntz@nome.org>
-+
-+	* gtkdoc-common.pl.in:
-+	  Be more friendly for files with a space in their name. Fixes #575574.
-+	  
-+
- 2009-01-04  Stefan Kost  <ensonic@users.sf.net>
- 
- 	* tests/gtk-doc.make:
-diff --git a/gtkdoc-common.pl.in b/gtkdoc-common.pl.in
-index 972644d..8cd7614 100644
---- a/gtkdoc-common.pl.in
-+++ b/gtkdoc-common.pl.in
-@@ -51,7 +51,7 @@ sub UpdateFileIfChanged {
-     my $exit_code = 1;
- 
-     if (-e $old_file) {
--	`cmp -s $old_file $new_file`;
-+	`cmp -s "$old_file" "$new_file"`;
- 	$exit_code = $? >> 8;
- #	print "   cmp exit code: $exit_code ($?)\n";
-     }
--- 
-1.6.1.3
-
diff --git a/dev-util/gtk-doc/files/gtk-doc-1.11-tests-fixes.patch b/dev-util/gtk-doc/files/gtk-doc-1.11-tests-fixes.patch
deleted file mode 100644
index 6b3f5835d1f0..000000000000
--- a/dev-util/gtk-doc/files/gtk-doc-1.11-tests-fixes.patch
+++ /dev/null
@@ -1,403 +0,0 @@
-From 7ef64f1d7d3309612a14c22dba59a3a4a34bc381 Mon Sep 17 00:00:00 2001
-From: Stefan Kost <stefkost@src.gnome.org>
-Date: Sun, 4 Jan 2009 12:08:02 +0000
-Subject: [PATCH 2/3] Fix running tests, if no gtk-doc is installed yet.
-
-* gtkdoc-mkhtml.in:
-* tests/Makefile.am:
-* tests/gtk-doc.make:
-* tests/gtk-doc.notmpl.make:
-* tests/gtkdoctest.sh:
-Fix running tests, if no gtk-doc is installed yet.
-
-svn path=/trunk/; revision=630
-(cherry picked from commit 0ceaa25cb719bda5205627819fa170a41783cafc)
-
-Now aall tests pass.
-
-* tests/gtk-doc.make:
-* tests/gtk-doc.notmpl.make:
-Now aall tests pass.
-
-svn path=/trunk/; revision=631
-(cherry picked from commit b3305a943c1dfe522fdc222d495a4a449d37d30c)
----
- ChangeLog                 |   15 +++++++++++++++
- gtkdoc-mkhtml.in          |   12 ++++++------
- tests/Makefile.am         |    4 +++-
- tests/gtk-doc.make        |   12 ++++++------
- tests/gtk-doc.notmpl.make |   10 +++++-----
- tests/gtkdoctest.sh       |    2 +-
- 6 files changed, 36 insertions(+), 19 deletions(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index 63fa517..bc14efa 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,18 @@
-+2009-01-04  Stefan Kost  <ensonic@users.sf.net>
-+
-+	* tests/gtk-doc.make:
-+	* tests/gtk-doc.notmpl.make:
-+	  Now aall tests pass.
-+
-+2009-01-04  Stefan Kost  <ensonic@users.sf.net>
-+
-+	* gtkdoc-mkhtml.in:
-+	* tests/Makefile.am:
-+	* tests/gtk-doc.make:
-+	* tests/gtk-doc.notmpl.make:
-+	* tests/gtkdoctest.sh:
-+	  Fix running tests, if no gtk-doc is installed yet.
-+
- 2008-12-01  Stefan Kost  <ensonic@users.sf.net>
- 
- 	patch by: Matthias Clasen  <mclasen@redhat.com>
-diff --git a/gtkdoc-mkhtml.in b/gtkdoc-mkhtml.in
-index 1671cf0..d18b10e 100644
---- a/gtkdoc-mkhtml.in
-+++ b/gtkdoc-mkhtml.in
-@@ -29,16 +29,16 @@ shift
- document=$1
- shift
- 
--# FIXME: this is a hack to run uninstalled
--if test "x$0" = "x../../../gtkdoc-mkhtml" ; then
--      # uninstalled
--      gtkdocdir=`dirname $0`
--else
--      # installed
-+# FIXME: this is a hack to detect uninstalled
-+if test "x$0" = "x@prefix@/bin/gtkdoc-mkhtml" ; then
-+      #echo "installed"
-       # the first two are needed to resolve datadir
-       prefix=@prefix@
-       datarootdir=@datarootdir@
-       gtkdocdir=@datadir@/gtk-doc/data
-+else
-+      #echo "uninstalled"
-+      gtkdocdir=`dirname $0`
- fi
- 
- if head -n 1 $document | grep "<?xml" > /dev/null; then
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 4281c5c..1b05e7a 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -5,7 +5,9 @@ SUBDIRS = gobject bugs annotations .
- if BUILD_TESTS
- 
- TESTS = gobject.sh bugs.sh annotations.sh
--TESTS_ENVIRONMENT = PATH=$(top_builddir):$(srcdir):$(PATH)
-+TESTS_ENVIRONMENT = \
-+	PATH=$(abs_top_builddir):$(srcdir):$(PATH) \
-+	PERL5LIB=$(abs_top_builddir):$(PERL5LIB)
- 
- endif
- 
-diff --git a/tests/Makefile.in b/tests/Makefile.in
---- a/tests/Makefile.in
-+++ b/tests/Makefile.in
-@@ -193,7 +193,10 @@
- top_srcdir = @top_srcdir@
- SUBDIRS = gobject bugs annotations .
- @BUILD_TESTS_TRUE@TESTS = gobject.sh bugs.sh annotations.sh
--@BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = PATH=$(top_builddir):$(srcdir):$(PATH)
-+@BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = \
-+@BUILD_TESTS_TRUE@	PATH=$(abs_top_builddir):$(srcdir):$(PATH) \
-+@BUILD_TESTS_TRUE@	PERL5LIB=$(abs_top_builddir):$(PERL5LIB)
-+
- EXTRA_DIST = gtkdoctest.sh \
- 	gobject.sh bugs.sh annotations.sh
- 
-diff --git a/tests/gtk-doc.make b/tests/gtk-doc.make
-index 1c37e9b..b18c405 100644
---- a/tests/gtk-doc.make
-+++ b/tests/gtk-doc.make
-@@ -59,10 +59,10 @@ $(REPORT_FILES): sgml-build.stamp
- scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
- 	@echo 'gtk-doc: Scanning header files'
- 	@-chmod -R u+w $(srcdir)
--	@PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \
-+	@cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
- 	  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)" $(top_builddir)/gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) $(SCANGOBJ_OPTIONS); \
-+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) $(SCANGOBJ_OPTIONS); \
- 	else \
- 	    cd $(srcdir) ; \
- 	    for i in $(SCANOBJ_FILES) ; do \
-@@ -79,7 +79,7 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)
- tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
- 	@echo 'gtk-doc: Rebuilding template files'
- 	@-chmod -R u+w $(srcdir)
--	@PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \
-+	@cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
- 	gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
- 	touch tmpl-build.stamp
- 
-@@ -94,7 +94,7 @@ tmpl/*.sgml:
- sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
- 	@echo 'gtk-doc: Building XML'
- 	@-chmod -R u+w $(srcdir)
--	@PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \
-+	@cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
- 	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
- 	touch sgml-build.stamp
- 
-@@ -108,11 +108,11 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
- 	@-chmod -R u+w $(srcdir)
- 	rm -rf $(srcdir)/html
- 	mkdir $(srcdir)/html
--	@PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir)/html && \
-+	@cd $(srcdir)/html && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
- 	gtkdoc-mkhtml --path="$(srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)  $(MKHTML_OPTIONS)
- 	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
- 	@echo 'gtk-doc: Fixing cross-references'
--	@PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \
-+	@cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
- 	gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
- 	touch html-build.stamp
- 
-diff --git a/tests/gtk-doc.notmpl.make b/tests/gtk-doc.notmpl.make
-index 1f4c518..46bdb41 100644
---- a/tests/gtk-doc.notmpl.make
-+++ b/tests/gtk-doc.notmpl.make
-@@ -59,10 +59,10 @@ $(REPORT_FILES): sgml-build.stamp
- scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
- 	@echo 'gtk-doc: Scanning header files'
- 	@-chmod -R u+w $(srcdir)
--	@PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \
-+	@cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
- 	  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)" $(top_builddir)/gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) $(SCANGOBJ_OPTIONS); \
-+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) $(SCANGOBJ_OPTIONS); \
- 	else \
- 	    cd $(srcdir) ; \
- 	    for i in $(SCANOBJ_FILES) ; do \
-@@ -79,7 +79,7 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)
- sgml-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) $(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)
--	@PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \
-+	@cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
- 	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
- 	touch sgml-build.stamp
- 
-@@ -93,11 +93,11 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
- 	@-chmod -R u+w $(srcdir)
- 	rm -rf $(srcdir)/html
- 	mkdir $(srcdir)/html
--	@PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir)/html && \
-+	@cd $(srcdir)/html && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
- 	gtkdoc-mkhtml --path="$(srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)  $(MKHTML_OPTIONS)
- 	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
- 	@echo 'gtk-doc: Fixing cross-references'
--	@PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \
-+	@cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
- 	gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
- 	touch html-build.stamp
- 
-diff --git a/tests/gtkdoctest.sh b/tests/gtkdoctest.sh
-index 2b92d57..694c4c5 100755
---- a/tests/gtkdoctest.sh
-+++ b/tests/gtkdoctest.sh
-@@ -3,7 +3,7 @@
- suite=$1
- dir=`dirname $0`
- 
--PATH=`pwd`:$PATH PERL5LIB=`pwd`:$PERL5LIB && cd $dir/$suite/docs && gtkdoc-check
-+cd $dir/$suite/docs && gtkdoc-check
- 
- # xmllint --noout --nonet --schema ../devhelp2.xsd ./bugs/docs/html/tester.devhelp2
- #
---- a/tests/annotations/docs/Makefile.am
-+++ b/tests/annotations/docs/Makefile.am
-@@ -76,3 +76,10 @@
- 	gtkdoc-mkhtml.log \
- 	gtkdoc-fixxref.log
- 
-+if BUILD_TESTS
-+
-+TESTS_ENVIRONMENT = \
-+	PATH=$(abs_top_builddir):$(srcdir):$(PATH) \
-+	PERL5LIB=$(abs_top_builddir):$(PERL5LIB)
-+
-+endif
---- a/tests/annotations/docs/Makefile.in
-+++ b/tests/annotations/docs/Makefile.in
-@@ -295,6 +295,10 @@
- 	gtkdoc-mkhtml.log \
- 	gtkdoc-fixxref.log
- 
-+@BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = \
-+@BUILD_TESTS_TRUE@	PATH=$(abs_top_builddir):$(srcdir):$(PATH) \
-+@BUILD_TESTS_TRUE@	PERL5LIB=$(abs_top_builddir):$(PERL5LIB)
-+
- all: all-am
- 
- .SUFFIXES:
-@@ -482,10 +486,10 @@
- scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
- 	@echo 'gtk-doc: Scanning header files'
- 	@-chmod -R u+w $(srcdir)
--	@PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \
-+	@cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
- 	  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)" $(top_builddir)/gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) $(SCANGOBJ_OPTIONS); \
-+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) $(SCANGOBJ_OPTIONS); \
- 	else \
- 	    cd $(srcdir) ; \
- 	    for i in $(SCANOBJ_FILES) ; do \
-@@ -502,7 +506,7 @@
- sgml-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) $(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)
--	@PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \
-+	@cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
- 	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
- 	touch sgml-build.stamp
- 
-@@ -516,11 +520,11 @@
- 	@-chmod -R u+w $(srcdir)
- 	rm -rf $(srcdir)/html
- 	mkdir $(srcdir)/html
--	@PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir)/html && \
-+	@cd $(srcdir)/html && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
- 	gtkdoc-mkhtml --path="$(srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)  $(MKHTML_OPTIONS)
- 	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
- 	@echo 'gtk-doc: Fixing cross-references'
--	@PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \
-+	@cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
- 	gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
- 	touch html-build.stamp
- 
---- a/tests/bugs/docs/Makefile.am
-+++ b/tests/bugs/docs/Makefile.am
-@@ -76,3 +76,10 @@
- 	gtkdoc-mkhtml.log \
- 	gtkdoc-fixxref.log
- 
-+if BUILD_TESTS
-+
-+TESTS_ENVIRONMENT = \
-+	PATH=$(abs_top_builddir):$(srcdir):$(PATH) \
-+	PERL5LIB=$(abs_top_builddir):$(PERL5LIB)
-+
-+endif
---- a/tests/bugs/docs/Makefile.in
-+++ b/tests/bugs/docs/Makefile.in
-@@ -295,6 +295,10 @@
- 	gtkdoc-mkhtml.log \
- 	gtkdoc-fixxref.log
- 
-+@BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = \
-+@BUILD_TESTS_TRUE@	PATH=$(abs_top_builddir):$(srcdir):$(PATH) \
-+@BUILD_TESTS_TRUE@	PERL5LIB=$(abs_top_builddir):$(PERL5LIB)
-+
- all: all-am
- 
- .SUFFIXES:
-@@ -482,10 +486,10 @@
- scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
- 	@echo 'gtk-doc: Scanning header files'
- 	@-chmod -R u+w $(srcdir)
--	@PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \
-+	@cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
- 	  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)" $(top_builddir)/gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) $(SCANGOBJ_OPTIONS); \
-+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) $(SCANGOBJ_OPTIONS); \
- 	else \
- 	    cd $(srcdir) ; \
- 	    for i in $(SCANOBJ_FILES) ; do \
-@@ -502,7 +506,7 @@
- sgml-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) $(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)
--	@PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \
-+	@cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
- 	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
- 	touch sgml-build.stamp
- 
-@@ -516,11 +520,11 @@
- 	@-chmod -R u+w $(srcdir)
- 	rm -rf $(srcdir)/html
- 	mkdir $(srcdir)/html
--	@PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir)/html && \
-+	@cd $(srcdir)/html && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
- 	gtkdoc-mkhtml --path="$(srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)  $(MKHTML_OPTIONS)
- 	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
- 	@echo 'gtk-doc: Fixing cross-references'
--	@PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \
-+	@cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
- 	gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
- 	touch html-build.stamp
- 
---- a/tests/gobject/docs/Makefile.am
-+++ b/tests/gobject/docs/Makefile.am
-@@ -76,3 +76,10 @@
- 	gtkdoc-mkhtml.log \
- 	gtkdoc-fixxref.log
- 
-+if BUILD_TESTS
-+
-+TESTS_ENVIRONMENT = \
-+	PATH=$(abs_top_builddir):$(srcdir):$(PATH) \
-+	PERL5LIB=$(abs_top_builddir):$(PERL5LIB)
-+
-+endif
---- a/tests/gobject/docs/Makefile.in
-+++ b/tests/gobject/docs/Makefile.in
-@@ -295,6 +295,10 @@
- 	gtkdoc-mkhtml.log \
- 	gtkdoc-fixxref.log
- 
-+@BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = \
-+@BUILD_TESTS_TRUE@	PATH=$(abs_top_builddir):$(srcdir):$(PATH) \
-+@BUILD_TESTS_TRUE@	PERL5LIB=$(abs_top_builddir):$(PERL5LIB)
-+
- all: all-am
- 
- .SUFFIXES:
-@@ -482,10 +486,10 @@
- scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
- 	@echo 'gtk-doc: Scanning header files'
- 	@-chmod -R u+w $(srcdir)
--	@PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \
-+	@cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
- 	  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)" $(top_builddir)/gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) $(SCANGOBJ_OPTIONS); \
-+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) $(SCANGOBJ_OPTIONS); \
- 	else \
- 	    cd $(srcdir) ; \
- 	    for i in $(SCANOBJ_FILES) ; do \
-@@ -502,7 +506,7 @@
- sgml-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) $(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)
--	@PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \
-+	@cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
- 	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
- 	touch sgml-build.stamp
- 
-@@ -516,11 +520,11 @@
- 	@-chmod -R u+w $(srcdir)
- 	rm -rf $(srcdir)/html
- 	mkdir $(srcdir)/html
--	@PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir)/html && \
-+	@cd $(srcdir)/html && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
- 	gtkdoc-mkhtml --path="$(srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)  $(MKHTML_OPTIONS)
- 	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
- 	@echo 'gtk-doc: Fixing cross-references'
--	@PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \
-+	@cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
- 	gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
- 	touch html-build.stamp
- 
--- 
-1.6.1.3
-
diff --git a/dev-util/gtk-doc/files/gtk-doc-1.13-fixxref-compat.patch b/dev-util/gtk-doc/files/gtk-doc-1.13-fixxref-compat.patch
deleted file mode 100644
index 6b5a09b66c77..000000000000
--- a/dev-util/gtk-doc/files/gtk-doc-1.13-fixxref-compat.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From b39bb84dfb5f16c8b2977105bd5876b7b8d58a11 Mon Sep 17 00:00:00 2001
-From: Vincent Untz <vuntz@gnome.org>
-Date: Tue, 22 Dec 2009 11:54:31 +0000
-Subject: fixxref: make it work again without --module argument, Fixes #605211
-
-This restores a compatible behavior with previous versions of gtk-doc,
-which is required by many tarballs.
----
-diff --git a/gtkdoc-fixxref.in b/gtkdoc-fixxref.in
-index 8f166ef..5a703ad 100755
---- a/gtkdoc-fixxref.in
-+++ b/gtkdoc-fixxref.in
-@@ -168,36 +168,38 @@ foreach my $dir (@EXTRA_DIRS) {
-     }
- }
- 
--open (INPUT, "$MODULE-sections.txt")
--	|| die "Can't open $MODULE-sections.txt: $!";
--my $subsection = "";
--while (<INPUT>) {
--    if (m/^#/) {
--        next;
--
--    } elsif (m/^<SECTION>/) {
--        $subsection = "";
--    } elsif (m/^<SUBSECTION\s*(.*)>/i) {
--        $subsection = $1;
--    } elsif (m/^<SUBSECTION>/) {
--        next;
--    } elsif (m/^<TITLE>(.*)<\/TITLE>/) {
--        next;
--    } elsif (m/^<FILE>(.*)<\/FILE>/) {
--        next;
--    } elsif (m/^<INCLUDE>(.*)<\/INCLUDE>/) {
--        next;
--    } elsif (m/^<\/SECTION>/) {
--        next;
--    } elsif (m/^(\S+)/) {
--        my $symbol=CreateValidSGMLID($1);
--
--        if ($subsection eq "Standard" || $subsection eq "Private") {
--            $NoLinks{$symbol} = 1;
-+if (defined($MODULE)) {
-+    open (INPUT, "$MODULE-sections.txt")
-+            || die "Can't open $MODULE-sections.txt: $!";
-+    my $subsection = "";
-+    while (<INPUT>) {
-+        if (m/^#/) {
-+            next;
-+
-+        } elsif (m/^<SECTION>/) {
-+            $subsection = "";
-+        } elsif (m/^<SUBSECTION\s*(.*)>/i) {
-+            $subsection = $1;
-+        } elsif (m/^<SUBSECTION>/) {
-+            next;
-+        } elsif (m/^<TITLE>(.*)<\/TITLE>/) {
-+            next;
-+        } elsif (m/^<FILE>(.*)<\/FILE>/) {
-+            next;
-+        } elsif (m/^<INCLUDE>(.*)<\/INCLUDE>/) {
-+            next;
-+        } elsif (m/^<\/SECTION>/) {
-+            next;
-+        } elsif (m/^(\S+)/) {
-+            my $symbol=CreateValidSGMLID($1);
-+
-+            if ($subsection eq "Standard" || $subsection eq "Private") {
-+                $NoLinks{$symbol} = 1;
-+            }
-         }
-     }
-+    close (INPUT);
- }
--close (INPUT);
- 
- &FixCrossReferences ($MODULE_DIR);
- 
---
-cgit v0.8.3.1
diff --git a/dev-util/gtk-doc/files/gtk-doc-1.13-scan-touch-module-overrides.patch b/dev-util/gtk-doc/files/gtk-doc-1.13-scan-touch-module-overrides.patch
deleted file mode 100644
index ded24161d3bf..000000000000
--- a/dev-util/gtk-doc/files/gtk-doc-1.13-scan-touch-module-overrides.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From d1a042fbd75b7f8d44293fbee01e783be79d884c Mon Sep 17 00:00:00 2001
-From: Nicola Fontana <ntd@entidi.it>
-Date: Mon, 03 Aug 2009 13:32:36 +0000
-Subject: gtkdoc-scan: touch MODULE-overrides.txt when missing. Fixes #590625
-
-gtk-doc.make puts $(DOC_MODULE)-overrides.txt in EXTRA_DIST, so this
-file must exist to be able to "make dist".
----
-diff --git a/gtkdoc-scan.in b/gtkdoc-scan.in
-index ece8d99..c986f36 100755
---- a/gtkdoc-scan.in
-+++ b/gtkdoc-scan.in
-@@ -185,12 +185,12 @@ if ($REBUILD_SECTIONS || ! -e $sections_file) {
-   `cp $old_decl_list $sections_file`;
- }
- 
--# If there is no MODULE-overrides.txt file we create an empty one.
--# FIXME: why?
--#my $overrides_file = "${OUTPUT_DIR}/$MODULE-overrides.txt";
--#if (! -e $overrides_file) {
--#  `touch $overrides_file`;
--#}
-+# If there is no MODULE-overrides.txt file we create an empty one
-+# because EXTRA_DIST in gtk-doc.make requires it.
-+my $overrides_file = "${OUTPUT_DIR}/$MODULE-overrides.txt";
-+if (! -e $overrides_file) {
-+  `touch $overrides_file`;
-+}
- 
- 
- 
---
-cgit v0.8.3.1
diff --git a/dev-util/gtk-doc/files/gtk-doc-1.15-allow-selection-highlighter.patch b/dev-util/gtk-doc/files/gtk-doc-1.15-allow-selection-highlighter.patch
new file mode 100644
index 000000000000..a3b2b9d1835a
--- /dev/null
+++ b/dev-util/gtk-doc/files/gtk-doc-1.15-allow-selection-highlighter.patch
@@ -0,0 +1,86 @@
+From 8506e3b61dca2861b594c3cea2dc4e0470aad4fc Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 26 Sep 2010 18:48:04 +0200
+Subject: [PATCH 01/13] Allow selection of a specific syntax highlighter, bug #628611.
+
+---
+ configure.ac |   53 +++++++++++++++++++++++++++++++++++++++++++----------
+ 1 files changed, 43 insertions(+), 10 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3d7c8e1..9dada11 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -100,26 +100,59 @@ JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/html/ch
+ 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])
+-- 
+1.7.3.1
+