[Pkg-mono-svn-commits] rev 3693 - in mono-tools/trunk/debian: . patches
Mirco Bauer
meebey at alioth.debian.org
Sun Aug 10 13:06:20 UTC 2008
Author: meebey
Date: 2008-08-10 13:06:19 +0000 (Sun, 10 Aug 2008)
New Revision: 3693
Added:
mono-tools/trunk/debian/gnunit.desktop
mono-tools/trunk/debian/gnunit2.desktop
mono-tools/trunk/debian/patches/05_nunit_2.4_port.dpatch
mono-tools/trunk/debian/patches/05_webkit-sharp_port.dpatch
Modified:
mono-tools/trunk/debian/changelog
mono-tools/trunk/debian/control
mono-tools/trunk/debian/gnunit.install
mono-tools/trunk/debian/gnunit2.install
mono-tools/trunk/debian/patches/00list
mono-tools/trunk/debian/patches/99_autoreconf.dpatch
mono-tools/trunk/debian/rules
Log:
* debian/control:
+ Removed libgecko2.0-cil and libxul-dev from build-dependencies.
+ Added libwebkit1.0-cil to build-dependencies.
+ Replaced libnunit2.2.6-cil build-dependency with libmono-nunit2.2-cil.
+ Moved pseudo homepage field of gendarme to real field.
+ Added extra space to lists in package description to make them verbatim.
(Closes: #480336, #480343)
* debian/patches/05_webkit-sharp_port.dpatch:
+ Link against webkit-sharp instead of gecko-sharp (xulrunner).
(patch taken from upstream SVN, Closes: #480811, #488674)
* debian/patches/00list:
+ Disabled 01_use_real_nunit, linking now against libmono-nunit2.2-cil
instead of libnunit2.2.6-cil. (Closes: #487037)
* debian/gnunit(2).desktop
debian/gnunit(2).install:
+ Desktop files for the freedesktop menu.
(thanks goes to benoit tuduri <tuduri.benoit at freesurf.Fr> for the patch,
Closes: #478962)
Modified: mono-tools/trunk/debian/changelog
===================================================================
--- mono-tools/trunk/debian/changelog 2008-08-06 18:08:05 UTC (rev 3692)
+++ mono-tools/trunk/debian/changelog 2008-08-10 13:06:19 UTC (rev 3693)
@@ -1,3 +1,26 @@
+mono-tools (1.9-2) unstable; urgency=medium
+
+ * debian/control:
+ + Removed libgecko2.0-cil and libxul-dev from build-dependencies.
+ + Added libwebkit1.0-cil to build-dependencies.
+ + Replaced libnunit2.2.6-cil build-dependency with libmono-nunit2.2-cil.
+ + Moved pseudo homepage field of gendarme to real field.
+ + Added extra space to lists in package description to make them verbatim.
+ (Closes: #480336, #480343)
+ * debian/patches/05_webkit-sharp_port.dpatch:
+ + Link against webkit-sharp instead of gecko-sharp (xulrunner).
+ (patch taken from upstream SVN, Closes: #480811, #488674)
+ * debian/patches/00list:
+ + Disabled 01_use_real_nunit, linking now against libmono-nunit2.2-cil
+ instead of libnunit2.2.6-cil. (Closes: #487037)
+ * debian/gnunit(2).desktop
+ debian/gnunit(2).install:
+ + Desktop files for the freedesktop menu.
+ (thanks goes to benoit tuduri <tuduri.benoit at freesurf.Fr> for the patch,
+ Closes: #478962)
+
+ -- Mirco Bauer <meebey at debian.org> Sun, 10 Aug 2008 14:20:01 +0200
+
mono-tools (1.9-1) unstable; urgency=low
[ Sebastian Dröge ]
Modified: mono-tools/trunk/debian/control
===================================================================
--- mono-tools/trunk/debian/control 2008-08-06 18:08:05 UTC (rev 3692)
+++ mono-tools/trunk/debian/control 2008-08-10 13:06:19 UTC (rev 3693)
@@ -9,19 +9,18 @@
mono-mcs (>= 1.0),
mono-gmcs (>= 1.0),
libmono-dev (>= 1.0),
+ libmono-nunit2.2-cil,
+ libmono-system-web2.0-cil,
+ libmono1.0-cil (>= 1.9.1),
mono-gac (>= 1.0),
mono-1.0-devel,
- libnunit2.2.6-cil (>= 2.2.0),
libgtk2.0-cil (>= 2.0),
libgconf2.0-cil (>= 2.0),
libglade2.0-cil (>= 2.0),
- libgecko2.0-cil (>= 0.10),
libgnome2.0-cil (>= 2.0),
libgtkhtml3.16-cil,
- monodoc-base (>= 1.1.9),
- libxul-dev,
- libmono1.0-cil (>= 1.9.1),
- libmono-system-web2.0-cil
+ libwebkit1.0-cil,
+ monodoc-base (>= 1.1.9)
Standards-Version: 3.7.3
Package: monodoc-browser
@@ -67,21 +66,21 @@
Replaces: gnunit (<< 1.2.1)
Description: Various GUI tools for mono
This package contains various GUI tools for use with Mono:
- - gasnview
- - ilcontrast
- - gui-compare
+ - gasnview
+ - ilcontrast
+ - gui-compare
Package: mono-tools-devel
Architecture: all
Depends: ${cli:Depends}
+Homepage: http://www.mono-project.com/Gendarme
Description: Various development tools for mono
This package contains various development tools for use with Mono:
- - create-native-map
- - gendarme
+ - create-native-map
+ - gendarme
Gendarme is a extensible rule-based tool to find problems in .NET
applications and libraries. Gendarme inspects programs and libraries that
contain code in ECMA CIL format (Mono and .NET) and looks for common
problems with the code, problems that compiler do not typically check or
have not historically checked.
.
- Homepage: http://www.mono-project.com/Gendarme
Added: mono-tools/trunk/debian/gnunit.desktop
===================================================================
--- mono-tools/trunk/debian/gnunit.desktop (rev 0)
+++ mono-tools/trunk/debian/gnunit.desktop 2008-08-10 13:06:19 UTC (rev 3693)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Gnunit
+Comment=Run NUnit test suites on CLI 1.0/1.1
+Exec=gnunit
+TryExec=gnunit
+Terminal=false
+Type=Application
+Categories=Development;
Modified: mono-tools/trunk/debian/gnunit.install
===================================================================
--- mono-tools/trunk/debian/gnunit.install 2008-08-06 18:08:05 UTC (rev 3692)
+++ mono-tools/trunk/debian/gnunit.install 2008-08-10 13:06:19 UTC (rev 3693)
@@ -1,2 +1,3 @@
debian/tmp/usr/bin/gnunit
debian/tmp/usr/lib/mono/1.0/gnunit.exe
+debian/gnunit.desktop /usr/share/applications/
Added: mono-tools/trunk/debian/gnunit2.desktop
===================================================================
--- mono-tools/trunk/debian/gnunit2.desktop (rev 0)
+++ mono-tools/trunk/debian/gnunit2.desktop 2008-08-10 13:06:19 UTC (rev 3693)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=Gnunit2
+Comment=Run NUnit test suites on CLI 2.0
+Exec=gnunit2
+TryExec=gnunit2
+Terminal=false
+Type=Application
+Categories=Development;
Modified: mono-tools/trunk/debian/gnunit2.install
===================================================================
--- mono-tools/trunk/debian/gnunit2.install 2008-08-06 18:08:05 UTC (rev 3692)
+++ mono-tools/trunk/debian/gnunit2.install 2008-08-10 13:06:19 UTC (rev 3693)
@@ -1,2 +1,3 @@
debian/tmp/usr/bin/gnunit2
debian/tmp/usr/lib/mono/2.0/gnunit2.exe
+debian/gnunit2.desktop /usr/share/applications/
Modified: mono-tools/trunk/debian/patches/00list
===================================================================
--- mono-tools/trunk/debian/patches/00list 2008-08-06 18:08:05 UTC (rev 3692)
+++ mono-tools/trunk/debian/patches/00list 2008-08-10 13:06:19 UTC (rev 3693)
@@ -1,5 +1,7 @@
-01_use_real_nunit
+#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/05_nunit_2.4_port.dpatch
===================================================================
--- mono-tools/trunk/debian/patches/05_nunit_2.4_port.dpatch (rev 0)
+++ mono-tools/trunk/debian/patches/05_nunit_2.4_port.dpatch 2008-08-10 13:06:19 UTC (rev 3693)
@@ -0,0 +1,249 @@
+#! /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);
+
Property changes on: mono-tools/trunk/debian/patches/05_nunit_2.4_port.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: mono-tools/trunk/debian/patches/05_webkit-sharp_port.dpatch
===================================================================
--- mono-tools/trunk/debian/patches/05_webkit-sharp_port.dpatch (rev 0)
+++ mono-tools/trunk/debian/patches/05_webkit-sharp_port.dpatch 2008-08-10 13:06:19 UTC (rev 3693)
@@ -0,0 +1,1047 @@
+#! /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 ()
Property changes on: mono-tools/trunk/debian/patches/05_webkit-sharp_port.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: mono-tools/trunk/debian/patches/99_autoreconf.dpatch
===================================================================
--- mono-tools/trunk/debian/patches/99_autoreconf.dpatch 2008-08-06 18:08:05 UTC (rev 3692)
+++ mono-tools/trunk/debian/patches/99_autoreconf.dpatch 2008-08-10 13:06:19 UTC (rev 3693)
@@ -6,8 +6,8 @@
@DPATCH@
diff -urNad mono-tools-1.9~/Makefile.in mono-tools-1.9/Makefile.in
---- mono-tools-1.9~/Makefile.in 2008-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/Makefile.in 2008-05-02 20:23:04.000000000 +0200
+--- 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.
@@ -19,7 +19,15 @@
# 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.
-@@ -122,6 +122,7 @@
+@@ -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@
@@ -27,7 +35,16 @@
MONODOC_CFLAGS = @MONODOC_CFLAGS@
MONODOC_LIBS = @MONODOC_LIBS@
MOZILLA_HOME = @MOZILLA_HOME@
-@@ -317,8 +318,8 @@
+@@ -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 | \
@@ -38,7 +55,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -343,8 +344,8 @@
+@@ -343,8 +347,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -49,7 +66,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -354,13 +355,12 @@
+@@ -354,13 +358,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -65,7 +82,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -431,6 +431,10 @@
+@@ -431,6 +434,10 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
@@ -76,7 +93,7 @@
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
-@@ -457,6 +461,8 @@
+@@ -457,6 +464,8 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
@@ -85,7 +102,7 @@
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
-@@ -607,7 +613,7 @@
+@@ -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 \
@@ -95,8 +112,8 @@
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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/aclocal.m4 2008-05-02 20:23:01.000000000 +0200
+--- 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 -*-
@@ -249,8 +266,8 @@
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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/asn1view/Makefile.in 2008-05-02 20:23:02.000000000 +0200
+--- 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.
@@ -262,7 +279,15 @@
# 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.
-@@ -108,6 +108,7 @@
+@@ -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@
@@ -270,7 +295,16 @@
MONODOC_CFLAGS = @MONODOC_CFLAGS@
MONODOC_LIBS = @MONODOC_LIBS@
MOZILLA_HOME = @MOZILLA_HOME@
-@@ -299,8 +300,8 @@
+@@ -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 | \
@@ -281,7 +315,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -325,8 +326,8 @@
+@@ -325,8 +329,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -292,7 +326,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -336,13 +337,12 @@
+@@ -336,13 +340,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -309,8 +343,8 @@
|| $(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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/asn1view/art/Makefile.in 2008-05-02 20:23:02.000000000 +0200
+--- 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.
@@ -322,7 +356,15 @@
# 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.
-@@ -95,6 +95,7 @@
+@@ -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@
@@ -330,9 +372,18 @@
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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/asn1view/common/Makefile.in 2008-05-02 20:23:02.000000000 +0200
+--- 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.
@@ -344,7 +395,15 @@
# 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.
-@@ -95,6 +95,7 @@
+@@ -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@
@@ -352,9 +411,18 @@
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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/asn1view/gtk/Makefile.in 2008-05-02 20:23:02.000000000 +0200
+--- 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.
@@ -366,7 +434,15 @@
# 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.
-@@ -100,6 +100,7 @@
+@@ -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@
@@ -374,10 +450,40 @@
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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/configure 2008-05-02 20:23:02.000000000 +0200
-@@ -744,6 +744,7 @@
+--- 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
@@ -385,66 +491,84 @@
GNUNIT_VERSION
TOOLS_VERSION
GENDARME_VERSION
-@@ -2929,12 +2930,12 @@
- pkg_cv_NUNIT_CFLAGS="$NUNIT_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mono-nunit\"") >&5
-- ($PKG_CONFIG --exists --print-errors "mono-nunit") 2>&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nunit\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "nunit") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_NUNIT_CFLAGS=`$PKG_CONFIG --cflags "mono-nunit" 2>/dev/null`
-+ pkg_cv_NUNIT_CFLAGS=`$PKG_CONFIG --cflags "nunit" 2>/dev/null`
- else
- pkg_failed=yes
+@@ -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
-@@ -2947,12 +2948,12 @@
- pkg_cv_NUNIT_LIBS="$NUNIT_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mono-nunit\"") >&5
-- ($PKG_CONFIG --exists --print-errors "mono-nunit") 2>&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nunit\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "nunit") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_NUNIT_LIBS=`$PKG_CONFIG --libs "mono-nunit" 2>/dev/null`
-+ pkg_cv_NUNIT_LIBS=`$PKG_CONFIG --libs "nunit" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -2971,14 +2972,14 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- NUNIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "mono-nunit"`
-+ NUNIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "nunit"`
- else
-- NUNIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mono-nunit"`
-+ NUNIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nunit"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$NUNIT_PKG_ERRORS" >&5
-- { { echo "$as_me:$LINENO: error: Package requirements (mono-nunit) were not met:
-+ { { echo "$as_me:$LINENO: error: Package requirements (nunit) were not met:
- $NUNIT_PKG_ERRORS
++# 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
++
++
-@@ -2989,7 +2990,7 @@
- and NUNIT_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--echo "$as_me: error: Package requirements (mono-nunit) were not met:
-+echo "$as_me: error: Package requirements (nunit) were not met:
+ CS="C#"
+ if test "x$MCS" = "xno" ; then
+@@ -2801,6 +2856,8 @@
- $NUNIT_PKG_ERRORS
-@@ -3010,7 +3011,7 @@
+
++
++
+ 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.
@@ -453,7 +577,7 @@
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 +3021,7 @@
+@@ -3020,7 +3077,7 @@
and NUNIT_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -462,7 +586,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -3123,7 +3124,7 @@
+@@ -3123,7 +3180,7 @@
and MONODOC_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -471,7 +595,7 @@
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 +3134,7 @@
+@@ -3133,7 +3190,7 @@
and MONODOC_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -480,7 +604,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -3236,7 +3237,7 @@
+@@ -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.
@@ -489,7 +613,7 @@
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 +3247,7 @@
+@@ -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.
@@ -498,7 +622,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -3500,7 +3501,7 @@
+@@ -3500,14 +3557,127 @@
if test "x$enable_gecko" = "xyes"; then
# get the mozilla home directory
@@ -507,8 +631,131 @@
fi
-@@ -5458,7 +5459,7 @@
++# 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
@@ -516,7 +763,7 @@
gt_cv_have_gettext=no
-@@ -6750,6 +6751,15 @@
+@@ -6750,6 +6920,15 @@
fi
fi
@@ -532,7 +779,60 @@
test -d po || mkdir po
if test "x$srcdir" != "x."; then
if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-@@ -7746,6 +7756,7 @@
+@@ -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
@@ -540,16 +840,16 @@
GNUNIT_VERSION!$GNUNIT_VERSION$ac_delim
TOOLS_VERSION!$TOOLS_VERSION$ac_delim
GENDARME_VERSION!$GENDARME_VERSION$ac_delim
-@@ -7753,7 +7764,7 @@
+@@ -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` = 40; 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 +8086,7 @@
+@@ -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.
@@ -558,9 +858,21 @@
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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/create-native-map/Makefile.in 2008-05-02 20:23:02.000000000 +0200
+--- 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.
@@ -572,7 +884,15 @@
# 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.
-@@ -107,6 +107,7 @@
+@@ -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@
@@ -580,7 +900,16 @@
MONODOC_CFLAGS = @MONODOC_CFLAGS@
MONODOC_LIBS = @MONODOC_LIBS@
MOZILLA_HOME = @MOZILLA_HOME@
-@@ -298,8 +299,8 @@
+@@ -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 | \
@@ -591,7 +920,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -324,8 +325,8 @@
+@@ -324,8 +328,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -602,7 +931,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -335,13 +336,12 @@
+@@ -335,13 +339,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -619,8 +948,8 @@
|| $(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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/create-native-map/bin/Makefile.in 2008-05-02 20:23:02.000000000 +0200
+--- 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.
@@ -632,7 +961,15 @@
# 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.
-@@ -99,6 +99,7 @@
+@@ -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@
@@ -640,9 +977,18 @@
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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/create-native-map/lib/Makefile.in 2008-05-02 20:23:02.000000000 +0200
+--- 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.
@@ -654,7 +1000,15 @@
# 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.
-@@ -107,6 +107,7 @@
+@@ -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@
@@ -662,7 +1016,16 @@
MONODOC_CFLAGS = @MONODOC_CFLAGS@
MONODOC_LIBS = @MONODOC_LIBS@
MOZILLA_HOME = @MOZILLA_HOME@
-@@ -298,8 +299,8 @@
+@@ -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 | \
@@ -673,7 +1036,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -324,8 +325,8 @@
+@@ -324,8 +328,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -684,7 +1047,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -335,13 +336,12 @@
+@@ -335,13 +339,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -701,8 +1064,8 @@
|| $(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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/create-native-map/lib/create-native-map/Makefile.in 2008-05-02 20:23:02.000000000 +0200
+--- 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.
@@ -714,7 +1077,15 @@
# 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.
-@@ -97,6 +97,7 @@
+@@ -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@
@@ -722,9 +1093,18 @@
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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/create-native-map/lib/pkgconfig/Makefile.in 2008-05-02 20:23:02.000000000 +0200
+--- 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.
@@ -736,7 +1116,15 @@
# 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.
-@@ -106,6 +106,7 @@
+@@ -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@
@@ -744,9 +1132,18 @@
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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/create-native-map/man/Makefile.in 2008-05-02 20:23:03.000000000 +0200
+--- 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.
@@ -758,7 +1155,15 @@
# 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.
-@@ -99,6 +99,7 @@
+@@ -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@
@@ -766,9 +1171,18 @@
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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/create-native-map/src/Makefile.in 2008-05-02 20:23:03.000000000 +0200
+--- 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.
@@ -780,7 +1194,15 @@
# 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.
-@@ -105,6 +105,7 @@
+@@ -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@
@@ -788,9 +1210,18 @@
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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/docbrowser/Makefile.in 2008-05-02 20:23:03.000000000 +0200
+--- 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.
@@ -802,7 +1233,15 @@
# 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.
-@@ -112,6 +112,7 @@
+@@ -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@
@@ -810,9 +1249,89 @@
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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/gendarme/Makefile.in 2008-05-02 20:23:03.000000000 +0200
+--- 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.
@@ -824,7 +1343,15 @@
# 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.
-@@ -113,6 +113,7 @@
+@@ -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@
@@ -832,7 +1359,16 @@
MONODOC_CFLAGS = @MONODOC_CFLAGS@
MONODOC_LIBS = @MONODOC_LIBS@
MOZILLA_HOME = @MOZILLA_HOME@
-@@ -342,8 +343,8 @@
+@@ -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 | \
@@ -843,7 +1379,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -368,8 +369,8 @@
+@@ -368,8 +372,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -854,7 +1390,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -379,13 +380,12 @@
+@@ -379,13 +383,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -871,8 +1407,8 @@
|| $(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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/gendarme/console/Makefile.in 2008-05-02 20:23:03.000000000 +0200
+--- 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.
@@ -884,7 +1420,15 @@
# 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.
-@@ -99,6 +99,7 @@
+@@ -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@
@@ -892,9 +1436,18 @@
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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/gendarme/framework/Makefile.in 2008-05-02 20:23:03.000000000 +0200
+--- 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.
@@ -906,7 +1459,15 @@
# 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.
-@@ -110,6 +110,7 @@
+@@ -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@
@@ -914,9 +1475,18 @@
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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/gendarme/man/Makefile.in 2008-05-02 20:23:03.000000000 +0200
+--- 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.
@@ -928,7 +1498,15 @@
# 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.
-@@ -100,6 +100,7 @@
+@@ -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@
@@ -936,9 +1514,18 @@
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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.BadPractice/Makefile.in 2008-05-02 20:23:03.000000000 +0200
+--- 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.
@@ -950,7 +1537,15 @@
# 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.
-@@ -122,6 +122,7 @@
+@@ -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@
@@ -958,7 +1553,16 @@
MONODOC_CFLAGS = @MONODOC_CFLAGS@
MONODOC_LIBS = @MONODOC_LIBS@
MOZILLA_HOME = @MOZILLA_HOME@
-@@ -373,8 +374,8 @@
+@@ -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 | \
@@ -969,7 +1573,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -399,8 +400,8 @@
+@@ -399,8 +403,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -980,7 +1584,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -410,13 +411,12 @@
+@@ -410,13 +414,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -997,8 +1601,8 @@
|| $(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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.BadPractice/Test/Makefile.in 2008-05-02 20:23:03.000000000 +0200
+--- 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.
@@ -1010,7 +1614,15 @@
# 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.
-@@ -95,6 +95,7 @@
+@@ -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@
@@ -1018,9 +1630,18 @@
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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Concurrency/Makefile.in 2008-05-02 20:23:03.000000000 +0200
+--- 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.
@@ -1032,7 +1653,15 @@
# 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.
-@@ -122,6 +122,7 @@
+@@ -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@
@@ -1040,7 +1669,16 @@
MONODOC_CFLAGS = @MONODOC_CFLAGS@
MONODOC_LIBS = @MONODOC_LIBS@
MOZILLA_HOME = @MOZILLA_HOME@
-@@ -371,8 +372,8 @@
+@@ -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 | \
@@ -1051,7 +1689,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -397,8 +398,8 @@
+@@ -397,8 +401,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -1062,7 +1700,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -408,13 +409,12 @@
+@@ -408,13 +412,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -1079,8 +1717,8 @@
|| $(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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Concurrency/Test/Makefile.in 2008-05-02 20:23:03.000000000 +0200
+--- 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.
@@ -1092,7 +1730,15 @@
# 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.
-@@ -95,6 +95,7 @@
+@@ -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@
@@ -1100,9 +1746,18 @@
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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Correctness/Makefile.in 2008-05-02 20:23:03.000000000 +0200
+--- 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.
@@ -1114,7 +1769,15 @@
# 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.
-@@ -122,6 +122,7 @@
+@@ -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@
@@ -1122,7 +1785,16 @@
MONODOC_CFLAGS = @MONODOC_CFLAGS@
MONODOC_LIBS = @MONODOC_LIBS@
MOZILLA_HOME = @MOZILLA_HOME@
-@@ -376,8 +377,8 @@
+@@ -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 | \
@@ -1133,7 +1805,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -402,8 +403,8 @@
+@@ -402,8 +406,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -1144,7 +1816,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -413,13 +414,12 @@
+@@ -413,13 +417,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -1161,8 +1833,8 @@
|| $(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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Correctness/Test/Makefile.in 2008-05-02 20:23:03.000000000 +0200
+--- 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.
@@ -1174,7 +1846,15 @@
# 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.
-@@ -95,6 +95,7 @@
+@@ -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@
@@ -1182,9 +1862,18 @@
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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Design/Makefile.in 2008-05-02 20:23:03.000000000 +0200
+--- 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.
@@ -1196,7 +1885,15 @@
# 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.
-@@ -122,6 +122,7 @@
+@@ -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@
@@ -1204,7 +1901,16 @@
MONODOC_CFLAGS = @MONODOC_CFLAGS@
MONODOC_LIBS = @MONODOC_LIBS@
MOZILLA_HOME = @MOZILLA_HOME@
-@@ -386,8 +387,8 @@
+@@ -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 | \
@@ -1215,7 +1921,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -412,8 +413,8 @@
+@@ -412,8 +416,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -1226,7 +1932,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -423,13 +424,12 @@
+@@ -423,13 +427,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -1243,8 +1949,8 @@
|| $(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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Design/Test/Makefile.in 2008-05-02 20:23:03.000000000 +0200
+--- 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.
@@ -1256,7 +1962,15 @@
# 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.
-@@ -95,6 +95,7 @@
+@@ -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@
@@ -1264,9 +1978,18 @@
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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Exceptions/Makefile.in 2008-05-02 20:23:03.000000000 +0200
+--- 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.
@@ -1278,7 +2001,15 @@
# 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.
-@@ -122,6 +122,7 @@
+@@ -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@
@@ -1286,7 +2017,16 @@
MONODOC_CFLAGS = @MONODOC_CFLAGS@
MONODOC_LIBS = @MONODOC_LIBS@
MOZILLA_HOME = @MOZILLA_HOME@
-@@ -373,8 +374,8 @@
+@@ -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 | \
@@ -1297,7 +2037,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -399,8 +400,8 @@
+@@ -399,8 +403,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -1308,7 +2048,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -410,13 +411,12 @@
+@@ -410,13 +414,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -1325,8 +2065,8 @@
|| $(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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Exceptions/Test/Makefile.in 2008-05-02 20:23:03.000000000 +0200
+--- 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.
@@ -1338,7 +2078,15 @@
# 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.
-@@ -95,6 +95,7 @@
+@@ -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@
@@ -1346,9 +2094,18 @@
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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Interoperability/Makefile.in 2008-05-02 20:23:03.000000000 +0200
+--- 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.
@@ -1360,7 +2117,15 @@
# 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.
-@@ -122,6 +122,7 @@
+@@ -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@
@@ -1368,7 +2133,16 @@
MONODOC_CFLAGS = @MONODOC_CFLAGS@
MONODOC_LIBS = @MONODOC_LIBS@
MOZILLA_HOME = @MOZILLA_HOME@
-@@ -371,8 +372,8 @@
+@@ -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 | \
@@ -1379,7 +2153,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -397,8 +398,8 @@
+@@ -397,8 +401,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -1390,7 +2164,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -408,13 +409,12 @@
+@@ -408,13 +412,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -1407,8 +2181,8 @@
|| $(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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Interoperability/Test/Makefile.in 2008-05-02 20:23:03.000000000 +0200
+--- 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.
@@ -1420,7 +2194,15 @@
# 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.
-@@ -95,6 +95,7 @@
+@@ -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@
@@ -1428,9 +2210,18 @@
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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Naming/Makefile.in 2008-05-02 20:23:03.000000000 +0200
+--- 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.
@@ -1442,7 +2233,15 @@
# 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.
-@@ -122,6 +122,7 @@
+@@ -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@
@@ -1450,7 +2249,16 @@
MONODOC_CFLAGS = @MONODOC_CFLAGS@
MONODOC_LIBS = @MONODOC_LIBS@
MOZILLA_HOME = @MOZILLA_HOME@
-@@ -376,8 +377,8 @@
+@@ -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 | \
@@ -1461,7 +2269,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -402,8 +403,8 @@
+@@ -402,8 +406,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -1472,7 +2280,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -413,13 +414,12 @@
+@@ -413,13 +417,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -1489,8 +2297,8 @@
|| $(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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Naming/Test/Makefile.in 2008-05-02 20:23:03.000000000 +0200
+--- 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.
@@ -1502,7 +2310,15 @@
# 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.
-@@ -95,6 +95,7 @@
+@@ -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@
@@ -1510,9 +2326,18 @@
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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Performance/Makefile.in 2008-05-02 20:23:04.000000000 +0200
+--- 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.
@@ -1524,7 +2349,15 @@
# 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.
-@@ -122,6 +122,7 @@
+@@ -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@
@@ -1532,7 +2365,16 @@
MONODOC_CFLAGS = @MONODOC_CFLAGS@
MONODOC_LIBS = @MONODOC_LIBS@
MOZILLA_HOME = @MOZILLA_HOME@
-@@ -376,8 +377,8 @@
+@@ -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 | \
@@ -1543,7 +2385,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -402,8 +403,8 @@
+@@ -402,8 +406,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -1554,7 +2396,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -413,13 +414,12 @@
+@@ -413,13 +417,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -1571,8 +2413,8 @@
|| $(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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Performance/Test/Makefile.in 2008-05-02 20:23:04.000000000 +0200
+--- 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.
@@ -1584,7 +2426,15 @@
# 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.
-@@ -95,6 +95,7 @@
+@@ -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@
@@ -1592,9 +2442,18 @@
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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Portability/Makefile.in 2008-05-02 20:23:04.000000000 +0200
+--- 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.
@@ -1606,7 +2465,15 @@
# 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.
-@@ -122,6 +122,7 @@
+@@ -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@
@@ -1614,7 +2481,16 @@
MONODOC_CFLAGS = @MONODOC_CFLAGS@
MONODOC_LIBS = @MONODOC_LIBS@
MOZILLA_HOME = @MOZILLA_HOME@
-@@ -371,8 +372,8 @@
+@@ -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 | \
@@ -1625,7 +2501,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -397,8 +398,8 @@
+@@ -397,8 +401,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -1636,7 +2512,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -408,13 +409,12 @@
+@@ -408,13 +412,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -1652,7 +2528,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -581,7 +581,7 @@
+@@ -581,7 +584,7 @@
../../bin/Gendarme.Rules.Portability.dll: $(portability_rules_build_sources)
@@ -1662,8 +2538,8 @@
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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Portability/Test/Makefile.in 2008-05-02 20:23:04.000000000 +0200
+--- 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.
@@ -1675,7 +2551,15 @@
# 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.
-@@ -95,6 +95,7 @@
+@@ -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@
@@ -1683,9 +2567,18 @@
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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Security/Makefile.in 2008-05-02 20:23:04.000000000 +0200
+--- 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.
@@ -1697,7 +2590,15 @@
# 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.
-@@ -122,6 +122,7 @@
+@@ -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@
@@ -1705,7 +2606,16 @@
MONODOC_CFLAGS = @MONODOC_CFLAGS@
MONODOC_LIBS = @MONODOC_LIBS@
MOZILLA_HOME = @MOZILLA_HOME@
-@@ -374,8 +375,8 @@
+@@ -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 | \
@@ -1716,7 +2626,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -400,8 +401,8 @@
+@@ -400,8 +404,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -1727,7 +2637,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -411,13 +412,12 @@
+@@ -411,13 +415,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -1744,8 +2654,8 @@
|| $(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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Security/Test/Makefile.in 2008-05-02 20:23:04.000000000 +0200
+--- 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.
@@ -1757,7 +2667,15 @@
# 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.
-@@ -95,6 +95,7 @@
+@@ -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@
@@ -1765,9 +2683,18 @@
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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Smells/Makefile.in 2008-05-02 20:23:04.000000000 +0200
+--- 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.
@@ -1779,7 +2706,15 @@
# 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.
-@@ -122,6 +122,7 @@
+@@ -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@
@@ -1787,7 +2722,16 @@
MONODOC_CFLAGS = @MONODOC_CFLAGS@
MONODOC_LIBS = @MONODOC_LIBS@
MOZILLA_HOME = @MOZILLA_HOME@
-@@ -373,8 +374,8 @@
+@@ -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 | \
@@ -1798,7 +2742,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -399,8 +400,8 @@
+@@ -399,8 +403,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -1809,7 +2753,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -410,13 +411,12 @@
+@@ -410,13 +414,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -1826,8 +2770,8 @@
|| $(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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Smells/Test/Makefile.in 2008-05-02 20:23:04.000000000 +0200
+--- 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.
@@ -1839,7 +2783,15 @@
# 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.
-@@ -95,6 +95,7 @@
+@@ -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@
@@ -1847,9 +2799,18 @@
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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Ui/Makefile.in 2008-05-02 20:23:04.000000000 +0200
+--- 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.
@@ -1861,7 +2822,15 @@
# 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.
-@@ -122,6 +122,7 @@
+@@ -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@
@@ -1869,7 +2838,16 @@
MONODOC_CFLAGS = @MONODOC_CFLAGS@
MONODOC_LIBS = @MONODOC_LIBS@
MOZILLA_HOME = @MOZILLA_HOME@
-@@ -370,8 +371,8 @@
+@@ -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 | \
@@ -1880,7 +2858,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -396,8 +397,8 @@
+@@ -396,8 +400,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -1891,7 +2869,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -407,13 +408,12 @@
+@@ -407,13 +411,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -1908,8 +2886,8 @@
|| $(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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Ui/Test/Makefile.in 2008-05-02 20:23:04.000000000 +0200
+--- 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.
@@ -1921,7 +2899,15 @@
# 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.
-@@ -95,6 +95,7 @@
+@@ -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@
@@ -1929,9 +2915,18 @@
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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/gendarme/rules/Makefile.in 2008-05-02 20:23:04.000000000 +0200
+--- 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.
@@ -1943,7 +2938,15 @@
# 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.
-@@ -107,6 +107,7 @@
+@@ -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@
@@ -1951,7 +2954,16 @@
MONODOC_CFLAGS = @MONODOC_CFLAGS@
MONODOC_LIBS = @MONODOC_LIBS@
MOZILLA_HOME = @MOZILLA_HOME@
-@@ -306,8 +307,8 @@
+@@ -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 | \
@@ -1962,7 +2974,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -332,8 +333,8 @@
+@@ -332,8 +336,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -1973,7 +2985,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -343,13 +344,12 @@
+@@ -343,13 +347,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -1990,8 +3002,8 @@
|| $(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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/gnunit/Makefile.in 2008-05-02 20:23:04.000000000 +0200
+--- 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.
@@ -2003,7 +3015,15 @@
# 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.
-@@ -108,6 +108,7 @@
+@@ -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@
@@ -2011,7 +3031,16 @@
MONODOC_CFLAGS = @MONODOC_CFLAGS@
MONODOC_LIBS = @MONODOC_LIBS@
MOZILLA_HOME = @MOZILLA_HOME@
-@@ -299,8 +300,8 @@
+@@ -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 | \
@@ -2022,7 +3051,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -325,8 +326,8 @@
+@@ -325,8 +329,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -2033,7 +3062,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -336,13 +337,12 @@
+@@ -336,13 +340,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -2050,8 +3079,8 @@
|| $(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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/gnunit/art/Makefile.in 2008-05-02 20:23:04.000000000 +0200
+--- 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.
@@ -2063,7 +3092,15 @@
# 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.
-@@ -95,6 +95,7 @@
+@@ -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@
@@ -2071,9 +3108,18 @@
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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/gnunit/src/Makefile.in 2008-05-02 20:23:04.000000000 +0200
+--- 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.
@@ -2085,7 +3131,15 @@
# 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.
-@@ -103,6 +103,7 @@
+@@ -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@
@@ -2093,9 +3147,18 @@
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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/gui-compare/Makefile.in 2008-05-02 20:23:04.000000000 +0200
+--- 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.
@@ -2107,7 +3170,15 @@
# 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.
-@@ -109,6 +109,7 @@
+@@ -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@
@@ -2115,9 +3186,18 @@
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-05-02 20:22:54.000000000 +0200
-+++ mono-tools-1.9/ilcontrast/Makefile.in 2008-05-02 20:23:04.000000000 +0200
+--- 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.
@@ -2129,7 +3209,15 @@
# 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.
-@@ -112,6 +112,7 @@
+@@ -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@
@@ -2137,3 +3225,45 @@
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)
Modified: mono-tools/trunk/debian/rules
===================================================================
--- mono-tools/trunk/debian/rules 2008-08-06 18:08:05 UTC (rev 3692)
+++ mono-tools/trunk/debian/rules 2008-08-10 13:06:19 UTC (rev 3693)
@@ -39,6 +39,7 @@
dh_installchangelogs ChangeLog
dh_installdocs
dh_installmenu
+ dh_desktop
dh_installman
dh_strip
dh_clistrip
More information about the Pkg-mono-svn-commits
mailing list