[Pkg-mono-svn-commits] rev 3840 - in mono-tools/trunk/debian: . patches
David Paleino
hanska-guest at alioth.debian.org
Wed Nov 26 13:15:00 UTC 2008
Author: hanska-guest
Date: 2008-11-26 13:14:59 +0000 (Wed, 26 Nov 2008)
New Revision: 3840
Added:
mono-tools/trunk/debian/patches/00-fix_build_system.patch
mono-tools/trunk/debian/patches/01-use_real_nunit.patch
mono-tools/trunk/debian/patches/02-startup_mono_path.patch
mono-tools/trunk/debian/patches/03-mozilla_home.patch
mono-tools/trunk/debian/patches/04-gendarme_link_libraries_correctly.patch
mono-tools/trunk/debian/patches/05-cecil.patch
mono-tools/trunk/debian/patches/06-nunit_2.4_port.patch
mono-tools/trunk/debian/patches/07-webkit-sharp_port.patch
mono-tools/trunk/debian/patches/series
Removed:
mono-tools/trunk/debian/patches/00list
mono-tools/trunk/debian/patches/01_use_real_nunit.dpatch
mono-tools/trunk/debian/patches/02_startup_mono_path.dpatch
mono-tools/trunk/debian/patches/03_mozilla-home.dpatch
mono-tools/trunk/debian/patches/04_cecil.dpatch
mono-tools/trunk/debian/patches/04_gendarme_link_libraries_correctly.dpatch
mono-tools/trunk/debian/patches/05_nunit_2.4_port.dpatch
mono-tools/trunk/debian/patches/05_webkit-sharp_port.dpatch
mono-tools/trunk/debian/patches/99_autoreconf.dpatch
Modified:
mono-tools/trunk/debian/changelog
mono-tools/trunk/debian/control
mono-tools/trunk/debian/rules
Log:
* debian/control:
+ Build-Depends:
- added libmono-winforms2.0-cil
- added libmono-webbrowser0.5-cil
- removed libmono1.0-cil
* debian/patches/:
+ converted to quilt
+ 00-fix_build_system.patch added
Modified: mono-tools/trunk/debian/changelog
===================================================================
--- mono-tools/trunk/debian/changelog 2008-11-26 11:02:32 UTC (rev 3839)
+++ mono-tools/trunk/debian/changelog 2008-11-26 13:14:59 UTC (rev 3840)
@@ -10,15 +10,17 @@
- added autotools-dev, autoconf, automake
- added mono-devel
- removed mono-mcs, mono-gmcs, mono-gac and mono-1.0-devel
+ - added libmono-winforms2.0-cil
+ - added libmono-webbrowser0.5-cil
+ - removed libmono1.0-cil
+ fixed spurious dot in long description
* debian/rules:
+ implemented autotools files re-generation
* debian/patches:
- + 04_gendarme_link_libraries_correctly updated
- + 05_webkit-sharp_port disabled
- + 99_autoreconf disabled
+ + converted to quilt
+ + 00-fix_build_system.patch added
- -- David Paleino <d.paleino at gmail.com> Mon, 24 Nov 2008 00:14:31 +0100
+ -- David Paleino <d.paleino at gmail.com> Wed, 26 Nov 2008 14:12:09 +0100
mono-tools (1.9-2) unstable; urgency=medium
Modified: mono-tools/trunk/debian/control
===================================================================
--- mono-tools/trunk/debian/control 2008-11-26 11:02:32 UTC (rev 3839)
+++ mono-tools/trunk/debian/control 2008-11-26 13:14:59 UTC (rev 3840)
@@ -3,22 +3,22 @@
Priority: optional
Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
Uploaders: Mirco Bauer <meebey at debian.org>, Sebastian Dröge <slomo at debian.org>
-Build-Depends: debhelper (>= 5.0.0), dpatch
+Build-Depends: debhelper (>= 5.0.0), quilt
Build-Depends-Indep: cli-common-dev (>= 0.5.4),
pkg-config,
autoconf,
automake,
autotools-dev,
mono-devel,
- libmono-dev (>= 1.0),
libmono-nunit2.2-cil,
+ libmono-winforms2.0-cil,
libmono-system-web2.0-cil,
- libmono1.0-cil (>= 1.9.1),
libgtk2.0-cil (>= 2.0),
libgconf2.0-cil (>= 2.0),
libglade2.0-cil (>= 2.0),
libgnome2.0-cil (>= 2.0),
libgtkhtml3.16-cil,
+ libmono-webbrowser0.5-cil,
libwebkit1.0-cil,
monodoc-base (>= 1.1.9)
Standards-Version: 3.7.3
Added: mono-tools/trunk/debian/patches/00-fix_build_system.patch
===================================================================
--- mono-tools/trunk/debian/patches/00-fix_build_system.patch (rev 0)
+++ mono-tools/trunk/debian/patches/00-fix_build_system.patch 2008-11-26 13:14:59 UTC (rev 3840)
@@ -0,0 +1,13 @@
+--- mono-tools-2.0.orig/configure.in
++++ mono-tools-2.0/configure.in
+@@ -7,8 +7,8 @@
+ AC_PROG_INSTALL
+
+ dnl C# compiler
+-AC_PATH_PROG(MCS, mcs, no)
+-AC_PATH_PROG(GMCS, gmcs, no)
++AC_PATH_PROG(MCS, csc, no)
++AC_PATH_PROG(GMCS, csc, no)
+ AC_PATH_PROG(RUNTIME, mono, no)
+ AC_PATH_PROG(GACUTIL, gacutil, no)
+
Deleted: mono-tools/trunk/debian/patches/00list
===================================================================
--- mono-tools/trunk/debian/patches/00list 2008-11-26 11:02:32 UTC (rev 3839)
+++ mono-tools/trunk/debian/patches/00list 2008-11-26 13:14:59 UTC (rev 3840)
@@ -1,7 +0,0 @@
-#01_use_real_nunit
-02_startup_mono_path
-03_mozilla-home
-04_gendarme_link_libraries_correctly
-#05_webkit-sharp_port
-#05_nunit_2.4_port
-#99_autoreconf
Added: mono-tools/trunk/debian/patches/01-use_real_nunit.patch
===================================================================
--- mono-tools/trunk/debian/patches/01-use_real_nunit.patch (rev 0)
+++ mono-tools/trunk/debian/patches/01-use_real_nunit.patch 2008-11-26 13:14:59 UTC (rev 3840)
@@ -0,0 +1,51 @@
+--- mono-tools-2.0.orig/configure.in
++++ mono-tools-2.0/configure.in
+@@ -35,7 +35,7 @@
+ AC_SUBST(GACUTIL)
+
+
+-PKG_CHECK_MODULES(NUNIT, mono-nunit)
++PKG_CHECK_MODULES(NUNIT, nunit)
+ AC_SUBST(NUNIT_LIBS)
+
+ PKG_CHECK_MODULES(MONODOC, monodoc)
+--- mono-tools-2.0.orig/gnunit/src/AssemblyStore.cs
++++ mono-tools-2.0/gnunit/src/AssemblyStore.cs
+@@ -574,6 +574,11 @@
+ idle.Set ();
+ }
+
++ void EventListener.TestOutput (TestOutput testOutput)
++ {
++ ;
++ }
++
+ void SetIconFromResult (TestResult result)
+ {
+ CircleColor color;
+--- mono-tools-2.0.orig/gnunit/src/main.cs
++++ mono-tools-2.0/gnunit/src/main.cs
+@@ -284,6 +284,11 @@
+ return inner_filter.Pass (test);
+ }
+
++ public bool Exclude
++ {
++ get { return false; }
++ }
++
+ static string _ (string key)
+ {
+ return Catalog.GetString (key);
+@@ -767,6 +772,11 @@
+ ClockUpdater (this, EventArgs.Empty);
+ }
+
++ void EventListener.TestOutput (TestOutput testOutput)
++ {
++ ;
++ }
++
+ // Misc.
+
+ void UpdateRunStatus ()
Deleted: mono-tools/trunk/debian/patches/01_use_real_nunit.dpatch
===================================================================
--- mono-tools/trunk/debian/patches/01_use_real_nunit.dpatch 2008-11-26 11:02:32 UTC (rev 3839)
+++ mono-tools/trunk/debian/patches/01_use_real_nunit.dpatch 2008-11-26 13:14:59 UTC (rev 3840)
@@ -1,57 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
- at DPATCH@
-diff -urNad mono-tools-1.2.6~/configure.in mono-tools-1.2.6/configure.in
---- mono-tools-1.2.6~/configure.in 2007-12-06 21:43:46.000000000 +0000
-+++ mono-tools-1.2.6/configure.in 2008-01-10 14:20:22.000000000 +0000
-@@ -30,7 +30,7 @@
- AC_SUBST(RUNTIME)
- AC_SUBST(RESGEN)
-
--PKG_CHECK_MODULES(NUNIT, mono-nunit)
-+PKG_CHECK_MODULES(NUNIT, nunit)
- AC_SUBST(NUNIT_LIBS)
-
- PKG_CHECK_MODULES(MONODOC, monodoc)
-diff -urNad mono-tools-1.2.6~/gnunit/src/AssemblyStore.cs mono-tools-1.2.6/gnunit/src/AssemblyStore.cs
---- mono-tools-1.2.6~/gnunit/src/AssemblyStore.cs 2007-12-06 21:43:44.000000000 +0000
-+++ mono-tools-1.2.6/gnunit/src/AssemblyStore.cs 2008-01-10 14:21:08.000000000 +0000
-@@ -574,6 +574,11 @@
- idle.Set ();
- }
-
-+ void EventListener.TestOutput (TestOutput testOutput)
-+ {
-+ ;
-+ }
-+
- void SetIconFromResult (TestResult result)
- {
- CircleColor color;
-diff -urNad mono-tools-1.2.6~/gnunit/src/main.cs mono-tools-1.2.6/gnunit/src/main.cs
---- mono-tools-1.2.6~/gnunit/src/main.cs 2007-12-06 21:43:44.000000000 +0000
-+++ mono-tools-1.2.6/gnunit/src/main.cs 2008-01-10 14:21:13.000000000 +0000
-@@ -284,6 +284,11 @@
- return inner_filter.Pass (test);
- }
-
-+ public bool Exclude
-+ {
-+ get { return false; }
-+ }
-+
- static string _ (string key)
- {
- return Catalog.GetString (key);
-@@ -767,6 +772,11 @@
- ClockUpdater (this, EventArgs.Empty);
- }
-
-+ void EventListener.TestOutput (TestOutput testOutput)
-+ {
-+ ;
-+ }
-+
- // Misc.
-
- void UpdateRunStatus ()
Added: mono-tools/trunk/debian/patches/02-startup_mono_path.patch
===================================================================
--- mono-tools/trunk/debian/patches/02-startup_mono_path.patch (rev 0)
+++ mono-tools/trunk/debian/patches/02-startup_mono_path.patch 2008-11-26 13:14:59 UTC (rev 3840)
@@ -0,0 +1,12 @@
+--- mono-tools-2.0.orig/gnunit/src/script.in
++++ mono-tools-2.0/gnunit/src/script.in
+@@ -1,2 +1,3 @@
+ #!/bin/sh
++export MONO_PATH=/usr/lib/nunit:$MONO_PATH
+ exec @RUNTIME@ @mono_one_instdir@/@exe_file@ "$@"
+--- mono-tools-2.0.orig/gnunit/src/script2.in
++++ mono-tools-2.0/gnunit/src/script2.in
+@@ -1,2 +1,3 @@
+ #!/bin/sh
++export MONO_PATH=/usr/lib/nunit:$MONO_PATH
+ exec @RUNTIME@ @mono_two_instdir@/@exe_file@ "$@"
Deleted: mono-tools/trunk/debian/patches/02_startup_mono_path.dpatch
===================================================================
--- mono-tools/trunk/debian/patches/02_startup_mono_path.dpatch 2008-11-26 11:02:32 UTC (rev 3839)
+++ mono-tools/trunk/debian/patches/02_startup_mono_path.dpatch 2008-11-26 13:14:59 UTC (rev 3840)
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## startup_mono_path.dpatch by Mirco Bauer <meebey at meebey.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad mono-tools-1.1.9~/gnunit/src/script.in mono-tools-1.1.9/gnunit/src/script.in
---- mono-tools-1.1.9~/gnunit/src/script.in 2005-05-09 01:27:19.000000000 +0200
-+++ mono-tools-1.1.9/gnunit/src/script.in 2005-09-25 21:42:06.000000000 +0200
-@@ -1,2 +1,3 @@
- #!/bin/sh
-+export MONO_PATH=/usr/lib/nunit:$MONO_PATH
- exec @RUNTIME@ @mono_one_instdir@/@exe_file@ "$@"
-diff -urNad mono-tools-1.1.9~/gnunit/src/script2.in mono-tools-1.1.9/gnunit/src/script2.in
---- mono-tools-1.1.9~/gnunit/src/script2.in 2005-05-09 01:27:19.000000000 +0200
-+++ mono-tools-1.1.9/gnunit/src/script2.in 2005-09-25 21:42:10.000000000 +0200
-@@ -1,2 +1,3 @@
- #!/bin/sh
-+export MONO_PATH=/usr/lib/nunit:$MONO_PATH
- exec @RUNTIME@ @mono_two_instdir@/@exe_file@ "$@"
Added: mono-tools/trunk/debian/patches/03-mozilla_home.patch
===================================================================
--- mono-tools/trunk/debian/patches/03-mozilla_home.patch (rev 0)
+++ mono-tools/trunk/debian/patches/03-mozilla_home.patch 2008-11-26 13:14:59 UTC (rev 3840)
@@ -0,0 +1,34 @@
+--- mono-tools-2.0.orig/configure.in
++++ mono-tools-2.0/configure.in
+@@ -62,7 +62,7 @@
+
+ if test "x$enable_gecko" = "xyes"; then
+ # get the mozilla home directory
+- MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`"
++ MOZILLA_HOME="`$PKG_CONFIG --variable=libdir xulrunner-gtkmozembed`"
+ AC_SUBST(MOZILLA_HOME)
+ fi
+
+--- mono-tools-2.0.orig/ilcontrast/ilcontrast.in
++++ mono-tools-2.0/ilcontrast/ilcontrast.in
+@@ -19,16 +19,20 @@
+ elif test x at MOZILLA_HOME@ != x; then
+ if [ -f @MOZILLA_HOME@/chrome/comm.jar ]; then
+ MOZILLA_HOME=@MOZILLA_HOME@
++ MOZILLA_FIVE_HOME=$MOZILLA_HOME
+ fi
+ elif grep GRE_PATH /etc/gre.d/*.conf > /dev/null ; then
+ MOZILLA_HOME=$(grep -h GRE_PATH= /etc/gre.d/*.conf | cut -d '"' -f 2 -d = | head -n 1)
++ MOZILLA_FIVE_HOME=$MOZILLA_HOME
+ elif [ $(which xulrunner 2> /dev/null) ] > /dev/null ; then
+ MOZILLA_FIVE_HOME=`getdirectory xulrunner`
+ MOZILLA_HOME=$MOZILLA_FIVE_HOME
+ elif [ $(which mozilla 2> /dev/null) ] && grep MOZILLA_FIVE_HOME= "$(which mozilla)" > /dev/null ; then
+ MOZILLA_HOME=$(grep MOZILLA_FIVE_HOME= $(which mozilla) | cut -d '"' -f 2)
++ MOZILLA_FIVE_HOME=$MOZILLA_HOME
+ elif [ $(which firefox 2> /dev/null) ] && grep MOZILLA_FIVE_HOME= "$(which firefox)" > /dev/null ; then
+ MOZILLA_HOME=$(grep MOZILLA_FIVE_HOME= $(which firefox) | cut -d '"' -f 2)
++ MOZILLA_FIVE_HOME=$MOZILLA_HOME
+ fi
+
+ if [ -n $LD_LIBRARY_PATH ]; then
Deleted: mono-tools/trunk/debian/patches/03_mozilla-home.dpatch
===================================================================
--- mono-tools/trunk/debian/patches/03_mozilla-home.dpatch 2008-11-26 11:02:32 UTC (rev 3839)
+++ mono-tools/trunk/debian/patches/03_mozilla-home.dpatch 2008-11-26 13:14:59 UTC (rev 3840)
@@ -1,38 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
- at DPATCH@
-
---- mono-tools-1.2.4/configure.in.old 2007-05-17 10:35:26.000000000 +0200
-+++ mono-tools-1.2.4/configure.in 2007-05-17 10:35:50.000000000 +0200
-@@ -53,7 +53,7 @@
-
- if test "x$enable_gecko" = "xyes"; then
- # get the mozilla home directory
-- MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`"
-+ MOZILLA_HOME="`$PKG_CONFIG --variable=libdir xulrunner-gtkmozembed`"
- AC_SUBST(MOZILLA_HOME)
- fi
-
---- mono-tools-1.2.4/ilcontrast/ilcontrast.in.old 2007-12-14 11:03:22.000000000 +0100
-+++ mono-tools-1.2.4/ilcontrast/ilcontrast.in 2007-12-14 11:04:28.000000000 +0100
-@@ -19,16 +19,20 @@
- elif test x at MOZILLA_HOME@ != x; then
- if [ -f @MOZILLA_HOME@/chrome/comm.jar ]; then
- MOZILLA_HOME=@MOZILLA_HOME@
-+ MOZILLA_FIVE_HOME=$MOZILLA_HOME
- fi
- elif grep GRE_PATH /etc/gre.d/*.conf > /dev/null ; then
- MOZILLA_HOME=$(grep -h GRE_PATH= /etc/gre.d/*.conf | cut -d '"' -f 2 -d = | head -n 1)
-+ MOZILLA_FIVE_HOME=$MOZILLA_HOME
- elif [ $(which xulrunner 2> /dev/null) ] > /dev/null ; then
- MOZILLA_FIVE_HOME=`getdirectory xulrunner`
- MOZILLA_HOME=$MOZILLA_FIVE_HOME
- elif [ $(which mozilla 2> /dev/null) ] && grep MOZILLA_FIVE_HOME= "$(which mozilla)" > /dev/null ; then
- MOZILLA_HOME=$(grep MOZILLA_FIVE_HOME= $(which mozilla) | cut -d '"' -f 2)
-+ MOZILLA_FIVE_HOME=$MOZILLA_HOME
- elif [ $(which firefox 2> /dev/null) ] && grep MOZILLA_FIVE_HOME= "$(which firefox)" > /dev/null ; then
- MOZILLA_HOME=$(grep MOZILLA_FIVE_HOME= $(which firefox) | cut -d '"' -f 2)
-+ MOZILLA_FIVE_HOME=$MOZILLA_HOME
- fi
-
- if [ -n $LD_LIBRARY_PATH ]; then
Added: mono-tools/trunk/debian/patches/04-gendarme_link_libraries_correctly.patch
===================================================================
--- mono-tools/trunk/debian/patches/04-gendarme_link_libraries_correctly.patch (rev 0)
+++ mono-tools/trunk/debian/patches/04-gendarme_link_libraries_correctly.patch 2008-11-26 13:14:59 UTC (rev 3840)
@@ -0,0 +1,11 @@
+--- mono-tools-2.0.orig/gendarme/rules/Gendarme.Rules.Portability/Makefile.am
++++ mono-tools-2.0/gendarme/rules/Gendarme.Rules.Portability/Makefile.am
+@@ -13,7 +13,7 @@
+ CLEANFILES = $(rules_dll) $(rules_dll).mdb $(tests_dll)
+ DISTCLEANFILES = Makefile.in Gendarme.Rules.Portability.xml TestResult.xml
+
+-EXTRA_RULES_OPTIONS = -r:ICSharpCode.SharpZipLib.dll -pkg:dotnet
++EXTRA_RULES_OPTIONS = -r:ICSharpCode.SharpZipLib.dll -r:System.Web.Services
+
+ rules_sources = \
+ DoNotHardcodePathsRule.cs \
Deleted: mono-tools/trunk/debian/patches/04_cecil.dpatch
===================================================================
--- mono-tools/trunk/debian/patches/04_cecil.dpatch 2008-11-26 11:02:32 UTC (rev 3839)
+++ mono-tools/trunk/debian/patches/04_cecil.dpatch 2008-11-26 13:14:59 UTC (rev 3840)
@@ -1,24 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
- at DPATCH@
-
---- mono-tools-1.9/configure.in.old 2008-04-07 10:23:25.000000000 +0200
-+++ mono-tools-1.9/configure.in 2008-04-07 10:23:43.000000000 +0200
-@@ -71,13 +71,13 @@
- dnl
- dnl I hate PKG_CONFIG_MODULES, that is for the weak
- dnl
--if pkg-config --modversion cecil>/dev/null; then
--AC_MSG_RESULT("Found cecil.pc")
-+if pkg-config --modversion mono-cecil>/dev/null; then
-+AC_MSG_RESULT("Found mono-cecil.pc")
- else
--AC_MSG_ERROR([You are missing Cecil (cecil.pc for packageconfig) required for gui-compare])
-+AC_MSG_ERROR([You are missing Cecil (mono-cecil.pc for packageconfig) required for gui-compare])
- fi
-
--CECIL_ASM=`pkg-config --variable=Libraries cecil`
-+CECIL_ASM=`pkg-config --variable=Libraries mono-cecil`
- AC_SUBST(CECIL_ASM)
-
- dnl Intl
Deleted: mono-tools/trunk/debian/patches/04_gendarme_link_libraries_correctly.dpatch
===================================================================
--- mono-tools/trunk/debian/patches/04_gendarme_link_libraries_correctly.dpatch 2008-11-26 11:02:32 UTC (rev 3839)
+++ mono-tools/trunk/debian/patches/04_gendarme_link_libraries_correctly.dpatch 2008-11-26 13:14:59 UTC (rev 3840)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_gendarme_link_libraries_correctly.dpatch by Mirco Bauer <meebey at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad mono-tools-2.0~/gendarme/rules/Gendarme.Rules.Portability/Makefile.am mono-tools-2.0/gendarme/rules/Gendarme.Rules.Portability/Makefile.am
---- mono-tools-2.0~/gendarme/rules/Gendarme.Rules.Portability/Makefile.am 2008-11-23 23:54:52.000000000 +0100
-+++ mono-tools-2.0/gendarme/rules/Gendarme.Rules.Portability/Makefile.am 2008-11-23 23:56:39.000000000 +0100
-@@ -13,7 +13,7 @@
- CLEANFILES = $(rules_dll) $(rules_dll).mdb $(tests_dll)
- DISTCLEANFILES = Makefile.in Gendarme.Rules.Portability.xml TestResult.xml
-
--EXTRA_RULES_OPTIONS = -r:ICSharpCode.SharpZipLib.dll -pkg:dotnet
-+EXTRA_RULES_OPTIONS = -r:ICSharpCode.SharpZipLib.dll -r:System.Web.Services
-
- rules_sources = \
- DoNotHardcodePathsRule.cs \
Added: mono-tools/trunk/debian/patches/05-cecil.patch
===================================================================
--- mono-tools/trunk/debian/patches/05-cecil.patch (rev 0)
+++ mono-tools/trunk/debian/patches/05-cecil.patch 2008-11-26 13:14:59 UTC (rev 3840)
@@ -0,0 +1,20 @@
+--- mono-tools-2.0.orig/configure.in
++++ mono-tools-2.0/configure.in
+@@ -119,13 +119,13 @@
+ dnl
+ dnl I hate PKG_CONFIG_MODULES, that is for the weak
+ dnl
+-if pkg-config --modversion cecil>/dev/null; then
+-AC_MSG_RESULT("Found cecil.pc")
++if pkg-config --modversion mono-cecil>/dev/null; then
++AC_MSG_RESULT("Found mono-cecil.pc")
+ else
+-AC_MSG_ERROR([You are missing Cecil (cecil.pc for packageconfig) required for gui-compare])
++AC_MSG_ERROR([You are missing Cecil (mono-cecil.pc for packageconfig) required for gui-compare])
+ fi
+
+-CECIL_ASM=`pkg-config --variable=Libraries cecil`
++CECIL_ASM=`pkg-config --variable=Libraries mono-cecil`
+ AC_SUBST(CECIL_ASM)
+
+ dnl Intl
Deleted: mono-tools/trunk/debian/patches/05_nunit_2.4_port.dpatch
===================================================================
--- mono-tools/trunk/debian/patches/05_nunit_2.4_port.dpatch 2008-11-26 11:02:32 UTC (rev 3839)
+++ mono-tools/trunk/debian/patches/05_nunit_2.4_port.dpatch 2008-11-26 13:14:59 UTC (rev 3840)
@@ -1,249 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_nunit_2.4_port.dpatch by Mirco Bauer <meebey at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad mono-tools-1.9~/gnunit/src/AssemblyStore.cs mono-tools-1.9/gnunit/src/AssemblyStore.cs
---- mono-tools-1.9~/gnunit/src/AssemblyStore.cs 2008-07-26 22:56:28.000000000 +0200
-+++ mono-tools-1.9/gnunit/src/AssemblyStore.cs 2008-07-26 22:56:43.000000000 +0200
-@@ -40,9 +40,9 @@
- }
- }
-
-- delegate void TestStartHandler (TestCase test);
-+ delegate void TestStartHandler (TestName test);
- delegate void TestFinishHandler (TestCaseResult result);
-- delegate void SuiteStartHandler (TestSuite test);
-+ delegate void SuiteStartHandler (TestName test);
- delegate void SuiteFinishHandler (TestSuiteResult result);
- delegate void TestCaseResultHandler (TestResult result);
-
-@@ -71,9 +71,9 @@
- class QueuedSuiteStart : QueuedEvent
- {
- SuiteStartHandler handler;
-- TestSuite suite;
-+ TestName suite;
-
-- public QueuedSuiteStart (SuiteStartHandler handler, TestSuite suite)
-+ public QueuedSuiteStart (SuiteStartHandler handler, TestName suite)
- {
- this.handler = handler;
- this.suite = suite;
-@@ -105,9 +105,9 @@
- class QueuedTestStart : QueuedEvent
- {
- TestStartHandler handler;
-- TestCase test;
-+ TestName test;
-
-- public QueuedTestStart (TestStartHandler handler, TestCase test)
-+ public QueuedTestStart (TestStartHandler handler, TestName test)
- {
- this.handler = handler;
- this.test = test;
-@@ -186,7 +186,7 @@
- Queue pending;
- System.Threading.Thread th;
- string location;
-- IFilter filter;
-+ ITestFilter filter;
-
- Exception exception;
- static GLib.GType gtype = GLib.GType.Invalid;
-@@ -220,7 +220,7 @@
- }
- }
-
-- public IFilter Filter {
-+ public ITestFilter Filter {
- get { return filter; }
- set { filter = value; }
- }
-@@ -437,7 +437,7 @@
- {
- TreeIter next;
- foreach (Test t in suite.Tests) {
-- next = AddFixture (parent, t.FullName);
-+ next = AddFixture (parent, t.TestName.FullName);
- if ((n % 5) == 0) {
- while (GLib.MainContext.Iteration ());
- }
-@@ -516,11 +516,11 @@
- }
-
- // Interface NUnit.Core.EventListener
-- void EventListener.RunStarted (Test [] tests)
-+ void EventListener.RunStarted (string name, int testCount)
- {
- }
-
-- void EventListener.RunFinished (TestResult [] results)
-+ void EventListener.RunFinished (TestResult result)
- {
- }
-
-@@ -532,7 +532,7 @@
- {
- }
-
-- void EventListener.TestStarted (TestCase testCase)
-+ void EventListener.TestStarted (TestName testCase)
- {
- if (listener != null) {
- Monitor.Enter (pending);
-@@ -553,7 +553,7 @@
- idle.Set ();
- }
-
-- void EventListener.SuiteStarted (TestSuite suite)
-+ void EventListener.SuiteStarted (TestName suite)
- {
- if (listener != null) {
- Monitor.Enter (pending);
-diff -urNad mono-tools-1.9~/gnunit/src/main.cs mono-tools-1.9/gnunit/src/main.cs
---- mono-tools-1.9~/gnunit/src/main.cs 2008-07-26 22:56:28.000000000 +0200
-+++ mono-tools-1.9/gnunit/src/main.cs 2008-07-26 22:56:28.000000000 +0200
-@@ -17,6 +17,7 @@
- using Gnome;
- using Gtk;
- using NUnit.Core;
-+using NUnit.Core.Filters;
- using NUnit.Util;
- using Dialog = Gtk.Dialog;
-
-@@ -125,7 +126,7 @@
- }
- }
-
-- class CategoryMaster : IFilter {
-+ class CategoryMaster : ITestFilter {
- static Hashtable known_categories;
- string [] categories;
- bool [] states;
-@@ -134,7 +135,7 @@
- string [] exclude;
- bool uncategorized;
- bool all;
-- IFilter inner_filter;
-+ ITestFilter inner_filter;
-
- static CategoryMaster ()
- {
-@@ -216,6 +217,10 @@
- get { return cb; }
- }
-
-+ public bool IsEmpty {
-+ get { return false; }
-+ }
-+
- void ToggleState (object sender, EventArgs args)
- {
- CheckMenuItem item = (CheckMenuItem) sender;
-@@ -255,25 +260,18 @@
- idx++;
- }
- }
-- inner_filter = new CategoryFilter (exclude, uncategorized);
-+ inner_filter = new CategoryFilter (exclude);
- } else {
-- inner_filter = new CategoryFilter (categories, uncategorized);
-+ inner_filter = new CategoryFilter (categories);
-+ }
-+
-+ if (uncategorized) {
-+ inner_filter = new NotFilter(inner_filter);
- }
- }
-
- public bool Cancel;
-- bool IFilter.Pass (TestSuite suite)
-- {
-- if (Cancel)
-- return false;
--
-- if (all)
-- return true;
--
-- return inner_filter.Pass (suite);
-- }
--
-- bool IFilter.Pass (TestCase test)
-+ bool ITestFilter.Pass (ITest test)
- {
- if (Cancel)
- return false;
-@@ -284,9 +282,9 @@
- return inner_filter.Pass (test);
- }
-
-- public bool Exclude
-+ public bool Match (ITest test)
- {
-- get { return false; }
-+ return true;
- }
-
- static string _ (string key)
-@@ -724,11 +722,11 @@
- }
-
- // Interface NUnit.Core.EventListener
-- void EventListener.RunStarted (Test [] tests)
-+ void EventListener.RunStarted (string name, int testCount)
- {
- }
-
-- void EventListener.RunFinished (TestResult [] results)
-+ void EventListener.RunFinished (TestResult result)
- {
- }
-
-@@ -740,7 +738,7 @@
- {
- }
-
-- void EventListener.TestStarted (TestCase testCase)
-+ void EventListener.TestStarted (TestName testCase)
- {
- frameLabel.Text = "Test: " + testCase.FullName;
- }
-@@ -752,7 +750,7 @@
-
- assertions += result.AssertCount;
- if (result.Executed == false) {
-- AddIgnored (result.Test.FullName, result.Test.IgnoreReason);
-+ AddIgnored (result.Test.TestName.FullName, result.Test.IgnoreReason);
- } else if (result.IsFailure) {
- AddError (result);
- }
-@@ -762,7 +760,7 @@
- ClockUpdater (this, EventArgs.Empty);
- }
-
-- void EventListener.SuiteStarted (TestSuite suite)
-+ void EventListener.SuiteStarted (TestName suite)
- {
- frameLabel.Text = "Suite: " + suite.FullName;
- }
-@@ -826,7 +824,7 @@
- int dot;
- TreeIter main = TreeIter.Zero;
- TreeIter iter;
-- string fullname = result.Test.FullName;
-+ string fullname = result.Test.TestName.FullName;
- if ((dot = fullname.LastIndexOf ('.')) != -1) {
- string key = fullname.Substring (0, dot);
- if (!errorIters.ContainsKey (key)) {
-@@ -841,7 +839,7 @@
- errorIters [fullname] = main;
- }
-
-- iter = failuresStore.AppendValues (main, result.Test.Name);
-+ iter = failuresStore.AppendValues (main, result.Test.TestName.Name);
- iter = failuresStore.AppendValues (iter, result.Message);
- iter = failuresStore.AppendValues (iter, result.StackTrace);
-
Deleted: mono-tools/trunk/debian/patches/05_webkit-sharp_port.dpatch
===================================================================
--- mono-tools/trunk/debian/patches/05_webkit-sharp_port.dpatch 2008-11-26 11:02:32 UTC (rev 3839)
+++ mono-tools/trunk/debian/patches/05_webkit-sharp_port.dpatch 2008-11-26 13:14:59 UTC (rev 3840)
@@ -1,1047 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_webkit-sharp_port.dpatch by Mirco Bauer <meebey at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Backport of webkit-sharp support, taken from upstream SVN revision:
-## DP: r97203, r97657, r97745, r105817, r105820, r105828, r105860 and r105868
-
- at DPATCH@
-diff -urNad mono-tools-1.9~/configure.in mono-tools-1.9/configure.in
---- mono-tools-1.9~/configure.in 2008-08-10 14:59:40.000000000 +0200
-+++ mono-tools-1.9/configure.in 2008-08-10 14:59:40.000000000 +0200
-@@ -10,6 +10,7 @@
- AC_PATH_PROG(MCS, mcs, no)
- AC_PATH_PROG(GMCS, gmcs, no)
- AC_PATH_PROG(RUNTIME, mono, no)
-+AC_PATH_PROG(GACUTIL, gacutil, no)
-
- CS="C#"
- if test "x$MCS" = "xno" ; then
-@@ -31,6 +32,8 @@
- AC_SUBST(GMCS)
- AC_SUBST(RUNTIME)
- AC_SUBST(RESGEN)
-+AC_SUBST(GACUTIL)
-+
-
- PKG_CHECK_MODULES(NUNIT, mono-nunit)
- AC_SUBST(NUNIT_LIBS)
-@@ -63,9 +66,35 @@
- AC_SUBST(MOZILLA_HOME)
- fi
-
-+dnl TODO: check for webkit-sharp
-+# AM_CONDITIONAL(ENABLE_WEBKIT, test "xno" = "xyes")
-+PKG_CHECK_MODULES(WEBKIT_SHARP, webkit-sharp-1.0, enable_webkit=yes, enable_webkit=no)
-+AC_SUBST(WEBKIT_SHARP_LIBS)
-+AM_CONDITIONAL(ENABLE_WEBKIT, test "x$enable_webkit" = "xyes")
-
--if test "x$enable_gtkhtml$enable_gecko" = "xnono" ; then
-- AC_MSG_ERROR([no HTML display found. You need either gtkhtml or gecko])
-+# PKG_CHECK_MODULES(MONOWEBBROWSER, mono-webbrowser, enable_monowebbrowser=yes, enable_monowebbrowser=no)
-+# AC_SUBST(MONOWEBBROWSER_LIBS)
-+
-+AC_MSG_CHECKING([for Mono.WebBrowser])
-+if test "x$GACUTIL" = "xno"
-+then
-+ AC_MSG_RESULT([no])
-+ if test "x$enable_monowebbrowser" = "x" ; then enable_monowebbrowser=no ; fi
-+else
-+ if $GACUTIL -l Mono.WebBrowser | grep -q "Mono.WebBrowser"
-+ then
-+ AC_MSG_RESULT([yes])
-+ enable_monowebbrowser=yes
-+ else
-+ AC_MSG_RESULT([no])
-+ enable_monowebbrowser=no
-+ fi
-+fi
-+MONOWEBBROWSER_LIBS=-r:Mono.WebBrowser
-+AM_CONDITIONAL(ENABLE_MONOWEBBROWSER, test "x$enable_monowebbrowser" = "xyes")
-+
-+if test "x$enable_gtkhtml$enable_gecko$enable_monowebbrowser$enable_webkit" = "xnononono" ; then
-+ AC_MSG_ERROR([no HTML display found. You need either gtkhtml, gecko, WebKit or Mono.WebBrowser])
- fi
-
- dnl
-@@ -183,7 +212,10 @@
- echo "Configuration summary"
- echo ""
- echo " * Installation prefix = $prefix"
--echo " * gecko-sharp.dll = $enable_gecko"
-+echo " * Using Gecko = $enable_gecko"
-+echo " * Using GtkHtml = $enable_gtkhtml"
-+echo " * Using Mono.WebBrowser = $enable_monowebbrowser"
-+echo " * Using WebKit = $enable_webkit"
- echo ""
- echo " NOTE: if any of the above say 'no' you may install the"
- echo " corresponding development packages for them, rerun"
-diff -urNad mono-tools-1.9~/docbrowser/BrowserWidget.cs mono-tools-1.9/docbrowser/BrowserWidget.cs
---- mono-tools-1.9~/docbrowser/BrowserWidget.cs 1970-01-01 01:00:00.000000000 +0100
-+++ mono-tools-1.9/docbrowser/BrowserWidget.cs 2008-08-10 14:59:40.000000000 +0200
-@@ -0,0 +1,108 @@
-+//Permission is hereby granted, free of charge, to any person obtaining
-+//a copy of this software and associated documentation files (the
-+//"Software"), to deal in the Software without restriction, including
-+//without limitation the rights to use, copy, modify, merge, publish,
-+//distribute, sublicense, and/or sell copies of the Software, and to
-+//permit persons to whom the Software is furnished to do so, subject to
-+//the following conditions:
-+//
-+//The above copyright notice and this permission notice shall be
-+//included in all copies or substantial portions of the Software.
-+//
-+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+//NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+//LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+//OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+//WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+//
-+//Copyright (c) 2008 Novell, Inc.
-+//
-+//Authors:
-+// Andreia Gaita (avidigal at novell.com)
-+//
-+
-+using System;
-+using Mono.WebBrowser;
-+using Gtk;
-+using Gdk;
-+using Gnome;
-+
-+namespace Monodoc
-+{
-+ public class BrowserWidget : Gtk.Bin
-+ {
-+ public IWebBrowser browser;
-+ int width, height;
-+
-+ public BrowserWidget() : base()
-+ {
-+ width = height = 200;
-+ browser = Manager.GetNewInstance (Platform.Gtk);
-+ }
-+
-+
-+ protected override void OnRealized ()
-+ {
-+ base.OnRealized ();
-+
-+ WindowAttr attributes = new WindowAttr ();
-+ attributes.WindowType = Gdk.WindowType.Child;
-+ attributes.X = Allocation.X;
-+ attributes.Y = Allocation.Y;
-+ attributes.Width = Allocation.Width;
-+ attributes.Height = Allocation.Height;
-+ attributes.Wclass = WindowClass.InputOutput;
-+ attributes.Visual = Visual;
-+ attributes.Colormap = Colormap;
-+ attributes.EventMask = (int) Events;
-+ attributes.EventMask = attributes.EventMask | ((int) Gdk.EventMask.ExposureMask |
-+ (int) Gdk.EventMask.KeyPressMask |
-+ (int) Gdk.EventMask.KeyReleaseMask |
-+ (int) Gdk.EventMask.EnterNotifyMask |
-+ (int) Gdk.EventMask.LeaveNotifyMask |
-+ (int) Gdk.EventMask.StructureMask |
-+ (int) Gdk.EventMask.FocusChangeMask);
-+
-+ GdkWindow = new Gdk.Window (ParentWindow, attributes, Gdk.WindowAttributesType.X | Gdk.WindowAttributesType.Y |
-+ Gdk.WindowAttributesType.Colormap | Gdk.WindowAttributesType.Visual);
-+ GdkWindow.UserData = this.Handle;
-+
-+ Style = Style.Attach (GdkWindow);
-+ Style.Background (StateType.Normal);
-+
-+ browser.Load (this.Handle, width, height);
-+ }
-+
-+ protected override void OnMapped ()
-+ {
-+ base.OnMapped ();
-+ GdkWindow.Show ();
-+ }
-+
-+ protected override void OnUnmapped ()
-+ {
-+ base.OnUnmapped ();
-+ GdkWindow.Hide ();
-+ }
-+
-+ protected override void OnSizeAllocated (Rectangle allocation)
-+ {
-+ base.OnSizeAllocated (allocation);
-+ if ((WidgetFlags & WidgetFlags.Realized) != 0) {
-+ GdkWindow.MoveResize (allocation);
-+ if (browser != null)
-+ browser.Resize (allocation.Width, allocation.Height);
-+ }
-+ }
-+
-+ protected override void OnSizeRequested (ref Requisition requisition)
-+ {
-+ SetSizeRequest (width, height);
-+
-+ }
-+
-+
-+ }
-+}
-diff -urNad mono-tools-1.9~/docbrowser/GtkHtmlHtmlRender.cs mono-tools-1.9/docbrowser/GtkHtmlHtmlRender.cs
---- mono-tools-1.9~/docbrowser/GtkHtmlHtmlRender.cs 2008-01-30 00:06:11.000000000 +0100
-+++ mono-tools-1.9/docbrowser/GtkHtmlHtmlRender.cs 2008-08-10 14:59:40.000000000 +0200
-@@ -31,11 +31,6 @@
-
- public GtkHtmlHtmlRender (RootTree help_tree)
- {
-- html_panel = new HTML();
-- html_panel.Show();
-- html_panel.LinkClicked += new LinkClickedHandler (LinkClicked);
-- html_panel.OnUrl += new OnUrlHandler (OnUrlMouseOver);
-- html_panel.UrlRequested += new UrlRequestedHandler (UrlRequested);
- this.help_tree = help_tree;
- }
-
-@@ -115,5 +110,34 @@
-
- PrintManager.Print (Html);
- }
-+
-+ public bool Initialize ()
-+ {
-+ try {
-+ html_panel = new HTML ();
-+ }
-+ catch (Exception ex) {
-+ Console.WriteLine (ex.Message);
-+ Console.WriteLine (ex.StackTrace);
-+ return false;
-+ }
-+ html_panel.Show ();
-+ html_panel.LinkClicked += new LinkClickedHandler (LinkClicked);
-+ html_panel.OnUrl += new OnUrlHandler (OnUrlMouseOver);
-+ html_panel.UrlRequested += new UrlRequestedHandler (UrlRequested);
-+ return true;
-+
-+ }
-+
-+ public Capabilities Capabilities
-+ {
-+ get { return Capabilities.None; }
-+ }
-+
-+ public string Name
-+ {
-+ get { return "GtkHtml"; }
-+ }
-+
- }
- }
-diff -urNad mono-tools-1.9~/docbrowser/IHtmlRender.cs mono-tools-1.9/docbrowser/IHtmlRender.cs
---- mono-tools-1.9~/docbrowser/IHtmlRender.cs 2007-12-06 22:43:45.000000000 +0100
-+++ mono-tools-1.9/docbrowser/IHtmlRender.cs 2008-08-10 14:59:40.000000000 +0200
-@@ -6,35 +6,49 @@
- using System;
- using Gtk;
-
--namespace Monodoc {
--public interface IHtmlRender {
-- // Jump to an anchor of the form <a name="tttt">
-- void JumpToAnchor (string anchor_name);
-+namespace Monodoc
-+{
-+ public interface IHtmlRender
-+ {
-+ // Jump to an anchor of the form <a name="tttt">
-+ void JumpToAnchor (string anchor_name);
-
-- //Copy to the clipboard the selcted text
-- void Copy ();
-+ //Copy to the clipboard the selcted text
-+ void Copy ();
-
-- //Select all the text
-- void SelectAll ();
-+ //Select all the text
-+ void SelectAll ();
-
-- //Render the HTML code given
-- void Render (string html_code);
-+ //Render the HTML code given
-+ void Render (string html_code);
-
-- //Event fired when the use is over an Url
-- event EventHandler OnUrl;
-+ //Event fired when the use is over an Url
-+ event EventHandler OnUrl;
-
-- //Event fired when the user clicks on a Link
-- event EventHandler UrlClicked;
-+ //Event fired when the user clicks on a Link
-+ event EventHandler UrlClicked;
-
-- // Variable that handles the info encessary for the events
-- // As every implementation of HtmlRender will have differents events
-- // we try to homogenize them with the variabel
-- string Url { get; }
-+ // Variable that handles the info encessary for the events
-+ // As every implementation of HtmlRender will have differents events
-+ // we try to homogenize them with the variabel
-+ string Url { get; }
-
-- Widget HtmlPanel { get; }
-+ Widget HtmlPanel { get; }
-
-- void Print (string Html);
--}
-+ void Print (string Html);
-+
-+ bool Initialize ();
-+ Capabilities Capabilities { get; }
-+ string Name { get; }
-+
-+ }
-
-+ [Flags]
-+ public enum Capabilities
-+ {
-+ None = 0,
-+ Css = 1,
-+ Fonts = 2
-+ }
-
- }
-diff -urNad mono-tools-1.9~/docbrowser/Makefile.am mono-tools-1.9/docbrowser/Makefile.am
---- mono-tools-1.9~/docbrowser/Makefile.am 2008-01-30 00:06:11.000000000 +0100
-+++ mono-tools-1.9/docbrowser/Makefile.am 2008-08-10 14:59:40.000000000 +0200
-@@ -10,9 +10,15 @@
-
- GTKHTML_TARGET=GtkHtmlHtmlRender.dll
- endif
-+if ENABLE_WEBKIT
-+WEBKIT_TARGET=WebKitHtmlRender.dll
-+endif
-+if ENABLE_MONOWEBBROWSER
-+MONOWEBBROWSER_TARGET=MonoWebBrowserHtmlRender.dll
-+endif
-
--CLEANFILES = browser.exe browser.exe.mdb admin.exe admin.exe.mdb $(GECKO_TARGET) $(GECKO_TARGET).mdb $(GTKHTML_TARGET) $(GTKHTML_TARGET).mdb monodoc.desktop
--monodoc_DATA = browser.exe $(GECKO_TARGET) $(GTKHTML_TARGET)
-+CLEANFILES = browser.exe browser.exe.mdb admin.exe admin.exe.mdb $(GECKO_TARGET) $(GECKO_TARGET).mdb $(GTKHTML_TARGET) $(GTKHTML_TARGET).mdb $(WEBKIT_TARGET) $(WEBKIT_TARGET).mdb $(MONOWEBBROWSER_TARGET) $(MONOWEBBROWSER_TARGET).mdb monodoc.desktop
-+monodoc_DATA = browser.exe $(GECKO_TARGET) $(GTKHTML_TARGET) $(WEBKIT_TARGET) $(MONOWEBBROWSER_TARGET)
-
- DISTCLEANFILES = AssemblyInfo.cs monodoc.desktop monodoc
-
-@@ -39,6 +45,13 @@
- $(srcdir)/PrintManager.cs \
- $(srcdir)/GtkHtmlHtmlRender.cs
-
-+webkitrender_sources = \
-+ $(srcdir)/WebKitHtmlRender.cs
-+
-+monowebbrowserrender_sources = \
-+ $(srcdir)/BrowserWidget.cs \
-+ $(srcdir)/MonoWebBrowserHtmlRender.cs
-+
- admin_sources = \
- $(srcdir)/admin.cs \
- $(srcdir)/Contributions.cs
-@@ -48,10 +61,17 @@
- geckorender_assemblies = $(GTK_SHARP_LIBS) $(GTKHTML_SHARP_LIBS) $(GECKO_SHARP_LIBS) $(MONODOC_LIBS) -r:browser.exe
- gtkhtmlrender_assemblies = $(GTK_SHARP_LIBS) $(GTKHTML_SHARP_LIBS) $(MONODOC_LIBS) -r:browser.exe
-
-+# TODO: use pkg-config for webkit-sharp
-+# WEBKIT_SHARP_LIBS = -r:nwebkit.dll
-+webkitrender_assemblies = $(GTK_SHARP_LIBS) $(WEBKIT_SHARP_LIBS) $(MONODOC_LIBS) -r:browser.exe
-+
-+monowebbrowserrender_assemblies = $(GTK_SHARP_LIBS) $(MONOWEBBROWSER_LIBS) $(MONODOC_LIBS) -r:browser.exe -r:Mono.Mozilla.dll
-+
- EXTRA_DIST = \
- $(browser_sources) \
- $(geckorender_sources) \
- $(gtkhtmlrender_sources) \
-+ $(webkitrender_sources) \
- monodoc.desktop.in \
- admin.cs \
- admin.glade \
-@@ -63,17 +83,23 @@
- # admin hardcodes GTKHTML for now.
- if ENABLE_GTKHTML
- admin.exe: $(admin_sources) $(srcdir)/admin.glade
-- $(MCS) -debug -out:admin.exe $(admin_sources) -resource:$(srcdir)/admin.glade,admin.glade $(browser_assemblies) $(GTKHTML_SHARP_LIBS) -r:System.Drawing
-+ $(GMCS) -debug -out:admin.exe $(admin_sources) -resource:$(srcdir)/admin.glade,admin.glade $(browser_assemblies) $(GTKHTML_SHARP_LIBS) -r:System.Drawing
- endif
-
- browser.exe: $(browser_sources) $(browser_built_sources) $(srcdir)/browser.glade $(srcdir)/monodoc.png
-- $(MCS) -debug -out:browser.exe $(browser_sources) $(browser_built_sources) -resource:$(srcdir)/monodoc.png,monodoc.png -resource:$(srcdir)/browser.glade,browser.glade $(browser_assemblies)
-+ $(GMCS) -debug -out:browser.exe $(browser_sources) $(browser_built_sources) -resource:$(srcdir)/monodoc.png,monodoc.png -resource:$(srcdir)/browser.glade,browser.glade $(browser_assemblies)
-
- GeckoHtmlRender.dll : $(geckorender_sources) browser.exe
-- $(MCS) -debug -target:library -out:$@ $(geckorender_sources) $(geckorender_assemblies) $(GECKO_PRINTING_DEF) $(CSHARP_FLAGS)
-+ $(GMCS) -debug -target:library -out:$@ $(geckorender_sources) $(geckorender_assemblies) $(GECKO_PRINTING_DEF) $(CSHARP_FLAGS)
-
- GtkHtmlHtmlRender.dll : $(gtkhtmlrender_sources) browser.exe
-- $(MCS) -debug -target:library -out:$@ $(gtkhtmlrender_sources) $(gtkhtmlrender_assemblies) $(CSHARP_FLAGS)
-+ $(GMCS) -debug -target:library -out:$@ $(gtkhtmlrender_sources) $(gtkhtmlrender_assemblies) $(CSHARP_FLAGS)
-+
-+WebKitHtmlRender.dll : $(webkitrender_sources) browser.exe
-+ $(GMCS) -debug -target:library -out:$@ $(webkitrender_sources) $(webkitrender_assemblies) $(CSHARP_FLAGS)
-+
-+MonoWebBrowserHtmlRender.dll : $(monowebbrowserrender_sources) browser.exe
-+ $(GMCS) -debug -target:library -out:$@ $(monowebbrowserrender_sources) $(monowebbrowserrender_assemblies) $(CSHARP_FLAGS)
-
- b: browser.exe
- MONO_PATH=. $(RUNTIME) --debug browser.exe
-diff -urNad mono-tools-1.9~/docbrowser/Makefile.am.orig mono-tools-1.9/docbrowser/Makefile.am.orig
---- mono-tools-1.9~/docbrowser/Makefile.am.orig 1970-01-01 01:00:00.000000000 +0100
-+++ mono-tools-1.9/docbrowser/Makefile.am.orig 2008-08-10 14:59:40.000000000 +0200
-@@ -0,0 +1,117 @@
-+monodocdir=$(prefix)/lib/monodoc
-+noinst_DATA = admin.exe
-+
-+
-+if ENABLE_GECKO
-+GECKO_TARGET=GeckoHtmlRender.dll
-+endif
-+if ENABLE_GTKHTML
-+GECKO_PRINTING_DEF="-d:USE_GTKHTML_PRINT"
-+
-+GTKHTML_TARGET=GtkHtmlHtmlRender.dll
-+endif
-+if ENABLE_WEBKIT
-+WEBKIT_TARGET=WebKitHtmlRender.dll
-+endif
-+if ENABLE_MONOWEBBROWSER
-+MONOWEBBROWSER_TARGET=MonoWebBrowserHtmlRender.dll
-+endif
-+
-+CLEANFILES = browser.exe browser.exe.mdb admin.exe admin.exe.mdb $(GECKO_TARGET) $(GECKO_TARGET).mdb $(GTKHTML_TARGET) $(GTKHTML_TARGET).mdb $(WEBKIT_TARGET) $(WEBKIT_TARGET).mdb $(MONOWEBBROWSER_TARGET) $(MONOWEBBROWSER_TARGET).mdb monodoc.desktop
-+monodoc_DATA = browser.exe $(GECKO_TARGET) $(GTKHTML_TARGET) $(WEBKIT_TARGET) $(MONOWEBBROWSER_TARGET)
-+
-+DISTCLEANFILES = AssemblyInfo.cs monodoc.desktop monodoc
-+
-+bin_SCRIPTS = monodoc
-+
-+browser_sources = \
-+ $(srcdir)/browser.cs \
-+ $(srcdir)/list.cs \
-+ $(srcdir)/elabel.cs \
-+ $(srcdir)/history.cs \
-+ $(srcdir)/Contributions.cs \
-+ $(srcdir)/XmlNodeWriter.cs \
-+ $(srcdir)/IHtmlRender.cs \
-+ $(srcdir)/BookmarkManager.cs \
-+ $(srcdir)/ProgressPanel.cs
-+
-+browser_built_sources = AssemblyInfo.cs
-+
-+geckorender_sources = \
-+ $(srcdir)/PrintManager.cs \
-+ $(srcdir)/GeckoHtmlRender.cs
-+
-+gtkhtmlrender_sources = \
-+ $(srcdir)/PrintManager.cs \
-+ $(srcdir)/GtkHtmlHtmlRender.cs
-+
-+webkitrender_sources = \
-+ $(srcdir)/WebKitHtmlRender.cs
-+
-+monowebbrowserrender_sources = \
-+ $(srcdir)/BrowserWidget.cs \
-+ $(srcdir)/MonoWebBrowserHtmlRender.cs
-+
-+admin_sources = \
-+ $(srcdir)/admin.cs \
-+ $(srcdir)/Contributions.cs
-+
-+browser_assemblies = $(GTK_SHARP_LIBS) $(MONODOC_LIBS) -r:System.Web.Services
-+# we insert gtkhtml libs if we have them for printing
-+geckorender_assemblies = $(GTK_SHARP_LIBS) $(GTKHTML_SHARP_LIBS) $(GECKO_SHARP_LIBS) $(MONODOC_LIBS) -r:browser.exe
-+gtkhtmlrender_assemblies = $(GTK_SHARP_LIBS) $(GTKHTML_SHARP_LIBS) $(MONODOC_LIBS) -r:browser.exe
-+
-+# TODO: use pkg-config for webkit-sharp
-+# WEBKIT_SHARP_LIBS = -r:nwebkit.dll
-+webkitrender_assemblies = $(GTK_SHARP_LIBS) $(WEBKIT_SHARP_LIBS) $(MONODOC_LIBS) -r:browser.exe
-+
-+monowebbrowserrender_assemblies = $(GTK_SHARP_LIBS) $(MONOWEBBROWSER_LIBS) $(MONODOC_LIBS) -r:browser.exe -r:Mono.Mozilla.dll
-+
-+EXTRA_DIST = \
-+ $(browser_sources) \
-+ $(geckorender_sources) \
-+ $(gtkhtmlrender_sources) \
-+ $(webkitrender_sources) \
-+ monodoc.desktop.in \
-+ admin.cs \
-+ admin.glade \
-+ browser.glade \
-+ monodoc.png \
-+ AssemblyInfo.cs.in \
-+ README.ADMIN
-+
-+# admin hardcodes GTKHTML for now.
-+if ENABLE_GTKHTML
-+admin.exe: $(admin_sources) $(srcdir)/admin.glade
-+ $(MCS) -debug -out:admin.exe $(admin_sources) -resource:$(srcdir)/admin.glade,admin.glade $(browser_assemblies) $(GTKHTML_SHARP_LIBS) -r:System.Drawing
-+endif
-+
-+browser.exe: $(browser_sources) $(browser_built_sources) $(srcdir)/browser.glade $(srcdir)/monodoc.png
-+ $(MCS) -debug -out:browser.exe $(browser_sources) $(browser_built_sources) -resource:$(srcdir)/monodoc.png,monodoc.png -resource:$(srcdir)/browser.glade,browser.glade $(browser_assemblies)
-+
-+GeckoHtmlRender.dll : $(geckorender_sources) browser.exe
-+ $(MCS) -debug -target:library -out:$@ $(geckorender_sources) $(geckorender_assemblies) $(GECKO_PRINTING_DEF) $(CSHARP_FLAGS)
-+
-+GtkHtmlHtmlRender.dll : $(gtkhtmlrender_sources) browser.exe
-+ $(MCS) -debug -target:library -out:$@ $(gtkhtmlrender_sources) $(gtkhtmlrender_assemblies) $(CSHARP_FLAGS)
-+
-+WebKitHtmlRender.dll : $(webkitrender_sources) browser.exe
-+ $(GMCS) -debug -target:library -out:$@ $(webkitrender_sources) $(webkitrender_assemblies) $(CSHARP_FLAGS)
-+
-+MonoWebBrowserHtmlRender.dll : $(monowebbrowserrender_sources) browser.exe
-+ $(GMCS) -debug -target:library -out:$@ $(monowebbrowserrender_sources) $(monowebbrowserrender_assemblies) $(CSHARP_FLAGS)
-+
-+b: browser.exe
-+ MONO_PATH=. $(RUNTIME) --debug browser.exe
-+
-+c: admin.exe
-+ MONO_PATH=. $(RUNTIME) --debug admin.exe
-+
-+desktopdir = $(datadir)/applications
-+desktop_DATA = monodoc.desktop
-+
-+monodoc.desktop: monodoc.desktop.in
-+ sed -e "s|\@bindir\@|$(bindir)|" $< > $@
-+
-+pixmapdir = $(datadir)/pixmaps
-+pixmap_DATA = monodoc.png
-diff -urNad mono-tools-1.9~/docbrowser/MonoWebBrowserHtmlRender.cs mono-tools-1.9/docbrowser/MonoWebBrowserHtmlRender.cs
---- mono-tools-1.9~/docbrowser/MonoWebBrowserHtmlRender.cs 1970-01-01 01:00:00.000000000 +0100
-+++ mono-tools-1.9/docbrowser/MonoWebBrowserHtmlRender.cs 2008-08-10 14:59:40.000000000 +0200
-@@ -0,0 +1,116 @@
-+//Permission is hereby granted, free of charge, to any person obtaining
-+//a copy of this software and associated documentation files (the
-+//"Software"), to deal in the Software without restriction, including
-+//without limitation the rights to use, copy, modify, merge, publish,
-+//distribute, sublicense, and/or sell copies of the Software, and to
-+//permit persons to whom the Software is furnished to do so, subject to
-+//the following conditions:
-+//
-+//The above copyright notice and this permission notice shall be
-+//included in all copies or substantial portions of the Software.
-+//
-+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+//NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+//LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+//OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+//WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+//
-+//Copyright (c) 2008 Novell, Inc.
-+//
-+//Authors:
-+// Andreia Gaita (avidigal at novell.com)
-+//
-+
-+using System;
-+using Mono.WebBrowser;
-+using Gtk;
-+
-+namespace Monodoc
-+{
-+ public class MonoWebBrowserHtmlRender : IHtmlRender
-+ {
-+ BrowserWidget html_panel;
-+// Widget html_panel;
-+ RootTree help_tree;
-+
-+ public MonoWebBrowserHtmlRender (RootTree help_tree)
-+ {
-+
-+
-+// html_panel = new Gtk.Bin (IntPtr.Zero);
-+// html_panel.ExposeEvent += new ExposeEventHandler (OnExposed);
-+ //html_panel.Realized += new EventHandler (OnRealized);
-+ this.help_tree = help_tree;
-+
-+ }
-+
-+ public void OnRealized (object sender, EventArgs e)
-+ {
-+
-+ }
-+
-+ public void OnExposed (object sender, ExposeEventArgs e)
-+ {
-+ }
-+
-+ public event EventHandler OnUrl;
-+ public event EventHandler UrlClicked;
-+
-+ // Jump to an anchor of the form <a name="tttt">
-+ public void JumpToAnchor (string anchor_name)
-+ {
-+ }
-+
-+ //Copy to the clipboard the selcted text
-+ public void Copy ()
-+ {
-+ }
-+
-+ //Select all the text
-+ public void SelectAll ()
-+ {
-+ }
-+
-+ //Render the HTML code given
-+ public void Render (string html_code)
-+ {
-+ Console.WriteLine (html_code);
-+ html_panel.browser.Render (html_code);
-+ }
-+
-+
-+ // Variable that handles the info encessary for the events
-+ // As every implementation of HtmlRender will have differents events
-+ // we try to homogenize them with the variabel
-+ public string Url {
-+ get {return String.Empty;}//return html_panel.browser.Document.Url; }
-+ }
-+
-+ public Widget HtmlPanel {
-+ get { return (Widget)html_panel; }
-+ }
-+
-+ public void Print (string Html)
-+ {
-+ }
-+
-+ public bool Initialize ()
-+ {
-+ html_panel = new BrowserWidget ();
-+ return html_panel.browser.Initialized;
-+ }
-+
-+ public Capabilities Capabilities
-+ {
-+ get { return Capabilities.Css | Capabilities.Fonts; }
-+ }
-+
-+ public string Name
-+ {
-+ get { return "MonoWebBrowser"; }
-+ }
-+
-+ }
-+}
-diff -urNad mono-tools-1.9~/docbrowser/WebKitHtmlRender.cs mono-tools-1.9/docbrowser/WebKitHtmlRender.cs
---- mono-tools-1.9~/docbrowser/WebKitHtmlRender.cs 1970-01-01 01:00:00.000000000 +0100
-+++ mono-tools-1.9/docbrowser/WebKitHtmlRender.cs 2008-08-10 14:59:40.000000000 +0200
-@@ -0,0 +1,89 @@
-+//
-+// WebKitHtmlRender.cs: Implementation of IHtmlRender that uses WebKit
-+//
-+// Author: Alp Toker <alp at nuanti.com>
-+//
-+
-+using System;
-+using System.IO;
-+using Gtk;
-+using WebKit;
-+
-+namespace Monodoc {
-+public class WebKitHtmlRender : IHtmlRender {
-+
-+ WebView web_view;
-+ public Widget HtmlPanel {
-+ get { return (Widget) web_view; }
-+ }
-+
-+ string url;
-+ public string Url {
-+ get { return url; }
-+ }
-+
-+ RootTree help_tree;
-+ public event EventHandler OnUrl;
-+ public event EventHandler UrlClicked;
-+
-+ public WebKitHtmlRender (RootTree help_tree)
-+ {
-+ web_view = new WebView ();
-+ web_view.Show ();
-+ web_view.NavigationRequested += delegate (object sender, NavigationRequestedArgs e) {
-+ url = e.Request.Uri;
-+ if (UrlClicked != null)
-+ UrlClicked (this, new EventArgs());
-+ e.RetVal = NavigationResponse.Ignore;
-+ };
-+ web_view.HoveringOverLink += delegate (object sender, HoveringOverLinkArgs e) {
-+ url = e.Link;
-+ if (OnUrl != null)
-+ OnUrl (this, new EventArgs ());
-+ };
-+ this.help_tree = help_tree;
-+ }
-+
-+ public void JumpToAnchor (string anchor)
-+ {
-+ web_view.Open ("#" + anchor);
-+ }
-+
-+ public void Copy ()
-+ {
-+ web_view.CopyClipboard ();
-+ }
-+
-+ public void SelectAll ()
-+ {
-+ web_view.SelectAll ();
-+ }
-+
-+ public void Render (string html)
-+ {
-+ web_view.LoadHtmlString (html, null);
-+ }
-+
-+ public void Print (string html)
-+ {
-+ web_view.ExecuteScript ("print();");
-+ }
-+
-+ public bool Initialize ()
-+ {
-+ return true;
-+ }
-+
-+ public Capabilities Capabilities
-+ {
-+ get { return Capabilities.Css | Capabilities.Fonts; }
-+ }
-+
-+ public string Name
-+ {
-+ get { return "WebKit"; }
-+ }
-+
-+
-+}
-+}
-diff -urNad mono-tools-1.9~/docbrowser/browser.cs mono-tools-1.9/docbrowser/browser.cs
---- mono-tools-1.9~/docbrowser/browser.cs 2008-01-30 00:06:10.000000000 +0100
-+++ mono-tools-1.9/docbrowser/browser.cs 2008-08-10 14:59:40.000000000 +0200
-@@ -15,17 +15,22 @@
- using System.Reflection;
- using System.Threading;
- using System.Collections;
-+using System.Collections.Generic;
- using System.Web.Services.Protocols;
- using System.Xml;
-
- namespace Monodoc {
- class Driver {
-+
-+ public static string[] engines = {"WebKit", "GtkHtml", "MonoWebBrowser", "Gecko"};
-+
- static int Main (string [] args)
- {
- string topic = null;
-- bool useGecko = true;
- bool remote_mode = false;
-
-+ string engine = engines[0];
-+
- for (int i = 0; i < args.Length; i++){
- switch (args [i]){
- case "--html":
-@@ -98,8 +103,14 @@
- remote_mode = true;
- break;
-
-- case "--no-gecko":
-- useGecko = false;
-+ case "--engine":
-+ if (i + 1 == args.Length) {
-+ Console.WriteLine ("Usage: --engine engine, where engine is the name of the browser engine to use (WebKit, GtkHtml, MonoWebBrowser, Gecko or another).");
-+ return 1;
-+ }
-+
-+ engine = args [i+1];
-+ i++;
- break;
- default:
- topic = args [i];
-@@ -112,7 +123,7 @@
-
- Settings.RunningGUI = true;
- Application.Init ();
-- Browser browser = new Browser (useGecko);
-+ Browser browser = new Browser (engine);
-
- if (topic != null)
- browser.LoadUrl (topic);
-@@ -165,7 +176,7 @@
- public Notebook tabs_nb;
- public Tab CurrentTab;
- bool HoldCtrl;
-- public bool UseGecko;
-+ public string engine;
-
- [Glade.Widget] public MenuItem bookmarksMenu;
- [Glade.Widget] MenuItem view1;
-@@ -231,9 +242,11 @@
-
- public ArrayList bookList;
-
-- public Browser (bool UseGecko)
-+ public Capabilities capabilities;
-+
-+ public Browser (string engine)
- {
-- this.UseGecko = UseGecko;
-+ this.engine = engine;
- ui = new Glade.XML (null, "browser.glade", "window1", null);
- ui.Autoconnect (this);
-
-@@ -280,7 +293,10 @@
- tabs_nb.SwitchPage += new SwitchPageHandler(ChangeTab);
- help_container.Add(tabs_nb);
-
-- if (UseGecko) {
-+ AddTab();
-+
-+
-+ if ((capabilities & Capabilities.Fonts) != 0) {
- // Add Menu entries for changing the font
- Menu aux = (Menu) view1.Submenu;
- MenuItem sep = new SeparatorMenuItem ();
-@@ -334,10 +350,11 @@
-
- index_browser = IndexBrowser.MakeIndexBrowser (this);
-
-- AddTab();
- MainWindow.ShowAll();
- }
-
-+
-+
- // Initianlizes the search index
- void CreateSearchPanel ()
- {
-@@ -821,7 +838,7 @@
- void on_print_activate (object sender, EventArgs e)
- {
- // desactivate css temporary
-- if (UseGecko)
-+ if ((capabilities & Capabilities.Css) != 0)
- HelpSource.use_css = false;
-
- string url = CurrentUrl;
-@@ -842,7 +859,7 @@
- if (html != null)
- CurrentTab.html.Print (html);
-
-- if (UseGecko)
-+ if ((capabilities & Capabilities.Css) != 0)
- HelpSource.use_css = true;
- }
-
-@@ -2264,19 +2281,65 @@
- text_editor.GrabFocus ();
- }
-
-- static IHtmlRender GetRenderer (string file, string type, Browser browser)
-- {
-+
-+ private static IHtmlRender LoadRenderer (string dll, Browser browser) {
- try {
--
-- string exeAssembly = Assembly.GetExecutingAssembly ().Location;
-- string myPath = System.IO.Path.GetDirectoryName (exeAssembly);
-- Assembly dll = Assembly.LoadFrom (System.IO.Path.Combine (myPath, file));
-- Type t = dll.GetType (type, true);
-+ Assembly ass = Assembly.LoadFile (dll);
-+ System.Type type = ass.GetType ("Monodoc." + ass.GetName ().Name, false, false);
-+ if (type == null)
-+ return null;
-+ return (IHtmlRender) Activator.CreateInstance (type, new object[1] { browser.help_tree });
-+ } catch (Exception ex) {
-+ Console.Error.WriteLine (ex);
-+ }
-+ return null;
-+ }
-+
-+
-+ public static IHtmlRender GetRenderer (string engine, string fallback, Browser browser)
-+ {
-+ IHtmlRender renderer = LoadRenderer (System.IO.Path.Combine (AppDomain.CurrentDomain.BaseDirectory, engine + "HtmlRender.dll"), browser);
-+ if (renderer != null) {
-+ try {
-+ if (renderer.Initialize ()) {
-+ Console.WriteLine ("using " + renderer.Name);
-+ return renderer;
-+ }
-+ } catch (Exception ex) {
-+ Console.Error.WriteLine (ex);
-+ }
-+ }
-
-- return (IHtmlRender) Activator.CreateInstance (t, new object [1] { browser.help_tree });
-- } catch {
-- return null;
-+ renderer = LoadRenderer (System.IO.Path.Combine (AppDomain.CurrentDomain.BaseDirectory, fallback + "HtmlRender.dll"), browser);
-+ if (renderer != null) {
-+ try {
-+ if (renderer.Initialize ()) {
-+ Console.WriteLine ("using " + renderer.Name);
-+ return renderer;
-+ }
-+ } catch (Exception ex) {
-+ //Console.Error.WriteLine (ex);
-+ }
-+ }
-+
-+ foreach (string backend in Driver.engines) {
-+ string dll = System.IO.Path.Combine (AppDomain.CurrentDomain.BaseDirectory, backend + "HtmlRender.dll");
-+ if (System.IO.File.Exists (dll)) {
-+ renderer = LoadRenderer (dll, browser);
-+ if (renderer != null) {
-+ try {
-+ if (renderer.Initialize ()) {
-+ Console.WriteLine ("using " + renderer.Name);
-+ return renderer;
-+ }
-+ } catch (Exception ex) {
-+ //Console.Error.WriteLine (ex);
-+ }
-+ }
-+ }
- }
-+
-+ return null;
- }
-
-
-@@ -2300,24 +2363,19 @@
- //
- // Setup the HTML rendering and preview area
- //
-- if (browser.UseGecko) {
-- html = GetRenderer ("GeckoHtmlRender.dll", "Monodoc.GeckoHtmlRender", browser);
-- html_preview = GetRenderer ("GeckoHtmlRender.dll", "Monodoc.GeckoHtmlRender", browser);
-- HelpSource.use_css = true;
-- }
--
-- if (html == null || html_preview == null) {
-- html = GetRenderer ("GtkHtmlHtmlRender.dll", "Monodoc.GtkHtmlHtmlRender", browser);
-- html_preview = GetRenderer ("GtkHtmlHtmlRender.dll", "Monodoc.GtkHtmlHtmlRender", browser);
-- browser.UseGecko = false;
-- HelpSource.use_css = false;
-- }
-
-+ html = GetRenderer (browser.engine, Driver.engines[1], browser);
-+ html_preview = GetRenderer (browser.engine, Driver.engines[1], browser);
- if (html == null || html_preview == null)
- throw new Exception ("Couldn't find html renderer!");
--
-+
-+ browser.capabilities = html.Capabilities;
-+
-+ if ((html.Capabilities & Capabilities.Css) != 0)
-+ HelpSource.use_css = true;
-+
- //Prepare Font for css (TODO: use GConf?)
-- if (browser.UseGecko && SettingsHandler.Settings.preferred_font_size == 0) {
-+ if ((html.Capabilities & Capabilities.Fonts) != 0 && SettingsHandler.Settings.preferred_font_size == 0) {
- Pango.FontDescription font_desc = Pango.FontDescription.FromString ("Sans 12");
- SettingsHandler.Settings.preferred_font_family = font_desc.Family;
- SettingsHandler.Settings.preferred_font_size = 100; //size: 100%
-diff -urNad mono-tools-1.9~/docbrowser/monodoc.in mono-tools-1.9/docbrowser/monodoc.in
---- mono-tools-1.9~/docbrowser/monodoc.in 2008-03-10 23:34:01.000000000 +0100
-+++ mono-tools-1.9/docbrowser/monodoc.in 2008-08-10 15:00:17.000000000 +0200
-@@ -98,4 +98,4 @@
- export MOZILLA_HOME
- export LD_LIBRARY_PATH
-
--exec @RUNTIME@ $monodocdir/browser.exe $OPTIONS "$@" $REST
-+exec @RUNTIME@ $monodocdir/browser.exe --engine GtkHtml $OPTIONS "$@" $REST
-diff -urNad mono-tools-1.9~/ilcontrast/Makefile.am mono-tools-1.9/ilcontrast/Makefile.am
---- mono-tools-1.9~/ilcontrast/Makefile.am 2007-12-06 22:43:43.000000000 +0100
-+++ mono-tools-1.9/ilcontrast/Makefile.am 2008-08-10 14:59:40.000000000 +0200
-@@ -7,6 +7,12 @@
- desktopdir = $(datadir)/applications
- pixmapdir = $(datadir)/pixmaps
-
-+if ENABLE_WEBKIT
-+assembly_DATA = $(TARGET)
-+bin_SCRIPTS = ilcontrast
-+desktop_DATA = ilcontrast.desktop
-+pixmap_DATA = ilcontrast.png
-+else
- if ENABLE_GECKO
- assembly_DATA = $(TARGET)
- bin_SCRIPTS = ilcontrast
-@@ -14,10 +20,15 @@
- pixmap_DATA = ilcontrast.png
- else
- all:
-- echo "Install gecko-sharp to build ilContrast"
-+ echo "Install webkit-sharp or gecko-sharp to build ilContrast"
-+endif
- endif
-
--references = $(GTK_SHARP_LIBS) $(GECKO_SHARP_LIBS) -r:ICSharpCode.SharpZipLib.dll
-+if ENABLE_WEBKIT
-+references = $(GTK_SHARP_LIBS) $(WEBKIT_SHARP_LIBS) -r:ICSharpCode.SharpZipLib.dll
-+else
-+references = $(GTK_SHARP_LIBS) $(GECKO_SHARP_LIBS) -d:USE_GECKO -r:ICSharpCode.SharpZipLib.dll
-+endif
-
- resources = \
- /resource:$(srcdir)/ilcontrast.png,ilcontrast.png \
-diff -urNad mono-tools-1.9~/ilcontrast/Window.cs mono-tools-1.9/ilcontrast/Window.cs
---- mono-tools-1.9~/ilcontrast/Window.cs 2007-12-06 22:43:43.000000000 +0100
-+++ mono-tools-1.9/ilcontrast/Window.cs 2008-08-10 14:59:40.000000000 +0200
-@@ -40,7 +40,11 @@
-
- Box main_vbox;
- Statusbar statusbar;
-+#if USE_GECKO
- Gecko.WebControl browser;
-+#else
-+ WebKit.WebView web_view;
-+#endif
- bool first_show = false;
- Thread worker;
- ComparisonInfo info;
-@@ -49,10 +53,17 @@
- {
- DefaultSize = new Size (450, 450);
-
-- browser = new Gecko.WebControl ();
- main_vbox = new VBox (false, 0);
- AddActionUI ();
-+#if USE_GECKO
-+ browser = new Gecko.WebControl ();
- main_vbox.PackStart (browser, true, true, 0);
-+#else
-+ web_view = new WebKit.WebView ();
-+ ScrolledWindow sw = new ScrolledWindow ();
-+ sw.Add (web_view);
-+ main_vbox.PackStart (sw, true, true, 0);
-+#endif
- statusbar = new Statusbar ();
- main_vbox.PackStart (statusbar, false, false, 0);
- Add (main_vbox);
-@@ -125,7 +136,11 @@
-
- void LoadUrl (string url)
- {
-+#if USE_GECKO
- browser.LoadUrl (url);
-+#else
-+ web_view.Open (url);
-+#endif
- }
-
- void GenerateHtmlTarget ()
Added: mono-tools/trunk/debian/patches/06-nunit_2.4_port.patch
===================================================================
--- mono-tools/trunk/debian/patches/06-nunit_2.4_port.patch (rev 0)
+++ mono-tools/trunk/debian/patches/06-nunit_2.4_port.patch 2008-11-26 13:14:59 UTC (rev 3840)
@@ -0,0 +1,240 @@
+--- mono-tools-2.0.orig/gnunit/src/AssemblyStore.cs
++++ mono-tools-2.0/gnunit/src/AssemblyStore.cs
+@@ -40,9 +40,9 @@
+ }
+ }
+
+- delegate void TestStartHandler (TestCase test);
++ delegate void TestStartHandler (TestName test);
+ delegate void TestFinishHandler (TestCaseResult result);
+- delegate void SuiteStartHandler (TestSuite test);
++ delegate void SuiteStartHandler (TestName test);
+ delegate void SuiteFinishHandler (TestSuiteResult result);
+ delegate void TestCaseResultHandler (TestResult result);
+
+@@ -71,9 +71,9 @@
+ class QueuedSuiteStart : QueuedEvent
+ {
+ SuiteStartHandler handler;
+- TestSuite suite;
++ TestName suite;
+
+- public QueuedSuiteStart (SuiteStartHandler handler, TestSuite suite)
++ public QueuedSuiteStart (SuiteStartHandler handler, TestName suite)
+ {
+ this.handler = handler;
+ this.suite = suite;
+@@ -105,9 +105,9 @@
+ class QueuedTestStart : QueuedEvent
+ {
+ TestStartHandler handler;
+- TestCase test;
++ TestName test;
+
+- public QueuedTestStart (TestStartHandler handler, TestCase test)
++ public QueuedTestStart (TestStartHandler handler, TestName test)
+ {
+ this.handler = handler;
+ this.test = test;
+@@ -186,7 +186,7 @@
+ Queue pending;
+ System.Threading.Thread th;
+ string location;
+- IFilter filter;
++ ITestFilter filter;
+
+ Exception exception;
+ static GLib.GType gtype = GLib.GType.Invalid;
+@@ -220,7 +220,7 @@
+ }
+ }
+
+- public IFilter Filter {
++ public ITestFilter Filter {
+ get { return filter; }
+ set { filter = value; }
+ }
+@@ -437,7 +437,7 @@
+ {
+ TreeIter next;
+ foreach (Test t in suite.Tests) {
+- next = AddFixture (parent, t.FullName);
++ next = AddFixture (parent, t.TestName.FullName);
+ if ((n % 5) == 0) {
+ while (GLib.MainContext.Iteration ());
+ }
+@@ -516,11 +516,11 @@
+ }
+
+ // Interface NUnit.Core.EventListener
+- void EventListener.RunStarted (Test [] tests)
++ void EventListener.RunStarted (string name, int testCount)
+ {
+ }
+
+- void EventListener.RunFinished (TestResult [] results)
++ void EventListener.RunFinished (TestResult result)
+ {
+ }
+
+@@ -532,7 +532,7 @@
+ {
+ }
+
+- void EventListener.TestStarted (TestCase testCase)
++ void EventListener.TestStarted (TestName testCase)
+ {
+ if (listener != null) {
+ Monitor.Enter (pending);
+@@ -553,7 +553,7 @@
+ idle.Set ();
+ }
+
+- void EventListener.SuiteStarted (TestSuite suite)
++ void EventListener.SuiteStarted (TestName suite)
+ {
+ if (listener != null) {
+ Monitor.Enter (pending);
+--- mono-tools-2.0.orig/gnunit/src/main.cs
++++ mono-tools-2.0/gnunit/src/main.cs
+@@ -17,6 +17,7 @@
+ using Gnome;
+ using Gtk;
+ using NUnit.Core;
++using NUnit.Core.Filters;
+ using NUnit.Util;
+ using Dialog = Gtk.Dialog;
+
+@@ -125,7 +126,7 @@
+ }
+ }
+
+- class CategoryMaster : IFilter {
++ class CategoryMaster : ITestFilter {
+ static Hashtable known_categories;
+ string [] categories;
+ bool [] states;
+@@ -134,7 +135,7 @@
+ string [] exclude;
+ bool uncategorized;
+ bool all;
+- IFilter inner_filter;
++ ITestFilter inner_filter;
+
+ static CategoryMaster ()
+ {
+@@ -216,6 +217,10 @@
+ get { return cb; }
+ }
+
++ public bool IsEmpty {
++ get { return false; }
++ }
++
+ void ToggleState (object sender, EventArgs args)
+ {
+ CheckMenuItem item = (CheckMenuItem) sender;
+@@ -255,25 +260,19 @@
+ idx++;
+ }
+ }
+- inner_filter = new CategoryFilter (exclude, uncategorized);
++ inner_filter = new CategoryFilter (exclude);
+ } else {
+- inner_filter = new CategoryFilter (categories, uncategorized);
++ inner_filter = new CategoryFilter (categories);
++ }
++
++ if (uncategorized) {
++ inner_filter = new NotFilter(inner_filter);
+ }
+ }
+
+ public bool Cancel;
+- bool IFilter.Pass (TestSuite suite)
+- {
+- if (Cancel)
+- return false;
+-
+- if (all)
+- return true;
+-
+- return inner_filter.Pass (suite);
+- }
+
+- bool IFilter.Pass (TestCase test)
++ bool ITestFilter.Pass (ITest test)
+ {
+ if (Cancel)
+ return false;
+@@ -284,9 +283,9 @@
+ return inner_filter.Pass (test);
+ }
+
+- public bool Exclude
++ public bool Match (ITest test)
+ {
+- get { return false; }
++ return true;
+ }
+
+ static string _ (string key)
+@@ -724,11 +723,11 @@
+ }
+
+ // Interface NUnit.Core.EventListener
+- void EventListener.RunStarted (Test [] tests)
++ void EventListener.RunStarted (string name, int testCount)
+ {
+ }
+
+- void EventListener.RunFinished (TestResult [] results)
++ void EventListener.RunFinished (TestResult result)
+ {
+ }
+
+@@ -740,7 +739,7 @@
+ {
+ }
+
+- void EventListener.TestStarted (TestCase testCase)
++ void EventListener.TestStarted (TestName testCase)
+ {
+ frameLabel.Text = "Test: " + testCase.FullName;
+ }
+@@ -752,7 +751,7 @@
+
+ assertions += result.AssertCount;
+ if (result.Executed == false) {
+- AddIgnored (result.Test.FullName, result.Test.IgnoreReason);
++ AddIgnored (result.Test.TestName.FullName, result.Test.IgnoreReason);
+ } else if (result.IsFailure) {
+ AddError (result);
+ }
+@@ -762,7 +761,7 @@
+ ClockUpdater (this, EventArgs.Empty);
+ }
+
+- void EventListener.SuiteStarted (TestSuite suite)
++ void EventListener.SuiteStarted (TestName suite)
+ {
+ frameLabel.Text = "Suite: " + suite.FullName;
+ }
+@@ -826,7 +825,7 @@
+ int dot;
+ TreeIter main = TreeIter.Zero;
+ TreeIter iter;
+- string fullname = result.Test.FullName;
++ string fullname = result.Test.TestName.FullName;
+ if ((dot = fullname.LastIndexOf ('.')) != -1) {
+ string key = fullname.Substring (0, dot);
+ if (!errorIters.ContainsKey (key)) {
+@@ -841,7 +840,7 @@
+ errorIters [fullname] = main;
+ }
+
+- iter = failuresStore.AppendValues (main, result.Test.Name);
++ iter = failuresStore.AppendValues (main, result.Test.TestName.Name);
+ iter = failuresStore.AppendValues (iter, result.Message);
+ iter = failuresStore.AppendValues (iter, result.StackTrace);
+
Added: mono-tools/trunk/debian/patches/07-webkit-sharp_port.patch
===================================================================
--- mono-tools/trunk/debian/patches/07-webkit-sharp_port.patch (rev 0)
+++ mono-tools/trunk/debian/patches/07-webkit-sharp_port.patch 2008-11-26 13:14:59 UTC (rev 3840)
@@ -0,0 +1,1042 @@
+Author: Mirco Bauer <meebey at debian.org>
+Reason: Backport of webkit-sharp support, taken from upstream SVN revision:
+ r97203, r97657, r97745, r105817, r105820, r105828, r105860 and r105868
+diff -urNad mono-tools-1.9~/configure.in mono-tools-1.9/configure.in
+--- mono-tools-1.9~/configure.in 2008-08-10 14:59:40.000000000 +0200
++++ mono-tools-1.9/configure.in 2008-08-10 14:59:40.000000000 +0200
+@@ -10,6 +10,7 @@
+ AC_PATH_PROG(MCS, mcs, no)
+ AC_PATH_PROG(GMCS, gmcs, no)
+ AC_PATH_PROG(RUNTIME, mono, no)
++AC_PATH_PROG(GACUTIL, gacutil, no)
+
+ CS="C#"
+ if test "x$MCS" = "xno" ; then
+@@ -31,6 +32,8 @@
+ AC_SUBST(GMCS)
+ AC_SUBST(RUNTIME)
+ AC_SUBST(RESGEN)
++AC_SUBST(GACUTIL)
++
+
+ PKG_CHECK_MODULES(NUNIT, mono-nunit)
+ AC_SUBST(NUNIT_LIBS)
+@@ -63,9 +66,35 @@
+ AC_SUBST(MOZILLA_HOME)
+ fi
+
++dnl TODO: check for webkit-sharp
++# AM_CONDITIONAL(ENABLE_WEBKIT, test "xno" = "xyes")
++PKG_CHECK_MODULES(WEBKIT_SHARP, webkit-sharp-1.0, enable_webkit=yes, enable_webkit=no)
++AC_SUBST(WEBKIT_SHARP_LIBS)
++AM_CONDITIONAL(ENABLE_WEBKIT, test "x$enable_webkit" = "xyes")
+
+-if test "x$enable_gtkhtml$enable_gecko" = "xnono" ; then
+- AC_MSG_ERROR([no HTML display found. You need either gtkhtml or gecko])
++# PKG_CHECK_MODULES(MONOWEBBROWSER, mono-webbrowser, enable_monowebbrowser=yes, enable_monowebbrowser=no)
++# AC_SUBST(MONOWEBBROWSER_LIBS)
++
++AC_MSG_CHECKING([for Mono.WebBrowser])
++if test "x$GACUTIL" = "xno"
++then
++ AC_MSG_RESULT([no])
++ if test "x$enable_monowebbrowser" = "x" ; then enable_monowebbrowser=no ; fi
++else
++ if $GACUTIL -l Mono.WebBrowser | grep -q "Mono.WebBrowser"
++ then
++ AC_MSG_RESULT([yes])
++ enable_monowebbrowser=yes
++ else
++ AC_MSG_RESULT([no])
++ enable_monowebbrowser=no
++ fi
++fi
++MONOWEBBROWSER_LIBS=-r:Mono.WebBrowser
++AM_CONDITIONAL(ENABLE_MONOWEBBROWSER, test "x$enable_monowebbrowser" = "xyes")
++
++if test "x$enable_gtkhtml$enable_gecko$enable_monowebbrowser$enable_webkit" = "xnononono" ; then
++ AC_MSG_ERROR([no HTML display found. You need either gtkhtml, gecko, WebKit or Mono.WebBrowser])
+ fi
+
+ dnl
+@@ -183,7 +212,10 @@
+ echo "Configuration summary"
+ echo ""
+ echo " * Installation prefix = $prefix"
+-echo " * gecko-sharp.dll = $enable_gecko"
++echo " * Using Gecko = $enable_gecko"
++echo " * Using GtkHtml = $enable_gtkhtml"
++echo " * Using Mono.WebBrowser = $enable_monowebbrowser"
++echo " * Using WebKit = $enable_webkit"
+ echo ""
+ echo " NOTE: if any of the above say 'no' you may install the"
+ echo " corresponding development packages for them, rerun"
+diff -urNad mono-tools-1.9~/docbrowser/BrowserWidget.cs mono-tools-1.9/docbrowser/BrowserWidget.cs
+--- mono-tools-1.9~/docbrowser/BrowserWidget.cs 1970-01-01 01:00:00.000000000 +0100
++++ mono-tools-1.9/docbrowser/BrowserWidget.cs 2008-08-10 14:59:40.000000000 +0200
+@@ -0,0 +1,108 @@
++//Permission is hereby granted, free of charge, to any person obtaining
++//a copy of this software and associated documentation files (the
++//"Software"), to deal in the Software without restriction, including
++//without limitation the rights to use, copy, modify, merge, publish,
++//distribute, sublicense, and/or sell copies of the Software, and to
++//permit persons to whom the Software is furnished to do so, subject to
++//the following conditions:
++//
++//The above copyright notice and this permission notice shall be
++//included in all copies or substantial portions of the Software.
++//
++//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++//NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
++//LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
++//OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
++//WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++//
++//Copyright (c) 2008 Novell, Inc.
++//
++//Authors:
++// Andreia Gaita (avidigal at novell.com)
++//
++
++using System;
++using Mono.WebBrowser;
++using Gtk;
++using Gdk;
++using Gnome;
++
++namespace Monodoc
++{
++ public class BrowserWidget : Gtk.Bin
++ {
++ public IWebBrowser browser;
++ int width, height;
++
++ public BrowserWidget() : base()
++ {
++ width = height = 200;
++ browser = Manager.GetNewInstance (Platform.Gtk);
++ }
++
++
++ protected override void OnRealized ()
++ {
++ base.OnRealized ();
++
++ WindowAttr attributes = new WindowAttr ();
++ attributes.WindowType = Gdk.WindowType.Child;
++ attributes.X = Allocation.X;
++ attributes.Y = Allocation.Y;
++ attributes.Width = Allocation.Width;
++ attributes.Height = Allocation.Height;
++ attributes.Wclass = WindowClass.InputOutput;
++ attributes.Visual = Visual;
++ attributes.Colormap = Colormap;
++ attributes.EventMask = (int) Events;
++ attributes.EventMask = attributes.EventMask | ((int) Gdk.EventMask.ExposureMask |
++ (int) Gdk.EventMask.KeyPressMask |
++ (int) Gdk.EventMask.KeyReleaseMask |
++ (int) Gdk.EventMask.EnterNotifyMask |
++ (int) Gdk.EventMask.LeaveNotifyMask |
++ (int) Gdk.EventMask.StructureMask |
++ (int) Gdk.EventMask.FocusChangeMask);
++
++ GdkWindow = new Gdk.Window (ParentWindow, attributes, Gdk.WindowAttributesType.X | Gdk.WindowAttributesType.Y |
++ Gdk.WindowAttributesType.Colormap | Gdk.WindowAttributesType.Visual);
++ GdkWindow.UserData = this.Handle;
++
++ Style = Style.Attach (GdkWindow);
++ Style.Background (StateType.Normal);
++
++ browser.Load (this.Handle, width, height);
++ }
++
++ protected override void OnMapped ()
++ {
++ base.OnMapped ();
++ GdkWindow.Show ();
++ }
++
++ protected override void OnUnmapped ()
++ {
++ base.OnUnmapped ();
++ GdkWindow.Hide ();
++ }
++
++ protected override void OnSizeAllocated (Rectangle allocation)
++ {
++ base.OnSizeAllocated (allocation);
++ if ((WidgetFlags & WidgetFlags.Realized) != 0) {
++ GdkWindow.MoveResize (allocation);
++ if (browser != null)
++ browser.Resize (allocation.Width, allocation.Height);
++ }
++ }
++
++ protected override void OnSizeRequested (ref Requisition requisition)
++ {
++ SetSizeRequest (width, height);
++
++ }
++
++
++ }
++}
+diff -urNad mono-tools-1.9~/docbrowser/GtkHtmlHtmlRender.cs mono-tools-1.9/docbrowser/GtkHtmlHtmlRender.cs
+--- mono-tools-1.9~/docbrowser/GtkHtmlHtmlRender.cs 2008-01-30 00:06:11.000000000 +0100
++++ mono-tools-1.9/docbrowser/GtkHtmlHtmlRender.cs 2008-08-10 14:59:40.000000000 +0200
+@@ -31,11 +31,6 @@
+
+ public GtkHtmlHtmlRender (RootTree help_tree)
+ {
+- html_panel = new HTML();
+- html_panel.Show();
+- html_panel.LinkClicked += new LinkClickedHandler (LinkClicked);
+- html_panel.OnUrl += new OnUrlHandler (OnUrlMouseOver);
+- html_panel.UrlRequested += new UrlRequestedHandler (UrlRequested);
+ this.help_tree = help_tree;
+ }
+
+@@ -115,5 +110,34 @@
+
+ PrintManager.Print (Html);
+ }
++
++ public bool Initialize ()
++ {
++ try {
++ html_panel = new HTML ();
++ }
++ catch (Exception ex) {
++ Console.WriteLine (ex.Message);
++ Console.WriteLine (ex.StackTrace);
++ return false;
++ }
++ html_panel.Show ();
++ html_panel.LinkClicked += new LinkClickedHandler (LinkClicked);
++ html_panel.OnUrl += new OnUrlHandler (OnUrlMouseOver);
++ html_panel.UrlRequested += new UrlRequestedHandler (UrlRequested);
++ return true;
++
++ }
++
++ public Capabilities Capabilities
++ {
++ get { return Capabilities.None; }
++ }
++
++ public string Name
++ {
++ get { return "GtkHtml"; }
++ }
++
+ }
+ }
+diff -urNad mono-tools-1.9~/docbrowser/IHtmlRender.cs mono-tools-1.9/docbrowser/IHtmlRender.cs
+--- mono-tools-1.9~/docbrowser/IHtmlRender.cs 2007-12-06 22:43:45.000000000 +0100
++++ mono-tools-1.9/docbrowser/IHtmlRender.cs 2008-08-10 14:59:40.000000000 +0200
+@@ -6,35 +6,49 @@
+ using System;
+ using Gtk;
+
+-namespace Monodoc {
+-public interface IHtmlRender {
+- // Jump to an anchor of the form <a name="tttt">
+- void JumpToAnchor (string anchor_name);
++namespace Monodoc
++{
++ public interface IHtmlRender
++ {
++ // Jump to an anchor of the form <a name="tttt">
++ void JumpToAnchor (string anchor_name);
+
+- //Copy to the clipboard the selcted text
+- void Copy ();
++ //Copy to the clipboard the selcted text
++ void Copy ();
+
+- //Select all the text
+- void SelectAll ();
++ //Select all the text
++ void SelectAll ();
+
+- //Render the HTML code given
+- void Render (string html_code);
++ //Render the HTML code given
++ void Render (string html_code);
+
+- //Event fired when the use is over an Url
+- event EventHandler OnUrl;
++ //Event fired when the use is over an Url
++ event EventHandler OnUrl;
+
+- //Event fired when the user clicks on a Link
+- event EventHandler UrlClicked;
++ //Event fired when the user clicks on a Link
++ event EventHandler UrlClicked;
+
+- // Variable that handles the info encessary for the events
+- // As every implementation of HtmlRender will have differents events
+- // we try to homogenize them with the variabel
+- string Url { get; }
++ // Variable that handles the info encessary for the events
++ // As every implementation of HtmlRender will have differents events
++ // we try to homogenize them with the variabel
++ string Url { get; }
+
+- Widget HtmlPanel { get; }
++ Widget HtmlPanel { get; }
+
+- void Print (string Html);
+-}
++ void Print (string Html);
++
++ bool Initialize ();
++ Capabilities Capabilities { get; }
++ string Name { get; }
++
++ }
+
++ [Flags]
++ public enum Capabilities
++ {
++ None = 0,
++ Css = 1,
++ Fonts = 2
++ }
+
+ }
+diff -urNad mono-tools-1.9~/docbrowser/Makefile.am mono-tools-1.9/docbrowser/Makefile.am
+--- mono-tools-1.9~/docbrowser/Makefile.am 2008-01-30 00:06:11.000000000 +0100
++++ mono-tools-1.9/docbrowser/Makefile.am 2008-08-10 14:59:40.000000000 +0200
+@@ -10,9 +10,15 @@
+
+ GTKHTML_TARGET=GtkHtmlHtmlRender.dll
+ endif
++if ENABLE_WEBKIT
++WEBKIT_TARGET=WebKitHtmlRender.dll
++endif
++if ENABLE_MONOWEBBROWSER
++MONOWEBBROWSER_TARGET=MonoWebBrowserHtmlRender.dll
++endif
+
+-CLEANFILES = browser.exe browser.exe.mdb admin.exe admin.exe.mdb $(GECKO_TARGET) $(GECKO_TARGET).mdb $(GTKHTML_TARGET) $(GTKHTML_TARGET).mdb monodoc.desktop
+-monodoc_DATA = browser.exe $(GECKO_TARGET) $(GTKHTML_TARGET)
++CLEANFILES = browser.exe browser.exe.mdb admin.exe admin.exe.mdb $(GECKO_TARGET) $(GECKO_TARGET).mdb $(GTKHTML_TARGET) $(GTKHTML_TARGET).mdb $(WEBKIT_TARGET) $(WEBKIT_TARGET).mdb $(MONOWEBBROWSER_TARGET) $(MONOWEBBROWSER_TARGET).mdb monodoc.desktop
++monodoc_DATA = browser.exe $(GECKO_TARGET) $(GTKHTML_TARGET) $(WEBKIT_TARGET) $(MONOWEBBROWSER_TARGET)
+
+ DISTCLEANFILES = AssemblyInfo.cs monodoc.desktop monodoc
+
+@@ -39,6 +45,13 @@
+ $(srcdir)/PrintManager.cs \
+ $(srcdir)/GtkHtmlHtmlRender.cs
+
++webkitrender_sources = \
++ $(srcdir)/WebKitHtmlRender.cs
++
++monowebbrowserrender_sources = \
++ $(srcdir)/BrowserWidget.cs \
++ $(srcdir)/MonoWebBrowserHtmlRender.cs
++
+ admin_sources = \
+ $(srcdir)/admin.cs \
+ $(srcdir)/Contributions.cs
+@@ -48,10 +61,17 @@
+ geckorender_assemblies = $(GTK_SHARP_LIBS) $(GTKHTML_SHARP_LIBS) $(GECKO_SHARP_LIBS) $(MONODOC_LIBS) -r:browser.exe
+ gtkhtmlrender_assemblies = $(GTK_SHARP_LIBS) $(GTKHTML_SHARP_LIBS) $(MONODOC_LIBS) -r:browser.exe
+
++# TODO: use pkg-config for webkit-sharp
++# WEBKIT_SHARP_LIBS = -r:nwebkit.dll
++webkitrender_assemblies = $(GTK_SHARP_LIBS) $(WEBKIT_SHARP_LIBS) $(MONODOC_LIBS) -r:browser.exe
++
++monowebbrowserrender_assemblies = $(GTK_SHARP_LIBS) $(MONOWEBBROWSER_LIBS) $(MONODOC_LIBS) -r:browser.exe -r:Mono.Mozilla.dll
++
+ EXTRA_DIST = \
+ $(browser_sources) \
+ $(geckorender_sources) \
+ $(gtkhtmlrender_sources) \
++ $(webkitrender_sources) \
+ monodoc.desktop.in \
+ admin.cs \
+ admin.glade \
+@@ -63,17 +83,23 @@
+ # admin hardcodes GTKHTML for now.
+ if ENABLE_GTKHTML
+ admin.exe: $(admin_sources) $(srcdir)/admin.glade
+- $(MCS) -debug -out:admin.exe $(admin_sources) -resource:$(srcdir)/admin.glade,admin.glade $(browser_assemblies) $(GTKHTML_SHARP_LIBS) -r:System.Drawing
++ $(GMCS) -debug -out:admin.exe $(admin_sources) -resource:$(srcdir)/admin.glade,admin.glade $(browser_assemblies) $(GTKHTML_SHARP_LIBS) -r:System.Drawing
+ endif
+
+ browser.exe: $(browser_sources) $(browser_built_sources) $(srcdir)/browser.glade $(srcdir)/monodoc.png
+- $(MCS) -debug -out:browser.exe $(browser_sources) $(browser_built_sources) -resource:$(srcdir)/monodoc.png,monodoc.png -resource:$(srcdir)/browser.glade,browser.glade $(browser_assemblies)
++ $(GMCS) -debug -out:browser.exe $(browser_sources) $(browser_built_sources) -resource:$(srcdir)/monodoc.png,monodoc.png -resource:$(srcdir)/browser.glade,browser.glade $(browser_assemblies)
+
+ GeckoHtmlRender.dll : $(geckorender_sources) browser.exe
+- $(MCS) -debug -target:library -out:$@ $(geckorender_sources) $(geckorender_assemblies) $(GECKO_PRINTING_DEF) $(CSHARP_FLAGS)
++ $(GMCS) -debug -target:library -out:$@ $(geckorender_sources) $(geckorender_assemblies) $(GECKO_PRINTING_DEF) $(CSHARP_FLAGS)
+
+ GtkHtmlHtmlRender.dll : $(gtkhtmlrender_sources) browser.exe
+- $(MCS) -debug -target:library -out:$@ $(gtkhtmlrender_sources) $(gtkhtmlrender_assemblies) $(CSHARP_FLAGS)
++ $(GMCS) -debug -target:library -out:$@ $(gtkhtmlrender_sources) $(gtkhtmlrender_assemblies) $(CSHARP_FLAGS)
++
++WebKitHtmlRender.dll : $(webkitrender_sources) browser.exe
++ $(GMCS) -debug -target:library -out:$@ $(webkitrender_sources) $(webkitrender_assemblies) $(CSHARP_FLAGS)
++
++MonoWebBrowserHtmlRender.dll : $(monowebbrowserrender_sources) browser.exe
++ $(GMCS) -debug -target:library -out:$@ $(monowebbrowserrender_sources) $(monowebbrowserrender_assemblies) $(CSHARP_FLAGS)
+
+ b: browser.exe
+ MONO_PATH=. $(RUNTIME) --debug browser.exe
+diff -urNad mono-tools-1.9~/docbrowser/Makefile.am.orig mono-tools-1.9/docbrowser/Makefile.am.orig
+--- mono-tools-1.9~/docbrowser/Makefile.am.orig 1970-01-01 01:00:00.000000000 +0100
++++ mono-tools-1.9/docbrowser/Makefile.am.orig 2008-08-10 14:59:40.000000000 +0200
+@@ -0,0 +1,117 @@
++monodocdir=$(prefix)/lib/monodoc
++noinst_DATA = admin.exe
++
++
++if ENABLE_GECKO
++GECKO_TARGET=GeckoHtmlRender.dll
++endif
++if ENABLE_GTKHTML
++GECKO_PRINTING_DEF="-d:USE_GTKHTML_PRINT"
++
++GTKHTML_TARGET=GtkHtmlHtmlRender.dll
++endif
++if ENABLE_WEBKIT
++WEBKIT_TARGET=WebKitHtmlRender.dll
++endif
++if ENABLE_MONOWEBBROWSER
++MONOWEBBROWSER_TARGET=MonoWebBrowserHtmlRender.dll
++endif
++
++CLEANFILES = browser.exe browser.exe.mdb admin.exe admin.exe.mdb $(GECKO_TARGET) $(GECKO_TARGET).mdb $(GTKHTML_TARGET) $(GTKHTML_TARGET).mdb $(WEBKIT_TARGET) $(WEBKIT_TARGET).mdb $(MONOWEBBROWSER_TARGET) $(MONOWEBBROWSER_TARGET).mdb monodoc.desktop
++monodoc_DATA = browser.exe $(GECKO_TARGET) $(GTKHTML_TARGET) $(WEBKIT_TARGET) $(MONOWEBBROWSER_TARGET)
++
++DISTCLEANFILES = AssemblyInfo.cs monodoc.desktop monodoc
++
++bin_SCRIPTS = monodoc
++
++browser_sources = \
++ $(srcdir)/browser.cs \
++ $(srcdir)/list.cs \
++ $(srcdir)/elabel.cs \
++ $(srcdir)/history.cs \
++ $(srcdir)/Contributions.cs \
++ $(srcdir)/XmlNodeWriter.cs \
++ $(srcdir)/IHtmlRender.cs \
++ $(srcdir)/BookmarkManager.cs \
++ $(srcdir)/ProgressPanel.cs
++
++browser_built_sources = AssemblyInfo.cs
++
++geckorender_sources = \
++ $(srcdir)/PrintManager.cs \
++ $(srcdir)/GeckoHtmlRender.cs
++
++gtkhtmlrender_sources = \
++ $(srcdir)/PrintManager.cs \
++ $(srcdir)/GtkHtmlHtmlRender.cs
++
++webkitrender_sources = \
++ $(srcdir)/WebKitHtmlRender.cs
++
++monowebbrowserrender_sources = \
++ $(srcdir)/BrowserWidget.cs \
++ $(srcdir)/MonoWebBrowserHtmlRender.cs
++
++admin_sources = \
++ $(srcdir)/admin.cs \
++ $(srcdir)/Contributions.cs
++
++browser_assemblies = $(GTK_SHARP_LIBS) $(MONODOC_LIBS) -r:System.Web.Services
++# we insert gtkhtml libs if we have them for printing
++geckorender_assemblies = $(GTK_SHARP_LIBS) $(GTKHTML_SHARP_LIBS) $(GECKO_SHARP_LIBS) $(MONODOC_LIBS) -r:browser.exe
++gtkhtmlrender_assemblies = $(GTK_SHARP_LIBS) $(GTKHTML_SHARP_LIBS) $(MONODOC_LIBS) -r:browser.exe
++
++# TODO: use pkg-config for webkit-sharp
++# WEBKIT_SHARP_LIBS = -r:nwebkit.dll
++webkitrender_assemblies = $(GTK_SHARP_LIBS) $(WEBKIT_SHARP_LIBS) $(MONODOC_LIBS) -r:browser.exe
++
++monowebbrowserrender_assemblies = $(GTK_SHARP_LIBS) $(MONOWEBBROWSER_LIBS) $(MONODOC_LIBS) -r:browser.exe -r:Mono.Mozilla.dll
++
++EXTRA_DIST = \
++ $(browser_sources) \
++ $(geckorender_sources) \
++ $(gtkhtmlrender_sources) \
++ $(webkitrender_sources) \
++ monodoc.desktop.in \
++ admin.cs \
++ admin.glade \
++ browser.glade \
++ monodoc.png \
++ AssemblyInfo.cs.in \
++ README.ADMIN
++
++# admin hardcodes GTKHTML for now.
++if ENABLE_GTKHTML
++admin.exe: $(admin_sources) $(srcdir)/admin.glade
++ $(MCS) -debug -out:admin.exe $(admin_sources) -resource:$(srcdir)/admin.glade,admin.glade $(browser_assemblies) $(GTKHTML_SHARP_LIBS) -r:System.Drawing
++endif
++
++browser.exe: $(browser_sources) $(browser_built_sources) $(srcdir)/browser.glade $(srcdir)/monodoc.png
++ $(MCS) -debug -out:browser.exe $(browser_sources) $(browser_built_sources) -resource:$(srcdir)/monodoc.png,monodoc.png -resource:$(srcdir)/browser.glade,browser.glade $(browser_assemblies)
++
++GeckoHtmlRender.dll : $(geckorender_sources) browser.exe
++ $(MCS) -debug -target:library -out:$@ $(geckorender_sources) $(geckorender_assemblies) $(GECKO_PRINTING_DEF) $(CSHARP_FLAGS)
++
++GtkHtmlHtmlRender.dll : $(gtkhtmlrender_sources) browser.exe
++ $(MCS) -debug -target:library -out:$@ $(gtkhtmlrender_sources) $(gtkhtmlrender_assemblies) $(CSHARP_FLAGS)
++
++WebKitHtmlRender.dll : $(webkitrender_sources) browser.exe
++ $(GMCS) -debug -target:library -out:$@ $(webkitrender_sources) $(webkitrender_assemblies) $(CSHARP_FLAGS)
++
++MonoWebBrowserHtmlRender.dll : $(monowebbrowserrender_sources) browser.exe
++ $(GMCS) -debug -target:library -out:$@ $(monowebbrowserrender_sources) $(monowebbrowserrender_assemblies) $(CSHARP_FLAGS)
++
++b: browser.exe
++ MONO_PATH=. $(RUNTIME) --debug browser.exe
++
++c: admin.exe
++ MONO_PATH=. $(RUNTIME) --debug admin.exe
++
++desktopdir = $(datadir)/applications
++desktop_DATA = monodoc.desktop
++
++monodoc.desktop: monodoc.desktop.in
++ sed -e "s|\@bindir\@|$(bindir)|" $< > $@
++
++pixmapdir = $(datadir)/pixmaps
++pixmap_DATA = monodoc.png
+diff -urNad mono-tools-1.9~/docbrowser/MonoWebBrowserHtmlRender.cs mono-tools-1.9/docbrowser/MonoWebBrowserHtmlRender.cs
+--- mono-tools-1.9~/docbrowser/MonoWebBrowserHtmlRender.cs 1970-01-01 01:00:00.000000000 +0100
++++ mono-tools-1.9/docbrowser/MonoWebBrowserHtmlRender.cs 2008-08-10 14:59:40.000000000 +0200
+@@ -0,0 +1,116 @@
++//Permission is hereby granted, free of charge, to any person obtaining
++//a copy of this software and associated documentation files (the
++//"Software"), to deal in the Software without restriction, including
++//without limitation the rights to use, copy, modify, merge, publish,
++//distribute, sublicense, and/or sell copies of the Software, and to
++//permit persons to whom the Software is furnished to do so, subject to
++//the following conditions:
++//
++//The above copyright notice and this permission notice shall be
++//included in all copies or substantial portions of the Software.
++//
++//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++//NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
++//LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
++//OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
++//WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++//
++//Copyright (c) 2008 Novell, Inc.
++//
++//Authors:
++// Andreia Gaita (avidigal at novell.com)
++//
++
++using System;
++using Mono.WebBrowser;
++using Gtk;
++
++namespace Monodoc
++{
++ public class MonoWebBrowserHtmlRender : IHtmlRender
++ {
++ BrowserWidget html_panel;
++// Widget html_panel;
++ RootTree help_tree;
++
++ public MonoWebBrowserHtmlRender (RootTree help_tree)
++ {
++
++
++// html_panel = new Gtk.Bin (IntPtr.Zero);
++// html_panel.ExposeEvent += new ExposeEventHandler (OnExposed);
++ //html_panel.Realized += new EventHandler (OnRealized);
++ this.help_tree = help_tree;
++
++ }
++
++ public void OnRealized (object sender, EventArgs e)
++ {
++
++ }
++
++ public void OnExposed (object sender, ExposeEventArgs e)
++ {
++ }
++
++ public event EventHandler OnUrl;
++ public event EventHandler UrlClicked;
++
++ // Jump to an anchor of the form <a name="tttt">
++ public void JumpToAnchor (string anchor_name)
++ {
++ }
++
++ //Copy to the clipboard the selcted text
++ public void Copy ()
++ {
++ }
++
++ //Select all the text
++ public void SelectAll ()
++ {
++ }
++
++ //Render the HTML code given
++ public void Render (string html_code)
++ {
++ Console.WriteLine (html_code);
++ html_panel.browser.Render (html_code);
++ }
++
++
++ // Variable that handles the info encessary for the events
++ // As every implementation of HtmlRender will have differents events
++ // we try to homogenize them with the variabel
++ public string Url {
++ get {return String.Empty;}//return html_panel.browser.Document.Url; }
++ }
++
++ public Widget HtmlPanel {
++ get { return (Widget)html_panel; }
++ }
++
++ public void Print (string Html)
++ {
++ }
++
++ public bool Initialize ()
++ {
++ html_panel = new BrowserWidget ();
++ return html_panel.browser.Initialized;
++ }
++
++ public Capabilities Capabilities
++ {
++ get { return Capabilities.Css | Capabilities.Fonts; }
++ }
++
++ public string Name
++ {
++ get { return "MonoWebBrowser"; }
++ }
++
++ }
++}
+diff -urNad mono-tools-1.9~/docbrowser/WebKitHtmlRender.cs mono-tools-1.9/docbrowser/WebKitHtmlRender.cs
+--- mono-tools-1.9~/docbrowser/WebKitHtmlRender.cs 1970-01-01 01:00:00.000000000 +0100
++++ mono-tools-1.9/docbrowser/WebKitHtmlRender.cs 2008-08-10 14:59:40.000000000 +0200
+@@ -0,0 +1,89 @@
++//
++// WebKitHtmlRender.cs: Implementation of IHtmlRender that uses WebKit
++//
++// Author: Alp Toker <alp at nuanti.com>
++//
++
++using System;
++using System.IO;
++using Gtk;
++using WebKit;
++
++namespace Monodoc {
++public class WebKitHtmlRender : IHtmlRender {
++
++ WebView web_view;
++ public Widget HtmlPanel {
++ get { return (Widget) web_view; }
++ }
++
++ string url;
++ public string Url {
++ get { return url; }
++ }
++
++ RootTree help_tree;
++ public event EventHandler OnUrl;
++ public event EventHandler UrlClicked;
++
++ public WebKitHtmlRender (RootTree help_tree)
++ {
++ web_view = new WebView ();
++ web_view.Show ();
++ web_view.NavigationRequested += delegate (object sender, NavigationRequestedArgs e) {
++ url = e.Request.Uri;
++ if (UrlClicked != null)
++ UrlClicked (this, new EventArgs());
++ e.RetVal = NavigationResponse.Ignore;
++ };
++ web_view.HoveringOverLink += delegate (object sender, HoveringOverLinkArgs e) {
++ url = e.Link;
++ if (OnUrl != null)
++ OnUrl (this, new EventArgs ());
++ };
++ this.help_tree = help_tree;
++ }
++
++ public void JumpToAnchor (string anchor)
++ {
++ web_view.Open ("#" + anchor);
++ }
++
++ public void Copy ()
++ {
++ web_view.CopyClipboard ();
++ }
++
++ public void SelectAll ()
++ {
++ web_view.SelectAll ();
++ }
++
++ public void Render (string html)
++ {
++ web_view.LoadHtmlString (html, null);
++ }
++
++ public void Print (string html)
++ {
++ web_view.ExecuteScript ("print();");
++ }
++
++ public bool Initialize ()
++ {
++ return true;
++ }
++
++ public Capabilities Capabilities
++ {
++ get { return Capabilities.Css | Capabilities.Fonts; }
++ }
++
++ public string Name
++ {
++ get { return "WebKit"; }
++ }
++
++
++}
++}
+diff -urNad mono-tools-1.9~/docbrowser/browser.cs mono-tools-1.9/docbrowser/browser.cs
+--- mono-tools-1.9~/docbrowser/browser.cs 2008-01-30 00:06:10.000000000 +0100
++++ mono-tools-1.9/docbrowser/browser.cs 2008-08-10 14:59:40.000000000 +0200
+@@ -15,17 +15,22 @@
+ using System.Reflection;
+ using System.Threading;
+ using System.Collections;
++using System.Collections.Generic;
+ using System.Web.Services.Protocols;
+ using System.Xml;
+
+ namespace Monodoc {
+ class Driver {
++
++ public static string[] engines = {"WebKit", "GtkHtml", "MonoWebBrowser", "Gecko"};
++
+ static int Main (string [] args)
+ {
+ string topic = null;
+- bool useGecko = true;
+ bool remote_mode = false;
+
++ string engine = engines[0];
++
+ for (int i = 0; i < args.Length; i++){
+ switch (args [i]){
+ case "--html":
+@@ -98,8 +103,14 @@
+ remote_mode = true;
+ break;
+
+- case "--no-gecko":
+- useGecko = false;
++ case "--engine":
++ if (i + 1 == args.Length) {
++ Console.WriteLine ("Usage: --engine engine, where engine is the name of the browser engine to use (WebKit, GtkHtml, MonoWebBrowser, Gecko or another).");
++ return 1;
++ }
++
++ engine = args [i+1];
++ i++;
+ break;
+ default:
+ topic = args [i];
+@@ -112,7 +123,7 @@
+
+ Settings.RunningGUI = true;
+ Application.Init ();
+- Browser browser = new Browser (useGecko);
++ Browser browser = new Browser (engine);
+
+ if (topic != null)
+ browser.LoadUrl (topic);
+@@ -165,7 +176,7 @@
+ public Notebook tabs_nb;
+ public Tab CurrentTab;
+ bool HoldCtrl;
+- public bool UseGecko;
++ public string engine;
+
+ [Glade.Widget] public MenuItem bookmarksMenu;
+ [Glade.Widget] MenuItem view1;
+@@ -231,9 +242,11 @@
+
+ public ArrayList bookList;
+
+- public Browser (bool UseGecko)
++ public Capabilities capabilities;
++
++ public Browser (string engine)
+ {
+- this.UseGecko = UseGecko;
++ this.engine = engine;
+ ui = new Glade.XML (null, "browser.glade", "window1", null);
+ ui.Autoconnect (this);
+
+@@ -280,7 +293,10 @@
+ tabs_nb.SwitchPage += new SwitchPageHandler(ChangeTab);
+ help_container.Add(tabs_nb);
+
+- if (UseGecko) {
++ AddTab();
++
++
++ if ((capabilities & Capabilities.Fonts) != 0) {
+ // Add Menu entries for changing the font
+ Menu aux = (Menu) view1.Submenu;
+ MenuItem sep = new SeparatorMenuItem ();
+@@ -334,10 +350,11 @@
+
+ index_browser = IndexBrowser.MakeIndexBrowser (this);
+
+- AddTab();
+ MainWindow.ShowAll();
+ }
+
++
++
+ // Initianlizes the search index
+ void CreateSearchPanel ()
+ {
+@@ -821,7 +838,7 @@
+ void on_print_activate (object sender, EventArgs e)
+ {
+ // desactivate css temporary
+- if (UseGecko)
++ if ((capabilities & Capabilities.Css) != 0)
+ HelpSource.use_css = false;
+
+ string url = CurrentUrl;
+@@ -842,7 +859,7 @@
+ if (html != null)
+ CurrentTab.html.Print (html);
+
+- if (UseGecko)
++ if ((capabilities & Capabilities.Css) != 0)
+ HelpSource.use_css = true;
+ }
+
+@@ -2264,19 +2281,65 @@
+ text_editor.GrabFocus ();
+ }
+
+- static IHtmlRender GetRenderer (string file, string type, Browser browser)
+- {
++
++ private static IHtmlRender LoadRenderer (string dll, Browser browser) {
+ try {
+-
+- string exeAssembly = Assembly.GetExecutingAssembly ().Location;
+- string myPath = System.IO.Path.GetDirectoryName (exeAssembly);
+- Assembly dll = Assembly.LoadFrom (System.IO.Path.Combine (myPath, file));
+- Type t = dll.GetType (type, true);
++ Assembly ass = Assembly.LoadFile (dll);
++ System.Type type = ass.GetType ("Monodoc." + ass.GetName ().Name, false, false);
++ if (type == null)
++ return null;
++ return (IHtmlRender) Activator.CreateInstance (type, new object[1] { browser.help_tree });
++ } catch (Exception ex) {
++ Console.Error.WriteLine (ex);
++ }
++ return null;
++ }
++
++
++ public static IHtmlRender GetRenderer (string engine, string fallback, Browser browser)
++ {
++ IHtmlRender renderer = LoadRenderer (System.IO.Path.Combine (AppDomain.CurrentDomain.BaseDirectory, engine + "HtmlRender.dll"), browser);
++ if (renderer != null) {
++ try {
++ if (renderer.Initialize ()) {
++ Console.WriteLine ("using " + renderer.Name);
++ return renderer;
++ }
++ } catch (Exception ex) {
++ Console.Error.WriteLine (ex);
++ }
++ }
+
+- return (IHtmlRender) Activator.CreateInstance (t, new object [1] { browser.help_tree });
+- } catch {
+- return null;
++ renderer = LoadRenderer (System.IO.Path.Combine (AppDomain.CurrentDomain.BaseDirectory, fallback + "HtmlRender.dll"), browser);
++ if (renderer != null) {
++ try {
++ if (renderer.Initialize ()) {
++ Console.WriteLine ("using " + renderer.Name);
++ return renderer;
++ }
++ } catch (Exception ex) {
++ //Console.Error.WriteLine (ex);
++ }
++ }
++
++ foreach (string backend in Driver.engines) {
++ string dll = System.IO.Path.Combine (AppDomain.CurrentDomain.BaseDirectory, backend + "HtmlRender.dll");
++ if (System.IO.File.Exists (dll)) {
++ renderer = LoadRenderer (dll, browser);
++ if (renderer != null) {
++ try {
++ if (renderer.Initialize ()) {
++ Console.WriteLine ("using " + renderer.Name);
++ return renderer;
++ }
++ } catch (Exception ex) {
++ //Console.Error.WriteLine (ex);
++ }
++ }
++ }
+ }
++
++ return null;
+ }
+
+
+@@ -2300,24 +2363,19 @@
+ //
+ // Setup the HTML rendering and preview area
+ //
+- if (browser.UseGecko) {
+- html = GetRenderer ("GeckoHtmlRender.dll", "Monodoc.GeckoHtmlRender", browser);
+- html_preview = GetRenderer ("GeckoHtmlRender.dll", "Monodoc.GeckoHtmlRender", browser);
+- HelpSource.use_css = true;
+- }
+-
+- if (html == null || html_preview == null) {
+- html = GetRenderer ("GtkHtmlHtmlRender.dll", "Monodoc.GtkHtmlHtmlRender", browser);
+- html_preview = GetRenderer ("GtkHtmlHtmlRender.dll", "Monodoc.GtkHtmlHtmlRender", browser);
+- browser.UseGecko = false;
+- HelpSource.use_css = false;
+- }
+
++ html = GetRenderer (browser.engine, Driver.engines[1], browser);
++ html_preview = GetRenderer (browser.engine, Driver.engines[1], browser);
+ if (html == null || html_preview == null)
+ throw new Exception ("Couldn't find html renderer!");
+-
++
++ browser.capabilities = html.Capabilities;
++
++ if ((html.Capabilities & Capabilities.Css) != 0)
++ HelpSource.use_css = true;
++
+ //Prepare Font for css (TODO: use GConf?)
+- if (browser.UseGecko && SettingsHandler.Settings.preferred_font_size == 0) {
++ if ((html.Capabilities & Capabilities.Fonts) != 0 && SettingsHandler.Settings.preferred_font_size == 0) {
+ Pango.FontDescription font_desc = Pango.FontDescription.FromString ("Sans 12");
+ SettingsHandler.Settings.preferred_font_family = font_desc.Family;
+ SettingsHandler.Settings.preferred_font_size = 100; //size: 100%
+diff -urNad mono-tools-1.9~/docbrowser/monodoc.in mono-tools-1.9/docbrowser/monodoc.in
+--- mono-tools-1.9~/docbrowser/monodoc.in 2008-03-10 23:34:01.000000000 +0100
++++ mono-tools-1.9/docbrowser/monodoc.in 2008-08-10 15:00:17.000000000 +0200
+@@ -98,4 +98,4 @@
+ export MOZILLA_HOME
+ export LD_LIBRARY_PATH
+
+-exec @RUNTIME@ $monodocdir/browser.exe $OPTIONS "$@" $REST
++exec @RUNTIME@ $monodocdir/browser.exe --engine GtkHtml $OPTIONS "$@" $REST
+diff -urNad mono-tools-1.9~/ilcontrast/Makefile.am mono-tools-1.9/ilcontrast/Makefile.am
+--- mono-tools-1.9~/ilcontrast/Makefile.am 2007-12-06 22:43:43.000000000 +0100
++++ mono-tools-1.9/ilcontrast/Makefile.am 2008-08-10 14:59:40.000000000 +0200
+@@ -7,6 +7,12 @@
+ desktopdir = $(datadir)/applications
+ pixmapdir = $(datadir)/pixmaps
+
++if ENABLE_WEBKIT
++assembly_DATA = $(TARGET)
++bin_SCRIPTS = ilcontrast
++desktop_DATA = ilcontrast.desktop
++pixmap_DATA = ilcontrast.png
++else
+ if ENABLE_GECKO
+ assembly_DATA = $(TARGET)
+ bin_SCRIPTS = ilcontrast
+@@ -14,10 +20,15 @@
+ pixmap_DATA = ilcontrast.png
+ else
+ all:
+- echo "Install gecko-sharp to build ilContrast"
++ echo "Install webkit-sharp or gecko-sharp to build ilContrast"
++endif
+ endif
+
+-references = $(GTK_SHARP_LIBS) $(GECKO_SHARP_LIBS) -r:ICSharpCode.SharpZipLib.dll
++if ENABLE_WEBKIT
++references = $(GTK_SHARP_LIBS) $(WEBKIT_SHARP_LIBS) -r:ICSharpCode.SharpZipLib.dll
++else
++references = $(GTK_SHARP_LIBS) $(GECKO_SHARP_LIBS) -d:USE_GECKO -r:ICSharpCode.SharpZipLib.dll
++endif
+
+ resources = \
+ /resource:$(srcdir)/ilcontrast.png,ilcontrast.png \
+diff -urNad mono-tools-1.9~/ilcontrast/Window.cs mono-tools-1.9/ilcontrast/Window.cs
+--- mono-tools-1.9~/ilcontrast/Window.cs 2007-12-06 22:43:43.000000000 +0100
++++ mono-tools-1.9/ilcontrast/Window.cs 2008-08-10 14:59:40.000000000 +0200
+@@ -40,7 +40,11 @@
+
+ Box main_vbox;
+ Statusbar statusbar;
++#if USE_GECKO
+ Gecko.WebControl browser;
++#else
++ WebKit.WebView web_view;
++#endif
+ bool first_show = false;
+ Thread worker;
+ ComparisonInfo info;
+@@ -49,10 +53,17 @@
+ {
+ DefaultSize = new Size (450, 450);
+
+- browser = new Gecko.WebControl ();
+ main_vbox = new VBox (false, 0);
+ AddActionUI ();
++#if USE_GECKO
++ browser = new Gecko.WebControl ();
+ main_vbox.PackStart (browser, true, true, 0);
++#else
++ web_view = new WebKit.WebView ();
++ ScrolledWindow sw = new ScrolledWindow ();
++ sw.Add (web_view);
++ main_vbox.PackStart (sw, true, true, 0);
++#endif
+ statusbar = new Statusbar ();
+ main_vbox.PackStart (statusbar, false, false, 0);
+ Add (main_vbox);
+@@ -125,7 +136,11 @@
+
+ void LoadUrl (string url)
+ {
++#if USE_GECKO
+ browser.LoadUrl (url);
++#else
++ web_view.Open (url);
++#endif
+ }
+
+ void GenerateHtmlTarget ()
Deleted: mono-tools/trunk/debian/patches/99_autoreconf.dpatch
===================================================================
--- mono-tools/trunk/debian/patches/99_autoreconf.dpatch 2008-11-26 11:02:32 UTC (rev 3839)
+++ mono-tools/trunk/debian/patches/99_autoreconf.dpatch 2008-11-26 13:14:59 UTC (rev 3840)
@@ -1,3269 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 99_autoreconf.dpatch by Mirco Bauer <meebey at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad mono-tools-1.9~/Makefile.in mono-tools-1.9/Makefile.in
---- mono-tools-1.9~/Makefile.in 2008-03-10 23:34:11.000000000 +0100
-+++ mono-tools-1.9/Makefile.in 2008-08-10 13:48:56.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -94,6 +94,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -122,6 +123,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -150,6 +152,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -317,8 +321,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -343,8 +347,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -354,13 +358,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-@@ -431,6 +434,10 @@
- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
- $(am__remove_distdir)
-
-+dist-lzma: distdir
-+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-+ $(am__remove_distdir)
-+
- dist-tarZ: distdir
- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__remove_distdir)
-@@ -457,6 +464,8 @@
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
- *.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-+ *.tar.lzma*) \
-+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
- *.tar.Z*) \
- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- *.shar.gz*) \
-@@ -607,7 +616,7 @@
- .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am am--refresh check check-am clean clean-generic \
- ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-- dist-shar dist-tarZ dist-zip distcheck distclean \
-+ dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \
- distclean-generic distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
-diff -urNad mono-tools-1.9~/aclocal.m4 mono-tools-1.9/aclocal.m4
---- mono-tools-1.9~/aclocal.m4 2008-03-10 23:34:07.000000000 +0100
-+++ mono-tools-1.9/aclocal.m4 2008-08-10 13:48:52.000000000 +0200
-@@ -1,7 +1,7 @@
--# generated automatically by aclocal 1.10 -*- Autoconf -*-
-+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
-
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005, 2006 Free Software Foundation, Inc.
-+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -11,10 +11,13 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
-
--m4_if(m4_PACKAGE_VERSION, [2.61],,
--[m4_fatal([this file was generated for autoconf 2.61.
--You have another version of autoconf. If you want to use that,
--you should regenerate the build system entirely.], [63])])
-+m4_ifndef([AC_AUTOCONF_VERSION],
-+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+m4_if(AC_AUTOCONF_VERSION, [2.61],,
-+[m4_warning([this file was generated for autoconf 2.61.
-+You have another version of autoconf. It may work, but is not guaranteed to.
-+If you have problems, you may need to regenerate the build system entirely.
-+To do so, use the procedure documented by the package, typically `autoreconf'.])])
-
- # Copyright (C) 1995-2002 Free Software Foundation, Inc.
- # Copyright (C) 2001-2003,2004 Red Hat, Inc.
-@@ -119,8 +122,7 @@
- #-----------------
- glib_DEFUN([GLIB_WITH_NLS],
- dnl NLS is obligatory
-- [AC_REQUIRE([AC_CANONICAL_HOST])dnl
-- USE_NLS=yes
-+ [USE_NLS=yes
- AC_SUBST(USE_NLS)
-
- gt_cv_have_gettext=no
-@@ -372,6 +374,18 @@
- fi
- fi
-
-+ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-+ dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
-+ dnl Try to locate is.
-+ MKINSTALLDIRS=
-+ if test -n "$ac_aux_dir"; then
-+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-+ fi
-+ if test -z "$MKINSTALLDIRS"; then
-+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-+ fi
-+ AC_SUBST(MKINSTALLDIRS)
-+
- dnl Generate list of files to be processed by xgettext which will
- dnl be included in po/Makefile.
- test -d po || mkdir po
-@@ -586,7 +600,7 @@
-
- _PKG_TEXT
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
- [$4])
- else
- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-@@ -596,7 +610,7 @@
- fi[]dnl
- ])# PKG_CHECK_MODULES
-
--# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
-+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -611,7 +625,7 @@
- [am__api_version='1.10'
- 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.10], [],
-+m4_if([$1], [1.10.1], [],
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
- ])
-
-@@ -627,8 +641,10 @@
- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.10])dnl
--_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
-+[AM_AUTOMAKE_VERSION([1.10.1])dnl
-+m4_ifndef([AC_AUTOCONF_VERSION],
-+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
-
- # AM_AUX_DIR_EXPAND -*- Autoconf -*-
-
-@@ -900,7 +916,7 @@
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
-- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
-+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
-@@ -948,13 +964,13 @@
- # Do all the work for Automake. -*- Autoconf -*-
-
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005, 2006 Free Software Foundation, Inc.
-+# 2005, 2006, 2008 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-
--# serial 12
-+# serial 13
-
- # This macro actually does too much. Some checks are only needed if
- # your package does certain things. But this isn't really a big deal.
-@@ -1059,16 +1075,17 @@
- # our stamp files there.
- AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
- [# Compute $1's index in $config_headers.
-+_am_arg=$1
- _am_stamp_count=1
- for _am_header in $config_headers :; do
- case $_am_header in
-- $1 | $1:* )
-+ $_am_arg | $_am_arg:* )
- break ;;
- * )
- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
- esac
- done
--echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-
- # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
- #
-@@ -1386,7 +1403,7 @@
-
- # _AM_SUBST_NOTMAKE(VARIABLE)
- # ---------------------------
--# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
-+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
- # This macro is traced by Automake.
- AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-diff -urNad mono-tools-1.9~/asn1view/Makefile.in mono-tools-1.9/asn1view/Makefile.in
---- mono-tools-1.9~/asn1view/Makefile.in 2008-03-10 23:34:09.000000000 +0100
-+++ mono-tools-1.9/asn1view/Makefile.in 2008-08-10 13:48:53.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -80,6 +80,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -108,6 +109,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -136,6 +138,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -299,8 +303,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -325,8 +329,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -336,13 +340,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-tools-1.9~/asn1view/art/Makefile.in mono-tools-1.9/asn1view/art/Makefile.in
---- mono-tools-1.9~/asn1view/art/Makefile.in 2008-03-10 23:34:09.000000000 +0100
-+++ mono-tools-1.9/asn1view/art/Makefile.in 2008-08-10 13:48:53.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -67,6 +67,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -95,6 +96,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -123,6 +125,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-diff -urNad mono-tools-1.9~/asn1view/common/Makefile.in mono-tools-1.9/asn1view/common/Makefile.in
---- mono-tools-1.9~/asn1view/common/Makefile.in 2008-03-10 23:34:09.000000000 +0100
-+++ mono-tools-1.9/asn1view/common/Makefile.in 2008-08-10 13:48:53.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -67,6 +67,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -95,6 +96,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -123,6 +125,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-diff -urNad mono-tools-1.9~/asn1view/gtk/Makefile.in mono-tools-1.9/asn1view/gtk/Makefile.in
---- mono-tools-1.9~/asn1view/gtk/Makefile.in 2008-03-10 23:34:09.000000000 +0100
-+++ mono-tools-1.9/asn1view/gtk/Makefile.in 2008-08-10 13:48:53.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -72,6 +72,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -100,6 +101,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -128,6 +130,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-diff -urNad mono-tools-1.9~/configure mono-tools-1.9/configure
---- mono-tools-1.9~/configure 2008-03-10 23:34:11.000000000 +0100
-+++ mono-tools-1.9/configure 2008-08-10 13:48:53.000000000 +0200
-@@ -690,6 +690,7 @@
- MCS
- GMCS
- RUNTIME
-+GACUTIL
- RESGEN
- PKG_CONFIG
- NUNIT_CFLAGS
-@@ -708,6 +709,12 @@
- ENABLE_GECKO_TRUE
- ENABLE_GECKO_FALSE
- MOZILLA_HOME
-+WEBKIT_SHARP_CFLAGS
-+WEBKIT_SHARP_LIBS
-+ENABLE_WEBKIT_TRUE
-+ENABLE_WEBKIT_FALSE
-+ENABLE_MONOWEBBROWSER_TRUE
-+ENABLE_MONOWEBBROWSER_FALSE
- CECIL_ASM
- GETTEXT_PACKAGE
- CC
-@@ -744,6 +751,7 @@
- PO_IN_DATADIR_FALSE
- POFILES
- POSUB
-+MKINSTALLDIRS
- GNUNIT_VERSION
- TOOLS_VERSION
- GENDARME_VERSION
-@@ -764,6 +772,8 @@
- GTKHTML_SHARP_LIBS
- GECKO_SHARP_CFLAGS
- GECKO_SHARP_LIBS
-+WEBKIT_SHARP_CFLAGS
-+WEBKIT_SHARP_LIBS
- CC
- CFLAGS
- LDFLAGS
-@@ -1376,6 +1386,10 @@
- C compiler flags for GECKO_SHARP, overriding pkg-config
- GECKO_SHARP_LIBS
- linker flags for GECKO_SHARP, overriding pkg-config
-+ WEBKIT_SHARP_CFLAGS
-+ C compiler flags for WEBKIT_SHARP, overriding pkg-config
-+ WEBKIT_SHARP_LIBS
-+ linker flags for WEBKIT_SHARP, overriding pkg-config
- CC C compiler command
- CFLAGS C compiler flags
- LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
-@@ -2733,6 +2747,47 @@
- fi
-
-
-+# Extract the first word of "gacutil", so it can be a program name with args.
-+set dummy gacutil; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_GACUTIL+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ case $GACUTIL in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_GACUTIL="$GACUTIL" # 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_GACUTIL="$as_dir/$ac_word$ac_exec_ext"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+ test -z "$ac_cv_path_GACUTIL" && ac_cv_path_GACUTIL="no"
-+ ;;
-+esac
-+fi
-+GACUTIL=$ac_cv_path_GACUTIL
-+if test -n "$GACUTIL"; then
-+ { echo "$as_me:$LINENO: result: $GACUTIL" >&5
-+echo "${ECHO_T}$GACUTIL" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-
- CS="C#"
- if test "x$MCS" = "xno" ; then
-@@ -2801,6 +2856,8 @@
-
-
-
-+
-+
- if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-@@ -3010,7 +3067,7 @@
- and NUNIT_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
- echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -3020,7 +3077,7 @@
- and NUNIT_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- else
-@@ -3123,7 +3180,7 @@
- and MONODOC_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
- echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -3133,7 +3190,7 @@
- and MONODOC_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- else
-@@ -3236,7 +3293,7 @@
- and GTK_SHARP_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
- echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -3246,7 +3303,7 @@
- and GTK_SHARP_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- else
-@@ -3500,14 +3557,127 @@
-
- if test "x$enable_gecko" = "xyes"; then
- # get the mozilla home directory
-- MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`"
-+ MOZILLA_HOME="`$PKG_CONFIG --variable=libdir xulrunner-gtkmozembed`"
-
- fi
-
-+# AM_CONDITIONAL(ENABLE_WEBKIT, test "xno" = "xyes")
-
--if test "x$enable_gtkhtml$enable_gecko" = "xnono" ; then
-- { { echo "$as_me:$LINENO: error: no HTML display found. You need either gtkhtml or gecko" >&5
--echo "$as_me: error: no HTML display found. You need either gtkhtml or gecko" >&2;}
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for WEBKIT_SHARP" >&5
-+echo $ECHO_N "checking for WEBKIT_SHARP... $ECHO_C" >&6; }
-+
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$WEBKIT_SHARP_CFLAGS"; then
-+ pkg_cv_WEBKIT_SHARP_CFLAGS="$WEBKIT_SHARP_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"webkit-sharp-1.0\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "webkit-sharp-1.0") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_WEBKIT_SHARP_CFLAGS=`$PKG_CONFIG --cflags "webkit-sharp-1.0" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$WEBKIT_SHARP_LIBS"; then
-+ pkg_cv_WEBKIT_SHARP_LIBS="$WEBKIT_SHARP_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"webkit-sharp-1.0\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "webkit-sharp-1.0") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_WEBKIT_SHARP_LIBS=`$PKG_CONFIG --libs "webkit-sharp-1.0" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ WEBKIT_SHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "webkit-sharp-1.0"`
-+ else
-+ WEBKIT_SHARP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "webkit-sharp-1.0"`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$WEBKIT_SHARP_PKG_ERRORS" >&5
-+
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ enable_webkit=no
-+elif test $pkg_failed = untried; then
-+ enable_webkit=no
-+else
-+ WEBKIT_SHARP_CFLAGS=$pkg_cv_WEBKIT_SHARP_CFLAGS
-+ WEBKIT_SHARP_LIBS=$pkg_cv_WEBKIT_SHARP_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ enable_webkit=yes
-+fi
-+
-+ if test "x$enable_webkit" = "xyes"; then
-+ ENABLE_WEBKIT_TRUE=
-+ ENABLE_WEBKIT_FALSE='#'
-+else
-+ ENABLE_WEBKIT_TRUE='#'
-+ ENABLE_WEBKIT_FALSE=
-+fi
-+
-+
-+# PKG_CHECK_MODULES(MONOWEBBROWSER, mono-webbrowser, enable_monowebbrowser=yes, enable_monowebbrowser=no)
-+# AC_SUBST(MONOWEBBROWSER_LIBS)
-+
-+{ echo "$as_me:$LINENO: checking for Mono.WebBrowser" >&5
-+echo $ECHO_N "checking for Mono.WebBrowser... $ECHO_C" >&6; }
-+if test "x$GACUTIL" = "xno"
-+then
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ if test "x$enable_monowebbrowser" = "x" ; then enable_monowebbrowser=no ; fi
-+else
-+ if $GACUTIL -l Mono.WebBrowser | grep -q "Mono.WebBrowser"
-+ then
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ enable_monowebbrowser=yes
-+ else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ enable_monowebbrowser=no
-+ fi
-+fi
-+MONOWEBBROWSER_LIBS=-r:Mono.WebBrowser
-+ if test "x$enable_monowebbrowser" = "xyes"; then
-+ ENABLE_MONOWEBBROWSER_TRUE=
-+ ENABLE_MONOWEBBROWSER_FALSE='#'
-+else
-+ ENABLE_MONOWEBBROWSER_TRUE='#'
-+ ENABLE_MONOWEBBROWSER_FALSE=
-+fi
-+
-+
-+if test "x$enable_gtkhtml$enable_gecko$enable_monowebbrowser$enable_webkit" = "xnononono" ; then
-+ { { echo "$as_me:$LINENO: error: no HTML display found. You need either gtkhtml, gecko, WebKit or Mono.WebBrowser" >&5
-+echo "$as_me: error: no HTML display found. You need either gtkhtml, gecko, WebKit or Mono.WebBrowser" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-@@ -5458,7 +5628,7 @@
-
- fi
- fi
-- USE_NLS=yes
-+ USE_NLS=yes
-
-
- gt_cv_have_gettext=no
-@@ -6750,6 +6920,15 @@
- fi
- fi
-
-+ MKINSTALLDIRS=
-+ if test -n "$ac_aux_dir"; then
-+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-+ fi
-+ if test -z "$MKINSTALLDIRS"; then
-+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-+ fi
-+
-+
- test -d po || mkdir po
- if test "x$srcdir" != "x."; then
- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-@@ -6973,6 +7152,20 @@
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
-+if test -z "${ENABLE_WEBKIT_TRUE}" && test -z "${ENABLE_WEBKIT_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"ENABLE_WEBKIT\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"ENABLE_WEBKIT\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${ENABLE_MONOWEBBROWSER_TRUE}" && test -z "${ENABLE_MONOWEBBROWSER_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"ENABLE_MONOWEBBROWSER\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"ENABLE_MONOWEBBROWSER\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
- if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
-@@ -7651,6 +7844,7 @@
- MCS!$MCS$ac_delim
- GMCS!$GMCS$ac_delim
- RUNTIME!$RUNTIME$ac_delim
-+GACUTIL!$GACUTIL$ac_delim
- RESGEN!$RESGEN$ac_delim
- PKG_CONFIG!$PKG_CONFIG$ac_delim
- NUNIT_CFLAGS!$NUNIT_CFLAGS$ac_delim
-@@ -7669,8 +7863,7 @@
- ENABLE_GECKO_TRUE!$ENABLE_GECKO_TRUE$ac_delim
- ENABLE_GECKO_FALSE!$ENABLE_GECKO_FALSE$ac_delim
- MOZILLA_HOME!$MOZILLA_HOME$ac_delim
--CECIL_ASM!$CECIL_ASM$ac_delim
--GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
-+WEBKIT_SHARP_CFLAGS!$WEBKIT_SHARP_CFLAGS$ac_delim
- _ACEOF
-
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -7712,6 +7905,13 @@
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
- cat >conf$$subs.sed <<_ACEOF
-+WEBKIT_SHARP_LIBS!$WEBKIT_SHARP_LIBS$ac_delim
-+ENABLE_WEBKIT_TRUE!$ENABLE_WEBKIT_TRUE$ac_delim
-+ENABLE_WEBKIT_FALSE!$ENABLE_WEBKIT_FALSE$ac_delim
-+ENABLE_MONOWEBBROWSER_TRUE!$ENABLE_MONOWEBBROWSER_TRUE$ac_delim
-+ENABLE_MONOWEBBROWSER_FALSE!$ENABLE_MONOWEBBROWSER_FALSE$ac_delim
-+CECIL_ASM!$CECIL_ASM$ac_delim
-+GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
- CC!$CC$ac_delim
- CFLAGS!$CFLAGS$ac_delim
- LDFLAGS!$LDFLAGS$ac_delim
-@@ -7746,6 +7946,7 @@
- PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
- POFILES!$POFILES$ac_delim
- POSUB!$POSUB$ac_delim
-+MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
- GNUNIT_VERSION!$GNUNIT_VERSION$ac_delim
- TOOLS_VERSION!$TOOLS_VERSION$ac_delim
- GENDARME_VERSION!$GENDARME_VERSION$ac_delim
-@@ -7753,7 +7954,7 @@
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
-
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 39; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 47; then
- break
- elif $ac_last_try; then
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -8075,7 +8276,7 @@
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
-- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
-+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`$as_dirname -- "$mf" ||
- $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$mf" : 'X\(//\)[^/]' \| \
-@@ -8229,7 +8430,10 @@
- echo "Configuration summary"
- echo ""
- echo " * Installation prefix = $prefix"
--echo " * gecko-sharp.dll = $enable_gecko"
-+echo " * Using Gecko = $enable_gecko"
-+echo " * Using GtkHtml = $enable_gtkhtml"
-+echo " * Using Mono.WebBrowser = $enable_monowebbrowser"
-+echo " * Using WebKit = $enable_webkit"
- echo ""
- echo " NOTE: if any of the above say 'no' you may install the"
- echo " corresponding development packages for them, rerun"
-diff -urNad mono-tools-1.9~/create-native-map/Makefile.in mono-tools-1.9/create-native-map/Makefile.in
---- mono-tools-1.9~/create-native-map/Makefile.in 2008-03-10 23:34:09.000000000 +0100
-+++ mono-tools-1.9/create-native-map/Makefile.in 2008-08-10 13:48:53.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,6 +79,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -107,6 +108,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -135,6 +137,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -298,8 +302,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -324,8 +328,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -335,13 +339,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-tools-1.9~/create-native-map/bin/Makefile.in mono-tools-1.9/create-native-map/bin/Makefile.in
---- mono-tools-1.9~/create-native-map/bin/Makefile.in 2008-03-10 23:34:09.000000000 +0100
-+++ mono-tools-1.9/create-native-map/bin/Makefile.in 2008-08-10 13:48:53.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -71,6 +71,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -99,6 +100,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -127,6 +129,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-diff -urNad mono-tools-1.9~/create-native-map/lib/Makefile.in mono-tools-1.9/create-native-map/lib/Makefile.in
---- mono-tools-1.9~/create-native-map/lib/Makefile.in 2008-03-10 23:34:09.000000000 +0100
-+++ mono-tools-1.9/create-native-map/lib/Makefile.in 2008-08-10 13:48:54.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,6 +79,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -107,6 +108,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -135,6 +137,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -298,8 +302,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -324,8 +328,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -335,13 +339,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-tools-1.9~/create-native-map/lib/create-native-map/Makefile.in mono-tools-1.9/create-native-map/lib/create-native-map/Makefile.in
---- mono-tools-1.9~/create-native-map/lib/create-native-map/Makefile.in 2008-03-10 23:34:09.000000000 +0100
-+++ mono-tools-1.9/create-native-map/lib/create-native-map/Makefile.in 2008-08-10 13:48:54.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -69,6 +69,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -97,6 +98,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -125,6 +127,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-diff -urNad mono-tools-1.9~/create-native-map/lib/pkgconfig/Makefile.in mono-tools-1.9/create-native-map/lib/pkgconfig/Makefile.in
---- mono-tools-1.9~/create-native-map/lib/pkgconfig/Makefile.in 2008-03-10 23:34:09.000000000 +0100
-+++ mono-tools-1.9/create-native-map/lib/pkgconfig/Makefile.in 2008-08-10 13:48:54.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,6 +78,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -106,6 +107,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -134,6 +136,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-diff -urNad mono-tools-1.9~/create-native-map/man/Makefile.in mono-tools-1.9/create-native-map/man/Makefile.in
---- mono-tools-1.9~/create-native-map/man/Makefile.in 2008-03-10 23:34:09.000000000 +0100
-+++ mono-tools-1.9/create-native-map/man/Makefile.in 2008-08-10 13:48:54.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -71,6 +71,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -99,6 +100,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -127,6 +129,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-diff -urNad mono-tools-1.9~/create-native-map/src/Makefile.in mono-tools-1.9/create-native-map/src/Makefile.in
---- mono-tools-1.9~/create-native-map/src/Makefile.in 2008-03-10 23:34:09.000000000 +0100
-+++ mono-tools-1.9/create-native-map/src/Makefile.in 2008-08-10 13:48:54.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,6 +77,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -105,6 +106,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -133,6 +135,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-diff -urNad mono-tools-1.9~/docbrowser/Makefile.in mono-tools-1.9/docbrowser/Makefile.in
---- mono-tools-1.9~/docbrowser/Makefile.in 2008-03-10 23:34:09.000000000 +0100
-+++ mono-tools-1.9/docbrowser/Makefile.in 2008-08-10 13:48:54.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -84,6 +84,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -112,6 +113,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -140,6 +142,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -199,8 +203,10 @@
- @ENABLE_GECKO_TRUE at GECKO_TARGET = GeckoHtmlRender.dll
- @ENABLE_GTKHTML_TRUE at GECKO_PRINTING_DEF = "-d:USE_GTKHTML_PRINT"
- @ENABLE_GTKHTML_TRUE at GTKHTML_TARGET = GtkHtmlHtmlRender.dll
--CLEANFILES = browser.exe browser.exe.mdb admin.exe admin.exe.mdb $(GECKO_TARGET) $(GECKO_TARGET).mdb $(GTKHTML_TARGET) $(GTKHTML_TARGET).mdb monodoc.desktop
--monodoc_DATA = browser.exe $(GECKO_TARGET) $(GTKHTML_TARGET)
-+ at ENABLE_WEBKIT_TRUE@WEBKIT_TARGET = WebKitHtmlRender.dll
-+ at ENABLE_MONOWEBBROWSER_TRUE@MONOWEBBROWSER_TARGET = MonoWebBrowserHtmlRender.dll
-+CLEANFILES = browser.exe browser.exe.mdb admin.exe admin.exe.mdb $(GECKO_TARGET) $(GECKO_TARGET).mdb $(GTKHTML_TARGET) $(GTKHTML_TARGET).mdb $(WEBKIT_TARGET) $(WEBKIT_TARGET).mdb $(MONOWEBBROWSER_TARGET) $(MONOWEBBROWSER_TARGET).mdb monodoc.desktop
-+monodoc_DATA = browser.exe $(GECKO_TARGET) $(GTKHTML_TARGET) $(WEBKIT_TARGET) $(MONOWEBBROWSER_TARGET)
- DISTCLEANFILES = AssemblyInfo.cs monodoc.desktop monodoc
- bin_SCRIPTS = monodoc
- browser_sources = \
-@@ -223,6 +229,13 @@
- $(srcdir)/PrintManager.cs \
- $(srcdir)/GtkHtmlHtmlRender.cs
-
-+webkitrender_sources = \
-+ $(srcdir)/WebKitHtmlRender.cs
-+
-+monowebbrowserrender_sources = \
-+ $(srcdir)/BrowserWidget.cs \
-+ $(srcdir)/MonoWebBrowserHtmlRender.cs
-+
- admin_sources = \
- $(srcdir)/admin.cs \
- $(srcdir)/Contributions.cs
-@@ -231,10 +244,16 @@
- # we insert gtkhtml libs if we have them for printing
- geckorender_assemblies = $(GTK_SHARP_LIBS) $(GTKHTML_SHARP_LIBS) $(GECKO_SHARP_LIBS) $(MONODOC_LIBS) -r:browser.exe
- gtkhtmlrender_assemblies = $(GTK_SHARP_LIBS) $(GTKHTML_SHARP_LIBS) $(MONODOC_LIBS) -r:browser.exe
-+
-+# TODO: use pkg-config for webkit-sharp
-+# WEBKIT_SHARP_LIBS = -r:nwebkit.dll
-+webkitrender_assemblies = $(GTK_SHARP_LIBS) $(WEBKIT_SHARP_LIBS) $(MONODOC_LIBS) -r:browser.exe
-+monowebbrowserrender_assemblies = $(GTK_SHARP_LIBS) $(MONOWEBBROWSER_LIBS) $(MONODOC_LIBS) -r:browser.exe -r:Mono.Mozilla.dll
- EXTRA_DIST = \
- $(browser_sources) \
- $(geckorender_sources) \
- $(gtkhtmlrender_sources) \
-+ $(webkitrender_sources) \
- monodoc.desktop.in \
- admin.cs \
- admin.glade \
-@@ -493,16 +512,22 @@
-
- # admin hardcodes GTKHTML for now.
- @ENABLE_GTKHTML_TRUE at admin.exe: $(admin_sources) $(srcdir)/admin.glade
-- at ENABLE_GTKHTML_TRUE@ $(MCS) -debug -out:admin.exe $(admin_sources) -resource:$(srcdir)/admin.glade,admin.glade $(browser_assemblies) $(GTKHTML_SHARP_LIBS) -r:System.Drawing
-+ at ENABLE_GTKHTML_TRUE@ $(GMCS) -debug -out:admin.exe $(admin_sources) -resource:$(srcdir)/admin.glade,admin.glade $(browser_assemblies) $(GTKHTML_SHARP_LIBS) -r:System.Drawing
-
- browser.exe: $(browser_sources) $(browser_built_sources) $(srcdir)/browser.glade $(srcdir)/monodoc.png
-- $(MCS) -debug -out:browser.exe $(browser_sources) $(browser_built_sources) -resource:$(srcdir)/monodoc.png,monodoc.png -resource:$(srcdir)/browser.glade,browser.glade $(browser_assemblies)
-+ $(GMCS) -debug -out:browser.exe $(browser_sources) $(browser_built_sources) -resource:$(srcdir)/monodoc.png,monodoc.png -resource:$(srcdir)/browser.glade,browser.glade $(browser_assemblies)
-
- GeckoHtmlRender.dll : $(geckorender_sources) browser.exe
-- $(MCS) -debug -target:library -out:$@ $(geckorender_sources) $(geckorender_assemblies) $(GECKO_PRINTING_DEF) $(CSHARP_FLAGS)
-+ $(GMCS) -debug -target:library -out:$@ $(geckorender_sources) $(geckorender_assemblies) $(GECKO_PRINTING_DEF) $(CSHARP_FLAGS)
-
- GtkHtmlHtmlRender.dll : $(gtkhtmlrender_sources) browser.exe
-- $(MCS) -debug -target:library -out:$@ $(gtkhtmlrender_sources) $(gtkhtmlrender_assemblies) $(CSHARP_FLAGS)
-+ $(GMCS) -debug -target:library -out:$@ $(gtkhtmlrender_sources) $(gtkhtmlrender_assemblies) $(CSHARP_FLAGS)
-+
-+WebKitHtmlRender.dll : $(webkitrender_sources) browser.exe
-+ $(GMCS) -debug -target:library -out:$@ $(webkitrender_sources) $(webkitrender_assemblies) $(CSHARP_FLAGS)
-+
-+MonoWebBrowserHtmlRender.dll : $(monowebbrowserrender_sources) browser.exe
-+ $(GMCS) -debug -target:library -out:$@ $(monowebbrowserrender_sources) $(monowebbrowserrender_assemblies) $(CSHARP_FLAGS)
-
- b: browser.exe
- MONO_PATH=. $(RUNTIME) --debug browser.exe
-diff -urNad mono-tools-1.9~/gendarme/Makefile.in mono-tools-1.9/gendarme/Makefile.in
---- mono-tools-1.9~/gendarme/Makefile.in 2008-03-10 23:34:09.000000000 +0100
-+++ mono-tools-1.9/gendarme/Makefile.in 2008-08-10 13:48:54.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -85,6 +85,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -113,6 +114,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -141,6 +143,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -342,8 +346,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -368,8 +372,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -379,13 +383,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-tools-1.9~/gendarme/console/Makefile.in mono-tools-1.9/gendarme/console/Makefile.in
---- mono-tools-1.9~/gendarme/console/Makefile.in 2008-03-10 23:34:09.000000000 +0100
-+++ mono-tools-1.9/gendarme/console/Makefile.in 2008-08-10 13:48:54.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -71,6 +71,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -99,6 +100,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -127,6 +129,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-diff -urNad mono-tools-1.9~/gendarme/framework/Makefile.in mono-tools-1.9/gendarme/framework/Makefile.in
---- mono-tools-1.9~/gendarme/framework/Makefile.in 2008-03-10 23:34:09.000000000 +0100
-+++ mono-tools-1.9/gendarme/framework/Makefile.in 2008-08-10 13:48:54.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -82,6 +82,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -110,6 +111,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -138,6 +140,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-diff -urNad mono-tools-1.9~/gendarme/man/Makefile.in mono-tools-1.9/gendarme/man/Makefile.in
---- mono-tools-1.9~/gendarme/man/Makefile.in 2008-03-10 23:34:09.000000000 +0100
-+++ mono-tools-1.9/gendarme/man/Makefile.in 2008-08-10 13:48:54.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -72,6 +72,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -100,6 +101,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -128,6 +130,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-diff -urNad mono-tools-1.9~/gendarme/rules/Gendarme.Rules.BadPractice/Makefile.in mono-tools-1.9/gendarme/rules/Gendarme.Rules.BadPractice/Makefile.in
---- mono-tools-1.9~/gendarme/rules/Gendarme.Rules.BadPractice/Makefile.in 2008-03-10 23:34:09.000000000 +0100
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.BadPractice/Makefile.in 2008-08-10 13:48:54.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -94,6 +94,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -122,6 +123,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -150,6 +152,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -373,8 +377,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -399,8 +403,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -410,13 +414,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-tools-1.9~/gendarme/rules/Gendarme.Rules.BadPractice/Test/Makefile.in mono-tools-1.9/gendarme/rules/Gendarme.Rules.BadPractice/Test/Makefile.in
---- mono-tools-1.9~/gendarme/rules/Gendarme.Rules.BadPractice/Test/Makefile.in 2008-03-10 23:34:09.000000000 +0100
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.BadPractice/Test/Makefile.in 2008-08-10 13:48:54.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -67,6 +67,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -95,6 +96,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -123,6 +125,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-diff -urNad mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Concurrency/Makefile.in mono-tools-1.9/gendarme/rules/Gendarme.Rules.Concurrency/Makefile.in
---- mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Concurrency/Makefile.in 2008-03-10 23:34:09.000000000 +0100
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Concurrency/Makefile.in 2008-08-10 13:48:54.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -94,6 +94,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -122,6 +123,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -150,6 +152,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -371,8 +375,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -397,8 +401,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -408,13 +412,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Concurrency/Test/Makefile.in mono-tools-1.9/gendarme/rules/Gendarme.Rules.Concurrency/Test/Makefile.in
---- mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Concurrency/Test/Makefile.in 2008-03-10 23:34:09.000000000 +0100
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Concurrency/Test/Makefile.in 2008-08-10 13:48:54.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -67,6 +67,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -95,6 +96,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -123,6 +125,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-diff -urNad mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Correctness/Makefile.in mono-tools-1.9/gendarme/rules/Gendarme.Rules.Correctness/Makefile.in
---- mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Correctness/Makefile.in 2008-03-10 23:34:09.000000000 +0100
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Correctness/Makefile.in 2008-08-10 13:48:54.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -94,6 +94,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -122,6 +123,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -150,6 +152,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -376,8 +380,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -402,8 +406,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -413,13 +417,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Correctness/Test/Makefile.in mono-tools-1.9/gendarme/rules/Gendarme.Rules.Correctness/Test/Makefile.in
---- mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Correctness/Test/Makefile.in 2008-03-10 23:34:09.000000000 +0100
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Correctness/Test/Makefile.in 2008-08-10 13:48:54.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -67,6 +67,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -95,6 +96,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -123,6 +125,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-diff -urNad mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Design/Makefile.in mono-tools-1.9/gendarme/rules/Gendarme.Rules.Design/Makefile.in
---- mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Design/Makefile.in 2008-03-10 23:34:10.000000000 +0100
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Design/Makefile.in 2008-08-10 13:48:54.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -94,6 +94,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -122,6 +123,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -150,6 +152,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -386,8 +390,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -412,8 +416,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -423,13 +427,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Design/Test/Makefile.in mono-tools-1.9/gendarme/rules/Gendarme.Rules.Design/Test/Makefile.in
---- mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Design/Test/Makefile.in 2008-03-10 23:34:10.000000000 +0100
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Design/Test/Makefile.in 2008-08-10 13:48:54.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -67,6 +67,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -95,6 +96,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -123,6 +125,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-diff -urNad mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Exceptions/Makefile.in mono-tools-1.9/gendarme/rules/Gendarme.Rules.Exceptions/Makefile.in
---- mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Exceptions/Makefile.in 2008-03-10 23:34:10.000000000 +0100
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Exceptions/Makefile.in 2008-08-10 13:48:54.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -94,6 +94,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -122,6 +123,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -150,6 +152,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -373,8 +377,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -399,8 +403,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -410,13 +414,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Exceptions/Test/Makefile.in mono-tools-1.9/gendarme/rules/Gendarme.Rules.Exceptions/Test/Makefile.in
---- mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Exceptions/Test/Makefile.in 2008-03-10 23:34:10.000000000 +0100
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Exceptions/Test/Makefile.in 2008-08-10 13:48:54.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -67,6 +67,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -95,6 +96,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -123,6 +125,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-diff -urNad mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Interoperability/Makefile.in mono-tools-1.9/gendarme/rules/Gendarme.Rules.Interoperability/Makefile.in
---- mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Interoperability/Makefile.in 2008-03-10 23:34:10.000000000 +0100
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Interoperability/Makefile.in 2008-08-10 13:48:55.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -94,6 +94,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -122,6 +123,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -150,6 +152,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -371,8 +375,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -397,8 +401,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -408,13 +412,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Interoperability/Test/Makefile.in mono-tools-1.9/gendarme/rules/Gendarme.Rules.Interoperability/Test/Makefile.in
---- mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Interoperability/Test/Makefile.in 2008-03-10 23:34:10.000000000 +0100
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Interoperability/Test/Makefile.in 2008-08-10 13:48:55.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -67,6 +67,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -95,6 +96,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -123,6 +125,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-diff -urNad mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Naming/Makefile.in mono-tools-1.9/gendarme/rules/Gendarme.Rules.Naming/Makefile.in
---- mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Naming/Makefile.in 2008-03-10 23:34:10.000000000 +0100
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Naming/Makefile.in 2008-08-10 13:48:55.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -94,6 +94,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -122,6 +123,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -150,6 +152,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -376,8 +380,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -402,8 +406,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -413,13 +417,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Naming/Test/Makefile.in mono-tools-1.9/gendarme/rules/Gendarme.Rules.Naming/Test/Makefile.in
---- mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Naming/Test/Makefile.in 2008-03-10 23:34:10.000000000 +0100
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Naming/Test/Makefile.in 2008-08-10 13:48:55.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -67,6 +67,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -95,6 +96,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -123,6 +125,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-diff -urNad mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Performance/Makefile.in mono-tools-1.9/gendarme/rules/Gendarme.Rules.Performance/Makefile.in
---- mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Performance/Makefile.in 2008-03-10 23:34:10.000000000 +0100
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Performance/Makefile.in 2008-08-10 13:48:55.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -94,6 +94,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -122,6 +123,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -150,6 +152,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -376,8 +380,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -402,8 +406,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -413,13 +417,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Performance/Test/Makefile.in mono-tools-1.9/gendarme/rules/Gendarme.Rules.Performance/Test/Makefile.in
---- mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Performance/Test/Makefile.in 2008-03-10 23:34:10.000000000 +0100
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Performance/Test/Makefile.in 2008-08-10 13:48:55.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -67,6 +67,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -95,6 +96,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -123,6 +125,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-diff -urNad mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Portability/Makefile.in mono-tools-1.9/gendarme/rules/Gendarme.Rules.Portability/Makefile.in
---- mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Portability/Makefile.in 2008-03-10 23:34:10.000000000 +0100
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Portability/Makefile.in 2008-08-10 13:48:55.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -94,6 +94,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -122,6 +123,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -150,6 +152,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -371,8 +375,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -397,8 +401,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -408,13 +412,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-@@ -581,7 +584,7 @@
-
-
- ../../bin/Gendarme.Rules.Portability.dll: $(portability_rules_build_sources)
-- $(GMCS) -debug -target:library -r:$(top_builddir)/gendarme/bin/Mono.Cecil.dll -pkg:dotnet -r:ICSharpCode.SharpZipLib.dll -r:../../bin/Gendarme.Framework.dll -out:$@ $(portability_rules_build_sources)
-+ $(GMCS) -debug -target:library -r:$(top_builddir)/gendarme/bin/Mono.Cecil.dll -r:System.Web.Services -r:ICSharpCode.SharpZipLib.dll -r:../../bin/Gendarme.Framework.dll -out:$@ $(portability_rules_build_sources)
- cp Gendarme.Rules.*.xml ../../bin/
-
- Test.Rules.Portability.dll: $(portability_rules_build_sources) $(portability_rules_SCRIPTS)
-diff -urNad mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Portability/Test/Makefile.in mono-tools-1.9/gendarme/rules/Gendarme.Rules.Portability/Test/Makefile.in
---- mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Portability/Test/Makefile.in 2008-03-10 23:34:10.000000000 +0100
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Portability/Test/Makefile.in 2008-08-10 13:48:55.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -67,6 +67,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -95,6 +96,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -123,6 +125,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-diff -urNad mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Security/Makefile.in mono-tools-1.9/gendarme/rules/Gendarme.Rules.Security/Makefile.in
---- mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Security/Makefile.in 2008-03-10 23:34:10.000000000 +0100
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Security/Makefile.in 2008-08-10 13:48:55.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -94,6 +94,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -122,6 +123,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -150,6 +152,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -374,8 +378,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -400,8 +404,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -411,13 +415,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Security/Test/Makefile.in mono-tools-1.9/gendarme/rules/Gendarme.Rules.Security/Test/Makefile.in
---- mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Security/Test/Makefile.in 2008-03-10 23:34:10.000000000 +0100
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Security/Test/Makefile.in 2008-08-10 13:48:55.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -67,6 +67,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -95,6 +96,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -123,6 +125,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-diff -urNad mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Smells/Makefile.in mono-tools-1.9/gendarme/rules/Gendarme.Rules.Smells/Makefile.in
---- mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Smells/Makefile.in 2008-03-10 23:34:10.000000000 +0100
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Smells/Makefile.in 2008-08-10 13:48:55.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -94,6 +94,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -122,6 +123,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -150,6 +152,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -373,8 +377,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -399,8 +403,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -410,13 +414,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Smells/Test/Makefile.in mono-tools-1.9/gendarme/rules/Gendarme.Rules.Smells/Test/Makefile.in
---- mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Smells/Test/Makefile.in 2008-03-10 23:34:10.000000000 +0100
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Smells/Test/Makefile.in 2008-08-10 13:48:55.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -67,6 +67,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -95,6 +96,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -123,6 +125,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-diff -urNad mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Ui/Makefile.in mono-tools-1.9/gendarme/rules/Gendarme.Rules.Ui/Makefile.in
---- mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Ui/Makefile.in 2008-03-10 23:34:10.000000000 +0100
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Ui/Makefile.in 2008-08-10 13:48:55.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -94,6 +94,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -122,6 +123,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -150,6 +152,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -370,8 +374,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -396,8 +400,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -407,13 +411,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Ui/Test/Makefile.in mono-tools-1.9/gendarme/rules/Gendarme.Rules.Ui/Test/Makefile.in
---- mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Ui/Test/Makefile.in 2008-03-10 23:34:10.000000000 +0100
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Ui/Test/Makefile.in 2008-08-10 13:48:55.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -67,6 +67,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -95,6 +96,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -123,6 +125,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-diff -urNad mono-tools-1.9~/gendarme/rules/Makefile.in mono-tools-1.9/gendarme/rules/Makefile.in
---- mono-tools-1.9~/gendarme/rules/Makefile.in 2008-03-10 23:34:10.000000000 +0100
-+++ mono-tools-1.9/gendarme/rules/Makefile.in 2008-08-10 13:48:55.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,6 +79,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -107,6 +108,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -135,6 +137,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -306,8 +310,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -332,8 +336,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -343,13 +347,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-tools-1.9~/gnunit/Makefile.in mono-tools-1.9/gnunit/Makefile.in
---- mono-tools-1.9~/gnunit/Makefile.in 2008-03-10 23:34:10.000000000 +0100
-+++ mono-tools-1.9/gnunit/Makefile.in 2008-08-10 13:48:55.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -80,6 +80,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -108,6 +109,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -136,6 +138,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -299,8 +303,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -325,8 +329,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -336,13 +340,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-tools-1.9~/gnunit/art/Makefile.in mono-tools-1.9/gnunit/art/Makefile.in
---- mono-tools-1.9~/gnunit/art/Makefile.in 2008-03-10 23:34:10.000000000 +0100
-+++ mono-tools-1.9/gnunit/art/Makefile.in 2008-08-10 13:48:55.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -67,6 +67,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -95,6 +96,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -123,6 +125,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-diff -urNad mono-tools-1.9~/gnunit/src/Makefile.in mono-tools-1.9/gnunit/src/Makefile.in
---- mono-tools-1.9~/gnunit/src/Makefile.in 2008-03-10 23:34:10.000000000 +0100
-+++ mono-tools-1.9/gnunit/src/Makefile.in 2008-08-10 13:48:55.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -75,6 +75,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -103,6 +104,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -131,6 +133,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-diff -urNad mono-tools-1.9~/gui-compare/Makefile.in mono-tools-1.9/gui-compare/Makefile.in
---- mono-tools-1.9~/gui-compare/Makefile.in 2008-03-10 23:34:10.000000000 +0100
-+++ mono-tools-1.9/gui-compare/Makefile.in 2008-08-10 13:48:55.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -81,6 +81,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -109,6 +110,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -137,6 +139,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-diff -urNad mono-tools-1.9~/ilcontrast/Makefile.in mono-tools-1.9/ilcontrast/Makefile.in
---- mono-tools-1.9~/ilcontrast/Makefile.in 2008-03-10 23:34:11.000000000 +0100
-+++ mono-tools-1.9/ilcontrast/Makefile.in 2008-08-10 13:48:56.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -84,6 +84,7 @@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+GACUTIL = @GACUTIL@
- GECKO_SHARP_CFLAGS = @GECKO_SHARP_CFLAGS@
- GECKO_SHARP_LIBS = @GECKO_SHARP_LIBS@
- GENDARME_VERSION = @GENDARME_VERSION@
-@@ -112,6 +113,7 @@
- MAKEINFO = @MAKEINFO@
- MCS = @MCS@
- MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_LIBS = @MONODOC_LIBS@
- MOZILLA_HOME = @MOZILLA_HOME@
-@@ -140,6 +142,8 @@
- TOOLS_VERSION = @TOOLS_VERSION@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEBKIT_SHARP_CFLAGS = @WEBKIT_SHARP_CFLAGS@
-+WEBKIT_SHARP_LIBS = @WEBKIT_SHARP_LIBS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -201,11 +205,16 @@
- assemblydir = $(libdir)/ilcontrast
- desktopdir = $(datadir)/applications
- pixmapdir = $(datadir)/pixmaps
-- at ENABLE_GECKO_TRUE@assembly_DATA = $(TARGET)
-- at ENABLE_GECKO_TRUE@bin_SCRIPTS = ilcontrast
-- at ENABLE_GECKO_TRUE@desktop_DATA = ilcontrast.desktop
-- at ENABLE_GECKO_TRUE@pixmap_DATA = ilcontrast.png
--references = $(GTK_SHARP_LIBS) $(GECKO_SHARP_LIBS) -r:ICSharpCode.SharpZipLib.dll
-+ at ENABLE_GECKO_TRUE@@ENABLE_WEBKIT_FALSE at assembly_DATA = $(TARGET)
-+ at ENABLE_WEBKIT_TRUE@assembly_DATA = $(TARGET)
-+ at ENABLE_GECKO_TRUE@@ENABLE_WEBKIT_FALSE at bin_SCRIPTS = ilcontrast
-+ at ENABLE_WEBKIT_TRUE@bin_SCRIPTS = ilcontrast
-+ at ENABLE_GECKO_TRUE@@ENABLE_WEBKIT_FALSE at desktop_DATA = ilcontrast.desktop
-+ at ENABLE_WEBKIT_TRUE@desktop_DATA = ilcontrast.desktop
-+ at ENABLE_GECKO_TRUE@@ENABLE_WEBKIT_FALSE at pixmap_DATA = ilcontrast.png
-+ at ENABLE_WEBKIT_TRUE@pixmap_DATA = ilcontrast.png
-+ at ENABLE_WEBKIT_FALSE@references = $(GTK_SHARP_LIBS) $(GECKO_SHARP_LIBS) -d:USE_GECKO -r:ICSharpCode.SharpZipLib.dll
-+ at ENABLE_WEBKIT_TRUE@references = $(GTK_SHARP_LIBS) $(WEBKIT_SHARP_LIBS) -r:ICSharpCode.SharpZipLib.dll
- resources = \
- /resource:$(srcdir)/ilcontrast.png,ilcontrast.png \
- /resource:$(srcdir)/mono-api.xsl,mono-api.xsl \
-@@ -462,8 +471,8 @@
- uninstall-am uninstall-assemblyDATA uninstall-binSCRIPTS \
- uninstall-desktopDATA uninstall-pixmapDATA
-
-- at ENABLE_GECKO_FALSE@all:
-- at ENABLE_GECKO_FALSE@ echo "Install gecko-sharp to build ilContrast"
-+ at ENABLE_GECKO_FALSE@@ENABLE_WEBKIT_FALSE at all:
-+ at ENABLE_GECKO_FALSE@@ENABLE_WEBKIT_FALSE@ echo "Install webkit-sharp or gecko-sharp to build ilContrast"
-
- ilcontrast.exe: $(build_sources)
- $(GMCS) -out:ilcontrast.exe $(references) $(resources) $(build_sources)
Added: mono-tools/trunk/debian/patches/series
===================================================================
--- mono-tools/trunk/debian/patches/series (rev 0)
+++ mono-tools/trunk/debian/patches/series 2008-11-26 13:14:59 UTC (rev 3840)
@@ -0,0 +1,8 @@
+#01-use_real_nunit.patch
+00-fix_build_system.patch
+02-startup_mono_path.patch
+03-mozilla_home.patch
+04-gendarme_link_libraries_correctly.patch
+#05-cecil.patch
+#06-nunit_2.4_port.patch
+#07-webkit-sharp_port.patch
Modified: mono-tools/trunk/debian/rules
===================================================================
--- mono-tools/trunk/debian/rules 2008-11-26 11:02:32 UTC (rev 3839)
+++ mono-tools/trunk/debian/rules 2008-11-26 13:14:59 UTC (rev 3840)
@@ -4,10 +4,10 @@
export MONO_SHARED_DIR=$(CURDIR)
CURVER = $(shell dpkg-parsechangelog | grep ^Version | cut -d' ' -f2 | cut -d'-' -f1)
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
configure: config-stamp
-config-stamp: patch
+config-stamp: $(QUILT_STAMPFN)
dh_testdir
aclocal
More information about the Pkg-mono-svn-commits
mailing list