[Pkg-mono-svn-commits] rev 3751 - in mono/trunk/debian: . patches
Mirco Bauer
meebey at alioth.debian.org
Tue Nov 11 21:51:28 UTC 2008
Author: meebey
Date: 2008-11-11 21:51:28 +0000 (Tue, 11 Nov 2008)
New Revision: 3751
Added:
mono/trunk/debian/libmono-data1.0-cil.install
mono/trunk/debian/libmono-data2.0-cil.install
mono/trunk/debian/libmono-getoptions1.0-cil.install
mono/trunk/debian/libmono-getoptions2.0-cil.install
mono/trunk/debian/libmono-posix1.0-cil.install
mono/trunk/debian/libmono-posix2.0-cil.install
mono/trunk/debian/libmono-webbrowser0.5-cil.install
mono/trunk/debian/mono-1.0-gac.install
mono/trunk/debian/mono-1.0-gac.manpages
mono/trunk/debian/mono-2.0-gac.install
mono/trunk/debian/mono-2.0-gac.manpages
mono/trunk/debian/mono-devel.install
mono/trunk/debian/mono-devel.manpages
mono/trunk/debian/patches/build_genxs_2.0.dpatch
Removed:
mono/trunk/debian/libmono-mozilla0.2-cil.install
mono/trunk/debian/patches/armel_fix_configure_fpu_check.dpatch
mono/trunk/debian/patches/fix_Dictionary_preventing_GC_r102114.dpatch
mono/trunk/debian/patches/fix_TdsConnectionPool_svn.dpatch
mono/trunk/debian/patches/fix_bound_checking_r98524_r98527.dpatch
mono/trunk/debian/patches/fix_delegate_memory_leak_r79001.dpatch
mono/trunk/debian/patches/fix_softfloat_r105848.dpatch
mono/trunk/debian/patches/fix_stack_alignment_r105650_r105651.dpatch
mono/trunk/debian/patches/fix_xen_support_r103474_r103475.dpatch
mono/trunk/debian/patches/method-signature-testing.dpatch
mono/trunk/debian/patches/pass_CPPFLAGS_nicely_r98803.dpatch
mono/trunk/debian/patches/ppc_disable_delegate_trampoline_optimization.dpatch
mono/trunk/debian/patches/ppc_fix_memory_corruption_r81413.dpatch
mono/trunk/debian/patches/remove_broken_dllmap_from_mono-shlib-cop.dpatch
Modified:
mono/trunk/debian/System.Windows.Forms.dll.config
mono/trunk/debian/changelog
mono/trunk/debian/control
mono/trunk/debian/copyright
mono/trunk/debian/libmono-dev.install
mono/trunk/debian/libmono-system-data2.0-cil.install
mono/trunk/debian/libmono-system-web2.0-cil.install
mono/trunk/debian/libmono-system2.1-cil.install
mono/trunk/debian/libmono1.0-cil.install
mono/trunk/debian/libmono2.0-cil.install
mono/trunk/debian/mono-1.0-devel.install
mono/trunk/debian/mono-1.0-devel.manpages
mono/trunk/debian/mono-2.0-devel.install
mono/trunk/debian/mono-2.0-devel.manpages
mono/trunk/debian/mono-gac.install
mono/trunk/debian/mono-gmcs.install
mono/trunk/debian/mono-gmcs.manpages
mono/trunk/debian/mono-mcs.install
mono/trunk/debian/mono-mcs.manpages
mono/trunk/debian/mono-smcs.install
mono/trunk/debian/mono.runtime-script
mono/trunk/debian/patches/00list
mono/trunk/debian/patches/99_autoreconf.dpatch
mono/trunk/debian/rules
mono/trunk/debian/shlibs.local
mono/trunk/debian/update-shlibs.local.sh
Log:
flush 2.0-1
Modified: mono/trunk/debian/System.Windows.Forms.dll.config
===================================================================
--- mono/trunk/debian/System.Windows.Forms.dll.config 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/System.Windows.Forms.dll.config 2008-11-11 21:51:28 UTC (rev 3751)
@@ -7,4 +7,5 @@
<dllmap dll="libgobject-2.0.so" target="libgobject-2.0.so.0"/>
<dllmap dll="libgdk-x11-2.0.so" target="libgdk-x11-2.0.so.0"/>
<dllmap dll="libgtk-x11-2.0.so" target="libgtk-x11-2.0.so.0"/>
+ <dllmap dll="libgdk_pixbuf-2.0.so" target="libgdk_pixbuf-2.0.so.0"/>
</configuration>
Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/changelog 2008-11-11 21:51:28 UTC (rev 3751)
@@ -1,3 +1,124 @@
+mono (2.0-1) experimental; urgency=low
+
+ * New upstream release.
+ + System.Web.Extensions is included in the debian source and binary
+ packages now, as JSON.NET was relicensed to MIT/X11 and thus no DFSGing
+ needed anymore! (Closes: #497213)
+ + With this release, we changed the default development stack from 1.0 to
+ 2.0. This has no influence to the runtime nor existing binary packages,
+ for more details see:
+ http://wiki.debian.org/Teams/DebianMonoGroup/Mono20Transition
+ * debian/copyright:
+ + Updated license info of JSON.NET
+ * debian/control:
+ + Removed libgda2-dev from buid-deps as debian/update-shlibs.local.sh
+ takes already care of it.
+ + mono-utils depends on libmono-corlib2.0-cil and only suggests
+ libmono-corlib1.0-cil now as the default runtime was changed to 2.0.
+ + Updated libcupsys2-dev build-dependency to libcups2-dev.
+ + Updated Standards-Version to 3.8.0 (no changes needed).
+ * debian/rules:
+ + Pass --enable-quiet-build=no to configure call, else we get a less
+ verbose build log.
+ + Bumped clilibs to 2.0 of libmono{1,2}.0-cil, libmono-cairo{1,2}.0-cil,
+ libmono-data-tds{1,2}.0-cil, libmono-system2.0-cil,
+ libmono-system-runtime2.0-cil, libmono-security{1,2}.0-cil,
+ libmono-web2.0-cil, libmono-winforms2.0-cil and libmono-system2.1-cil.
+ * debian/mono.runtime-script:
+ + Call the script of gacutil instead of passing the application filename
+ directly to mono, as we rely on the default gacutil now provided by the
+ mono-gac package.
+ * debian/patches/method-signature-testing.dpatch
+ debian/patches/pass_CPPFLAGS_nicely_r98803.dpatch
+ debian/patches/fix_bound_checking_r98524_r98527.dpatch
+ debian/patches/fix_softfloat_r105848.dpatch
+ debian/patches/fix_stack_alignment_r105650_r105651.dpatch
+ debian/patches/fix_xen_support_r103474_r103475.dpatch
+ debian/patches/fix_Dictionary_preventing_GC_r102114.dpatch
+ debian/patches/fix_TdsConnectionPool_svn.dpatch
+ debian/patches/fix_Assembly.LoadFrom_deadlock.dpatch:
+ + Removed, already applied upstream.
+ * debian/patches/dont_build_System.Web.Extensions.dpatch:
+ + Disabled, JSON.NET was re-licensed to MIT/X11.
+ * debian/libmono-system-web2.0-cil.install:
+ + Added System.Web.Extensions.dll and System.Web.Extensions.Design.dll.
+ * debian/update-shlibs.local.sh:
+ + Fixed grep calls so it doesn't match udeb lines.
+ * debian/shlibs.local:
+ + Updated
+ * debian/control
+ debian/libmono-mozilla0.2-cil.install
+ debian/libmono-webbrowser0.5-cil.install:
+ + Renamed libmono-mozilla0.2-cil to libmono-webbrowser0.5-cil and
+ removed Replaces.
+ * debian/control
+ debian/libmono{1,2}.0-cil.install
+ debian/libmono-posix{1,2}.0-cil.install:
+ debian/libmono-getoptions{1,2}.0-cil.install:
+ debian/libmono-data{1,2}.0-cil.install:
+ + Moved the Mono.Posix, Mono.GetOptions and Mono.Data.* libraries into
+ extra packages to support smaller install sizes of typical applications
+ (e.g. tomboy or gnome-do).
+ + Added libmono-posix{1,2}.0-cil, libmono-getoptions{1,2}.0-cil and
+ libmono-data{1,2}.0-cil as dependency of libmono{1,2}-cil to aid a smooth
+ runtime transition.
+ * debian/libmono-system-data2.0-cil.install:
+ + Added System.Data.DataSetExtensions.dll and System.Data.Linq.dll.
+ * debian/rules
+ debian/libmono{1,2}.0-cil.install:
+ + Dropped Mono.Security.Win32.dll as the library is only useful on
+ Windows.
+ * debian/patches/build_genxs_2.0.dpatch:
+ + Enables compiling genxs for CLI 2.0 as upstream provided a genxs2 script
+ but forgot to build the actual application.
+ * debian/mono-2.0-devel.install
+ debian/mono-2.0-devel.manpages:
+ + Added xsd2 and genxs2
+ * debian/mono-devel.install
+ debian/mono-devel.manpages
+ debian/mono-1.0-devel.install
+ debian/mono-1.0-devel.manpages:
+ + Moved all unversioned tools and default scripts (with their manpages) to
+ mono-devel.
+ * debian/mono-mcs.install
+ debian/mono-mcs.manpages
+ debian/mono-gmcs.install
+ debian/mono-gmcs.manpages
+ debian/mono-devel.install
+ debian/mono-devel.manpages
+ debian/control:
+ + Moved gmcs script and manpage from mono-gmcs to mono-devel.
+ + Added Replaces for mono-mcs and mono-gmcs to mono-devel.
+ + Added gmcs2 script and manpage to mono-gmcs
+ + Added mcs1 script and manpage to mono-mcs.
+ This changes are needed to get a default compiler target using a single
+ package that depends on the current default which is 2.0 (gmcs2).
+ * debian/System.Windows.Forms.dll.config:
+ + Added dll-map for libgdk_pixbuf-2.0.so
+ * debian/control:
+ + Improved many package descriptions by adding the names of the
+ libraries they contain with a brief description of what they do.
+ * debian/control
+ debian/mono-gac.install
+ debian/mono-{1,2}.0-gac.install:
+ + The default script "gacutil" is still shipped in mono-gac but
+ "gacutil1" and "gacutil2" are now in mono-1.0-gac and mono-2.0-gac.
+ mono-gac pulls in mono-2.0-gac by default.
+ This is needed to make a 2.0-only install possible.
+ * debian/control:
+ + Added mono-1.0-runtime and mono-2.0-runtime package, which pull in the
+ runtime stack of the specific runtime version in.
+ mono-runtime pulls in mono-2.0-runtime as the new default runtime.
+ This is needed to make a 2.0-only install possible.
+ * debian/libmono-dev.install:
+ + Added dotnet35.pc
+ * debian/mono-smcs.install:
+ + Added smcs.pc
+ * debian/control:
+ + s/meta package/metapackage/ as lintian says so.
+
+ -- Mirco Bauer <meebey at debian.org> Tue, 11 Nov 2008 00:21:27 +0100
+
mono (1.9.1+dfsg-4) unstable; urgency=high
[ Mirco Bauer ]
Modified: mono/trunk/debian/control
===================================================================
--- mono/trunk/debian/control 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/control 2008-11-11 21:51:28 UTC (rev 3751)
@@ -4,8 +4,8 @@
Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
Uploaders: Mirco Bauer <meebey at debian.org>, Sebastian Dröge <slomo at debian.org>, Jo Shields <directhex at apebox.org>
Build-Depends: debhelper (>= 5.0.0), dpkg-dev (>= 1.13.19), libglib2.0-dev (>= 2.4), bison, libtool, dpatch, libxml-dom-perl, libxslt1-dev, dc, libx11-dev, libxt-dev, zlib1g-dev
-Build-Depends-Indep: libgamin-dev, libcups2-dev | libcupsys2-dev, librsvg2-dev, libgtk2.0-dev, libgnomeui-dev, libgda2-dev
-Standards-Version: 3.7.3
+Build-Depends-Indep: libgamin-dev, libcups2-dev, librsvg2-dev, libgtk2.0-dev, libgnomeui-dev
+Standards-Version: 3.8.0
Homepage: http://www.mono-project.com/
Vcs-Svn: svn://svn.debian.org/svn/pkg-mono/mono/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-mono/mono/trunk/
@@ -27,7 +27,8 @@
Package: mono-runtime
Provides: cli-runtime
Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
-Depends: mono-jit (= ${binary:Version}), mono-gac (= ${source:Version})
+Depends: mono-2.0-runtime (= ${binary:Version}),
+ mono-gac (= ${source:Version})
Description: Mono runtime
Mono is a platform for running and developing applications based on the
ECMA/ISO Standards. Mono is an open source effort led by Novell.
@@ -35,8 +36,40 @@
runtime, which can produce and execute CIL (Common Intermediate Language)
bytecode (aka assemblies), and a class library.
.
- This package is a meta package and pulls the VM and the GAC in.
+ This package is a metapackage and pulls the default VM and the default GAC in
+ (which is 2.0 currently).
+Package: mono-1.0-runtime
+Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
+Depends: mono-jit (= ${binary:Version}),
+ libmono-corlib1.0-cil (= ${source:Version}),
+ mono-1.0-gac (= ${source:Version})
+Description: Mono runtime (1.0)
+ Mono is a platform for running and developing applications based on the
+ ECMA/ISO Standards. Mono is an open source effort led by Novell.
+ Mono provides a complete CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package is a metapackage and pulls the VM, corlib and the GAC for
+ CLI 1.0 in.
+
+Package: mono-2.0-runtime
+Provides: cli-runtime
+Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
+Depends: mono-jit (= ${binary:Version}),
+ libmono-corlib2.0-cil (= ${source:Version}),
+ mono-2.0-gac (= ${source:Version})
+Description: Mono runtime (2.0)
+ Mono is a platform for running and developing applications based on the
+ ECMA/ISO Standards. Mono is an open source effort led by Novell.
+ Mono provides a complete CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package is a metapackage and pulls the VM, corlib and the GAC for
+ CLI 2.0 in.
+
Package: mono-jit
Provides: cli-virtual-machine
Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
@@ -73,8 +106,8 @@
Section: devel
Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
Replaces: mono-mcs (<= 1.1.6-4)
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmono0 (<< ${mono:next-upversion}), libmono-corlib1.0-cil
-Suggests: libmono-corlib2.0-cil
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmono0 (<< ${mono:next-upversion}), libmono-corlib2.0-cil
+Suggests: libmono-corlib1.0-cil
Description: Mono utilities
Mono is a platform for running and developing applications based on the
ECMA/ISO Standards. Mono is an open source effort led by Novell.
@@ -133,7 +166,10 @@
Section: libs
Architecture: all
Replaces: mono-classlib-1.0 (<< 1.1.13.6), mono-classlib-1.0-dbg (<< 1.1.13.6)
-Depends: ${cli:Depends}
+Depends: ${cli:Depends},
+ libmono-posix1.0-cil (= ${source:Version}),
+ libmono-getoptions1.0-cil (= ${source:Version}),
+ libmono-data1.0-cil (= ${source:Version})
Description: Mono libraries (1.0)
Mono is a platform for running and developing applications based on the
ECMA/ISO Standards. Mono is an open source effort led by Novell.
@@ -141,13 +177,19 @@
runtime, which can produce and execute CIL (Common Intermediate Language)
bytecode (aka assemblies), and a class library.
.
- This package contains the Mono libraries.
+ This package contains various Mono libraries for CLI 1.0:
+ - Mono.CompilerServices.SymbolWriter
+ - Mono.Http
+ - OpenSystem.C
Package: libmono2.0-cil
Section: libs
Architecture: all
Replaces: mono-classlib-2.0 (<< 1.1.13.6), mono-classlib-2.0-dbg (<< 1.1.13.6)
-Depends: ${cli:Depends}
+Depends: ${cli:Depends},
+ libmono-posix2.0-cil (= ${source:Version}),
+ libmono-getoptions2.0-cil (= ${source:Version}),
+ libmono-data2.0-cil (= ${source:Version})
Description: Mono libraries (2.0)
Mono is a platform for running and developing applications based on the
ECMA/ISO Standards. Mono is an open source effort led by Novell.
@@ -155,8 +197,128 @@
runtime, which can produce and execute CIL (Common Intermediate Language)
bytecode (aka assemblies), and a class library.
.
- This package contains the Mono libraries.
+ This package contains various Mono libraries for CLI 2.0:
+ - Mono.CompilerServices.SymbolWriter
+ - Mono.Http
+ - Mono.Web
+ - OpenSystem.C
+Package: libmono-posix1.0-cil
+Section: libs
+Architecture: all
+Replaces: libmono1.0-cil (<< 2.0)
+Depends: ${cli:Depends},
+Description: Mono.Posix library (1.0)
+ Mono is a platform for running and developing applications based on the
+ ECMA/ISO Standards. Mono is an open source effort led by Novell.
+ Mono provides a complete CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Mono.Posix library for CLI 1.0 that binds many APIs
+ found in glibc or intl.
+
+Package: libmono-posix2.0-cil
+Section: libs
+Architecture: all
+Replaces: libmono2.0-cil (<< 2.0)
+Depends: ${cli:Depends}
+Description: Mono.Posix library (2.0)
+ Mono is a platform for running and developing applications based on the
+ ECMA/ISO Standards. Mono is an open source effort led by Novell.
+ Mono provides a complete CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Mono.Posix library for CLI 2.0 that binds many APIs
+ found in glibc or intl.
+
+Package: libmono-getoptions1.0-cil
+Section: libs
+Architecture: all
+Replaces: libmono1.0-cil (<< 2.0)
+Depends: ${cli:Depends}
+Description: Mono.GetOptions library (1.0)
+ Mono is a platform for running and developing applications based on the
+ ECMA/ISO Standards. Mono is an open source effort led by Novell.
+ Mono provides a complete CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Mono.GetOptions library for CLI 2.0 that allows to
+ parse command line options and arguments easily.
+
+Package: libmono-getoptions2.0-cil
+Section: libs
+Architecture: all
+Replaces: libmono2.0-cil (<< 2.0)
+Depends: ${cli:Depends}
+Description: Mono.GetOptions library (2.0)
+ Mono is a platform for running and developing applications based on the
+ ECMA/ISO Standards. Mono is an open source effort led by Novell.
+ Mono provides a complete CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Mono.GetOptions library for CLI 2.0 that allows to
+ parse command line options and arguments easily.
+
+Package: libmono-data1.0-cil
+Section: libs
+Architecture: all
+Replaces: libmono1.0-cil (<< 2.0)
+Depends: ${cli:Depends}
+Description: Mono.Data.* libraries (1.0)
+ Mono is a platform for running and developing applications based on the
+ ECMA/ISO Standards. Mono is an open source effort led by Novell.
+ Mono provides a complete CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains various Mono.Data.* libraries for CLI 1.0 that allow to
+ use different TDS-based databases:
+ - Mono.Data
+ - Mono.Data.TdsClient:
+ Generic TDS provider (TDS 4.2 by default) for older versions of Sybase and
+ Microsoft SQL Servers.
+ - Mono.Data.SybaseClient:
+ Provider for Sybase SQL Servers (TDS 5.0)
+ .
+ If you are looking for a current Microsoft SQL Server library then you want
+ to check the libmono-system-data1.0-cil package which contains
+ System.Data.SqlClient.
+ .
+ For more information about Mono.Data and TDS see:
+ http://www.mono-project.com/TDS_Providers
+
+Package: libmono-data2.0-cil
+Section: libs
+Architecture: all
+Replaces: libmono2.0-cil (<< 2.0)
+Depends: ${cli:Depends}
+Description: Mono.Data.* libraries (2.0)
+ Mono is a platform for running and developing applications based on the
+ ECMA/ISO Standards. Mono is an open source effort led by Novell.
+ Mono provides a complete CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains various Mono.Data.* libraries for CLI 2.0 that allow to
+ use different TDS-based databases:
+ - Mono.Data
+ - Mono.Data.TdsClient:
+ Generic TDS provider (TDS 4.2 by default) for older versions of Sybase and
+ Microsoft SQL Servers.
+ - Mono.Data.SybaseClient:
+ Provider for Sybase SQL Servers (TDS 5.0)
+ .
+ If you are looking for a current Microsoft SQL Server library then you want
+ to check the libmono-system-data2.0-cil package which contains
+ System.Data.SqlClient.
+ .
+ For more information about Mono.Data and TDS see:
+ http://www.mono-project.com/TDS_Providers
+
Package: libmono-c5-1.0-cil
Section: libs
Architecture: all
@@ -171,13 +333,12 @@
.
This package contains the Mono C5 library.
-Package: libmono-mozilla0.2-cil
+Package: libmono-webbrowser0.5-cil
Section: libs
Architecture: all
-Replaces: libmono-mozilla0.1-cil
Depends: ${cli:Depends}
Recommends: libgluezilla
-Description: Mono Mozilla library
+Description: Mono Web Browser library
Mono is a platform for running and developing applications based on the
ECMA/ISO Standards. Mono is an open source effort led by Novell.
Mono provides a complete CLR (Common Language Runtime) including compiler and
@@ -1051,9 +1212,9 @@
Provides: c-sharp-compiler
Depends: ${cli:Depends}
Recommends: pkg-config
-Description: Mono C# compiler for CLI 1.1
- This is the Mono C# (C-Sharp) compiler, a platform-independent compiler which
- produces CIL (Common Intermediate Language) binary executables.
+Description: Mono C# 1.0 compiler for CLI 1.1
+ This is the Mono C# (C-Sharp) 1.0 compiler, a platform-independent compiler
+ which produces CIL (Common Intermediate Language) binary executables.
This compiler targets the CLI 1.1 runtime version.
.
Mono is a platform for running and developing applications based on the
@@ -1106,7 +1267,9 @@
Package: mono-smcs
Section: devel
Architecture: all
-Depends: ${cli:Depends}, libmono-corlib2.1-cil, libmono-system2.1-cil
+Depends: ${cli:Depends},
+ libmono-corlib2.1-cil (= ${source:Version}),
+ libmono-system2.1-cil (= ${source:Version})
Recommends: pkg-config
Description: Mono C# 3.0 compiler for CLI 2.1 (Moonlight / Silverlight)
This is a special C# (C-Sharp) 3.0 compiler for Moonlight (Silverlight)
@@ -1121,12 +1284,34 @@
runtime, which can produce and execute CIL (Common Intermediate Language)
bytecode (aka assemblies), and a class library.
+Package: mono-devel
+Section: devel
+Architecture: all
+Provides: resource-file-generator, assembly-linker, strong-name-tool
+Replaces: mono-1.0-devel (<< 2.0),
+ mono-mcs (<< 2.0),
+ mono-gmcs (<< 2.0)
+Depends: ${cli:Depends},
+ mono-2.0-devel (= ${source:Version}),
+ mono-gac (= ${source:Version})
+Description: Mono development tools
+ Mono is a platform for running and developing applications based on the
+ ECMA/ISO Standards. Mono is an open source effort led by Novell.
+ Mono provides a complete CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains various development tools and pulls in the default
+ development stack for Mono (which is 2.0 currently).
+
Package: mono-1.0-devel
Section: devel
Architecture: all
-Provides: resource-file-generator, assembly-linker, strong-name-tool
-Depends: ${cli:Depends}
-Recommends: mono-mcs, libmono-dev, pkg-config
+Depends: ${cli:Depends},
+ mono-mcs (= ${source:Version}),
+ mono-1.0-gac (= ${source:Version}),
+ libmono-dev (>= ${source:Version}),
+ pkg-config
Replaces: mono-mcs (<< 1.2.6-1)
Description: Mono development tools for CLI 1.0
Mono is a platform for running and developing applications based on the
@@ -1135,13 +1320,17 @@
runtime, which can produce and execute CIL (Common Intermediate Language)
bytecode (aka assemblies), and a class library.
.
- This package contains various development tools for Mono targeting CLI 1.0.
+ This package contains various development tools and pulls in a full
+ development stack for Mono targeting CLI 1.0.
Package: mono-2.0-devel
Section: devel
Architecture: all
-Depends: ${cli:Depends}
-Recommends: mono-gmcs, libmono-dev, pkg-config
+Depends: ${cli:Depends},
+ mono-gmcs (= ${source:Version}),
+ mono-2.0-gac (= ${source:Version}),
+ libmono-dev (>= ${source:Version}),
+ pkg-config
Replaces: mono-gmcs (<< 1.2.6-1), mono-common (<< 1.2.6-2)
Description: Mono development tools for CLI 2.0
Mono is a platform for running and developing applications based on the
@@ -1150,7 +1339,8 @@
runtime, which can produce and execute CIL (Common Intermediate Language)
bytecode (aka assemblies), and a class library.
.
- This package contains various development tools for Mono targeting CLI 2.0.
+ This package contains various development tools and pull in a full
+ development stack for Mono targeting CLI 2.0.
Package: mono-1.0-service
Section: devel
@@ -1206,9 +1396,24 @@
Package: mono-gac
Section: devel
Architecture: all
+Depends: mono-2.0-gac (= ${source:Version})
+Provides: global-assembly-cache-tool
+Description: Mono GAC tool
+ Mono is a platform for running and developing applications based on the
+ ECMA/ISO Standards. Mono is an open source effort led by Novell.
+ Mono provides a complete CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package pulls in the default GAC (Global Assembly Cache) tool (gacutil)
+ used by Mono to store shared CIL (Common Intermediate Language) libraries.
+
+Package: mono-1.0-gac
+Section: devel
+Architecture: all
+Replaces: mono-gac (<< 2.0)
Depends: mono-jit (>= 1.0), ${cli:Depends}
Recommends: cli-common (>= 0.4.0)
-Provides: global-assembly-cache-tool
Description: Mono GAC tool
Mono is a platform for running and developing applications based on the
ECMA/ISO Standards. Mono is an open source effort led by Novell.
@@ -1219,6 +1424,21 @@
This package includes the GAC (Global Assembly Cache) tool (gacutil)
used by Mono to store shared CIL (Common Intermediate Language) libraries.
+Package: mono-2.0-gac
+Section: devel
+Architecture: all
+Depends: mono-jit (>= 1.0), ${cli:Depends}
+Recommends: cli-common (>= 0.4.0)
+Description: Mono GAC tool
+ Mono is a platform for running and developing applications based on the
+ ECMA/ISO Standards. Mono is an open source effort led by Novell.
+ Mono provides a complete CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package includes the GAC (Global Assembly Cache) tool (gacutil)
+ used by Mono to store shared CIL (Common Intermediate Language) libraries.
+
Package: mono-jay
Section: devel
Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
Modified: mono/trunk/debian/copyright
===================================================================
--- mono/trunk/debian/copyright 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/copyright 2008-11-11 21:51:28 UTC (rev 3751)
@@ -150,11 +150,29 @@
mcs/class/System.Web.Extensions/System.Web.Script.Serialization/JSON/*
-Creative Commons Attribution 2.5 License
+Copyright (c) 2007 James Newton-King
-As that license is not conform with the DFSG, those source files were deleted
-from the tarball.
+ 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.
+
-------------------------------------------------------------------------------
mcs/nunit20/*
Added: mono/trunk/debian/libmono-data1.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-data1.0-cil.install (rev 0)
+++ mono/trunk/debian/libmono-data1.0-cil.install 2008-11-11 21:51:28 UTC (rev 3751)
@@ -0,0 +1,6 @@
+debian/tmp/usr/lib/mono/1.0/Mono.Data.SybaseClient.dll
+debian/tmp/usr/lib/mono/1.0/Mono.Data.TdsClient.dll
+debian/tmp/usr/lib/mono/1.0/Mono.Data.dll
+debian/tmp/usr/lib/mono/gac/Mono.Data.SybaseClient/1.0.5000.0__*/
+debian/tmp/usr/lib/mono/gac/Mono.Data.TdsClient/1.0.5000.0__*/
+debian/tmp/usr/lib/mono/gac/Mono.Data/1.0.5000.0__*/
Added: mono/trunk/debian/libmono-data2.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-data2.0-cil.install (rev 0)
+++ mono/trunk/debian/libmono-data2.0-cil.install 2008-11-11 21:51:28 UTC (rev 3751)
@@ -0,0 +1,6 @@
+debian/tmp/usr/lib/mono/2.0/Mono.Data.SybaseClient.dll
+debian/tmp/usr/lib/mono/2.0/Mono.Data.TdsClient.dll
+debian/tmp/usr/lib/mono/2.0/Mono.Data.dll
+debian/tmp/usr/lib/mono/gac/Mono.Data.SybaseClient/2.0.0.0__*/
+debian/tmp/usr/lib/mono/gac/Mono.Data.TdsClient/2.0.0.0__*/
+debian/tmp/usr/lib/mono/gac/Mono.Data/2.0.0.0__*/
Modified: mono/trunk/debian/libmono-dev.install
===================================================================
--- mono/trunk/debian/libmono-dev.install 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/libmono-dev.install 2008-11-11 21:51:28 UTC (rev 3751)
@@ -4,4 +4,5 @@
debian/tmp/usr/lib/libMonoSupportW.a
debian/tmp/usr/lib/pkgconfig/mono.pc
debian/tmp/usr/lib/pkgconfig/dotnet.pc
+debian/tmp/usr/lib/pkgconfig/dotnet35.pc
debian/tmp/usr/include/
Added: mono/trunk/debian/libmono-getoptions1.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-getoptions1.0-cil.install (rev 0)
+++ mono/trunk/debian/libmono-getoptions1.0-cil.install 2008-11-11 21:51:28 UTC (rev 3751)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/1.0/Mono.GetOptions.dll
+debian/tmp/usr/lib/mono/gac/Mono.GetOptions/1.0.5000.0__*/
Added: mono/trunk/debian/libmono-getoptions2.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-getoptions2.0-cil.install (rev 0)
+++ mono/trunk/debian/libmono-getoptions2.0-cil.install 2008-11-11 21:51:28 UTC (rev 3751)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/2.0/Mono.GetOptions.dll
+debian/tmp/usr/lib/mono/gac/Mono.GetOptions/2.0.0.0__*/
Deleted: mono/trunk/debian/libmono-mozilla0.2-cil.install
===================================================================
--- mono/trunk/debian/libmono-mozilla0.2-cil.install 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/libmono-mozilla0.2-cil.install 2008-11-11 21:51:28 UTC (rev 3751)
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/mono/gac/Mono.Mozilla/0.2.0.0__*/
-debian/tmp/usr/lib/mono/2.0/Mono.Mozilla.dll
Added: mono/trunk/debian/libmono-posix1.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-posix1.0-cil.install (rev 0)
+++ mono/trunk/debian/libmono-posix1.0-cil.install 2008-11-11 21:51:28 UTC (rev 3751)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/1.0/Mono.Posix.dll
+debian/tmp/usr/lib/mono/gac/Mono.Posix/1.0.5000.0__*/
Added: mono/trunk/debian/libmono-posix2.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-posix2.0-cil.install (rev 0)
+++ mono/trunk/debian/libmono-posix2.0-cil.install 2008-11-11 21:51:28 UTC (rev 3751)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/2.0/Mono.Posix.dll
+debian/tmp/usr/lib/mono/gac/Mono.Posix/2.0.0.0__*/
Modified: mono/trunk/debian/libmono-system-data2.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-system-data2.0-cil.install 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/libmono-system-data2.0-cil.install 2008-11-11 21:51:28 UTC (rev 3751)
@@ -1,2 +1,6 @@
-debian/tmp/usr/lib/mono/gac/System.Data/2.0.*/
+debian/tmp/usr/lib/mono/gac/System.Data/2.0.0.0__*/
+debian/tmp/usr/lib/mono/gac/System.Data.DataSetExtensions/3.5.0.0__*/
+debian/tmp/usr/lib/mono/gac/System.Data.Linq/3.5.0.0__*/
debian/tmp/usr/lib/mono/2.0/System.Data.dll
+debian/tmp/usr/lib/mono/2.0/System.Data.DataSetExtensions.dll
+debian/tmp/usr/lib/mono/2.0/System.Data.Linq.dll
Modified: mono/trunk/debian/libmono-system-web2.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-system-web2.0-cil.install 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/libmono-system-web2.0-cil.install 2008-11-11 21:51:28 UTC (rev 3751)
@@ -1,4 +1,12 @@
debian/tmp/usr/lib/mono/gac/System.Web/2.0.0.0__*/
+debian/tmp/usr/lib/mono/gac/System.Web.Extensions/1.0.61025.0__*/
+debian/tmp/usr/lib/mono/gac/System.Web.Extensions/3.5.0.0__*/
+debian/tmp/usr/lib/mono/gac/System.Web.Extensions.Design/1.0.61025.0__*/
+debian/tmp/usr/lib/mono/gac/System.Web.Extensions.Design/3.5.0.0__*/
debian/tmp/usr/lib/mono/gac/System.Web.Services/2.0.0.0__*/
debian/tmp/usr/lib/mono/2.0/System.Web.dll
+debian/tmp/usr/lib/mono/2.0/System.Web.Extensions.dll
+debian/tmp/usr/lib/mono/2.0/System.Web.Extensions.Design.dll
debian/tmp/usr/lib/mono/2.0/System.Web.Services.dll
+debian/tmp/usr/lib/mono/3.5/System.Web.Extensions.dll
+debian/tmp/usr/lib/mono/3.5/System.Web.Extensions.Design.dll
Modified: mono/trunk/debian/libmono-system2.1-cil.install
===================================================================
--- mono/trunk/debian/libmono-system2.1-cil.install 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/libmono-system2.1-cil.install 2008-11-11 21:51:28 UTC (rev 3751)
@@ -1,6 +1,8 @@
-debian/tmp/usr/lib/mono/gac/System/2.1.0.0__*/
-debian/tmp/usr/lib/mono/gac/System.Core/2.1.0.0__*/
-debian/tmp/usr/lib/mono/gac/System.Xml.Core/2.1.0.0__*/
+debian/tmp/usr/lib/mono/gac/System/2.0.5.0__*/
+debian/tmp/usr/lib/mono/gac/System.Core/2.0.5.0__*/
+debian/tmp/usr/lib/mono/gac/System.Net/2.0.5.0__*/
+debian/tmp/usr/lib/mono/gac/System.Xml/2.0.5.0__*/
debian/tmp/usr/lib/mono/2.1/System.dll
debian/tmp/usr/lib/mono/2.1/System.Core.dll
-debian/tmp/usr/lib/mono/2.1/System.Xml.Core.dll
+debian/tmp/usr/lib/mono/2.1/System.Net.dll
+debian/tmp/usr/lib/mono/2.1/System.Xml.dll
Copied: mono/trunk/debian/libmono-webbrowser0.5-cil.install (from rev 3725, mono/trunk/debian/libmono-mozilla0.2-cil.install)
===================================================================
--- mono/trunk/debian/libmono-webbrowser0.5-cil.install (rev 0)
+++ mono/trunk/debian/libmono-webbrowser0.5-cil.install 2008-11-11 21:51:28 UTC (rev 3751)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/gac/Mono.WebBrowser/0.5.0.0__*/
+debian/tmp/usr/lib/mono/2.0/Mono.WebBrowser.dll
Property changes on: mono/trunk/debian/libmono-webbrowser0.5-cil.install
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: mono/trunk/debian/libmono1.0-cil.install
===================================================================
--- mono/trunk/debian/libmono1.0-cil.install 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/libmono1.0-cil.install 2008-11-11 21:51:28 UTC (rev 3751)
@@ -1,20 +1,8 @@
debian/tmp/usr/lib/mono/1.0/Mono.CompilerServices.SymbolWriter.dll
-debian/tmp/usr/lib/mono/1.0/Mono.Data.SybaseClient.dll
-debian/tmp/usr/lib/mono/1.0/Mono.Data.TdsClient.dll
-debian/tmp/usr/lib/mono/1.0/Mono.Data.dll
-debian/tmp/usr/lib/mono/1.0/Mono.GetOptions.dll
debian/tmp/usr/lib/mono/1.0/Mono.Http.dll
-debian/tmp/usr/lib/mono/1.0/Mono.Posix.dll
-debian/tmp/usr/lib/mono/1.0/Mono.Security.Win32.dll
debian/tmp/usr/lib/mono/1.0/OpenSystem.C.dll
debian/tmp/usr/lib/mono/gac/Mono.CompilerServices.SymbolWriter/1.0.5000.0__*/
-debian/tmp/usr/lib/mono/gac/Mono.Data.SybaseClient/1.0.5000.0__*/
-debian/tmp/usr/lib/mono/gac/Mono.Data.TdsClient/1.0.5000.0__*/
-debian/tmp/usr/lib/mono/gac/Mono.Data/1.0.5000.0__*/
-debian/tmp/usr/lib/mono/gac/Mono.GetOptions/1.0.5000.0__*/
debian/tmp/usr/lib/mono/gac/Mono.Http/1.0.5000.0__*/
-debian/tmp/usr/lib/mono/gac/Mono.Posix/1.0.5000.0__*/
-debian/tmp/usr/lib/mono/gac/Mono.Security.Win32/1.0.5000.0__*/
debian/tmp/usr/lib/mono/gac/OpenSystem.C/1.0.5000.0__*/
debian/tmp/usr/lib/mono/gac/Mono.Cecil/
debian/tmp/usr/lib/mono/gac/Mono.Cecil.Mdb/
Modified: mono/trunk/debian/libmono2.0-cil.install
===================================================================
--- mono/trunk/debian/libmono2.0-cil.install 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/libmono2.0-cil.install 2008-11-11 21:51:28 UTC (rev 3751)
@@ -1,21 +1,9 @@
debian/tmp/usr/lib/mono/2.0/Mono.CompilerServices.SymbolWriter.dll
-debian/tmp/usr/lib/mono/2.0/Mono.Data.SybaseClient.dll
-debian/tmp/usr/lib/mono/2.0/Mono.Data.TdsClient.dll
-debian/tmp/usr/lib/mono/2.0/Mono.Data.dll
-debian/tmp/usr/lib/mono/2.0/Mono.GetOptions.dll
debian/tmp/usr/lib/mono/2.0/Mono.Http.dll
-debian/tmp/usr/lib/mono/2.0/Mono.Posix.dll
-debian/tmp/usr/lib/mono/2.0/Mono.Security.Win32.dll
debian/tmp/usr/lib/mono/2.0/Mono.Web.dll
debian/tmp/usr/lib/mono/2.0/OpenSystem.C.dll
debian/tmp/usr/lib/mono/gac/Mono.CompilerServices.SymbolWriter/2.0.0.0__*/
-debian/tmp/usr/lib/mono/gac/Mono.Data.SybaseClient/2.0.0.0__*/
-debian/tmp/usr/lib/mono/gac/Mono.Data.TdsClient/2.0.0.0__*/
-debian/tmp/usr/lib/mono/gac/Mono.Data/2.0.0.0__*/
-debian/tmp/usr/lib/mono/gac/Mono.GetOptions/2.0.0.0__*/
debian/tmp/usr/lib/mono/gac/Mono.Http/2.0.0.0__*/
-debian/tmp/usr/lib/mono/gac/Mono.Posix/2.0.0.0__*/
-debian/tmp/usr/lib/mono/gac/Mono.Security.Win32/2.0.0.0__*/
debian/tmp/usr/lib/mono/gac/Mono.Web/2.0.0.0__*/
debian/tmp/usr/lib/mono/gac/OpenSystem.C/2.0.0.0__*/
debian/tmp/usr/lib/mono/gac/mono-service/2.0.0.0__*/
Modified: mono/trunk/debian/mono-1.0-devel.install
===================================================================
--- mono/trunk/debian/mono-1.0-devel.install 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/mono-1.0-devel.install 2008-11-11 21:51:28 UTC (rev 3751)
@@ -1,68 +1,18 @@
-debian/tmp/usr/bin/al
-debian/tmp/usr/bin/caspol
-debian/tmp/usr/bin/cert2spc
-debian/tmp/usr/bin/certmgr
-debian/tmp/usr/bin/chktrust
-debian/tmp/usr/bin/cilc
-debian/tmp/usr/bin/disco
-debian/tmp/usr/bin/dtd2xsd
-debian/tmp/usr/bin/dtd2rng
-debian/tmp/usr/bin/genxs
-debian/tmp/usr/bin/ilasm
-debian/tmp/usr/bin/installvst
-debian/tmp/usr/bin/macpack
-debian/tmp/usr/bin/mkbundle
-debian/tmp/usr/bin/mono-api-diff
-debian/tmp/usr/bin/mono-api-info
-debian/tmp/usr/bin/mono-shlib-cop
-debian/tmp/usr/bin/mono-xmltool
-debian/tmp/usr/bin/monop
-debian/tmp/usr/bin/monolinker
-debian/tmp/usr/bin/mozroots
-debian/tmp/usr/bin/permview
-debian/tmp/usr/bin/resgen
-debian/tmp/usr/bin/secutil
-debian/tmp/usr/bin/setreg
-debian/tmp/usr/bin/signcode
-debian/tmp/usr/bin/sn
-debian/tmp/usr/bin/soapsuds
-debian/tmp/usr/bin/sqlsharp
-debian/tmp/usr/bin/wsdl
-debian/tmp/usr/bin/xsd
-debian/tmp/usr/lib/mono/1.0/CorCompare.exe
+debian/tmp/usr/bin/al1
+debian/tmp/usr/bin/genxs1
+debian/tmp/usr/bin/ilasm1
+debian/tmp/usr/bin/mkbundle1
+debian/tmp/usr/bin/mono-api-info1
+debian/tmp/usr/bin/monop1
+debian/tmp/usr/bin/resgen1
+debian/tmp/usr/bin/wsdl1
+debian/tmp/usr/bin/xsd1
debian/tmp/usr/lib/mono/1.0/al.exe
-debian/tmp/usr/lib/mono/1.0/browsercaps-updater.exe
-debian/tmp/usr/lib/mono/1.0/caspol.exe
-debian/tmp/usr/lib/mono/1.0/cert2spc.exe
-debian/tmp/usr/lib/mono/1.0/certmgr.exe
-debian/tmp/usr/lib/mono/1.0/chktrust.exe
-debian/tmp/usr/lib/mono/1.0/cilc.exe
-debian/tmp/usr/lib/mono/1.0/culevel.exe
-debian/tmp/usr/lib/mono/1.0/disco.exe
-debian/tmp/usr/lib/mono/1.0/dtd2rng.exe
-debian/tmp/usr/lib/mono/1.0/dtd2xsd.exe
debian/tmp/usr/lib/mono/1.0/genxs.exe
-debian/tmp/usr/lib/mono/1.0/ictool.exe
debian/tmp/usr/lib/mono/1.0/ilasm.exe
-debian/tmp/usr/lib/mono/1.0/installvst.exe
-debian/tmp/usr/lib/mono/1.0/macpack.exe
-debian/tmp/usr/lib/mono/1.0/makecert.exe
debian/tmp/usr/lib/mono/1.0/mkbundle.exe
-debian/tmp/usr/lib/mono/1.0/mono-api-diff.exe
debian/tmp/usr/lib/mono/1.0/mono-api-info.exe
-debian/tmp/usr/lib/mono/1.0/mono-shlib-cop.exe*
-debian/tmp/usr/lib/mono/1.0/mono-xmltool.exe
-debian/tmp/usr/lib/mono/1.0/monolinker.exe
debian/tmp/usr/lib/mono/1.0/monop.exe
-debian/tmp/usr/lib/mono/1.0/mozroots.exe
-debian/tmp/usr/lib/mono/1.0/permview.exe
debian/tmp/usr/lib/mono/1.0/resgen.exe
-debian/tmp/usr/lib/mono/1.0/secutil.exe
-debian/tmp/usr/lib/mono/1.0/setreg.exe
-debian/tmp/usr/lib/mono/1.0/signcode.exe
-debian/tmp/usr/lib/mono/1.0/sn.exe
-debian/tmp/usr/lib/mono/1.0/soapsuds.exe
-debian/tmp/usr/lib/mono/1.0/sqlsharp.exe
debian/tmp/usr/lib/mono/1.0/wsdl.exe
debian/tmp/usr/lib/mono/1.0/xsd.exe
-debian/mono-api-check /usr/bin/
Modified: mono/trunk/debian/mono-1.0-devel.manpages
===================================================================
--- mono/trunk/debian/mono-1.0-devel.manpages 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/mono-1.0-devel.manpages 2008-11-11 21:51:28 UTC (rev 3751)
@@ -1,28 +1,9 @@
-debian/tmp/usr/share/man/man1/al.1
-debian/man/caspol.1
-debian/tmp/usr/share/man/man1/cert2spc.1
-debian/tmp/usr/share/man/man1/certmgr.1
-debian/tmp/usr/share/man/man1/chktrust.1
-debian/tmp/usr/share/man/man1/cilc.1
-debian/tmp/usr/share/man/man1/disco.1
-debian/tmp/usr/share/man/man1/dtd2xsd.1
-debian/tmp/usr/share/man/man1/genxs.1
-debian/tmp/usr/share/man/man1/ilasm.1
-debian/tmp/usr/share/man/man1/macpack.1
-debian/tmp/usr/share/man/man1/makecert.1
-debian/tmp/usr/share/man/man1/mkbundle.1
-debian/tmp/usr/share/man/man1/mono-shlib-cop.1
-debian/tmp/usr/share/man/man1/mono-xmltool.1
-debian/tmp/usr/share/man/man1/monolinker.1
-debian/tmp/usr/share/man/man1/monop.1
-debian/tmp/usr/share/man/man1/mozroots.1
-debian/tmp/usr/share/man/man1/permview.1
-debian/tmp/usr/share/man/man1/resgen.1
-debian/tmp/usr/share/man/man1/secutil.1
-debian/tmp/usr/share/man/man1/setreg.1
-debian/tmp/usr/share/man/man1/signcode.1
-debian/tmp/usr/share/man/man1/sn.1
-debian/tmp/usr/share/man/man1/soapsuds.1
-debian/tmp/usr/share/man/man1/sqlsharp.1
-debian/tmp/usr/share/man/man1/wsdl.1
-debian/tmp/usr/share/man/man1/xsd.1
+debian/tmp/usr/share/man/man1/al1.1
+debian/tmp/usr/share/man/man1/genxs1.1
+debian/tmp/usr/share/man/man1/ilasm1.1
+debian/tmp/usr/share/man/man1/mcs1.1
+debian/tmp/usr/share/man/man1/mkbundle1.1
+debian/tmp/usr/share/man/man1/monop1.1
+debian/tmp/usr/share/man/man1/resgen1.1
+debian/tmp/usr/share/man/man1/wsdl1.1
+debian/tmp/usr/share/man/man1/xsd1.1
Added: mono/trunk/debian/mono-1.0-gac.install
===================================================================
--- mono/trunk/debian/mono-1.0-gac.install (rev 0)
+++ mono/trunk/debian/mono-1.0-gac.install 2008-11-11 21:51:28 UTC (rev 3751)
@@ -0,0 +1,2 @@
+debian/tmp/usr/bin/gacutil1
+debian/tmp/usr/lib/mono/1.0/gacutil.exe
Added: mono/trunk/debian/mono-1.0-gac.manpages
===================================================================
--- mono/trunk/debian/mono-1.0-gac.manpages (rev 0)
+++ mono/trunk/debian/mono-1.0-gac.manpages 2008-11-11 21:51:28 UTC (rev 3751)
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man1/gacutil1.1
Modified: mono/trunk/debian/mono-2.0-devel.install
===================================================================
--- mono/trunk/debian/mono-2.0-devel.install 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/mono-2.0-devel.install 2008-11-11 21:51:28 UTC (rev 3751)
@@ -1,5 +1,6 @@
debian/tmp/etc/mono/mconfig
debian/tmp/usr/bin/al2
+debian/tmp/usr/bin/genxs2
debian/tmp/usr/bin/httpcfg
debian/tmp/usr/bin/ilasm2
debian/tmp/usr/bin/mconfig
@@ -8,8 +9,10 @@
debian/tmp/usr/bin/monop2
debian/tmp/usr/bin/resgen2
debian/tmp/usr/bin/sgen
-debian/tmp/usr/bin/wsdl2
+debian/tmp/usr/bin/wsdl2
+debian/tmp/usr/bin/xsd2
debian/tmp/usr/lib/mono/2.0/al.exe
+debian/tmp/usr/lib/mono/2.0/genxs.exe
debian/tmp/usr/lib/mono/2.0/httpcfg.exe
debian/tmp/usr/lib/mono/2.0/ilasm.exe
debian/tmp/usr/lib/mono/2.0/mconfig.exe
@@ -19,3 +22,4 @@
debian/tmp/usr/lib/mono/2.0/resgen.exe
debian/tmp/usr/lib/mono/2.0/sgen.exe
debian/tmp/usr/lib/mono/2.0/wsdl.exe
+debian/tmp/usr/lib/mono/2.0/xsd.exe
Modified: mono/trunk/debian/mono-2.0-devel.manpages
===================================================================
--- mono/trunk/debian/mono-2.0-devel.manpages 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/mono-2.0-devel.manpages 2008-11-11 21:51:28 UTC (rev 3751)
@@ -1,9 +1,11 @@
debian/tmp/usr/share/man/man1/al2.1
-debian/tmp/usr/share/man/man1/wsdl2.1
-debian/tmp/usr/share/man/man1/monop2.1
+debian/tmp/usr/share/man/man1/genxs2.1
+debian/tmp/usr/share/man/man1/httpcfg.1
+debian/tmp/usr/share/man/man1/ilasm2.1
debian/tmp/usr/share/man/man1/mconfig.1
debian/tmp/usr/share/man/man1/mkbundle2.1
-debian/tmp/usr/share/man/man1/ilasm2.1
+debian/tmp/usr/share/man/man1/monop2.1
debian/tmp/usr/share/man/man1/resgen2.1
debian/tmp/usr/share/man/man1/sgen.1
-debian/tmp/usr/share/man/man1/httpcfg.1
+debian/tmp/usr/share/man/man1/wsdl2.1
+debian/tmp/usr/share/man/man1/xsd2.1
Added: mono/trunk/debian/mono-2.0-gac.install
===================================================================
--- mono/trunk/debian/mono-2.0-gac.install (rev 0)
+++ mono/trunk/debian/mono-2.0-gac.install 2008-11-11 21:51:28 UTC (rev 3751)
@@ -0,0 +1,2 @@
+debian/tmp/usr/bin/gacutil2
+debian/tmp/usr/lib/mono/2.0/gacutil.exe
Added: mono/trunk/debian/mono-2.0-gac.manpages
===================================================================
--- mono/trunk/debian/mono-2.0-gac.manpages (rev 0)
+++ mono/trunk/debian/mono-2.0-gac.manpages 2008-11-11 21:51:28 UTC (rev 3751)
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man1/gacutil2.1
Added: mono/trunk/debian/mono-devel.install
===================================================================
--- mono/trunk/debian/mono-devel.install (rev 0)
+++ mono/trunk/debian/mono-devel.install 2008-11-11 21:51:28 UTC (rev 3751)
@@ -0,0 +1,61 @@
+debian/tmp/usr/bin/al
+debian/tmp/usr/bin/caspol
+debian/tmp/usr/bin/cert2spc
+debian/tmp/usr/bin/certmgr
+debian/tmp/usr/bin/chktrust
+debian/tmp/usr/bin/cilc
+debian/tmp/usr/bin/disco
+debian/tmp/usr/bin/dtd2xsd
+debian/tmp/usr/bin/dtd2rng
+debian/tmp/usr/bin/genxs
+debian/tmp/usr/bin/gmcs
+debian/tmp/usr/bin/ilasm
+debian/tmp/usr/bin/installvst
+debian/tmp/usr/bin/macpack
+debian/tmp/usr/bin/mcs
+debian/tmp/usr/bin/mkbundle
+debian/tmp/usr/bin/mono-api-diff
+debian/tmp/usr/bin/mono-api-info
+debian/tmp/usr/bin/mono-shlib-cop
+debian/tmp/usr/bin/mono-xmltool
+debian/tmp/usr/bin/monop
+debian/tmp/usr/bin/monolinker
+debian/tmp/usr/bin/mozroots
+debian/tmp/usr/bin/permview
+debian/tmp/usr/bin/resgen
+debian/tmp/usr/bin/secutil
+debian/tmp/usr/bin/setreg
+debian/tmp/usr/bin/signcode
+debian/tmp/usr/bin/sn
+debian/tmp/usr/bin/soapsuds
+debian/tmp/usr/bin/sqlsharp
+debian/tmp/usr/bin/wsdl
+debian/tmp/usr/bin/xsd
+debian/tmp/usr/lib/mono/1.0/CorCompare.exe
+debian/tmp/usr/lib/mono/1.0/browsercaps-updater.exe
+debian/tmp/usr/lib/mono/1.0/caspol.exe
+debian/tmp/usr/lib/mono/1.0/cert2spc.exe
+debian/tmp/usr/lib/mono/1.0/certmgr.exe
+debian/tmp/usr/lib/mono/1.0/chktrust.exe
+debian/tmp/usr/lib/mono/1.0/cilc.exe
+debian/tmp/usr/lib/mono/1.0/culevel.exe
+debian/tmp/usr/lib/mono/1.0/disco.exe
+debian/tmp/usr/lib/mono/1.0/dtd2rng.exe
+debian/tmp/usr/lib/mono/1.0/dtd2xsd.exe
+debian/tmp/usr/lib/mono/1.0/ictool.exe
+debian/tmp/usr/lib/mono/1.0/installvst.exe
+debian/tmp/usr/lib/mono/1.0/macpack.exe
+debian/tmp/usr/lib/mono/1.0/makecert.exe
+debian/tmp/usr/lib/mono/1.0/mono-api-diff.exe
+debian/tmp/usr/lib/mono/1.0/mono-shlib-cop.exe*
+debian/tmp/usr/lib/mono/1.0/mono-xmltool.exe
+debian/tmp/usr/lib/mono/1.0/monolinker.exe
+debian/tmp/usr/lib/mono/1.0/mozroots.exe
+debian/tmp/usr/lib/mono/1.0/permview.exe
+debian/tmp/usr/lib/mono/1.0/secutil.exe
+debian/tmp/usr/lib/mono/1.0/setreg.exe
+debian/tmp/usr/lib/mono/1.0/signcode.exe
+debian/tmp/usr/lib/mono/1.0/sn.exe
+debian/tmp/usr/lib/mono/1.0/soapsuds.exe
+debian/tmp/usr/lib/mono/1.0/sqlsharp.exe
+debian/mono-api-check /usr/bin/
Added: mono/trunk/debian/mono-devel.manpages
===================================================================
--- mono/trunk/debian/mono-devel.manpages (rev 0)
+++ mono/trunk/debian/mono-devel.manpages 2008-11-11 21:51:28 UTC (rev 3751)
@@ -0,0 +1,30 @@
+debian/tmp/usr/share/man/man1/al.1
+debian/man/caspol.1
+debian/tmp/usr/share/man/man1/cert2spc.1
+debian/tmp/usr/share/man/man1/certmgr.1
+debian/tmp/usr/share/man/man1/chktrust.1
+debian/tmp/usr/share/man/man1/cilc.1
+debian/tmp/usr/share/man/man1/disco.1
+debian/tmp/usr/share/man/man1/dtd2xsd.1
+debian/tmp/usr/share/man/man1/genxs.1
+debian/tmp/usr/share/man/man1/gmcs.1
+debian/tmp/usr/share/man/man1/ilasm.1
+debian/tmp/usr/share/man/man1/macpack.1
+debian/tmp/usr/share/man/man1/makecert.1
+debian/tmp/usr/share/man/man1/mcs.1
+debian/tmp/usr/share/man/man1/mkbundle.1
+debian/tmp/usr/share/man/man1/mono-shlib-cop.1
+debian/tmp/usr/share/man/man1/mono-xmltool.1
+debian/tmp/usr/share/man/man1/monolinker.1
+debian/tmp/usr/share/man/man1/monop.1
+debian/tmp/usr/share/man/man1/mozroots.1
+debian/tmp/usr/share/man/man1/permview.1
+debian/tmp/usr/share/man/man1/resgen.1
+debian/tmp/usr/share/man/man1/secutil.1
+debian/tmp/usr/share/man/man1/setreg.1
+debian/tmp/usr/share/man/man1/signcode.1
+debian/tmp/usr/share/man/man1/sn.1
+debian/tmp/usr/share/man/man1/soapsuds.1
+debian/tmp/usr/share/man/man1/sqlsharp.1
+debian/tmp/usr/share/man/man1/wsdl.1
+debian/tmp/usr/share/man/man1/xsd.1
Modified: mono/trunk/debian/mono-gac.install
===================================================================
--- mono/trunk/debian/mono-gac.install 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/mono-gac.install 2008-11-11 21:51:28 UTC (rev 3751)
@@ -1,2 +1 @@
debian/tmp/usr/bin/gacutil
-debian/tmp/usr/lib/mono/1.0/gacutil.exe
Modified: mono/trunk/debian/mono-gmcs.install
===================================================================
--- mono/trunk/debian/mono-gmcs.install 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/mono-gmcs.install 2008-11-11 21:51:28 UTC (rev 3751)
@@ -1,2 +1,2 @@
-debian/tmp/usr/bin/gmcs
+debian/tmp/usr/bin/gmcs2
debian/tmp/usr/lib/mono/2.0/gmcs.exe*
Modified: mono/trunk/debian/mono-gmcs.manpages
===================================================================
--- mono/trunk/debian/mono-gmcs.manpages 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/mono-gmcs.manpages 2008-11-11 21:51:28 UTC (rev 3751)
@@ -1 +1 @@
-debian/tmp/usr/share/man/man1/gmcs.1
+debian/tmp/usr/share/man/man1/gmcs2.1
Modified: mono/trunk/debian/mono-mcs.install
===================================================================
--- mono/trunk/debian/mono-mcs.install 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/mono-mcs.install 2008-11-11 21:51:28 UTC (rev 3751)
@@ -1,2 +1,2 @@
-debian/tmp/usr/bin/mcs
+debian/tmp/usr/bin/mcs1
debian/tmp/usr/lib/mono/1.0/mcs.exe*
Modified: mono/trunk/debian/mono-mcs.manpages
===================================================================
--- mono/trunk/debian/mono-mcs.manpages 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/mono-mcs.manpages 2008-11-11 21:51:28 UTC (rev 3751)
@@ -1 +1 @@
-debian/tmp/usr/share/man/man1/mcs.1
+debian/tmp/usr/share/man/man1/mcs1.1
Modified: mono/trunk/debian/mono-smcs.install
===================================================================
--- mono/trunk/debian/mono-smcs.install 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/mono-smcs.install 2008-11-11 21:51:28 UTC (rev 3751)
@@ -1,2 +1,3 @@
debian/tmp/usr/bin/smcs
debian/tmp/usr/lib/mono/2.1/smcs.exe*
+debian/tmp/usr/lib/pkgconfig/smcs.pc
Modified: mono/trunk/debian/mono.runtime-script
===================================================================
--- mono/trunk/debian/mono.runtime-script 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/mono.runtime-script 2008-11-11 21:51:28 UTC (rev 3751)
@@ -61,7 +61,7 @@
{
my $assembly = $_;
chomp($assembly);
- my $cmd = "/usr/bin/mono /usr/lib/mono/1.0/gacutil.exe /u $assembly > /dev/null";
+ my $cmd = "/usr/bin/gacutil -u $assembly > /dev/null";
my $res = system($cmd);
if ($res > 0) {
print STDERR "W: removing assembly: $assembly failed!\n";
@@ -117,7 +117,7 @@
# absolute paths). There isn't a problem of doing too many
# since we typically run from the root context.
my $cmd = "(cd `dirname $dll` && "
- . "/usr/bin/mono /usr/lib/mono/1.0/gacutil.exe /i `basename $dll`"
+ . "/usr/bin/gacutil -i `basename $dll`"
. " > /dev/null)";
system($cmd) == 0 or die "E: installing Assembly $dll failed\n";
}
Modified: mono/trunk/debian/patches/00list
===================================================================
--- mono/trunk/debian/patches/00list 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/patches/00list 2008-11-11 21:51:28 UTC (rev 3751)
@@ -6,18 +6,5 @@
fix-mono-nunit.pc.in
fix_BigInteger_overflow_CVE-2007-5197
fix_implicit_pointer_conversions
-method-signature-testing
-dont_build_System.Web.Extensions
-pass_CPPFLAGS_nicely_r98803
-fix_bound_checking_r98524_r98527
-fix_softfloat_r105848
-fix_stack_alignment_r105650_r105651
-fix_xen_support_r103474_r103475
-fix_Dictionary_preventing_GC_r102114
-fix_TdsConnectionPool_svn
-fix_sloppy_attribute_encode_CVE-2008-3422
-fix_CRLF_injection_CVE-2008-3906
-fix_IsolatedStorage_regression_r99231_r101171_r101172
-fix_mono-config_man_page_r111681
-fix_Assembly.LoadFrom_deadlock
+build_genxs_2.0
99_autoreconf
Modified: mono/trunk/debian/patches/99_autoreconf.dpatch
===================================================================
--- mono/trunk/debian/patches/99_autoreconf.dpatch 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/patches/99_autoreconf.dpatch 2008-11-11 21:51:28 UTC (rev 3751)
@@ -5,310 +5,19 @@
## DP: No description.
@DPATCH@
-diff -urNad mono-1.9.1+dfsg~/Makefile.in mono-1.9.1+dfsg/Makefile.in
---- mono-1.9.1+dfsg~/Makefile.in 2008-04-23 21:53:57.000000000 +0200
-+++ mono-1.9.1+dfsg/Makefile.in 2008-06-17 23:58:28.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
+diff -urNad mono-2.0~/aclocal.m4 mono-2.0/aclocal.m4
+--- mono-2.0~/aclocal.m4 2008-10-01 23:07:16.000000000 +0200
++++ mono-2.0/aclocal.m4 2008-10-05 15:24:57.000000000 +0200
+@@ -21,7 +21,7 @@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -107,6 +107,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -142,6 +143,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-@@ -393,8 +395,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -419,8 +421,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -430,13 +432,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-@@ -510,6 +511,10 @@
- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
- $(am__remove_distdir)
-
-+dist-lzma: distdir
-+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-+ $(am__remove_distdir)
-+
- dist-tarZ: distdir
- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__remove_distdir)
-@@ -536,6 +541,8 @@
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
- *.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-+ *.tar.lzma*) \
-+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
- *.tar.Z*) \
- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- *.shar.gz*) \
-@@ -688,18 +695,18 @@
- .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am am--refresh check check-am clean clean-generic \
- clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-- dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
-- distclean distclean-generic distclean-hdr distclean-libtool \
-- distclean-tags distcleancheck distdir distuninstallcheck dvi \
-- dvi-am html html-am info info-am install install-am \
-- install-data install-data-am install-dvi install-dvi-am \
-- install-exec install-exec-am install-html install-html-am \
-- install-info install-info-am install-man install-pdf \
-- install-pdf-am install-ps install-ps-am install-strip \
-- installcheck installcheck-am installdirs installdirs-am \
-- maintainer-clean maintainer-clean-generic mostlyclean \
-- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-- tags tags-recursive uninstall uninstall-am
-+ dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \
-+ distcheck distclean distclean-generic distclean-hdr \
-+ distclean-libtool distclean-tags distcleancheck distdir \
-+ distuninstallcheck dvi dvi-am html html-am info info-am \
-+ install install-am install-data install-data-am install-dvi \
-+ install-dvi-am install-exec install-exec-am install-html \
-+ install-html-am install-info install-info-am install-man \
-+ install-pdf install-pdf-am install-ps install-ps-am \
-+ install-strip installcheck installcheck-am installdirs \
-+ installdirs-am maintainer-clean maintainer-clean-generic \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-+ ps ps-am tags tags-recursive uninstall uninstall-am
-
-
- # Distribute the 'mcs' tree too
-diff -urNad mono-1.9.1+dfsg~/aclocal.m4 mono-1.9.1+dfsg/aclocal.m4
---- mono-1.9.1+dfsg~/aclocal.m4 2008-04-23 21:53:57.000000000 +0200
-+++ mono-1.9.1+dfsg/aclocal.m4 2008-06-17 23:58:14.000000000 +0200
-@@ -1,7 +1,7 @@
--# generated automatically by aclocal 1.10 -*- Autoconf -*-
-+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
-
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005, 2006 Free Software Foundation, Inc.
-+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -11,14 +11,17 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
-
--m4_if(m4_PACKAGE_VERSION, [2.61],,
--[m4_fatal([this file was generated for autoconf 2.61.
--You have another version of autoconf. If you want to use that,
--you should regenerate the build system entirely.], [63])])
-+m4_ifndef([AC_AUTOCONF_VERSION],
-+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+m4_if(AC_AUTOCONF_VERSION, [2.61],,
-+[m4_warning([this file was generated for autoconf 2.61.
-+You have another version of autoconf. It may work, but is not guaranteed to.
-+If you have problems, you may need to regenerate the build system entirely.
-+To do so, use the procedure documented by the package, typically `autoreconf'.])])
-
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
--# serial 51 AC_PROG_LIBTOOL
+-# serial 52 AC_PROG_LIBTOOL
+# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -106,7 +109,6 @@
- AC_REQUIRE([AC_OBJEXT])dnl
- AC_REQUIRE([AC_EXEEXT])dnl
- dnl
--
- AC_LIBTOOL_SYS_MAX_CMD_LEN
- AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
- AC_LIBTOOL_OBJDIR
-@@ -208,6 +210,8 @@
- ;;
- esac
-
-+_LT_REQUIRED_DARWIN_CHECKS
-+
- AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
- AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
- enable_win32_dll=yes, enable_win32_dll=no)
-@@ -287,9 +291,80 @@
- echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
--$rm conftest*
-+$rm -r conftest*
- ])# _LT_LINKER_BOILERPLATE
-
-+# _LT_REQUIRED_DARWIN_CHECKS
-+# --------------------------
-+# Check for some things on darwin
-+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
-+ case $host_os in
-+ rhapsody* | darwin*)
-+ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
-+ AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-+
-+ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
-+ [lt_cv_apple_cc_single_mod=no
-+ if test -z "${LT_MULTI_MODULE}"; then
-+ # By default we will add the -single_module flag. You can override
-+ # by either setting the environment variable LT_MULTI_MODULE
-+ # non-empty at configure time, or by adding -multi_module to the
-+ # link flags.
-+ echo "int foo(void){return 1;}" > conftest.c
-+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-+ -dynamiclib ${wl}-single_module conftest.c
-+ if test -f libconftest.dylib; then
-+ lt_cv_apple_cc_single_mod=yes
-+ rm -rf libconftest.dylib*
-+ fi
-+ rm conftest.c
-+ fi])
-+ AC_CACHE_CHECK([for -exported_symbols_list linker flag],
-+ [lt_cv_ld_exported_symbols_list],
-+ [lt_cv_ld_exported_symbols_list=no
-+ save_LDFLAGS=$LDFLAGS
-+ echo "_main" > conftest.sym
-+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-+ [lt_cv_ld_exported_symbols_list=yes],
-+ [lt_cv_ld_exported_symbols_list=no])
-+ LDFLAGS="$save_LDFLAGS"
-+ ])
-+ case $host_os in
-+ rhapsody* | darwin1.[[0123]])
-+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-+ darwin1.*)
-+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+ darwin*)
-+ # if running on 10.5 or later, the deployment target defaults
-+ # to the OS version, if on x86, and 10.4, the deployment
-+ # target defaults to 10.4. Don't you love it?
-+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-+ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+ 10.[[012]]*)
-+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+ 10.*)
-+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+ esac
-+ ;;
-+ esac
-+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-+ _lt_dar_single_mod='$single_module'
-+ fi
-+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-+ else
-+ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
-+ fi
-+ if test "$DSYMUTIL" != ":"; then
-+ _lt_dsymutil="~$DSYMUTIL \$lib || :"
-+ else
-+ _lt_dsymutil=
-+ fi
-+ ;;
-+ esac
-+])
-
- # _LT_AC_SYS_LIBPATH_AIX
- # ----------------------
-@@ -614,7 +689,11 @@
- *64-bit*)
- case $lt_cv_prog_gnu_ld in
- yes*) LD="${LD-ld} -m elf64_sparc" ;;
-- *) LD="${LD-ld} -64" ;;
-+ *)
-+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-+ LD="${LD-ld} -64"
-+ fi
-+ ;;
- esac
- ;;
- esac
-@@ -707,7 +786,7 @@
- $2=yes
- fi
- fi
-- $rm conftest*
-+ $rm -r conftest*
- LDFLAGS="$save_LDFLAGS"
- ])
-
-@@ -978,7 +1057,7 @@
- AC_CHECK_FUNC([shl_load],
- [lt_cv_dlopen="shl_load"],
- [AC_CHECK_LIB([dld], [shl_load],
-- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
-+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
- [AC_CHECK_FUNC([dlopen],
- [lt_cv_dlopen="dlopen"],
- [AC_CHECK_LIB([dl], [dlopen],
-@@ -986,7 +1065,7 @@
- [AC_CHECK_LIB([svld], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
- [AC_CHECK_LIB([dld], [dld_link],
-- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
-+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
- ])
- ])
- ])
-@@ -1303,7 +1382,7 @@
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
-
--aix4* | aix5*)
-+aix[[4-9]]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -1644,6 +1723,18 @@
+@@ -1723,6 +1723,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -327,145 +36,17 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -1824,6 +1915,13 @@
- AC_MSG_RESULT([$dynamic_linker])
- test "$dynamic_linker" = no && can_build_shared=no
-
-+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
-+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
-+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
-+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
-+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-+
- variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
- if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -2323,7 +2421,7 @@
- # whether `pass_all' will *always* work, you probably want this one.
-
- case $host_os in
--aix4* | aix5*)
-+aix[[4-9]]*)
+@@ -2504,7 +2516,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -2418,7 +2516,7 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-netbsd*)
+netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
-@@ -2759,7 +2857,7 @@
- fi
- ;;
-
--aix4* | aix5*)
-+aix[[4-9]]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
- fi
-@@ -2816,6 +2914,7 @@
- _LT_AC_TAGVAR(predeps, $1)=
- _LT_AC_TAGVAR(postdeps, $1)=
- _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
-+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
-
- # Source file extension for C++ test sources.
- ac_ext=cpp
-@@ -2925,7 +3024,7 @@
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-- aix4* | aix5*)
-+ aix[[4-9]]*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
-@@ -2938,7 +3037,7 @@
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
-- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
-+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
- for ld_flag in $LDFLAGS; do
- case $ld_flag in
- *-brtl*)
-@@ -3084,51 +3183,23 @@
- fi
- ;;
- darwin* | rhapsody*)
-- case $host_os in
-- rhapsody* | darwin1.[[012]])
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-- ;;
-- *) # Darwin 1.3 on
-- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-- else
-- case ${MACOSX_DEPLOYMENT_TARGET} in
-- 10.[[012]])
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-- ;;
-- 10.*)
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-- ;;
-- esac
-- fi
-- ;;
-- esac
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--
-- if test "$GXX" = yes ; then
-- lt_int_apple_cc_single_mod=no
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-+ if test "$GXX" = yes ; then
- output_verbose_link_cmd='echo'
-- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-- lt_int_apple_cc_single_mod=yes
-+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-+ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
- fi
-- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-- else
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-- fi
-- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- else
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- fi
-- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- case $cc_basename in
- xlc*)
-@@ -3379,7 +3450,7 @@
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+@@ -3511,7 +3523,7 @@
;;
-- pgCC*)
-+ pgCC* | pgcpp*)
- # Portland Group C++ compiler
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-@@ -3452,7 +3523,7 @@
- ;;
esac
;;
- netbsd*)
@@ -473,112 +54,8 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -3814,7 +3885,8 @@
- # compiler output when linking a shared library.
- # Parse the compiler output and extract the necessary
- # objects, libraries and library flags.
--AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
-+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
- dnl we can't use the lt_simple_compile_test_code here,
- dnl because it contains code intended for an executable,
- dnl not a library. It's possible we should let each
-@@ -3939,6 +4011,11 @@
-
- $rm -f confest.$objext
-
-+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
-+if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
-+ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-+fi
-+
- # PORTME: override above test on systems where it is broken
- ifelse([$1],[CXX],
- [case $host_os in
-@@ -3995,7 +4072,6 @@
- ;;
- esac
- ])
--
- case " $_LT_AC_TAGVAR(postdeps, $1) " in
- *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
- esac
-@@ -4080,7 +4156,7 @@
- postinstall_cmds='$RANLIB $lib'
- fi
- ;;
--aix4* | aix5*)
-+aix[[4-9]]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
- fi
-@@ -4257,6 +4333,7 @@
- _LT_AC_TAGVAR(predeps, $1) \
- _LT_AC_TAGVAR(postdeps, $1) \
- _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
-+ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
- _LT_AC_TAGVAR(archive_cmds, $1) \
- _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
- _LT_AC_TAGVAR(postinstall_cmds, $1) \
-@@ -4319,7 +4396,7 @@
- # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
- # NOTE: Changes made to this file will be lost: look at ltmain.sh.
- #
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
- # Free Software Foundation, Inc.
- #
- # This file is part of GNU Libtool:
-@@ -4556,6 +4633,10 @@
- # shared library.
- postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
-
-+# The directories searched by this compiler when creating a shared
-+# library
-+compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
-+
- # The library search path used internally by the compiler when linking
- # a shared library.
- compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
-@@ -4905,7 +4986,7 @@
- echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
- cat conftest.$ac_ext >&5
- fi
-- rm -f conftest* conftst*
-+ rm -rf conftest* conftst*
-
- # Do not use the global_symbol_pipe unless it works.
- if test "$pipe_works" = yes; then
-@@ -4962,7 +5043,8 @@
- # built for inclusion in a dll (and should export symbols for example).
- # Although the cygwin gcc ignores -fPIC, still need this for old-style
- # (--disable-auto-import) libraries
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-+ m4_if([$1], [GCJ], [],
-+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
- ;;
- darwin* | rhapsody*)
- # PIC is the default on this platform
-@@ -4999,7 +5081,7 @@
- esac
- else
- case $host_os in
-- aix4* | aix5*)
-+ aix[[4-9]]*)
- # All AIX code is PIC.
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
-@@ -5095,7 +5177,7 @@
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+@@ -5203,7 +5215,7 @@
;;
-- pgCC*)
-+ pgCC* | pgcpp*)
- # Portland Group C++ compiler.
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-@@ -5133,7 +5215,7 @@
- ;;
esac
;;
- netbsd*)
@@ -586,54 +63,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -5246,7 +5328,8 @@
- # built for inclusion in a dll (and should export symbols for example).
- # Although the cygwin gcc ignores -fPIC, still need this for old-style
- # (--disable-auto-import) libraries
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-+ m4_if([$1], [GCJ], [],
-+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
- ;;
-
- darwin* | rhapsody*)
-@@ -5316,7 +5399,8 @@
- mingw* | cygwin* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-+ m4_if([$1], [GCJ], [],
-+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
- ;;
-
- hpux9* | hpux10* | hpux11*)
-@@ -5453,7 +5537,7 @@
- #
- if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
- AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
-- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
-+ _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
- [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
- [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
- "" | " "*) ;;
-@@ -5477,7 +5561,7 @@
- #
- wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
- AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
-+ _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
- $lt_tmp_static_flag,
- [],
- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-@@ -5493,7 +5577,7 @@
- ifelse([$1],[CXX],[
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- case $host_os in
-- aix4* | aix5*)
-+ aix[[4-9]]*)
- # If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-@@ -5508,10 +5592,14 @@
+@@ -5580,6 +5592,9 @@
cygwin* | mingw*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
;;
@@ -643,37 +73,7 @@
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
- esac
-+ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
- ],[
- runpath_var=
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -5542,12 +5630,14 @@
- # it will be wrapped by ` (' and `)$', so one must not match beginning or
- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
- # as well as any symbol that contains `d'.
-- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
-+ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
- # platforms (ab)use it in PIC code, but their linkers get confused if
- # the symbol is explicitly referenced. Since portable code cannot
- # rely on this symbol name, it's probably fine to never include it in
- # preloaded symbol tables.
-+ # Exclude shared library initialization/finalization symbols.
-+dnl Note also adjust exclude_expsyms for C++ above.
- extract_expsyms_cmds=
- # Just being paranoid about ensuring that cc_basename is set.
- _LT_CC_BASENAME([$compiler])
-@@ -5597,7 +5687,7 @@
-
- # See if GNU ld supports shared libraries.
- case $host_os in
-- aix3* | aix4* | aix5*)
-+ aix[[3-9]]*)
- # On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -5713,12 +5803,13 @@
+@@ -5788,12 +5803,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
@@ -688,42 +88,8 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -5816,7 +5907,7 @@
- fi
- ;;
-
-- aix4* | aix5*)
-+ aix[[4-9]]*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
-@@ -5836,7 +5927,7 @@
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
-- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
-+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
- for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
- aix_use_runtimelinking=yes
-@@ -5996,11 +6087,10 @@
+@@ -6224,7 +6240,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- if test "$GCC" = yes ; then
- output_verbose_link_cmd='echo'
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
- else
- case $cc_basename in
- xlc*)
-@@ -6150,7 +6240,7 @@
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
- netbsd*)
@@ -731,125 +97,47 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -6729,7 +6819,7 @@
-
- _PKG_TEXT
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
- [$4])
- else
- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-@@ -6739,7 +6829,7 @@
+@@ -6723,14 +6739,16 @@
+ # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+ # ---------------------------------------------
+ m4_define([_PKG_CONFIG],
+-[if test -n "$$1"; then
+- pkg_cv_[]$1="$$1"
+- elif test -n "$PKG_CONFIG"; then
+- PKG_CHECK_EXISTS([$3],
+- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+- [pkg_failed=yes])
+- else
+- pkg_failed=untried
++[if test -n "$PKG_CONFIG"; then
++ if test -n "$$1"; then
++ pkg_cv_[]$1="$$1"
++ else
++ PKG_CHECK_EXISTS([$3],
++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
++ [pkg_failed=yes])
++ fi
++else
++ pkg_failed=untried
fi[]dnl
- ])# PKG_CHECK_MODULES
+ ])# _PKG_CONFIG
--# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
-+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -6754,7 +6844,7 @@
- [am__api_version='1.10'
- dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
- dnl require some minimum version. Point them to the right macro.
--m4_if([$1], [1.10], [],
-+m4_if([$1], [1.10.1], [],
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
- ])
-
-@@ -6770,8 +6860,10 @@
- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.10])dnl
--_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
-+[AM_AUTOMAKE_VERSION([1.10.1])dnl
-+m4_ifndef([AC_AUTOCONF_VERSION],
-+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
-
- # Figure out how to run the assembler. -*- Autoconf -*-
-
-@@ -7088,7 +7180,7 @@
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
-- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
-+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
-@@ -7148,13 +7240,13 @@
- # Do all the work for Automake. -*- Autoconf -*-
-
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005, 2006 Free Software Foundation, Inc.
-+# 2005, 2006, 2008 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-
--# serial 12
-+# serial 13
-
- # This macro actually does too much. Some checks are only needed if
- # your package does certain things. But this isn't really a big deal.
-@@ -7259,16 +7351,17 @@
- # our stamp files there.
- AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
- [# Compute $1's index in $config_headers.
-+_am_arg=$1
- _am_stamp_count=1
- for _am_header in $config_headers :; do
- case $_am_header in
-- $1 | $1:* )
-+ $_am_arg | $_am_arg:* )
- break ;;
- * )
- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
- esac
- done
--echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-
- # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
- #
-@@ -7586,7 +7679,7 @@
-
- # _AM_SUBST_NOTMAKE(VARIABLE)
- # ---------------------------
--# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
-+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
- # This macro is traced by Automake.
- AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-diff -urNad mono-1.9.1+dfsg~/configure mono-1.9.1+dfsg/configure
---- mono-1.9.1+dfsg~/configure 2008-04-23 21:53:57.000000000 +0200
-+++ mono-1.9.1+dfsg/configure 2008-06-17 23:58:24.000000000 +0200
-@@ -884,6 +884,8 @@
- ECHO
- AR
- RANLIB
-+DSYMUTIL
-+NMEDIT
- DLLTOOL
- AS
- OBJDUMP
-@@ -2839,6 +2841,11 @@
- gc_default=boehm
- fi
-
-+# These variables are the CPPFLAGS/CFLAGS passed to libgc's configure
-+# libgc should inherit the original CFLAGS/CPPFLAGS passed to configure, i.e. -O0
-+CPPFLAGS_FOR_LIBGC=$CPPFLAGS
-+CFLAGS_FOR_LIBGC=$CFLAGS
-+
- #
- # These are the flags that need to be stored in the mono.pc file for
- # compiling code that will embed Mono
-@@ -2900,6 +2907,16 @@
+@@ -6774,9 +6792,9 @@
+ if test $pkg_failed = yes; then
+ _PKG_SHORT_ERRORS_SUPPORTED
+ if test $_pkg_short_errors_supported = yes; then
+- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+ else
+- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+diff -urNad mono-2.0~/configure mono-2.0/configure
+--- mono-2.0~/configure 2008-10-01 23:07:24.000000000 +0200
++++ mono-2.0/configure 2008-10-05 15:25:07.000000000 +0200
+@@ -2925,6 +2925,16 @@
libgc_threads=pthreads
with_sigaltstack=no
;;
@@ -866,531 +154,67 @@
# these flags will work for all versions of -STABLE
#
*-*-*freebsd4*)
-@@ -6276,7 +6293,7 @@
- # whether `pass_all' will *always* work, you probably want this one.
-
- case $host_os in
--aix4* | aix5*)
-+aix[4-9]*)
+@@ -6409,7 +6419,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -6371,7 +6388,7 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-netbsd*)
+netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -6491,7 +6508,7 @@
+@@ -6529,7 +6539,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 6494 "configure"' > conftest.$ac_ext
-+ echo '#line 6511 "configure"' > conftest.$ac_ext
+- echo '#line 6532 "configure"' > conftest.$ac_ext
++ echo '#line 6542 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -6663,7 +6680,11 @@
- *64-bit*)
- case $lt_cv_prog_gnu_ld in
- yes*) LD="${LD-ld} -m elf64_sparc" ;;
-- *) LD="${LD-ld} -64" ;;
-+ *)
-+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-+ LD="${LD-ld} -64"
-+ fi
-+ ;;
- esac
- ;;
- esac
-@@ -8145,7 +8166,6 @@
-
-
- # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
--
- # find the maximum length of command line arguments
- { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
- echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
-@@ -8460,7 +8480,7 @@
- echo "$progname: failed program was:" >&5
- cat conftest.$ac_ext >&5
- fi
-- rm -f conftest* conftst*
-+ rm -rf conftest* conftst*
-
- # Do not use the global_symbol_pipe unless it works.
- if test "$pipe_works" = yes; then
-@@ -9020,6 +9040,318 @@
- ;;
- esac
-
-+
-+ case $host_os in
-+ rhapsody* | darwin*)
-+ if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$DSYMUTIL"; then
-+ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-+else
-+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_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+DSYMUTIL=$ac_cv_prog_DSYMUTIL
-+if test -n "$DSYMUTIL"; then
-+ { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
-+echo "${ECHO_T}$DSYMUTIL" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_DSYMUTIL"; then
-+ ac_ct_DSYMUTIL=$DSYMUTIL
-+ # Extract the first word of "dsymutil", so it can be a program name with args.
-+set dummy dsymutil; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$ac_ct_DSYMUTIL"; then
-+ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
-+else
-+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_prog_ac_ct_DSYMUTIL="dsymutil"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
-+if test -n "$ac_ct_DSYMUTIL"; then
-+ { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
-+echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+ if test "x$ac_ct_DSYMUTIL" = x; then
-+ DSYMUTIL=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ DSYMUTIL=$ac_ct_DSYMUTIL
-+ fi
-+else
-+ DSYMUTIL="$ac_cv_prog_DSYMUTIL"
-+fi
-+
-+ if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_NMEDIT+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$NMEDIT"; then
-+ ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-+else
-+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_prog_NMEDIT="${ac_tool_prefix}nmedit"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+NMEDIT=$ac_cv_prog_NMEDIT
-+if test -n "$NMEDIT"; then
-+ { echo "$as_me:$LINENO: result: $NMEDIT" >&5
-+echo "${ECHO_T}$NMEDIT" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_NMEDIT"; then
-+ ac_ct_NMEDIT=$NMEDIT
-+ # Extract the first word of "nmedit", so it can be a program name with args.
-+set dummy nmedit; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$ac_ct_NMEDIT"; then
-+ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-+else
-+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_prog_ac_ct_NMEDIT="nmedit"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
-+if test -n "$ac_ct_NMEDIT"; then
-+ { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
-+echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+ if test "x$ac_ct_NMEDIT" = x; then
-+ NMEDIT=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ NMEDIT=$ac_ct_NMEDIT
-+ fi
-+else
-+ NMEDIT="$ac_cv_prog_NMEDIT"
-+fi
-+
-+
-+ { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
-+echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
-+if test "${lt_cv_apple_cc_single_mod+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_apple_cc_single_mod=no
-+ if test -z "${LT_MULTI_MODULE}"; then
-+ # By default we will add the -single_module flag. You can override
-+ # by either setting the environment variable LT_MULTI_MODULE
-+ # non-empty at configure time, or by adding -multi_module to the
-+ # link flags.
-+ echo "int foo(void){return 1;}" > conftest.c
-+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-+ -dynamiclib ${wl}-single_module conftest.c
-+ if test -f libconftest.dylib; then
-+ lt_cv_apple_cc_single_mod=yes
-+ rm -rf libconftest.dylib*
-+ fi
-+ rm conftest.c
-+ fi
-+fi
-+{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
-+echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
-+ { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
-+echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
-+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_ld_exported_symbols_list=no
-+ save_LDFLAGS=$LDFLAGS
-+ echo "_main" > conftest.sym
-+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ lt_cv_ld_exported_symbols_list=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ lt_cv_ld_exported_symbols_list=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
-+ LDFLAGS="$save_LDFLAGS"
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
-+echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
-+ case $host_os in
-+ rhapsody* | darwin1.[0123])
-+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-+ darwin1.*)
-+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+ darwin*)
-+ # if running on 10.5 or later, the deployment target defaults
-+ # to the OS version, if on x86, and 10.4, the deployment
-+ # target defaults to 10.4. Don't you love it?
-+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-+ 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
-+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+ 10.[012]*)
-+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+ 10.*)
-+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+ esac
-+ ;;
-+ esac
-+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-+ _lt_dar_single_mod='$single_module'
-+ fi
-+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-+ else
-+ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
-+ fi
-+ if test "$DSYMUTIL" != ":"; then
-+ _lt_dsymutil="~$DSYMUTIL \$lib || :"
-+ else
-+ _lt_dsymutil=
-+ fi
-+ ;;
-+ esac
-+
-+
- enable_dlopen=no
- enable_win32_dll=yes
-
-@@ -9085,7 +9417,7 @@
- echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
--$rm conftest*
-+$rm -r conftest*
-
-
-
-@@ -9113,11 +9445,11 @@
+@@ -9466,11 +9476,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9116: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9448: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9469: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9479: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9120: \$? = $ac_status" >&5
-+ echo "$as_me:9452: \$? = $ac_status" >&5
+- echo "$as_me:9473: \$? = $ac_status" >&5
++ echo "$as_me:9483: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -9387,10 +9719,10 @@
-
- { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
- echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
--if test "${lt_prog_compiler_pic_works+set}" = set; then
-+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- lt_prog_compiler_pic_works=no
-+ lt_cv_prog_compiler_pic_works=no
- ac_outfile=conftest.$ac_objext
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
-@@ -9403,27 +9735,27 @@
+@@ -9756,11 +9766,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9406: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9738: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9759: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9769: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9410: \$? = $ac_status" >&5
-+ echo "$as_me:9742: \$? = $ac_status" >&5
+- echo "$as_me:9763: \$? = $ac_status" >&5
++ echo "$as_me:9773: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-- lt_prog_compiler_pic_works=yes
-+ lt_cv_prog_compiler_pic_works=yes
- fi
- fi
- $rm conftest*
-
- fi
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
-
--if test x"$lt_prog_compiler_pic_works" = xyes; then
-+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
- case $lt_prog_compiler_pic in
- "" | " "*) ;;
- *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-@@ -9450,10 +9782,10 @@
- wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
- { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
- echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
--if test "${lt_prog_compiler_static_works+set}" = set; then
-+if test "${lt_cv_prog_compiler_static_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- lt_prog_compiler_static_works=no
-+ lt_cv_prog_compiler_static_works=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
- echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -9466,20 +9798,20 @@
- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if diff conftest.exp conftest.er2 >/dev/null; then
-- lt_prog_compiler_static_works=yes
-+ lt_cv_prog_compiler_static_works=yes
- fi
- else
-- lt_prog_compiler_static_works=yes
-+ lt_cv_prog_compiler_static_works=yes
- fi
- fi
-- $rm conftest*
-+ $rm -r conftest*
- LDFLAGS="$save_LDFLAGS"
-
- fi
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
--echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
-
--if test x"$lt_prog_compiler_static_works" = xyes; then
-+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
- :
- else
- lt_prog_compiler_static=
-@@ -9507,11 +9839,11 @@
+@@ -9860,11 +9870,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9510: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9842: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9863: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9873: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9514: \$? = $ac_status" >&5
-+ echo "$as_me:9846: \$? = $ac_status" >&5
+- echo "$as_me:9867: \$? = $ac_status" >&5
++ echo "$as_me:9877: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -9591,12 +9923,13 @@
- # it will be wrapped by ` (' and `)$', so one must not match beginning or
- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
- # as well as any symbol that contains `d'.
-- exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
-+ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
- # platforms (ab)use it in PIC code, but their linkers get confused if
- # the symbol is explicitly referenced. Since portable code cannot
- # rely on this symbol name, it's probably fine to never include it in
- # preloaded symbol tables.
-+ # Exclude shared library initialization/finalization symbols.
- extract_expsyms_cmds=
- # Just being paranoid about ensuring that cc_basename is set.
- for cc_temp in $compiler""; do
-@@ -9655,7 +9988,7 @@
-
- # See if GNU ld supports shared libraries.
- case $host_os in
-- aix3* | aix4* | aix5*)
-+ aix[3-9]*)
- # On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
- ld_shlibs=no
-@@ -9771,12 +10104,13 @@
+@@ -10125,12 +10135,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
@@ -1405,42 +229,8 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -9874,7 +10208,7 @@
- fi
- ;;
-
-- aix4* | aix5*)
-+ aix[4-9]*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
-@@ -9894,7 +10228,7 @@
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
-- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
- for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
- aix_use_runtimelinking=yes
-@@ -10166,11 +10500,10 @@
+@@ -10673,7 +10684,7 @@
link_all_deplibs=yes
- if test "$GCC" = yes ; then
- output_verbose_link_cmd='echo'
-- archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
- else
- case $cc_basename in
- xlc*)
-@@ -10320,7 +10653,7 @@
- link_all_deplibs=yes
;;
- netbsd*)
@@ -1448,16 +238,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10690,7 +11023,7 @@
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
-
--aix4* | aix5*)
-+aix[4-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -11031,6 +11364,18 @@
+@@ -11384,6 +11395,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -1476,208 +257,26 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -11212,6 +11557,21 @@
- echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
-
-+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
-+fi
-+
-+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
-+fi
-+
-+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-+
- variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
- if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -11531,7 +11891,7 @@
- { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
- echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
- if test $ac_cv_lib_dld_shl_load = yes; then
-- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
- else
- { echo "$as_me:$LINENO: checking for dlopen" >&5
- echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
-@@ -11807,7 +12167,7 @@
- { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
- echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
- if test $ac_cv_lib_dld_dld_link = yes; then
-- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
- fi
-
-
-@@ -11856,7 +12216,7 @@
+@@ -12224,7 +12247,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11859 "configure"
-+#line 12219 "configure"
+-#line 12227 "configure"
++#line 12250 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11956,7 +12316,7 @@
+@@ -12324,7 +12347,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11959 "configure"
-+#line 12319 "configure"
+-#line 12327 "configure"
++#line 12350 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12083,7 +12443,7 @@
- fi
- ;;
-
--aix4* | aix5*)
-+aix[4-9]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
- fi
-@@ -12139,6 +12499,7 @@
- predeps \
- postdeps \
- compiler_lib_search_path \
-+ compiler_lib_search_dirs \
- archive_cmds \
- archive_expsym_cmds \
- postinstall_cmds \
-@@ -12199,7 +12560,7 @@
- # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
- # NOTE: Changes made to this file will be lost: look at ltmain.sh.
- #
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
- # Free Software Foundation, Inc.
- #
- # This file is part of GNU Libtool:
-@@ -12435,6 +12796,10 @@
- # shared library.
- postdeps=$lt_postdeps
-
-+# The directories searched by this compiler when creating a shared
-+# library
-+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
-+
- # The library search path used internally by the compiler when linking
- # a shared library.
- compiler_lib_search_path=$lt_compiler_lib_search_path
-@@ -12683,6 +13048,7 @@
- predeps_CXX=
- postdeps_CXX=
- compiler_lib_search_path_CXX=
-+compiler_lib_search_dirs_CXX=
-
- # Source file extension for C++ test sources.
- ac_ext=cpp
-@@ -12720,7 +13086,7 @@
- echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
--$rm conftest*
-+$rm -r conftest*
-
-
- # Allow CC to be a program name with arguments.
-@@ -12927,7 +13293,7 @@
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
-- aix4* | aix5*)
-+ aix[4-9]*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
-@@ -12940,7 +13306,7 @@
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
-- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
- for ld_flag in $LDFLAGS; do
- case $ld_flag in
- *-brtl*)
-@@ -13198,51 +13564,23 @@
- fi
- ;;
- darwin* | rhapsody*)
-- case $host_os in
-- rhapsody* | darwin1.[012])
-- allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
-- ;;
-- *) # Darwin 1.3 on
-- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-- else
-- case ${MACOSX_DEPLOYMENT_TARGET} in
-- 10.[012])
-- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-- ;;
-- 10.*)
-- allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
-- ;;
-- esac
-- fi
-- ;;
-- esac
- archive_cmds_need_lc_CXX=no
- hardcode_direct_CXX=no
- hardcode_automatic_CXX=yes
- hardcode_shlibpath_var_CXX=unsupported
- whole_archive_flag_spec_CXX=''
- link_all_deplibs_CXX=yes
--
-- if test "$GXX" = yes ; then
-- lt_int_apple_cc_single_mod=no
-+ allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
-+ if test "$GXX" = yes ; then
- output_verbose_link_cmd='echo'
-- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-- lt_int_apple_cc_single_mod=yes
-+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-+ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
- fi
-- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-- archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-- else
-- archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-- fi
-- module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- else
-- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- fi
-- module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- case $cc_basename in
- xlc*)
-@@ -13493,7 +13831,7 @@
- export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
- whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+@@ -13912,7 +13935,7 @@
;;
-- pgCC*)
-+ pgCC* | pgcpp*)
- # Portland Group C++ compiler
- archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-@@ -13566,7 +13904,7 @@
- ;;
esac
;;
- netbsd*)
@@ -1685,54 +284,8 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -13900,7 +14238,6 @@
- GCC_CXX="$GXX"
- LD_CXX="$LD"
-
--
- cat > conftest.$ac_ext <<EOF
- class Foo
- {
-@@ -14002,6 +14339,11 @@
-
- $rm -f confest.$objext
-
-+compiler_lib_search_dirs_CXX=
-+if test -n "$compiler_lib_search_path_CXX"; then
-+ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-+fi
-+
- # PORTME: override above test on systems where it is broken
- case $host_os in
- interix[3-9]*)
-@@ -14057,7 +14399,6 @@
- ;;
- esac
-
--
- case " $postdeps_CXX " in
- *" -lc "*) archive_cmds_need_lc_CXX=no ;;
- esac
-@@ -14133,7 +14474,7 @@
- esac
- else
- case $host_os in
-- aix4* | aix5*)
-+ aix[4-9]*)
- # All AIX code is PIC.
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
-@@ -14229,7 +14570,7 @@
- lt_prog_compiler_pic_CXX='-KPIC'
- lt_prog_compiler_static_CXX='-static'
+@@ -14616,7 +14639,7 @@
;;
-- pgCC*)
-+ pgCC* | pgcpp*)
- # Portland Group C++ compiler.
- lt_prog_compiler_wl_CXX='-Wl,'
- lt_prog_compiler_pic_CXX='-fpic'
-@@ -14267,7 +14608,7 @@
- ;;
esac
;;
- netbsd*)
@@ -1740,117 +293,35 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -14360,10 +14701,10 @@
-
- { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
- echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
--if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
-+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- lt_prog_compiler_pic_works_CXX=no
-+ lt_cv_prog_compiler_pic_works_CXX=no
- ac_outfile=conftest.$ac_objext
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
-@@ -14376,27 +14717,27 @@
+@@ -14725,11 +14748,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:14379: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14720: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14728: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14751: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:14383: \$? = $ac_status" >&5
-+ echo "$as_me:14724: \$? = $ac_status" >&5
+- echo "$as_me:14732: \$? = $ac_status" >&5
++ echo "$as_me:14755: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-- lt_prog_compiler_pic_works_CXX=yes
-+ lt_cv_prog_compiler_pic_works_CXX=yes
- fi
- fi
- $rm conftest*
-
- fi
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }
-
--if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
-+if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
- case $lt_prog_compiler_pic_CXX in
- "" | " "*) ;;
- *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-@@ -14423,10 +14764,10 @@
- wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
- { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
- echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
--if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
-+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- lt_prog_compiler_static_works_CXX=no
-+ lt_cv_prog_compiler_static_works_CXX=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
- echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -14439,20 +14780,20 @@
- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if diff conftest.exp conftest.er2 >/dev/null; then
-- lt_prog_compiler_static_works_CXX=yes
-+ lt_cv_prog_compiler_static_works_CXX=yes
- fi
- else
-- lt_prog_compiler_static_works_CXX=yes
-+ lt_cv_prog_compiler_static_works_CXX=yes
- fi
- fi
-- $rm conftest*
-+ $rm -r conftest*
- LDFLAGS="$save_LDFLAGS"
-
- fi
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
--echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }
-
--if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
-+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
- :
- else
- lt_prog_compiler_static_CXX=
-@@ -14480,11 +14821,11 @@
+@@ -14829,11 +14852,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:14483: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14824: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14832: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14855: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:14487: \$? = $ac_status" >&5
-+ echo "$as_me:14828: \$? = $ac_status" >&5
+- echo "$as_me:14836: \$? = $ac_status" >&5
++ echo "$as_me:14859: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -14537,7 +14878,7 @@
-
- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- case $host_os in
-- aix4* | aix5*)
-+ aix[4-9]*)
- # If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-@@ -14552,10 +14893,14 @@
+@@ -14901,6 +14924,9 @@
cygwin* | mingw*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
;;
@@ -1860,21 +331,7 @@
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
- esac
-+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-
- { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
- echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
-@@ -14657,7 +15002,7 @@
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
-
--aix4* | aix5*)
-+aix[4-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -14997,6 +15342,18 @@
+@@ -15347,6 +15373,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -1893,191 +350,35 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -15178,6 +15535,21 @@
- echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
-
-+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
-+fi
-+
-+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
-+fi
-+
-+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-+
- variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
- if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -15261,6 +15633,7 @@
- predeps_CXX \
- postdeps_CXX \
- compiler_lib_search_path_CXX \
-+ compiler_lib_search_dirs_CXX \
- archive_cmds_CXX \
- archive_expsym_cmds_CXX \
- postinstall_cmds_CXX \
-@@ -15509,6 +15882,10 @@
- # shared library.
- postdeps=$lt_postdeps_CXX
-
-+# The directories searched by this compiler when creating a shared
-+# library
-+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
-+
- # The library search path used internally by the compiler when linking
- # a shared library.
- compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-@@ -15723,7 +16100,7 @@
- echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
--$rm conftest*
-+$rm -r conftest*
-
-
- # Allow CC to be a program name with arguments.
-@@ -15761,7 +16138,7 @@
- postinstall_cmds='$RANLIB $lib'
- fi
- ;;
--aix4* | aix5*)
-+aix[4-9]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
- fi
-@@ -16026,10 +16403,10 @@
-
- { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
- echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
--if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
-+if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- lt_prog_compiler_pic_works_F77=no
-+ lt_cv_prog_compiler_pic_works_F77=no
- ac_outfile=conftest.$ac_objext
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic_F77"
-@@ -16042,27 +16419,27 @@
+@@ -16412,11 +16450,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16045: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16422: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16415: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16453: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16049: \$? = $ac_status" >&5
-+ echo "$as_me:16426: \$? = $ac_status" >&5
+- echo "$as_me:16419: \$? = $ac_status" >&5
++ echo "$as_me:16457: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-- lt_prog_compiler_pic_works_F77=yes
-+ lt_cv_prog_compiler_pic_works_F77=yes
- fi
- fi
- $rm conftest*
-
- fi
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; }
-
--if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
-+if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
- case $lt_prog_compiler_pic_F77 in
- "" | " "*) ;;
- *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
-@@ -16089,10 +16466,10 @@
- wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
- { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
- echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
--if test "${lt_prog_compiler_static_works_F77+set}" = set; then
-+if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- lt_prog_compiler_static_works_F77=no
-+ lt_cv_prog_compiler_static_works_F77=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
- echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -16105,20 +16482,20 @@
- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if diff conftest.exp conftest.er2 >/dev/null; then
-- lt_prog_compiler_static_works_F77=yes
-+ lt_cv_prog_compiler_static_works_F77=yes
- fi
- else
-- lt_prog_compiler_static_works_F77=yes
-+ lt_cv_prog_compiler_static_works_F77=yes
- fi
- fi
-- $rm conftest*
-+ $rm -r conftest*
- LDFLAGS="$save_LDFLAGS"
-
- fi
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
--echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; }
-
--if test x"$lt_prog_compiler_static_works_F77" = xyes; then
-+if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
- :
- else
- lt_prog_compiler_static_F77=
-@@ -16146,11 +16523,11 @@
+@@ -16516,11 +16554,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16149: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16526: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16519: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16557: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16153: \$? = $ac_status" >&5
-+ echo "$as_me:16530: \$? = $ac_status" >&5
+- echo "$as_me:16523: \$? = $ac_status" >&5
++ echo "$as_me:16561: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -16230,12 +16607,13 @@
- # it will be wrapped by ` (' and `)$', so one must not match beginning or
- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
- # as well as any symbol that contains `d'.
-- exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
-+ exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
- # platforms (ab)use it in PIC code, but their linkers get confused if
- # the symbol is explicitly referenced. Since portable code cannot
- # rely on this symbol name, it's probably fine to never include it in
- # preloaded symbol tables.
-+ # Exclude shared library initialization/finalization symbols.
- extract_expsyms_cmds=
- # Just being paranoid about ensuring that cc_basename is set.
- for cc_temp in $compiler""; do
-@@ -16294,7 +16672,7 @@
-
- # See if GNU ld supports shared libraries.
- case $host_os in
-- aix3* | aix4* | aix5*)
-+ aix[3-9]*)
- # On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
- ld_shlibs_F77=no
-@@ -16410,12 +16788,13 @@
+@@ -16781,12 +16819,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
@@ -2092,42 +393,8 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -16513,7 +16892,7 @@
- fi
- ;;
-
-- aix4* | aix5*)
-+ aix[4-9]*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
-@@ -16533,7 +16912,7 @@
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
-- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
- for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
- aix_use_runtimelinking=yes
-@@ -16785,11 +17164,10 @@
+@@ -17309,7 +17348,7 @@
link_all_deplibs_F77=yes
- if test "$GCC" = yes ; then
- output_verbose_link_cmd='echo'
-- archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-- module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+ module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+ archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+ module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
- else
- case $cc_basename in
- xlc*)
-@@ -16939,7 +17317,7 @@
- link_all_deplibs_F77=yes
;;
- netbsd*)
@@ -2135,16 +402,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -17258,7 +17636,7 @@
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
-
--aix4* | aix5*)
-+aix[4-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -17598,6 +17976,18 @@
+@@ -17968,6 +18007,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -2163,214 +421,49 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17779,6 +18169,21 @@
- echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
-
-+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
-+fi
-+
-+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
-+fi
-+
-+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-+
- variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
- if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -17862,6 +18267,7 @@
- predeps_F77 \
- postdeps_F77 \
- compiler_lib_search_path_F77 \
-+ compiler_lib_search_dirs_F77 \
- archive_cmds_F77 \
- archive_expsym_cmds_F77 \
- postinstall_cmds_F77 \
-@@ -18110,6 +18516,10 @@
- # shared library.
- postdeps=$lt_postdeps_F77
-
-+# The directories searched by this compiler when creating a shared
-+# library
-+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77
-+
- # The library search path used internally by the compiler when linking
- # a shared library.
- compiler_lib_search_path=$lt_compiler_lib_search_path_F77
-@@ -18284,7 +18694,7 @@
- echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
--$rm conftest*
-+$rm -r conftest*
-
-
- # Allow CC to be a program name with arguments.
-@@ -18333,11 +18743,11 @@
+@@ -18723,11 +18774,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18336: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18746: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18726: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18777: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18340: \$? = $ac_status" >&5
-+ echo "$as_me:18750: \$? = $ac_status" >&5
+- echo "$as_me:18730: \$? = $ac_status" >&5
++ echo "$as_me:18781: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -18397,7 +18807,7 @@
- # built for inclusion in a dll (and should export symbols for example).
- # Although the cygwin gcc ignores -fPIC, still need this for old-style
- # (--disable-auto-import) libraries
-- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
-+
- ;;
-
- darwin* | rhapsody*)
-@@ -18467,7 +18877,7 @@
- mingw* | cygwin* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
-- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
-+
- ;;
-
- hpux9* | hpux10* | hpux11*)
-@@ -18607,10 +19017,10 @@
-
- { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
- echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
--if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
-+if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- lt_prog_compiler_pic_works_GCJ=no
-+ lt_cv_prog_compiler_pic_works_GCJ=no
- ac_outfile=conftest.$ac_objext
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
-@@ -18623,27 +19033,27 @@
+@@ -19013,11 +19064,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18626: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19036: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:19016: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19067: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18630: \$? = $ac_status" >&5
-+ echo "$as_me:19040: \$? = $ac_status" >&5
+- echo "$as_me:19020: \$? = $ac_status" >&5
++ echo "$as_me:19071: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-- lt_prog_compiler_pic_works_GCJ=yes
-+ lt_cv_prog_compiler_pic_works_GCJ=yes
- fi
- fi
- $rm conftest*
-
- fi
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
-
--if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
-+if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
- case $lt_prog_compiler_pic_GCJ in
- "" | " "*) ;;
- *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
-@@ -18670,10 +19080,10 @@
- wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
- { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
- echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
--if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
-+if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- lt_prog_compiler_static_works_GCJ=no
-+ lt_cv_prog_compiler_static_works_GCJ=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
- echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -18686,20 +19096,20 @@
- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if diff conftest.exp conftest.er2 >/dev/null; then
-- lt_prog_compiler_static_works_GCJ=yes
-+ lt_cv_prog_compiler_static_works_GCJ=yes
- fi
- else
-- lt_prog_compiler_static_works_GCJ=yes
-+ lt_cv_prog_compiler_static_works_GCJ=yes
- fi
- fi
-- $rm conftest*
-+ $rm -r conftest*
- LDFLAGS="$save_LDFLAGS"
-
- fi
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
--echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; }
-
--if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
-+if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
- :
- else
- lt_prog_compiler_static_GCJ=
-@@ -18727,11 +19137,11 @@
+@@ -19117,11 +19168,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18730: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19140: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:19120: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19171: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18734: \$? = $ac_status" >&5
-+ echo "$as_me:19144: \$? = $ac_status" >&5
+- echo "$as_me:19124: \$? = $ac_status" >&5
++ echo "$as_me:19175: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -18811,12 +19221,13 @@
- # it will be wrapped by ` (' and `)$', so one must not match beginning or
- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
- # as well as any symbol that contains `d'.
-- exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
-+ exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
- # platforms (ab)use it in PIC code, but their linkers get confused if
- # the symbol is explicitly referenced. Since portable code cannot
- # rely on this symbol name, it's probably fine to never include it in
- # preloaded symbol tables.
-+ # Exclude shared library initialization/finalization symbols.
- extract_expsyms_cmds=
- # Just being paranoid about ensuring that cc_basename is set.
- for cc_temp in $compiler""; do
-@@ -18875,7 +19286,7 @@
-
- # See if GNU ld supports shared libraries.
- case $host_os in
-- aix3* | aix4* | aix5*)
-+ aix[3-9]*)
- # On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
- ld_shlibs_GCJ=no
-@@ -18991,12 +19402,13 @@
+@@ -19382,12 +19433,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
@@ -2385,42 +478,8 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -19094,7 +19506,7 @@
- fi
- ;;
-
-- aix4* | aix5*)
-+ aix[4-9]*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
-@@ -19114,7 +19526,7 @@
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
-- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
- for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
- aix_use_runtimelinking=yes
-@@ -19386,11 +19798,10 @@
+@@ -19930,7 +19982,7 @@
link_all_deplibs_GCJ=yes
- if test "$GCC" = yes ; then
- output_verbose_link_cmd='echo'
-- archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-- module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+ module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+ archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+ module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
- else
- case $cc_basename in
- xlc*)
-@@ -19540,7 +19951,7 @@
- link_all_deplibs_GCJ=yes
;;
- netbsd*)
@@ -2428,16 +487,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -19859,7 +20270,7 @@
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
-
--aix4* | aix5*)
-+aix[4-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -20199,6 +20610,18 @@
+@@ -20589,6 +20641,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -2456,145 +506,69 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -20380,6 +20803,21 @@
- echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
+@@ -24591,10 +24655,11 @@
+ { echo "$as_me:$LINENO: checking for BASE_DEPENDENCIES" >&5
+ echo $ECHO_N "checking for BASE_DEPENDENCIES... $ECHO_C" >&6; }
-+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
+-if test -n "$BASE_DEPENDENCIES_CFLAGS"; then
+- pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$BASE_DEPENDENCIES_CFLAGS"; then
++ pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED_VERSION\"") >&5
+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION") 2>&5
+ ac_status=$?
+@@ -24604,13 +24669,15 @@
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
+else
-+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
-+fi
-+
-+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
++ pkg_failed=untried
+ fi
+-if test -n "$BASE_DEPENDENCIES_LIBS"; then
+- pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++ if test -n "$BASE_DEPENDENCIES_LIBS"; then
++ pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED_VERSION\"") >&5
+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION") 2>&5
+ ac_status=$?
+@@ -24620,8 +24687,9 @@
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
+else
-+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
-+fi
-+
-+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-+
- variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
- if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -20463,6 +20901,7 @@
- predeps_GCJ \
- postdeps_GCJ \
- compiler_lib_search_path_GCJ \
-+ compiler_lib_search_dirs_GCJ \
- archive_cmds_GCJ \
- archive_expsym_cmds_GCJ \
- postinstall_cmds_GCJ \
-@@ -20711,6 +21150,10 @@
- # shared library.
- postdeps=$lt_postdeps_GCJ
-
-+# The directories searched by this compiler when creating a shared
-+# library
-+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ
-+
- # The library search path used internally by the compiler when linking
- # a shared library.
- compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
-@@ -20884,7 +21327,7 @@
- echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
--$rm conftest*
-+$rm -r conftest*
-
-
- # Allow CC to be a program name with arguments.
-@@ -20944,6 +21387,7 @@
- predeps_RC \
- postdeps_RC \
- compiler_lib_search_path_RC \
-+ compiler_lib_search_dirs_RC \
- archive_cmds_RC \
- archive_expsym_cmds_RC \
- postinstall_cmds_RC \
-@@ -21192,6 +21636,10 @@
- # shared library.
- postdeps=$lt_postdeps_RC
-
-+# The directories searched by this compiler when creating a shared
-+# library
-+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC
-+
- # The library search path used internally by the compiler when linking
- # a shared library.
- compiler_lib_search_path=$lt_compiler_lib_search_path_RC
-@@ -21380,6 +21828,8 @@
-
-
-
-+DOLT
-+
- # Test whenever ld supports -version-script
-
- # Check whether --with-gnu-ld was given.
-@@ -23687,6 +24137,7 @@
- esac
++ pkg_failed=untried
fi
- CFLAGS="$CFLAGS -g $WARN"
-+CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -g"
- # Where's the 'mcs' source tree?
- if test -d $srcdir/mcs; then
-@@ -24044,7 +24495,7 @@
- and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
- echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -24054,7 +24505,7 @@
- and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- else
-@@ -24243,6 +24694,8 @@
-
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
-+ # Pass it to libgc as well
-+ CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -mno-tls-direct-seg-refs"
-
- else
- echo "$as_me: failed program was:" >&5
-@@ -24812,14 +25265,6 @@
- ;;
-
- xincluded)
-- subdirs="$subdirs libgc"
--
--
-- # Pass CPPFLAGS to libgc configure
-- # Maybe we should use a separate variable for this to avoid passing useless and
-- # potentially problematic defines to libgc (like -D_FILE_OFFSET_BITS=64)
-- export CPPFLAGS
--
- found_boehm=yes
- gc_headers=yes
- use_included_gc=yes
-@@ -24920,9 +25365,6 @@
- CPPFLAGS="$CPPFLAGS -DLARGE_CONFIG"
+@@ -24634,9 +24702,9 @@
+ _pkg_short_errors_supported=no
fi
-
--# tell libgc/configure about what we want
--ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args"
--
- if test x$use_included_gc = xyes; then
- INCLUDED_LIBGC_TRUE=
- INCLUDED_LIBGC_FALSE='#'
-@@ -37464,6 +37906,11 @@
+ if test $_pkg_short_errors_supported = yes; then
+- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION" 2>&1`
++ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION"`
+ else
+- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION" 2>&1`
++ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$BASE_DEPENDENCIES_PKG_ERRORS" >&5
+@@ -38526,6 +38594,11 @@
LIBC="libc.so.12"
INTL="libintl.so.0"
;;
@@ -2606,644 +580,19 @@
*-*-*freebsd*)
LIBC="libc.so"
INTL="libintl.so"
-@@ -38057,6 +38504,21 @@
- CPPFLAGS="$CPPFLAGS -DNO_UNALIGNED_ACCESS"
- fi
+diff -urNad mono-2.0~/libgc/aclocal.m4 mono-2.0/libgc/aclocal.m4
+--- mono-2.0~/libgc/aclocal.m4 2008-10-01 23:07:27.000000000 +0200
++++ mono-2.0/libgc/aclocal.m4 2008-10-05 15:25:03.000000000 +0200
+@@ -21,7 +21,7 @@
-+case "x$gc" in
-+ xincluded)
-+ # Pass CPPFLAGS to libgc configure
-+ # We should use a separate variable for this to avoid passing useless and
-+ # potentially problematic defines to libgc (like -D_FILE_OFFSET_BITS=64)
-+ # This should be executed late so we pick up the final version of CPPFLAGS
-+ # The problem with this approach, is that during a reconfigure, the main
-+ # configure scripts gets invoked with these arguments, so we use separate
-+ # variables understood by libgc's configure to pass CPPFLAGS and CFLAGS.
-+ ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args \"CPPFLAGS_FOR_LIBGC=$CPPFLAGS\" \"CFLAGS_FOR_LIBGC=$CFLAGS_FOR_LIBGC\""
-+ subdirs="$subdirs libgc"
-+
-+ ;;
-+esac
-+
- PREVIEW=yes
-
- # Check whether --with-preview was given.
-@@ -39451,6 +39913,8 @@
- ECHO!$ECHO$ac_delim
- AR!$AR$ac_delim
- RANLIB!$RANLIB$ac_delim
-+DSYMUTIL!$DSYMUTIL$ac_delim
-+NMEDIT!$NMEDIT$ac_delim
- DLLTOOL!$DLLTOOL$ac_delim
- AS!$AS$ac_delim
- OBJDUMP!$OBJDUMP$ac_delim
-@@ -39526,8 +39990,6 @@
- SPARC64_FALSE!$SPARC64_FALSE$ac_delim
- X86_TRUE!$X86_TRUE$ac_delim
- X86_FALSE!$X86_FALSE$ac_delim
--AMD64_TRUE!$AMD64_TRUE$ac_delim
--AMD64_FALSE!$AMD64_FALSE$ac_delim
- _ACEOF
-
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -39569,6 +40031,8 @@
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
- cat >conf$$subs.sed <<_ACEOF
-+AMD64_TRUE!$AMD64_TRUE$ac_delim
-+AMD64_FALSE!$AMD64_FALSE$ac_delim
- ALPHA_TRUE!$ALPHA_TRUE$ac_delim
- ALPHA_FALSE!$ALPHA_FALSE$ac_delim
- IA64_TRUE!$IA64_TRUE$ac_delim
-@@ -39604,7 +40068,7 @@
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
-
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 33; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 35; then
- break
- elif $ac_last_try; then
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -40005,21 +40469,22 @@
- fi
- rm -f "$tmp/out12"
- # Compute $ac_file's index in $config_headers.
-+_am_arg=$ac_file
- _am_stamp_count=1
- for _am_header in $config_headers :; do
- case $_am_header in
-- $ac_file | $ac_file:* )
-+ $_am_arg | $_am_arg:* )
- break ;;
- * )
- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
- esac
- done
--echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
--$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X$ac_file : 'X\(//\)[^/]' \| \
-- X$ac_file : 'X\(//\)$' \| \
-- X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
--echo X$ac_file |
-+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$_am_arg" : 'X\(//\)[^/]' \| \
-+ X"$_am_arg" : 'X\(//\)$' \| \
-+ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-+echo X"$_am_arg" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
-@@ -40056,7 +40521,7 @@
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
-- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
-+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`$as_dirname -- "$mf" ||
- $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$mf" : 'X\(//\)[^/]' \| \
-diff -urNad mono-1.9.1+dfsg~/data/Makefile.in mono-1.9.1+dfsg/data/Makefile.in
---- mono-1.9.1+dfsg~/data/Makefile.in 2008-04-23 21:53:57.000000000 +0200
-+++ mono-1.9.1+dfsg/data/Makefile.in 2008-06-17 23:58:25.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -105,6 +105,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -140,6 +141,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-@@ -409,8 +411,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -435,8 +437,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -446,13 +448,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-1.9.1+dfsg~/data/net_1_1/Makefile.in mono-1.9.1+dfsg/data/net_1_1/Makefile.in
---- mono-1.9.1+dfsg~/data/net_1_1/Makefile.in 2008-04-23 21:53:57.000000000 +0200
-+++ mono-1.9.1+dfsg/data/net_1_1/Makefile.in 2008-06-17 23:58:25.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -88,6 +88,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -123,6 +124,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9.1+dfsg~/data/net_2_0/Makefile.in mono-1.9.1+dfsg/data/net_2_0/Makefile.in
---- mono-1.9.1+dfsg~/data/net_2_0/Makefile.in 2008-04-23 21:53:57.000000000 +0200
-+++ mono-1.9.1+dfsg/data/net_2_0/Makefile.in 2008-06-17 23:58:25.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -88,6 +88,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -123,6 +124,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9.1+dfsg~/docs/Makefile.in mono-1.9.1+dfsg/docs/Makefile.in
---- mono-1.9.1+dfsg~/docs/Makefile.in 2008-04-23 21:53:57.000000000 +0200
-+++ mono-1.9.1+dfsg/docs/Makefile.in 2008-06-17 23:58:25.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,6 +78,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -113,6 +114,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9.1+dfsg~/ikvm-native/Makefile.in mono-1.9.1+dfsg/ikvm-native/Makefile.in
---- mono-1.9.1+dfsg~/ikvm-native/Makefile.in 2008-04-23 21:53:57.000000000 +0200
-+++ mono-1.9.1+dfsg/ikvm-native/Makefile.in 2008-06-17 23:58:25.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -58,7 +58,7 @@
- libikvm_native_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(libikvm_native_la_LDFLAGS) $(LDFLAGS) -o $@
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -109,6 +109,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -144,6 +145,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-@@ -282,8 +284,8 @@
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
- f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
- done
-
-@@ -291,8 +293,8 @@
- @$(NORMAL_UNINSTALL)
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-
- clean-libLTLIBRARIES:
-@@ -347,8 +349,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -360,8 +362,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -371,13 +373,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-1.9.1+dfsg~/libgc/Makefile.in mono-1.9.1+dfsg/libgc/Makefile.in
---- mono-1.9.1+dfsg~/libgc/Makefile.in 2008-04-23 21:53:57.000000000 +0200
-+++ mono-1.9.1+dfsg/libgc/Makefile.in 2008-06-17 23:58:23.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -170,6 +170,7 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -198,6 +199,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MY_CFLAGS = @MY_CFLAGS@
-+NMEDIT = @NMEDIT@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -619,8 +621,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -645,8 +647,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -656,13 +658,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-@@ -733,6 +734,10 @@
- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
- $(am__remove_distdir)
-
-+dist-lzma: distdir
-+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-+ $(am__remove_distdir)
-+
- dist-tarZ: distdir
- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__remove_distdir)
-@@ -759,6 +764,8 @@
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
- *.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-+ *.tar.lzma*) \
-+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
- *.tar.Z*) \
- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- *.shar.gz*) \
-@@ -914,8 +921,8 @@
- .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am am--refresh check check-am clean clean-generic \
- clean-libtool clean-noinstLTLIBRARIES ctags ctags-recursive \
-- dist dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ \
-- dist-zip distcheck distclean distclean-compile \
-+ dist dist-all dist-bzip2 dist-gzip dist-lzma dist-shar \
-+ dist-tarZ dist-zip distcheck distclean distclean-compile \
- distclean-generic distclean-libtool distclean-tags \
- distcleancheck distdir distuninstallcheck dvi dvi-am html \
- html-am info info-am install install-am install-data \
-diff -urNad mono-1.9.1+dfsg~/libgc/aclocal.m4 mono-1.9.1+dfsg/libgc/aclocal.m4
---- mono-1.9.1+dfsg~/libgc/aclocal.m4 2008-04-23 21:53:57.000000000 +0200
-+++ mono-1.9.1+dfsg/libgc/aclocal.m4 2008-06-17 23:58:21.000000000 +0200
-@@ -1,7 +1,7 @@
--# generated automatically by aclocal 1.10 -*- Autoconf -*-
-+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
-
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005, 2006 Free Software Foundation, Inc.
-+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -11,14 +11,17 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
-
--m4_if(m4_PACKAGE_VERSION, [2.61],,
--[m4_fatal([this file was generated for autoconf 2.61.
--You have another version of autoconf. If you want to use that,
--you should regenerate the build system entirely.], [63])])
-+m4_ifndef([AC_AUTOCONF_VERSION],
-+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+m4_if(AC_AUTOCONF_VERSION, [2.61],,
-+[m4_warning([this file was generated for autoconf 2.61.
-+You have another version of autoconf. It may work, but is not guaranteed to.
-+If you have problems, you may need to regenerate the build system entirely.
-+To do so, use the procedure documented by the package, typically `autoreconf'.])])
-
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
--# serial 51 AC_PROG_LIBTOOL
+-# serial 52 AC_PROG_LIBTOOL
+# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -106,7 +109,6 @@
- AC_REQUIRE([AC_OBJEXT])dnl
- AC_REQUIRE([AC_EXEEXT])dnl
- dnl
--
- AC_LIBTOOL_SYS_MAX_CMD_LEN
- AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
- AC_LIBTOOL_OBJDIR
-@@ -208,6 +210,8 @@
- ;;
- esac
-
-+_LT_REQUIRED_DARWIN_CHECKS
-+
- AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
- AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
- enable_win32_dll=yes, enable_win32_dll=no)
-@@ -287,9 +291,80 @@
- echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
--$rm conftest*
-+$rm -r conftest*
- ])# _LT_LINKER_BOILERPLATE
-
-+# _LT_REQUIRED_DARWIN_CHECKS
-+# --------------------------
-+# Check for some things on darwin
-+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
-+ case $host_os in
-+ rhapsody* | darwin*)
-+ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
-+ AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-+
-+ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
-+ [lt_cv_apple_cc_single_mod=no
-+ if test -z "${LT_MULTI_MODULE}"; then
-+ # By default we will add the -single_module flag. You can override
-+ # by either setting the environment variable LT_MULTI_MODULE
-+ # non-empty at configure time, or by adding -multi_module to the
-+ # link flags.
-+ echo "int foo(void){return 1;}" > conftest.c
-+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-+ -dynamiclib ${wl}-single_module conftest.c
-+ if test -f libconftest.dylib; then
-+ lt_cv_apple_cc_single_mod=yes
-+ rm -rf libconftest.dylib*
-+ fi
-+ rm conftest.c
-+ fi])
-+ AC_CACHE_CHECK([for -exported_symbols_list linker flag],
-+ [lt_cv_ld_exported_symbols_list],
-+ [lt_cv_ld_exported_symbols_list=no
-+ save_LDFLAGS=$LDFLAGS
-+ echo "_main" > conftest.sym
-+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-+ [lt_cv_ld_exported_symbols_list=yes],
-+ [lt_cv_ld_exported_symbols_list=no])
-+ LDFLAGS="$save_LDFLAGS"
-+ ])
-+ case $host_os in
-+ rhapsody* | darwin1.[[0123]])
-+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-+ darwin1.*)
-+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+ darwin*)
-+ # if running on 10.5 or later, the deployment target defaults
-+ # to the OS version, if on x86, and 10.4, the deployment
-+ # target defaults to 10.4. Don't you love it?
-+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-+ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+ 10.[[012]]*)
-+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+ 10.*)
-+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+ esac
-+ ;;
-+ esac
-+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-+ _lt_dar_single_mod='$single_module'
-+ fi
-+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-+ else
-+ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
-+ fi
-+ if test "$DSYMUTIL" != ":"; then
-+ _lt_dsymutil="~$DSYMUTIL \$lib || :"
-+ else
-+ _lt_dsymutil=
-+ fi
-+ ;;
-+ esac
-+])
-
- # _LT_AC_SYS_LIBPATH_AIX
- # ----------------------
-@@ -614,7 +689,11 @@
- *64-bit*)
- case $lt_cv_prog_gnu_ld in
- yes*) LD="${LD-ld} -m elf64_sparc" ;;
-- *) LD="${LD-ld} -64" ;;
-+ *)
-+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-+ LD="${LD-ld} -64"
-+ fi
-+ ;;
- esac
- ;;
- esac
-@@ -707,7 +786,7 @@
- $2=yes
- fi
- fi
-- $rm conftest*
-+ $rm -r conftest*
- LDFLAGS="$save_LDFLAGS"
- ])
-
-@@ -978,7 +1057,7 @@
- AC_CHECK_FUNC([shl_load],
- [lt_cv_dlopen="shl_load"],
- [AC_CHECK_LIB([dld], [shl_load],
-- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
-+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
- [AC_CHECK_FUNC([dlopen],
- [lt_cv_dlopen="dlopen"],
- [AC_CHECK_LIB([dl], [dlopen],
-@@ -986,7 +1065,7 @@
- [AC_CHECK_LIB([svld], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
- [AC_CHECK_LIB([dld], [dld_link],
-- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
-+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
- ])
- ])
- ])
-@@ -1303,7 +1382,7 @@
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
-
--aix4* | aix5*)
-+aix[[4-9]]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -1644,6 +1723,18 @@
+@@ -1723,6 +1723,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -3262,145 +611,17 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -1824,6 +1915,13 @@
- AC_MSG_RESULT([$dynamic_linker])
- test "$dynamic_linker" = no && can_build_shared=no
-
-+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
-+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
-+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
-+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
-+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-+
- variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
- if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -2323,7 +2421,7 @@
- # whether `pass_all' will *always* work, you probably want this one.
-
- case $host_os in
--aix4* | aix5*)
-+aix[[4-9]]*)
+@@ -2504,7 +2516,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -2418,7 +2516,7 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-netbsd*)
+netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
-@@ -2759,7 +2857,7 @@
- fi
- ;;
-
--aix4* | aix5*)
-+aix[[4-9]]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
- fi
-@@ -2816,6 +2914,7 @@
- _LT_AC_TAGVAR(predeps, $1)=
- _LT_AC_TAGVAR(postdeps, $1)=
- _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
-+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
-
- # Source file extension for C++ test sources.
- ac_ext=cpp
-@@ -2925,7 +3024,7 @@
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-- aix4* | aix5*)
-+ aix[[4-9]]*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
-@@ -2938,7 +3037,7 @@
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
-- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
-+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
- for ld_flag in $LDFLAGS; do
- case $ld_flag in
- *-brtl*)
-@@ -3084,51 +3183,23 @@
- fi
- ;;
- darwin* | rhapsody*)
-- case $host_os in
-- rhapsody* | darwin1.[[012]])
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-- ;;
-- *) # Darwin 1.3 on
-- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-- else
-- case ${MACOSX_DEPLOYMENT_TARGET} in
-- 10.[[012]])
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-- ;;
-- 10.*)
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-- ;;
-- esac
-- fi
-- ;;
-- esac
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--
-- if test "$GXX" = yes ; then
-- lt_int_apple_cc_single_mod=no
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-+ if test "$GXX" = yes ; then
- output_verbose_link_cmd='echo'
-- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-- lt_int_apple_cc_single_mod=yes
-+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-+ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
- fi
-- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-- else
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-- fi
-- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- else
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- fi
-- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- case $cc_basename in
- xlc*)
-@@ -3379,7 +3450,7 @@
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+@@ -3511,7 +3523,7 @@
;;
-- pgCC*)
-+ pgCC* | pgcpp*)
- # Portland Group C++ compiler
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-@@ -3452,7 +3523,7 @@
- ;;
esac
;;
- netbsd*)
@@ -3408,112 +629,8 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -3814,7 +3885,8 @@
- # compiler output when linking a shared library.
- # Parse the compiler output and extract the necessary
- # objects, libraries and library flags.
--AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
-+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
- dnl we can't use the lt_simple_compile_test_code here,
- dnl because it contains code intended for an executable,
- dnl not a library. It's possible we should let each
-@@ -3939,6 +4011,11 @@
-
- $rm -f confest.$objext
-
-+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
-+if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
-+ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-+fi
-+
- # PORTME: override above test on systems where it is broken
- ifelse([$1],[CXX],
- [case $host_os in
-@@ -3995,7 +4072,6 @@
- ;;
- esac
- ])
--
- case " $_LT_AC_TAGVAR(postdeps, $1) " in
- *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
- esac
-@@ -4080,7 +4156,7 @@
- postinstall_cmds='$RANLIB $lib'
- fi
- ;;
--aix4* | aix5*)
-+aix[[4-9]]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
- fi
-@@ -4257,6 +4333,7 @@
- _LT_AC_TAGVAR(predeps, $1) \
- _LT_AC_TAGVAR(postdeps, $1) \
- _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
-+ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
- _LT_AC_TAGVAR(archive_cmds, $1) \
- _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
- _LT_AC_TAGVAR(postinstall_cmds, $1) \
-@@ -4319,7 +4396,7 @@
- # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
- # NOTE: Changes made to this file will be lost: look at ltmain.sh.
- #
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
- # Free Software Foundation, Inc.
- #
- # This file is part of GNU Libtool:
-@@ -4556,6 +4633,10 @@
- # shared library.
- postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
-
-+# The directories searched by this compiler when creating a shared
-+# library
-+compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
-+
- # The library search path used internally by the compiler when linking
- # a shared library.
- compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
-@@ -4905,7 +4986,7 @@
- echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
- cat conftest.$ac_ext >&5
- fi
-- rm -f conftest* conftst*
-+ rm -rf conftest* conftst*
-
- # Do not use the global_symbol_pipe unless it works.
- if test "$pipe_works" = yes; then
-@@ -4962,7 +5043,8 @@
- # built for inclusion in a dll (and should export symbols for example).
- # Although the cygwin gcc ignores -fPIC, still need this for old-style
- # (--disable-auto-import) libraries
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-+ m4_if([$1], [GCJ], [],
-+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
- ;;
- darwin* | rhapsody*)
- # PIC is the default on this platform
-@@ -4999,7 +5081,7 @@
- esac
- else
- case $host_os in
-- aix4* | aix5*)
-+ aix[[4-9]]*)
- # All AIX code is PIC.
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
-@@ -5095,7 +5177,7 @@
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+@@ -5203,7 +5215,7 @@
;;
-- pgCC*)
-+ pgCC* | pgcpp*)
- # Portland Group C++ compiler.
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-@@ -5133,7 +5215,7 @@
- ;;
esac
;;
- netbsd*)
@@ -3521,54 +638,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -5246,7 +5328,8 @@
- # built for inclusion in a dll (and should export symbols for example).
- # Although the cygwin gcc ignores -fPIC, still need this for old-style
- # (--disable-auto-import) libraries
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-+ m4_if([$1], [GCJ], [],
-+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
- ;;
-
- darwin* | rhapsody*)
-@@ -5316,7 +5399,8 @@
- mingw* | cygwin* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-+ m4_if([$1], [GCJ], [],
-+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
- ;;
-
- hpux9* | hpux10* | hpux11*)
-@@ -5453,7 +5537,7 @@
- #
- if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
- AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
-- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
-+ _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
- [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
- [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
- "" | " "*) ;;
-@@ -5477,7 +5561,7 @@
- #
- wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
- AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
-+ _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
- $lt_tmp_static_flag,
- [],
- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-@@ -5493,7 +5577,7 @@
- ifelse([$1],[CXX],[
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- case $host_os in
-- aix4* | aix5*)
-+ aix[[4-9]]*)
- # If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-@@ -5508,10 +5592,14 @@
+@@ -5580,6 +5592,9 @@
cygwin* | mingw*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
;;
@@ -3578,37 +648,7 @@
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
- esac
-+ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
- ],[
- runpath_var=
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -5542,12 +5630,14 @@
- # it will be wrapped by ` (' and `)$', so one must not match beginning or
- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
- # as well as any symbol that contains `d'.
-- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
-+ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
- # platforms (ab)use it in PIC code, but their linkers get confused if
- # the symbol is explicitly referenced. Since portable code cannot
- # rely on this symbol name, it's probably fine to never include it in
- # preloaded symbol tables.
-+ # Exclude shared library initialization/finalization symbols.
-+dnl Note also adjust exclude_expsyms for C++ above.
- extract_expsyms_cmds=
- # Just being paranoid about ensuring that cc_basename is set.
- _LT_CC_BASENAME([$compiler])
-@@ -5597,7 +5687,7 @@
-
- # See if GNU ld supports shared libraries.
- case $host_os in
-- aix3* | aix4* | aix5*)
-+ aix[[3-9]]*)
- # On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -5713,12 +5803,13 @@
+@@ -5788,12 +5803,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
@@ -3623,42 +663,8 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -5816,7 +5907,7 @@
- fi
- ;;
-
-- aix4* | aix5*)
-+ aix[[4-9]]*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
-@@ -5836,7 +5927,7 @@
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
-- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
-+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
- for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
- aix_use_runtimelinking=yes
-@@ -5996,11 +6087,10 @@
+@@ -6224,7 +6240,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- if test "$GCC" = yes ; then
- output_verbose_link_cmd='echo'
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
- else
- case $cc_basename in
- xlc*)
-@@ -6150,7 +6240,7 @@
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
- netbsd*)
@@ -3666,121 +672,11 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -6581,7 +6671,7 @@
- AC_MSG_RESULT([$SED])
- ])
+diff -urNad mono-2.0~/libgc/configure mono-2.0/libgc/configure
+--- mono-2.0~/libgc/configure 2008-10-01 23:07:29.000000000 +0200
++++ mono-2.0/libgc/configure 2008-10-05 15:25:05.000000000 +0200
+@@ -4637,6 +4637,32 @@
--# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
-+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -6596,7 +6686,7 @@
- [am__api_version='1.10'
- dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
- dnl require some minimum version. Point them to the right macro.
--m4_if([$1], [1.10], [],
-+m4_if([$1], [1.10.1], [],
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
- ])
-
-@@ -6612,8 +6702,10 @@
- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.10])dnl
--_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
-+[AM_AUTOMAKE_VERSION([1.10.1])dnl
-+m4_ifndef([AC_AUTOCONF_VERSION],
-+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
-
- # Figure out how to run the assembler. -*- Autoconf -*-
-
-@@ -6907,7 +6999,7 @@
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
-- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
-+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
-@@ -6955,13 +7047,13 @@
- # Do all the work for Automake. -*- Autoconf -*-
-
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005, 2006 Free Software Foundation, Inc.
-+# 2005, 2006, 2008 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-
--# serial 12
-+# serial 13
-
- # This macro actually does too much. Some checks are only needed if
- # your package does certain things. But this isn't really a big deal.
-@@ -7066,16 +7158,17 @@
- # our stamp files there.
- AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
- [# Compute $1's index in $config_headers.
-+_am_arg=$1
- _am_stamp_count=1
- for _am_header in $config_headers :; do
- case $_am_header in
-- $1 | $1:* )
-+ $_am_arg | $_am_arg:* )
- break ;;
- * )
- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
- esac
- done
--echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-
- # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
- #
-@@ -7376,7 +7469,7 @@
-
- # _AM_SUBST_NOTMAKE(VARIABLE)
- # ---------------------------
--# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
-+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
- # This macro is traced by Automake.
- AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-diff -urNad mono-1.9.1+dfsg~/libgc/configure mono-1.9.1+dfsg/libgc/configure
---- mono-1.9.1+dfsg~/libgc/configure 2008-04-23 21:53:57.000000000 +0200
-+++ mono-1.9.1+dfsg/libgc/configure 2008-06-17 23:58:22.000000000 +0200
-@@ -890,6 +890,8 @@
- EGREP
- LN_S
- ECHO
-+DSYMUTIL
-+NMEDIT
- CPP
- CXXCPP
- F77
-@@ -4515,6 +4517,15 @@
-
- . ${srcdir}/configure.host
-
-+# We use a separate variable to pass down CPPFLAGS and CFLAGS from the main mono
-+# configure, because of autoconf brokeness
-+if test "x$CPPFLAGS_FOR_LIBGC" != "x"; then
-+ CPPFLAGS=$CPPFLAGS_FOR_LIBGC
-+fi
-+if test "x$CFLAGS_FOR_LIBGC" != "x"; then
-+ CFLAGS=$CFLAGS_FOR_LIBGC
-+fi
-+
- GC_CFLAGS=${gc_cflags}
-
-
-@@ -4626,6 +4637,32 @@
-
THREADDLLIBS="-lpthread -lrt"
;;
+ *-*-kfreebsd*-gnu)
@@ -3812,531 +708,67 @@
*-*-freebsd4*)
{ echo "$as_me:$LINENO: WARNING: \"FreeBSD does not yet fully support threads with Boehm GC.\"" >&5
echo "$as_me: WARNING: \"FreeBSD does not yet fully support threads with Boehm GC.\"" >&2;}
-@@ -5622,7 +5659,7 @@
- # whether `pass_all' will *always* work, you probably want this one.
-
- case $host_os in
--aix4* | aix5*)
-+aix[4-9]*)
+@@ -5728,7 +5754,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -5717,7 +5754,7 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-netbsd*)
+netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -5837,7 +5874,7 @@
+@@ -5848,7 +5874,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 5840 "configure"' > conftest.$ac_ext
+- echo '#line 5851 "configure"' > conftest.$ac_ext
+ echo '#line 5877 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -6009,7 +6046,11 @@
- *64-bit*)
- case $lt_cv_prog_gnu_ld in
- yes*) LD="${LD-ld} -m elf64_sparc" ;;
-- *) LD="${LD-ld} -64" ;;
-+ *)
-+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-+ LD="${LD-ld} -64"
-+ fi
-+ ;;
- esac
- ;;
- esac
-@@ -7139,7 +7180,6 @@
-
-
- # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
--
- # find the maximum length of command line arguments
- { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
- echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
-@@ -7454,7 +7494,7 @@
- echo "$progname: failed program was:" >&5
- cat conftest.$ac_ext >&5
- fi
-- rm -f conftest* conftst*
-+ rm -rf conftest* conftst*
-
- # Do not use the global_symbol_pipe unless it works.
- if test "$pipe_works" = yes; then
-@@ -8014,6 +8054,318 @@
- ;;
- esac
-
-+
-+ case $host_os in
-+ rhapsody* | darwin*)
-+ if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$DSYMUTIL"; then
-+ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-+else
-+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_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+DSYMUTIL=$ac_cv_prog_DSYMUTIL
-+if test -n "$DSYMUTIL"; then
-+ { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
-+echo "${ECHO_T}$DSYMUTIL" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_DSYMUTIL"; then
-+ ac_ct_DSYMUTIL=$DSYMUTIL
-+ # Extract the first word of "dsymutil", so it can be a program name with args.
-+set dummy dsymutil; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$ac_ct_DSYMUTIL"; then
-+ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
-+else
-+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_prog_ac_ct_DSYMUTIL="dsymutil"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
-+if test -n "$ac_ct_DSYMUTIL"; then
-+ { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
-+echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+ if test "x$ac_ct_DSYMUTIL" = x; then
-+ DSYMUTIL=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ DSYMUTIL=$ac_ct_DSYMUTIL
-+ fi
-+else
-+ DSYMUTIL="$ac_cv_prog_DSYMUTIL"
-+fi
-+
-+ if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_NMEDIT+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$NMEDIT"; then
-+ ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-+else
-+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_prog_NMEDIT="${ac_tool_prefix}nmedit"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+NMEDIT=$ac_cv_prog_NMEDIT
-+if test -n "$NMEDIT"; then
-+ { echo "$as_me:$LINENO: result: $NMEDIT" >&5
-+echo "${ECHO_T}$NMEDIT" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_NMEDIT"; then
-+ ac_ct_NMEDIT=$NMEDIT
-+ # Extract the first word of "nmedit", so it can be a program name with args.
-+set dummy nmedit; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$ac_ct_NMEDIT"; then
-+ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-+else
-+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_prog_ac_ct_NMEDIT="nmedit"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
-+if test -n "$ac_ct_NMEDIT"; then
-+ { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
-+echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+ if test "x$ac_ct_NMEDIT" = x; then
-+ NMEDIT=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ NMEDIT=$ac_ct_NMEDIT
-+ fi
-+else
-+ NMEDIT="$ac_cv_prog_NMEDIT"
-+fi
-+
-+
-+ { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
-+echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
-+if test "${lt_cv_apple_cc_single_mod+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_apple_cc_single_mod=no
-+ if test -z "${LT_MULTI_MODULE}"; then
-+ # By default we will add the -single_module flag. You can override
-+ # by either setting the environment variable LT_MULTI_MODULE
-+ # non-empty at configure time, or by adding -multi_module to the
-+ # link flags.
-+ echo "int foo(void){return 1;}" > conftest.c
-+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-+ -dynamiclib ${wl}-single_module conftest.c
-+ if test -f libconftest.dylib; then
-+ lt_cv_apple_cc_single_mod=yes
-+ rm -rf libconftest.dylib*
-+ fi
-+ rm conftest.c
-+ fi
-+fi
-+{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
-+echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
-+ { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
-+echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
-+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_ld_exported_symbols_list=no
-+ save_LDFLAGS=$LDFLAGS
-+ echo "_main" > conftest.sym
-+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ lt_cv_ld_exported_symbols_list=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ lt_cv_ld_exported_symbols_list=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
-+ LDFLAGS="$save_LDFLAGS"
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
-+echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
-+ case $host_os in
-+ rhapsody* | darwin1.[0123])
-+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-+ darwin1.*)
-+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+ darwin*)
-+ # if running on 10.5 or later, the deployment target defaults
-+ # to the OS version, if on x86, and 10.4, the deployment
-+ # target defaults to 10.4. Don't you love it?
-+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-+ 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
-+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+ 10.[012]*)
-+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+ 10.*)
-+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+ esac
-+ ;;
-+ esac
-+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-+ _lt_dar_single_mod='$single_module'
-+ fi
-+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-+ else
-+ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
-+ fi
-+ if test "$DSYMUTIL" != ":"; then
-+ _lt_dsymutil="~$DSYMUTIL \$lib || :"
-+ else
-+ _lt_dsymutil=
-+ fi
-+ ;;
-+ esac
-+
-+
- enable_dlopen=no
- enable_win32_dll=no
-
-@@ -8079,7 +8431,7 @@
- echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
--$rm conftest*
-+$rm -r conftest*
-
-
-
-@@ -8107,11 +8459,11 @@
+@@ -8433,11 +8459,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8110: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8436: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8462: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:8114: \$? = $ac_status" >&5
+- echo "$as_me:8440: \$? = $ac_status" >&5
+ echo "$as_me:8466: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -8381,10 +8733,10 @@
-
- { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
- echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
--if test "${lt_prog_compiler_pic_works+set}" = set; then
-+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- lt_prog_compiler_pic_works=no
-+ lt_cv_prog_compiler_pic_works=no
- ac_outfile=conftest.$ac_objext
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
-@@ -8397,27 +8749,27 @@
+@@ -8723,11 +8749,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8400: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8726: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8752: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:8404: \$? = $ac_status" >&5
+- echo "$as_me:8730: \$? = $ac_status" >&5
+ echo "$as_me:8756: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-- lt_prog_compiler_pic_works=yes
-+ lt_cv_prog_compiler_pic_works=yes
- fi
- fi
- $rm conftest*
-
- fi
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
-
--if test x"$lt_prog_compiler_pic_works" = xyes; then
-+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
- case $lt_prog_compiler_pic in
- "" | " "*) ;;
- *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-@@ -8444,10 +8796,10 @@
- wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
- { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
- echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
--if test "${lt_prog_compiler_static_works+set}" = set; then
-+if test "${lt_cv_prog_compiler_static_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- lt_prog_compiler_static_works=no
-+ lt_cv_prog_compiler_static_works=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
- echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -8460,20 +8812,20 @@
- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if diff conftest.exp conftest.er2 >/dev/null; then
-- lt_prog_compiler_static_works=yes
-+ lt_cv_prog_compiler_static_works=yes
- fi
- else
-- lt_prog_compiler_static_works=yes
-+ lt_cv_prog_compiler_static_works=yes
- fi
- fi
-- $rm conftest*
-+ $rm -r conftest*
- LDFLAGS="$save_LDFLAGS"
-
- fi
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
--echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
-
--if test x"$lt_prog_compiler_static_works" = xyes; then
-+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
- :
- else
- lt_prog_compiler_static=
-@@ -8501,11 +8853,11 @@
+@@ -8827,11 +8853,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8504: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8830: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8856: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:8508: \$? = $ac_status" >&5
+- echo "$as_me:8834: \$? = $ac_status" >&5
+ echo "$as_me:8860: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -8585,12 +8937,13 @@
- # it will be wrapped by ` (' and `)$', so one must not match beginning or
- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
- # as well as any symbol that contains `d'.
-- exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
-+ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
- # platforms (ab)use it in PIC code, but their linkers get confused if
- # the symbol is explicitly referenced. Since portable code cannot
- # rely on this symbol name, it's probably fine to never include it in
- # preloaded symbol tables.
-+ # Exclude shared library initialization/finalization symbols.
- extract_expsyms_cmds=
- # Just being paranoid about ensuring that cc_basename is set.
- for cc_temp in $compiler""; do
-@@ -8649,7 +9002,7 @@
-
- # See if GNU ld supports shared libraries.
- case $host_os in
-- aix3* | aix4* | aix5*)
-+ aix[3-9]*)
- # On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
- ld_shlibs=no
-@@ -8765,12 +9118,13 @@
+@@ -9092,12 +9118,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
@@ -4351,42 +783,8 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -8868,7 +9222,7 @@
- fi
- ;;
-
-- aix4* | aix5*)
-+ aix[4-9]*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
-@@ -8888,7 +9242,7 @@
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
-- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
- for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
- aix_use_runtimelinking=yes
-@@ -9160,11 +9514,10 @@
+@@ -9640,7 +9667,7 @@
link_all_deplibs=yes
- if test "$GCC" = yes ; then
- output_verbose_link_cmd='echo'
-- archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
- else
- case $cc_basename in
- xlc*)
-@@ -9314,7 +9667,7 @@
- link_all_deplibs=yes
;;
- netbsd*)
@@ -4394,16 +792,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -9684,7 +10037,7 @@
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
-
--aix4* | aix5*)
-+aix[4-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -10025,6 +10378,18 @@
+@@ -10351,6 +10378,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -4422,208 +811,26 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10206,6 +10571,21 @@
- echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
-
-+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
-+fi
-+
-+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
-+fi
-+
-+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-+
- variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
- if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -10525,7 +10905,7 @@
- { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
- echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
- if test $ac_cv_lib_dld_shl_load = yes; then
-- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
- else
- { echo "$as_me:$LINENO: checking for dlopen" >&5
- echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
-@@ -10801,7 +11181,7 @@
- { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
- echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
- if test $ac_cv_lib_dld_dld_link = yes; then
-- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
- fi
-
-
-@@ -10850,7 +11230,7 @@
+@@ -11191,7 +11230,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 10853 "configure"
+-#line 11194 "configure"
+#line 11233 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -10950,7 +11330,7 @@
+@@ -11291,7 +11330,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 10953 "configure"
+-#line 11294 "configure"
+#line 11333 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11077,7 +11457,7 @@
- fi
- ;;
-
--aix4* | aix5*)
-+aix[4-9]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
- fi
-@@ -11133,6 +11513,7 @@
- predeps \
- postdeps \
- compiler_lib_search_path \
-+ compiler_lib_search_dirs \
- archive_cmds \
- archive_expsym_cmds \
- postinstall_cmds \
-@@ -11193,7 +11574,7 @@
- # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
- # NOTE: Changes made to this file will be lost: look at ltmain.sh.
- #
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
- # Free Software Foundation, Inc.
- #
- # This file is part of GNU Libtool:
-@@ -11429,6 +11810,10 @@
- # shared library.
- postdeps=$lt_postdeps
-
-+# The directories searched by this compiler when creating a shared
-+# library
-+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
-+
- # The library search path used internally by the compiler when linking
- # a shared library.
- compiler_lib_search_path=$lt_compiler_lib_search_path
-@@ -11677,6 +12062,7 @@
- predeps_CXX=
- postdeps_CXX=
- compiler_lib_search_path_CXX=
-+compiler_lib_search_dirs_CXX=
-
- # Source file extension for C++ test sources.
- ac_ext=cpp
-@@ -11714,7 +12100,7 @@
- echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
--$rm conftest*
-+$rm -r conftest*
-
-
- # Allow CC to be a program name with arguments.
-@@ -11921,7 +12307,7 @@
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
-- aix4* | aix5*)
-+ aix[4-9]*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
-@@ -11934,7 +12320,7 @@
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
-- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
- for ld_flag in $LDFLAGS; do
- case $ld_flag in
- *-brtl*)
-@@ -12192,51 +12578,23 @@
- fi
- ;;
- darwin* | rhapsody*)
-- case $host_os in
-- rhapsody* | darwin1.[012])
-- allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
-- ;;
-- *) # Darwin 1.3 on
-- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-- else
-- case ${MACOSX_DEPLOYMENT_TARGET} in
-- 10.[012])
-- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-- ;;
-- 10.*)
-- allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
-- ;;
-- esac
-- fi
-- ;;
-- esac
- archive_cmds_need_lc_CXX=no
- hardcode_direct_CXX=no
- hardcode_automatic_CXX=yes
- hardcode_shlibpath_var_CXX=unsupported
- whole_archive_flag_spec_CXX=''
- link_all_deplibs_CXX=yes
--
-- if test "$GXX" = yes ; then
-- lt_int_apple_cc_single_mod=no
-+ allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
-+ if test "$GXX" = yes ; then
- output_verbose_link_cmd='echo'
-- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-- lt_int_apple_cc_single_mod=yes
-+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-+ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
- fi
-- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-- archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-- else
-- archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-- fi
-- module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- else
-- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- fi
-- module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- case $cc_basename in
- xlc*)
-@@ -12487,7 +12845,7 @@
- export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
- whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+@@ -12879,7 +12918,7 @@
;;
-- pgCC*)
-+ pgCC* | pgcpp*)
- # Portland Group C++ compiler
- archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-@@ -12560,7 +12918,7 @@
- ;;
esac
;;
- netbsd*)
@@ -4631,54 +838,8 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -12894,7 +13252,6 @@
- GCC_CXX="$GXX"
- LD_CXX="$LD"
-
--
- cat > conftest.$ac_ext <<EOF
- class Foo
- {
-@@ -12996,6 +13353,11 @@
-
- $rm -f confest.$objext
-
-+compiler_lib_search_dirs_CXX=
-+if test -n "$compiler_lib_search_path_CXX"; then
-+ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-+fi
-+
- # PORTME: override above test on systems where it is broken
- case $host_os in
- interix[3-9]*)
-@@ -13051,7 +13413,6 @@
- ;;
- esac
-
--
- case " $postdeps_CXX " in
- *" -lc "*) archive_cmds_need_lc_CXX=no ;;
- esac
-@@ -13127,7 +13488,7 @@
- esac
- else
- case $host_os in
-- aix4* | aix5*)
-+ aix[4-9]*)
- # All AIX code is PIC.
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
-@@ -13223,7 +13584,7 @@
- lt_prog_compiler_pic_CXX='-KPIC'
- lt_prog_compiler_static_CXX='-static'
+@@ -13583,7 +13622,7 @@
;;
-- pgCC*)
-+ pgCC* | pgcpp*)
- # Portland Group C++ compiler.
- lt_prog_compiler_wl_CXX='-Wl,'
- lt_prog_compiler_pic_CXX='-fpic'
-@@ -13261,7 +13622,7 @@
- ;;
esac
;;
- netbsd*)
@@ -4686,117 +847,35 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -13354,10 +13715,10 @@
-
- { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
- echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
--if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
-+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- lt_prog_compiler_pic_works_CXX=no
-+ lt_cv_prog_compiler_pic_works_CXX=no
- ac_outfile=conftest.$ac_objext
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
-@@ -13370,27 +13731,27 @@
+@@ -13692,11 +13731,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13373: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13695: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13734: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:13377: \$? = $ac_status" >&5
+- echo "$as_me:13699: \$? = $ac_status" >&5
+ echo "$as_me:13738: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-- lt_prog_compiler_pic_works_CXX=yes
-+ lt_cv_prog_compiler_pic_works_CXX=yes
- fi
- fi
- $rm conftest*
-
- fi
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }
-
--if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
-+if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
- case $lt_prog_compiler_pic_CXX in
- "" | " "*) ;;
- *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-@@ -13417,10 +13778,10 @@
- wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
- { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
- echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
--if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
-+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- lt_prog_compiler_static_works_CXX=no
-+ lt_cv_prog_compiler_static_works_CXX=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
- echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -13433,20 +13794,20 @@
- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if diff conftest.exp conftest.er2 >/dev/null; then
-- lt_prog_compiler_static_works_CXX=yes
-+ lt_cv_prog_compiler_static_works_CXX=yes
- fi
- else
-- lt_prog_compiler_static_works_CXX=yes
-+ lt_cv_prog_compiler_static_works_CXX=yes
- fi
- fi
-- $rm conftest*
-+ $rm -r conftest*
- LDFLAGS="$save_LDFLAGS"
-
- fi
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
--echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }
-
--if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
-+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
- :
- else
- lt_prog_compiler_static_CXX=
-@@ -13474,11 +13835,11 @@
+@@ -13796,11 +13835,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13477: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13799: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13838: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:13481: \$? = $ac_status" >&5
+- echo "$as_me:13803: \$? = $ac_status" >&5
+ echo "$as_me:13842: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -13531,7 +13892,7 @@
-
- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- case $host_os in
-- aix4* | aix5*)
-+ aix[4-9]*)
- # If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-@@ -13546,10 +13907,14 @@
+@@ -13868,6 +13907,9 @@
cygwin* | mingw*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
;;
@@ -4806,21 +885,7 @@
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
- esac
-+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-
- { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
- echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
-@@ -13651,7 +14016,7 @@
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
-
--aix4* | aix5*)
-+aix[4-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -13991,6 +14356,18 @@
+@@ -14314,6 +14356,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -4839,191 +904,35 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14172,6 +14549,21 @@
- echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
-
-+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
-+fi
-+
-+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
-+fi
-+
-+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-+
- variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
- if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -14255,6 +14647,7 @@
- predeps_CXX \
- postdeps_CXX \
- compiler_lib_search_path_CXX \
-+ compiler_lib_search_dirs_CXX \
- archive_cmds_CXX \
- archive_expsym_cmds_CXX \
- postinstall_cmds_CXX \
-@@ -14503,6 +14896,10 @@
- # shared library.
- postdeps=$lt_postdeps_CXX
-
-+# The directories searched by this compiler when creating a shared
-+# library
-+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
-+
- # The library search path used internally by the compiler when linking
- # a shared library.
- compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-@@ -14717,7 +15114,7 @@
- echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
--$rm conftest*
-+$rm -r conftest*
-
-
- # Allow CC to be a program name with arguments.
-@@ -14755,7 +15152,7 @@
- postinstall_cmds='$RANLIB $lib'
- fi
- ;;
--aix4* | aix5*)
-+aix[4-9]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
- fi
-@@ -15020,10 +15417,10 @@
-
- { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
- echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
--if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
-+if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- lt_prog_compiler_pic_works_F77=no
-+ lt_cv_prog_compiler_pic_works_F77=no
- ac_outfile=conftest.$ac_objext
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic_F77"
-@@ -15036,27 +15433,27 @@
+@@ -15379,11 +15433,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:15039: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:15382: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15436: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:15043: \$? = $ac_status" >&5
+- echo "$as_me:15386: \$? = $ac_status" >&5
+ echo "$as_me:15440: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-- lt_prog_compiler_pic_works_F77=yes
-+ lt_cv_prog_compiler_pic_works_F77=yes
- fi
- fi
- $rm conftest*
-
- fi
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; }
-
--if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
-+if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
- case $lt_prog_compiler_pic_F77 in
- "" | " "*) ;;
- *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
-@@ -15083,10 +15480,10 @@
- wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
- { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
- echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
--if test "${lt_prog_compiler_static_works_F77+set}" = set; then
-+if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- lt_prog_compiler_static_works_F77=no
-+ lt_cv_prog_compiler_static_works_F77=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
- echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -15099,20 +15496,20 @@
- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if diff conftest.exp conftest.er2 >/dev/null; then
-- lt_prog_compiler_static_works_F77=yes
-+ lt_cv_prog_compiler_static_works_F77=yes
- fi
- else
-- lt_prog_compiler_static_works_F77=yes
-+ lt_cv_prog_compiler_static_works_F77=yes
- fi
- fi
-- $rm conftest*
-+ $rm -r conftest*
- LDFLAGS="$save_LDFLAGS"
-
- fi
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
--echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; }
-
--if test x"$lt_prog_compiler_static_works_F77" = xyes; then
-+if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
- :
- else
- lt_prog_compiler_static_F77=
-@@ -15140,11 +15537,11 @@
+@@ -15483,11 +15537,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:15143: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:15486: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15540: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:15147: \$? = $ac_status" >&5
+- echo "$as_me:15490: \$? = $ac_status" >&5
+ echo "$as_me:15544: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -15224,12 +15621,13 @@
- # it will be wrapped by ` (' and `)$', so one must not match beginning or
- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
- # as well as any symbol that contains `d'.
-- exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
-+ exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
- # platforms (ab)use it in PIC code, but their linkers get confused if
- # the symbol is explicitly referenced. Since portable code cannot
- # rely on this symbol name, it's probably fine to never include it in
- # preloaded symbol tables.
-+ # Exclude shared library initialization/finalization symbols.
- extract_expsyms_cmds=
- # Just being paranoid about ensuring that cc_basename is set.
- for cc_temp in $compiler""; do
-@@ -15288,7 +15686,7 @@
-
- # See if GNU ld supports shared libraries.
- case $host_os in
-- aix3* | aix4* | aix5*)
-+ aix[3-9]*)
- # On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
- ld_shlibs_F77=no
-@@ -15404,12 +15802,13 @@
+@@ -15748,12 +15802,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
@@ -5038,42 +947,8 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -15507,7 +15906,7 @@
- fi
- ;;
-
-- aix4* | aix5*)
-+ aix[4-9]*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
-@@ -15527,7 +15926,7 @@
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
-- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
- for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
- aix_use_runtimelinking=yes
-@@ -15779,11 +16178,10 @@
+@@ -16276,7 +16331,7 @@
link_all_deplibs_F77=yes
- if test "$GCC" = yes ; then
- output_verbose_link_cmd='echo'
-- archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-- module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+ module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+ archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+ module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
- else
- case $cc_basename in
- xlc*)
-@@ -15933,7 +16331,7 @@
- link_all_deplibs_F77=yes
;;
- netbsd*)
@@ -5081,16 +956,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -16252,7 +16650,7 @@
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
-
--aix4* | aix5*)
-+aix[4-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -16592,6 +16990,18 @@
+@@ -16935,6 +16990,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -5109,214 +975,49 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -16773,6 +17183,21 @@
- echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
-
-+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
-+fi
-+
-+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
-+fi
-+
-+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-+
- variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
- if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -16856,6 +17281,7 @@
- predeps_F77 \
- postdeps_F77 \
- compiler_lib_search_path_F77 \
-+ compiler_lib_search_dirs_F77 \
- archive_cmds_F77 \
- archive_expsym_cmds_F77 \
- postinstall_cmds_F77 \
-@@ -17104,6 +17530,10 @@
- # shared library.
- postdeps=$lt_postdeps_F77
-
-+# The directories searched by this compiler when creating a shared
-+# library
-+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77
-+
- # The library search path used internally by the compiler when linking
- # a shared library.
- compiler_lib_search_path=$lt_compiler_lib_search_path_F77
-@@ -17278,7 +17708,7 @@
- echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
--$rm conftest*
-+$rm -r conftest*
-
-
- # Allow CC to be a program name with arguments.
-@@ -17327,11 +17757,11 @@
+@@ -17690,11 +17757,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:17330: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:17693: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17760: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:17334: \$? = $ac_status" >&5
+- echo "$as_me:17697: \$? = $ac_status" >&5
+ echo "$as_me:17764: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -17391,7 +17821,7 @@
- # built for inclusion in a dll (and should export symbols for example).
- # Although the cygwin gcc ignores -fPIC, still need this for old-style
- # (--disable-auto-import) libraries
-- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
-+
- ;;
-
- darwin* | rhapsody*)
-@@ -17461,7 +17891,7 @@
- mingw* | cygwin* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
-- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
-+
- ;;
-
- hpux9* | hpux10* | hpux11*)
-@@ -17601,10 +18031,10 @@
-
- { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
- echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
--if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
-+if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- lt_prog_compiler_pic_works_GCJ=no
-+ lt_cv_prog_compiler_pic_works_GCJ=no
- ac_outfile=conftest.$ac_objext
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
-@@ -17617,27 +18047,27 @@
+@@ -17980,11 +18047,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:17620: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:17983: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18050: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:17624: \$? = $ac_status" >&5
+- echo "$as_me:17987: \$? = $ac_status" >&5
+ echo "$as_me:18054: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-- lt_prog_compiler_pic_works_GCJ=yes
-+ lt_cv_prog_compiler_pic_works_GCJ=yes
- fi
- fi
- $rm conftest*
-
- fi
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
-
--if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
-+if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
- case $lt_prog_compiler_pic_GCJ in
- "" | " "*) ;;
- *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
-@@ -17664,10 +18094,10 @@
- wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
- { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
- echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
--if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
-+if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- lt_prog_compiler_static_works_GCJ=no
-+ lt_cv_prog_compiler_static_works_GCJ=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
- echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -17680,20 +18110,20 @@
- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if diff conftest.exp conftest.er2 >/dev/null; then
-- lt_prog_compiler_static_works_GCJ=yes
-+ lt_cv_prog_compiler_static_works_GCJ=yes
- fi
- else
-- lt_prog_compiler_static_works_GCJ=yes
-+ lt_cv_prog_compiler_static_works_GCJ=yes
- fi
- fi
-- $rm conftest*
-+ $rm -r conftest*
- LDFLAGS="$save_LDFLAGS"
-
- fi
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
--echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; }
-
--if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
-+if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
- :
- else
- lt_prog_compiler_static_GCJ=
-@@ -17721,11 +18151,11 @@
+@@ -18084,11 +18151,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:17724: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18087: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18154: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:17728: \$? = $ac_status" >&5
+- echo "$as_me:18091: \$? = $ac_status" >&5
+ echo "$as_me:18158: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -17805,12 +18235,13 @@
- # it will be wrapped by ` (' and `)$', so one must not match beginning or
- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
- # as well as any symbol that contains `d'.
-- exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
-+ exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
- # platforms (ab)use it in PIC code, but their linkers get confused if
- # the symbol is explicitly referenced. Since portable code cannot
- # rely on this symbol name, it's probably fine to never include it in
- # preloaded symbol tables.
-+ # Exclude shared library initialization/finalization symbols.
- extract_expsyms_cmds=
- # Just being paranoid about ensuring that cc_basename is set.
- for cc_temp in $compiler""; do
-@@ -17869,7 +18300,7 @@
-
- # See if GNU ld supports shared libraries.
- case $host_os in
-- aix3* | aix4* | aix5*)
-+ aix[3-9]*)
- # On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
- ld_shlibs_GCJ=no
-@@ -17985,12 +18416,13 @@
+@@ -18349,12 +18416,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
@@ -5331,42 +1032,8 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -18088,7 +18520,7 @@
- fi
- ;;
-
-- aix4* | aix5*)
-+ aix[4-9]*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
-@@ -18108,7 +18540,7 @@
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
-- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
- for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
- aix_use_runtimelinking=yes
-@@ -18380,11 +18812,10 @@
+@@ -18897,7 +18965,7 @@
link_all_deplibs_GCJ=yes
- if test "$GCC" = yes ; then
- output_verbose_link_cmd='echo'
-- archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-- module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+ module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+ archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+ module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
- else
- case $cc_basename in
- xlc*)
-@@ -18534,7 +18965,7 @@
- link_all_deplibs_GCJ=yes
;;
- netbsd*)
@@ -5374,16 +1041,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -18853,7 +19284,7 @@
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
-
--aix4* | aix5*)
-+aix[4-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -19193,6 +19624,18 @@
+@@ -19556,6 +19624,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -5402,2731 +1060,3 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -19374,6 +19817,21 @@
- echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
-
-+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
-+fi
-+
-+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
-+fi
-+
-+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-+
- variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
- if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -19457,6 +19915,7 @@
- predeps_GCJ \
- postdeps_GCJ \
- compiler_lib_search_path_GCJ \
-+ compiler_lib_search_dirs_GCJ \
- archive_cmds_GCJ \
- archive_expsym_cmds_GCJ \
- postinstall_cmds_GCJ \
-@@ -19705,6 +20164,10 @@
- # shared library.
- postdeps=$lt_postdeps_GCJ
-
-+# The directories searched by this compiler when creating a shared
-+# library
-+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ
-+
- # The library search path used internally by the compiler when linking
- # a shared library.
- compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
-@@ -19878,7 +20341,7 @@
- echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
--$rm conftest*
-+$rm -r conftest*
-
-
- # Allow CC to be a program name with arguments.
-@@ -19938,6 +20401,7 @@
- predeps_RC \
- postdeps_RC \
- compiler_lib_search_path_RC \
-+ compiler_lib_search_dirs_RC \
- archive_cmds_RC \
- archive_expsym_cmds_RC \
- postinstall_cmds_RC \
-@@ -20186,6 +20650,10 @@
- # shared library.
- postdeps=$lt_postdeps_RC
-
-+# The directories searched by this compiler when creating a shared
-+# library
-+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC
-+
- # The library search path used internally by the compiler when linking
- # a shared library.
- compiler_lib_search_path=$lt_compiler_lib_search_path_RC
-@@ -21694,6 +22162,8 @@
- EGREP!$EGREP$ac_delim
- LN_S!$LN_S$ac_delim
- ECHO!$ECHO$ac_delim
-+DSYMUTIL!$DSYMUTIL$ac_delim
-+NMEDIT!$NMEDIT$ac_delim
- CPP!$CPP$ac_delim
- CXXCPP!$CXXCPP$ac_delim
- F77!$F77$ac_delim
-@@ -21708,7 +22178,7 @@
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
-
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 36; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 38; then
- break
- elif $ac_last_try; then
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -22030,7 +22500,7 @@
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
-- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
-+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`$as_dirname -- "$mf" ||
- $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$mf" : 'X\(//\)[^/]' \| \
-diff -urNad mono-1.9.1+dfsg~/libgc/doc/Makefile.in mono-1.9.1+dfsg/libgc/doc/Makefile.in
---- mono-1.9.1+dfsg~/libgc/doc/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/libgc/doc/Makefile.in 2008-06-17 23:58:23.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -90,6 +90,7 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -118,6 +119,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MY_CFLAGS = @MY_CFLAGS@
-+NMEDIT = @NMEDIT@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-diff -urNad mono-1.9.1+dfsg~/libgc/include/Makefile.in mono-1.9.1+dfsg/libgc/include/Makefile.in
---- mono-1.9.1+dfsg~/libgc/include/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/libgc/include/Makefile.in 2008-06-17 23:58:23.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -81,6 +81,7 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -109,6 +110,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MY_CFLAGS = @MY_CFLAGS@
-+NMEDIT = @NMEDIT@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -298,8 +300,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -324,8 +326,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -335,13 +337,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-1.9.1+dfsg~/libgc/include/private/Makefile.in mono-1.9.1+dfsg/libgc/include/private/Makefile.in
---- mono-1.9.1+dfsg~/libgc/include/private/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/libgc/include/private/Makefile.in 2008-06-17 23:58:23.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -66,6 +66,7 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -94,6 +95,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MY_CFLAGS = @MY_CFLAGS@
-+NMEDIT = @NMEDIT@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-diff -urNad mono-1.9.1+dfsg~/man/Makefile.in mono-1.9.1+dfsg/man/Makefile.in
---- mono-1.9.1+dfsg~/man/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/man/Makefile.in 2008-06-17 23:58:25.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -83,6 +83,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -118,6 +119,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9.1+dfsg~/mono/Makefile.in mono-1.9.1+dfsg/mono/Makefile.in
---- mono-1.9.1+dfsg~/mono/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/mono/Makefile.in 2008-06-17 23:58:25.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -90,6 +90,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -125,6 +126,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-@@ -336,8 +338,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -362,8 +364,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -373,13 +375,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-1.9.1+dfsg~/mono/arch/Makefile.in mono-1.9.1+dfsg/mono/arch/Makefile.in
---- mono-1.9.1+dfsg~/mono/arch/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/mono/arch/Makefile.in 2008-06-17 23:58:25.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -48,7 +48,7 @@
- @INTERP_SUPPORTED_TRUE at am_libmonoarch_la_OBJECTS = unknown.lo
- libmonoarch_la_OBJECTS = $(am_libmonoarch_la_OBJECTS)
- @INTERP_SUPPORTED_TRUE at am_libmonoarch_la_rpath =
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -108,6 +108,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -143,6 +144,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-@@ -401,8 +403,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -427,8 +429,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -438,13 +440,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-1.9.1+dfsg~/mono/arch/alpha/Makefile.in mono-1.9.1+dfsg/mono/arch/alpha/Makefile.in
---- mono-1.9.1+dfsg~/mono/arch/alpha/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/mono/arch/alpha/Makefile.in 2008-06-17 23:58:25.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -52,7 +52,7 @@
- test_SOURCES = test.c
- test_OBJECTS = test.$(OBJEXT)
- test_LDADD = $(LDADD)
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -103,6 +103,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -138,6 +139,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-@@ -331,8 +333,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -344,8 +346,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -355,13 +357,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-1.9.1+dfsg~/mono/arch/amd64/Makefile.in mono-1.9.1+dfsg/mono/arch/amd64/Makefile.in
---- mono-1.9.1+dfsg~/mono/arch/amd64/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/mono/arch/amd64/Makefile.in 2008-06-17 23:58:25.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -46,7 +46,7 @@
- libmonoarch_amd64_la_LIBADD =
- am_libmonoarch_amd64_la_OBJECTS = tramp.lo
- libmonoarch_amd64_la_OBJECTS = $(am_libmonoarch_amd64_la_OBJECTS)
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -97,6 +97,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -132,6 +133,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-@@ -314,8 +316,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -327,8 +329,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -338,13 +340,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-1.9.1+dfsg~/mono/arch/arm/Makefile.in mono-1.9.1+dfsg/mono/arch/arm/Makefile.in
---- mono-1.9.1+dfsg~/mono/arch/arm/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/mono/arch/arm/Makefile.in 2008-06-17 23:58:25.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -48,7 +48,7 @@
- am_libmonoarch_arm_la_OBJECTS = $(am__objects_1) tramp.lo \
- arm-codegen.lo arm-dis.lo
- libmonoarch_arm_la_OBJECTS = $(am_libmonoarch_arm_la_OBJECTS)
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -99,6 +99,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -134,6 +135,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-@@ -331,8 +333,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -344,8 +346,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -355,13 +357,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-1.9.1+dfsg~/mono/arch/hppa/Makefile.in mono-1.9.1+dfsg/mono/arch/hppa/Makefile.in
---- mono-1.9.1+dfsg~/mono/arch/hppa/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/mono/arch/hppa/Makefile.in 2008-06-17 23:58:26.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -46,7 +46,7 @@
- libmonoarch_hppa_la_LIBADD =
- am_libmonoarch_hppa_la_OBJECTS = tramp.lo
- libmonoarch_hppa_la_OBJECTS = $(am_libmonoarch_hppa_la_OBJECTS)
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -97,6 +97,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -132,6 +133,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-@@ -314,8 +316,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -327,8 +329,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -338,13 +340,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-1.9.1+dfsg~/mono/arch/ia64/Makefile.in mono-1.9.1+dfsg/mono/arch/ia64/Makefile.in
---- mono-1.9.1+dfsg~/mono/arch/ia64/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/mono/arch/ia64/Makefile.in 2008-06-17 23:58:26.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,6 +78,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -113,6 +114,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9.1+dfsg~/mono/arch/mips/Makefile.in mono-1.9.1+dfsg/mono/arch/mips/Makefile.in
---- mono-1.9.1+dfsg~/mono/arch/mips/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/mono/arch/mips/Makefile.in 2008-06-17 23:58:26.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -52,7 +52,7 @@
- test_SOURCES = test.c
- test_OBJECTS = test.$(OBJEXT)
- test_LDADD = $(LDADD)
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -103,6 +103,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -138,6 +139,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-@@ -330,8 +332,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -343,8 +345,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -354,13 +356,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-1.9.1+dfsg~/mono/arch/ppc/Makefile.in mono-1.9.1+dfsg/mono/arch/ppc/Makefile.in
---- mono-1.9.1+dfsg~/mono/arch/ppc/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/mono/arch/ppc/Makefile.in 2008-06-17 23:58:26.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -54,7 +54,7 @@
- test_SOURCES = test.c
- test_OBJECTS = test.$(OBJEXT)
- test_LDADD = $(LDADD)
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -105,6 +105,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -140,6 +141,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-@@ -333,8 +335,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -346,8 +348,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -357,13 +359,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-1.9.1+dfsg~/mono/arch/s390/Makefile.in mono-1.9.1+dfsg/mono/arch/s390/Makefile.in
---- mono-1.9.1+dfsg~/mono/arch/s390/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/mono/arch/s390/Makefile.in 2008-06-17 23:58:26.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -46,7 +46,7 @@
- libmonoarch_s390_la_LIBADD =
- am_libmonoarch_s390_la_OBJECTS = tramp.lo
- libmonoarch_s390_la_OBJECTS = $(am_libmonoarch_s390_la_OBJECTS)
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -97,6 +97,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -132,6 +133,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-@@ -314,8 +316,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -327,8 +329,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -338,13 +340,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-1.9.1+dfsg~/mono/arch/s390x/Makefile.in mono-1.9.1+dfsg/mono/arch/s390x/Makefile.in
---- mono-1.9.1+dfsg~/mono/arch/s390x/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/mono/arch/s390x/Makefile.in 2008-06-17 23:58:26.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -46,7 +46,7 @@
- libmonoarch_s390x_la_LIBADD =
- am_libmonoarch_s390x_la_OBJECTS = tramp.lo
- libmonoarch_s390x_la_OBJECTS = $(am_libmonoarch_s390x_la_OBJECTS)
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -97,6 +97,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -132,6 +133,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-@@ -314,8 +316,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -327,8 +329,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -338,13 +340,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-1.9.1+dfsg~/mono/arch/sparc/Makefile.in mono-1.9.1+dfsg/mono/arch/sparc/Makefile.in
---- mono-1.9.1+dfsg~/mono/arch/sparc/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/mono/arch/sparc/Makefile.in 2008-06-17 23:58:26.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -46,7 +46,7 @@
- libmonoarch_sparc_la_LIBADD =
- am_libmonoarch_sparc_la_OBJECTS = tramp.lo
- libmonoarch_sparc_la_OBJECTS = $(am_libmonoarch_sparc_la_OBJECTS)
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -97,6 +97,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -132,6 +133,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-@@ -314,8 +316,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -327,8 +329,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -338,13 +340,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-1.9.1+dfsg~/mono/arch/x86/Makefile.in mono-1.9.1+dfsg/mono/arch/x86/Makefile.in
---- mono-1.9.1+dfsg~/mono/arch/x86/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/mono/arch/x86/Makefile.in 2008-06-17 23:58:26.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -48,7 +48,7 @@
- @INTERP_SUPPORTED_TRUE at am_libmonoarch_x86_la_OBJECTS = tramp.lo
- libmonoarch_x86_la_OBJECTS = $(am_libmonoarch_x86_la_OBJECTS)
- @INTERP_SUPPORTED_TRUE at am_libmonoarch_x86_la_rpath =
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -99,6 +99,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -134,6 +135,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-@@ -316,8 +318,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -329,8 +331,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -340,13 +342,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-1.9.1+dfsg~/mono/benchmark/Makefile.in mono-1.9.1+dfsg/mono/benchmark/Makefile.in
---- mono-1.9.1+dfsg~/mono/benchmark/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/mono/benchmark/Makefile.in 2008-06-17 23:58:26.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,6 +78,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -113,6 +114,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9.1+dfsg~/mono/cil/Makefile.in mono-1.9.1+dfsg/mono/cil/Makefile.in
---- mono-1.9.1+dfsg~/mono/cil/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/mono/cil/Makefile.in 2008-06-17 23:58:26.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -90,6 +90,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -125,6 +126,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9.1+dfsg~/mono/dis/Makefile.in mono-1.9.1+dfsg/mono/dis/Makefile.in
---- mono-1.9.1+dfsg~/mono/dis/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/mono/dis/Makefile.in 2008-06-17 23:58:26.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -60,7 +60,7 @@
- am__DEPENDENCIES_1 =
- monodis_DEPENDENCIES = libmonodis.a $(runtime_lib) \
- $(am__DEPENDENCIES_1)
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -114,6 +114,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -149,6 +150,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-@@ -319,8 +321,8 @@
- || test -f $$p1 \
- ; then \
- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
- else :; fi; \
- done
-
-@@ -432,8 +434,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -445,8 +447,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -456,13 +458,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-1.9.1+dfsg~/mono/interpreter/Makefile.in mono-1.9.1+dfsg/mono/interpreter/Makefile.in
---- mono-1.9.1+dfsg~/mono/interpreter/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/mono/interpreter/Makefile.in 2008-06-17 23:58:26.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -71,7 +71,7 @@
- am_mint_OBJECTS = main.$(OBJEXT)
- mint_OBJECTS = $(am_mint_OBJECTS)
- mint_DEPENDENCIES = libmint.la
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -127,6 +127,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -162,6 +163,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-@@ -339,8 +341,8 @@
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
- f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
- done
-
-@@ -348,8 +350,8 @@
- @$(NORMAL_UNINSTALL)
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-
- clean-libLTLIBRARIES:
-@@ -371,8 +373,8 @@
- || test -f $$p1 \
- ; then \
- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
- else :; fi; \
- done
-
-@@ -499,8 +501,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -512,8 +514,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -523,13 +525,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-1.9.1+dfsg~/mono/io-layer/Makefile.in mono-1.9.1+dfsg/mono/io-layer/Makefile.in
---- mono-1.9.1+dfsg~/mono/io-layer/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/mono/io-layer/Makefile.in 2008-06-17 23:58:26.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -76,7 +76,7 @@
- @HPPA_TRUE@@PLATFORM_WIN32_FALSE@ $(am__objects_2)
- @PLATFORM_WIN32_TRUE at am_libwapi_la_OBJECTS = $(am__objects_3)
- libwapi_la_OBJECTS = $(am_libwapi_la_OBJECTS)
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- CPPASCOMPILE = $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-@@ -147,6 +147,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -182,6 +183,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-@@ -557,8 +559,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -570,8 +572,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -581,13 +583,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-1.9.1+dfsg~/mono/metadata/Makefile.in mono-1.9.1+dfsg/mono/metadata/Makefile.in
---- mono-1.9.1+dfsg~/mono/metadata/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/mono/metadata/Makefile.in 2008-06-17 23:58:26.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -88,7 +88,7 @@
- pedump_DEPENDENCIES = libmonoruntime.la ../io-layer/libwapi.la \
- ../utils/libmonoutils.la $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -149,6 +149,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -184,6 +185,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-@@ -480,8 +482,8 @@
- || test -f $$p1 \
- ; then \
- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
- else :; fi; \
- done
-
-@@ -606,8 +608,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -619,8 +621,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -630,13 +632,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-1.9.1+dfsg~/mono/mini/Makefile.in mono-1.9.1+dfsg/mono/mini/Makefile.in
---- mono-1.9.1+dfsg~/mono/mini/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/mono/mini/Makefile.in 2008-06-17 23:58:27.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -203,7 +203,7 @@
- monow_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(monow_LDFLAGS) \
- $(LDFLAGS) -o $@
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -264,6 +264,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -299,6 +300,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-@@ -743,8 +745,8 @@
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
- f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
- done
-
-@@ -752,8 +754,8 @@
- @$(NORMAL_UNINSTALL)
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-
- clean-libLTLIBRARIES:
-@@ -786,8 +788,8 @@
- || test -f $$p1 \
- ; then \
- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
- else :; fi; \
- done
-
-@@ -979,8 +981,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -992,8 +994,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -1003,13 +1005,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-1.9.1+dfsg~/mono/monoburg/Makefile.in mono-1.9.1+dfsg/mono/monoburg/Makefile.in
---- mono-1.9.1+dfsg~/mono/monoburg/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/mono/monoburg/Makefile.in 2008-06-17 23:58:27.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -83,6 +83,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -118,6 +119,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9.1+dfsg~/mono/monograph/Makefile.in mono-1.9.1+dfsg/mono/monograph/Makefile.in
---- mono-1.9.1+dfsg~/mono/monograph/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/mono/monograph/Makefile.in 2008-06-17 23:58:27.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -50,7 +50,7 @@
- monograph_OBJECTS = monograph.$(OBJEXT)
- am__DEPENDENCIES_1 =
- monograph_DEPENDENCIES = $(runtime_lib) $(am__DEPENDENCIES_1)
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -101,6 +101,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -136,6 +137,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-@@ -286,8 +288,8 @@
- || test -f $$p1 \
- ; then \
- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
- else :; fi; \
- done
-
-@@ -349,8 +351,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -362,8 +364,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -373,13 +375,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-1.9.1+dfsg~/mono/os/Makefile.in mono-1.9.1+dfsg/mono/os/Makefile.in
---- mono-1.9.1+dfsg~/mono/os/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/mono/os/Makefile.in 2008-06-17 23:58:27.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,6 +78,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -113,6 +114,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9.1+dfsg~/mono/profiler/Makefile.in mono-1.9.1+dfsg/mono/profiler/Makefile.in
---- mono-1.9.1+dfsg~/mono/profiler/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/mono/profiler/Makefile.in 2008-06-17 23:58:27.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -65,7 +65,7 @@
- $(am_libmono_profiler_cov_la_OBJECTS)
- @JIT_SUPPORTED_TRUE at am_libmono_profiler_cov_la_rpath = -rpath \
- @JIT_SUPPORTED_TRUE@ $(libdir)
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -118,6 +118,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -153,6 +154,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-@@ -301,8 +303,8 @@
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
- f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
- done
-
-@@ -310,8 +312,8 @@
- @$(NORMAL_UNINSTALL)
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-
- clean-libLTLIBRARIES:
-@@ -368,8 +370,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -381,8 +383,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -392,13 +394,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-1.9.1+dfsg~/mono/tests/Makefile.in mono-1.9.1+dfsg/mono/tests/Makefile.in
---- mono-1.9.1+dfsg~/mono/tests/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/mono/tests/Makefile.in 2008-06-17 23:58:27.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -52,7 +52,7 @@
- libtest_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libtest_la_CFLAGS) \
- $(CFLAGS) $(libtest_la_LDFLAGS) $(LDFLAGS) -o $@
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -113,6 +113,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -148,6 +149,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-@@ -774,8 +776,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -800,8 +802,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -811,13 +813,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-1.9.1+dfsg~/mono/tests/assemblyresolve/Makefile.in mono-1.9.1+dfsg/mono/tests/assemblyresolve/Makefile.in
---- mono-1.9.1+dfsg~/mono/tests/assemblyresolve/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/mono/tests/assemblyresolve/Makefile.in 2008-06-17 23:58:27.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,6 +78,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -113,6 +114,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9.1+dfsg~/mono/tests/cas/Makefile.in mono-1.9.1+dfsg/mono/tests/cas/Makefile.in
---- mono-1.9.1+dfsg~/mono/tests/cas/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/mono/tests/cas/Makefile.in 2008-06-17 23:58:27.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -90,6 +90,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -125,6 +126,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-@@ -340,8 +342,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -366,8 +368,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -377,13 +379,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-1.9.1+dfsg~/mono/tests/cas/assembly/Makefile.in mono-1.9.1+dfsg/mono/tests/cas/assembly/Makefile.in
---- mono-1.9.1+dfsg~/mono/tests/cas/assembly/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/mono/tests/cas/assembly/Makefile.in 2008-06-17 23:58:27.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,6 +79,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -114,6 +115,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9.1+dfsg~/mono/tests/cas/demand/Makefile.in mono-1.9.1+dfsg/mono/tests/cas/demand/Makefile.in
---- mono-1.9.1+dfsg~/mono/tests/cas/demand/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/mono/tests/cas/demand/Makefile.in 2008-06-17 23:58:27.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,6 +79,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -114,6 +115,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9.1+dfsg~/mono/tests/cas/inheritance/Makefile.in mono-1.9.1+dfsg/mono/tests/cas/inheritance/Makefile.in
---- mono-1.9.1+dfsg~/mono/tests/cas/inheritance/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/mono/tests/cas/inheritance/Makefile.in 2008-06-17 23:58:27.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,6 +79,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -114,6 +115,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9.1+dfsg~/mono/tests/cas/linkdemand/Makefile.in mono-1.9.1+dfsg/mono/tests/cas/linkdemand/Makefile.in
---- mono-1.9.1+dfsg~/mono/tests/cas/linkdemand/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/mono/tests/cas/linkdemand/Makefile.in 2008-06-17 23:58:28.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,6 +79,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -114,6 +115,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9.1+dfsg~/mono/tests/cas/threads/Makefile.in mono-1.9.1+dfsg/mono/tests/cas/threads/Makefile.in
---- mono-1.9.1+dfsg~/mono/tests/cas/threads/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/mono/tests/cas/threads/Makefile.in 2008-06-17 23:58:28.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,6 +79,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -114,6 +115,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9.1+dfsg~/mono/utils/Makefile.in mono-1.9.1+dfsg/mono/utils/Makefile.in
---- mono-1.9.1+dfsg~/mono/utils/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/mono/utils/Makefile.in 2008-06-17 23:58:28.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -61,7 +61,7 @@
- mono-math.lo mono-mmap.lo strtod.lo strenc.lo mono-uri.lo \
- mono-poll.lo mono-path.lo mono-stdlib.lo
- libmonoutils_la_OBJECTS = $(am_libmonoutils_la_OBJECTS)
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -121,6 +121,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -156,6 +157,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-@@ -417,8 +419,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -430,8 +432,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -441,13 +443,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-1.9.1+dfsg~/msvc/Makefile.in mono-1.9.1+dfsg/msvc/Makefile.in
---- mono-1.9.1+dfsg~/msvc/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/msvc/Makefile.in 2008-06-17 23:58:28.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,6 +79,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -114,6 +115,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9.1+dfsg~/runtime/Makefile.in mono-1.9.1+dfsg/runtime/Makefile.in
---- mono-1.9.1+dfsg~/runtime/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/runtime/Makefile.in 2008-06-17 23:58:28.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -82,6 +82,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -117,6 +118,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9.1+dfsg~/samples/Makefile.in mono-1.9.1+dfsg/samples/Makefile.in
---- mono-1.9.1+dfsg~/samples/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/samples/Makefile.in 2008-06-17 23:58:28.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,6 +78,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -113,6 +114,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9.1+dfsg~/scripts/Makefile.in mono-1.9.1+dfsg/scripts/Makefile.in
---- mono-1.9.1+dfsg~/scripts/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/scripts/Makefile.in 2008-06-17 23:58:28.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -94,6 +94,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -129,6 +130,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9.1+dfsg~/support/Makefile.in mono-1.9.1+dfsg/support/Makefile.in
---- mono-1.9.1+dfsg~/support/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/support/Makefile.in 2008-06-17 23:58:28.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -90,7 +90,7 @@
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(libMonoSupportW_la_LDFLAGS) $(LDFLAGS) -o $@
- @PLATFORM_WIN32_FALSE at am_libMonoSupportW_la_rpath = -rpath $(libdir)
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -143,6 +143,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -178,6 +179,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-@@ -414,8 +416,8 @@
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
- f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
- done
-
-@@ -423,8 +425,8 @@
- @$(NORMAL_UNINSTALL)
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-
- clean-libLTLIBRARIES:
-@@ -521,8 +523,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -534,8 +536,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -545,13 +547,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-1.9.1+dfsg~/tools/Makefile.in mono-1.9.1+dfsg/tools/Makefile.in
---- mono-1.9.1+dfsg~/tools/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/tools/Makefile.in 2008-06-17 23:58:28.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -90,6 +90,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -125,6 +126,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-@@ -334,8 +336,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -360,8 +362,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -371,13 +373,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -urNad mono-1.9.1+dfsg~/tools/locale-builder/Makefile.in mono-1.9.1+dfsg/tools/locale-builder/Makefile.in
---- mono-1.9.1+dfsg~/tools/locale-builder/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/tools/locale-builder/Makefile.in 2008-06-17 23:58:28.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,6 +78,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -113,6 +114,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9.1+dfsg~/web/Makefile.in mono-1.9.1+dfsg/web/Makefile.in
---- mono-1.9.1+dfsg~/web/Makefile.in 2008-04-23 21:53:58.000000000 +0200
-+++ mono-1.9.1+dfsg/web/Makefile.in 2008-06-17 23:58:28.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,6 +79,7 @@
- DEPDIR = @DEPDIR@
- DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -114,6 +115,7 @@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
- MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
Deleted: mono/trunk/debian/patches/armel_fix_configure_fpu_check.dpatch
===================================================================
--- mono/trunk/debian/patches/armel_fix_configure_fpu_check.dpatch 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/patches/armel_fix_configure_fpu_check.dpatch 2008-11-11 21:51:28 UTC (rev 3751)
@@ -1,277 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## armel_fix_configure_fpu_check.dpatch by Riku Voipio <riku.voipio at iki.fi>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad mono-1.2.5~/configure.in mono-1.2.5/configure.in
---- mono-1.2.5~/configure.in 2007-08-17 19:41:56.000000000 +0200
-+++ mono-1.2.5/configure.in 2007-08-17 19:42:47.000000000 +0200
-@@ -1893,19 +1893,24 @@
- ])
- fi
-
-+AC_ARG_WITH(fpu, [ --with-fpu=FPA,VFP,NONE Select fpu to use on arm],[fpu=$withval])
-+
- if test ${TARGET} = ARM; then
- dnl ******************************************
- dnl *** Check to see what FPU is available ***
- dnl ******************************************
- AC_MSG_CHECKING(which FPU to use)
-
-- AC_TRY_COMPILE([], [
-- __asm__ ("ldfd f0, [r0]");
-- ], fpu=FPA, [
-- AC_TRY_COMPILE([], [
-- __asm__ ("fldd d0, [r0]");
-- ], fpu=VFP, fpu=NONE)
-- ])
-+ if test "x$fpu" = "x"; then
-+
-+ AC_TRY_COMPILE([], [
-+ __asm__ ("ldfd f0, [r0]");
-+ ], fpu=FPA, [
-+ AC_TRY_COMPILE([], [
-+ __asm__ ("fldd d0, [r0]");
-+ ], fpu=VFP, fpu=NONE)
-+ ])
-+ fi
-
- AC_MSG_RESULT($fpu)
- CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu=1"
-diff -urNad mono-1.2.5~/configure mono-1.2.5/configure
---- mono-1.2.5~/configure 2007-08-17 19:41:56.000000000 +0200
-+++ mono-1.2.5/configure 2007-08-17 19:43:15.000000000 +0200
-@@ -1610,6 +1610,7 @@
- --with-jit=yes,no If you want to build scripts that default to the JIT
- --with-interp=yes,no If you want to build scripts that default to the interpreter
- --with-x use the X Window System
-+ --with-fpu=FPA,VFP,NONE Select fpu to use on arm
- --with-preview=yes,no If you want to install the 2.0 FX preview
- --with-moonlight=yes,no If you want to build the Moonlight 2.1 assemblies
-
-@@ -6545,7 +6546,7 @@
- ;;
- *-*-irix6*)
- # Find out which ABI we are using.
-- echo '#line 6548 "configure"' > conftest.$ac_ext
-+ echo '#line 6549 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-@@ -9344,11 +9345,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9347: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9348: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:9351: \$? = $ac_status" >&5
-+ echo "$as_me:9352: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -9612,11 +9613,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9615: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9616: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:9619: \$? = $ac_status" >&5
-+ echo "$as_me:9620: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -9716,11 +9717,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9719: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9720: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:9723: \$? = $ac_status" >&5
-+ echo "$as_me:9724: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -12168,7 +12169,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 12171 "configure"
-+#line 12172 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -12268,7 +12269,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 12271 "configure"
-+#line 12272 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -14636,11 +14637,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:14639: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14640: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:14643: \$? = $ac_status" >&5
-+ echo "$as_me:14644: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -14740,11 +14741,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:14743: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14744: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:14747: \$? = $ac_status" >&5
-+ echo "$as_me:14748: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -16310,11 +16311,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16313: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16314: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:16317: \$? = $ac_status" >&5
-+ echo "$as_me:16318: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -16414,11 +16415,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16417: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16418: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:16421: \$? = $ac_status" >&5
-+ echo "$as_me:16422: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -18644,11 +18645,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18647: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18648: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:18651: \$? = $ac_status" >&5
-+ echo "$as_me:18652: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -18912,11 +18913,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18915: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18916: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:18919: \$? = $ac_status" >&5
-+ echo "$as_me:18920: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -19016,11 +19017,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:19019: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19020: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:19023: \$? = $ac_status" >&5
-+ echo "$as_me:19024: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -40617,11 +40618,20 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-
-+
-+# Check whether --with-fpu was given.
-+if test "${with_fpu+set}" = set; then
-+ withval=$with_fpu; fpu=$withval
-+fi
-+
-+
- if test ${TARGET} = ARM; then
- { echo "$as_me:$LINENO: checking which FPU to use" >&5
- echo $ECHO_N "checking which FPU to use... $ECHO_C" >&6; }
-
-- cat >conftest.$ac_ext <<_ACEOF
-+ if test "x$fpu" = "x"; then
-+
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -40632,7 +40642,7 @@
- main ()
- {
-
-- __asm__ ("ldfd f0, [r0]");
-+ __asm__ ("ldfd f0, [r0]");
-
- ;
- return 0;
-@@ -40678,7 +40688,7 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
-- cat >conftest.$ac_ext <<_ACEOF
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -40689,7 +40699,7 @@
- main ()
- {
-
-- __asm__ ("fldd d0, [r0]");
-+ __asm__ ("fldd d0, [r0]");
-
- ;
- return 0;
-@@ -40742,6 +40752,7 @@
- fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ fi
-
- { echo "$as_me:$LINENO: result: $fpu" >&5
- echo "${ECHO_T}$fpu" >&6; }
Added: mono/trunk/debian/patches/build_genxs_2.0.dpatch
===================================================================
--- mono/trunk/debian/patches/build_genxs_2.0.dpatch (rev 0)
+++ mono/trunk/debian/patches/build_genxs_2.0.dpatch 2008-11-11 21:51:28 UTC (rev 3751)
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## build_genxs_2.0.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-2.0~/mcs/tools/Makefile mono-2.0/mcs/tools/Makefile
+--- mono-2.0~/mcs/tools/Makefile 2008-09-02 17:44:36.000000000 +0200
++++ mono-2.0/mcs/tools/Makefile 2008-11-01 12:52:49.000000000 +0100
+@@ -8,7 +8,7 @@
+ net_1_1_bootstrap_SUBDIRS = gacutil security resgen culevel
+ net_2_0_bootstrap_SUBDIRS = resgen
+
+-net_2_0_SUBDIRS = al corcompare mono-xsd wsdl compiler-tester monop xbuild resgen mono-service mkbundle sgen security mconfig installutil nunitreport gacutil
++net_2_0_SUBDIRS = al corcompare mono-xsd wsdl compiler-tester monop xbuild resgen mono-service mkbundle sgen security mconfig installutil nunitreport gacutil genxs
+ net_2_1_raw_SUBDIRS = compiler-tester
+ net_2_1_SUBDIRS = compiler-tester tuner
+
+diff -urNad mono-2.0~/mcs/tools/genxs/Makefile mono-2.0/mcs/tools/genxs/Makefile
+--- mono-2.0~/mcs/tools/genxs/Makefile 2008-09-02 17:44:14.000000000 +0200
++++ mono-2.0/mcs/tools/genxs/Makefile 2008-11-01 12:52:02.000000000 +0100
+@@ -5,4 +5,6 @@
+ LOCAL_MCS_FLAGS = -r:System.Xml.dll
+ PROGRAM = $(topdir)/class/lib/$(PROFILE)/genxs.exe
+
++CLEAN_FILES = *.exe *.mdb
++
+ include ../../build/executable.make
Property changes on: mono/trunk/debian/patches/build_genxs_2.0.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Deleted: mono/trunk/debian/patches/fix_Dictionary_preventing_GC_r102114.dpatch
===================================================================
--- mono/trunk/debian/patches/fix_Dictionary_preventing_GC_r102114.dpatch 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/patches/fix_Dictionary_preventing_GC_r102114.dpatch 2008-11-11 21:51:28 UTC (rev 3751)
@@ -1,35 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix_Dictionary_preventing_GC_r102114.dpatch by Mirco Bauer <meebey at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: * Dictionary.cs (Clear, Remove): Clear empty slots in keySlots
-## DP: and valueSlots. Otherwise the garbage collector cannot reclaim
-## DP: the referenced key/value. Fixes bug #384723.
-
- at DPATCH@
-diff -urNad mono-1.9.1+dfsg~/mcs/class/corlib/System.Collections.Generic/Dictionary.cs mono-1.9.1+dfsg/mcs/class/corlib/System.Collections.Generic/Dictionary.cs
---- mono-1.9.1+dfsg~/mcs/class/corlib/System.Collections.Generic/Dictionary.cs 2007-11-08 23:13:53.000000000 +0100
-+++ mono-1.9.1+dfsg/mcs/class/corlib/System.Collections.Generic/Dictionary.cs 2008-07-08 14:13:04.000000000 +0200
-@@ -383,7 +383,10 @@
- {
- count = 0;
- // clear the hash table
-- Array.Clear(table, 0, table.Length);
-+ Array.Clear (table, 0, table.Length);
-+ // clear key and value arrays
-+ Array.Clear (keySlots, 0, keySlots.Length);
-+ Array.Clear (valueSlots, 0, valueSlots.Length);
-
- // empty the "empty slots chain"
- emptySlot = NO_SLOT;
-@@ -510,6 +513,10 @@
- linkSlots [cur].Next = emptySlot;
- emptySlot = cur;
-
-+ // clear empty key and value slots
-+ keySlots [cur] = default (TKey);
-+ valueSlots [cur] = default (TValue);
-+
- generation++;
- return true;
- }
Deleted: mono/trunk/debian/patches/fix_TdsConnectionPool_svn.dpatch
===================================================================
--- mono/trunk/debian/patches/fix_TdsConnectionPool_svn.dpatch 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/patches/fix_TdsConnectionPool_svn.dpatch 2008-11-11 21:51:28 UTC (rev 3751)
@@ -1,397 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix_TdsConnectionPool_r105424_r106448_107325.dpatch by Mirco Bauer <meebey at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Backport of upstream SVN trunk to fix connection pool leaks/stalls, see:
-## DP: https://bugzilla.novell.com/show_bug.cgi?id=360157
-## DP: r105424:
-## DP: Remove unnecessary locks and code refactoring
-## DP: r105432:
-## DP: Update according to the new return type of TdsConnectionPool.GetConnectionPool()
-## DP: r105433:
-## DP: Member to keep track of pool status
-## DP: r105719:
-## DP: Do not call tds.Reset () as it is already done in the connection pool.
-## DP: r106448:
-## DP: Honor timeout and throw appropriate exception when connections are not available
-## DP: r107325:
-## DP: TdsConnectionPool.cs: When pooled connection cannot be reset, remove
-## DP: it from pool and allow slot to be re-used for a newly established
-## DP: connection. Fixes part of bug #360157. When pool is full, and no
-## DP: connection becomes available before the connect timeout has elapsed,
-## DP: then throw an InvalidOperationException instead of a SqlException.
-
- at DPATCH@
-diff -urNad mono-1.9+dfsg~/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/Tds.cs mono-1.9+dfsg/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/Tds.cs
---- mono-1.9+dfsg~/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/Tds.cs 2008-01-29 23:04:15.000000000 +0100
-+++ mono-1.9+dfsg/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/Tds.cs 2008-07-08 21:15:49.000000000 +0200
-@@ -102,6 +102,8 @@
- bool isResultRead = false;
- bool LoadInProgress = false;
-
-+ internal int poolStatus = 0;
-+
- #endregion // Fields
-
- #region Properties
-diff -urNad mono-1.9+dfsg~/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/TdsConnectionPool.cs mono-1.9+dfsg/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/TdsConnectionPool.cs
---- mono-1.9+dfsg~/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/TdsConnectionPool.cs 2007-11-08 23:11:23.000000000 +0100
-+++ mono-1.9+dfsg/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/TdsConnectionPool.cs 2008-07-08 21:15:49.000000000 +0200
-@@ -3,6 +3,7 @@
- //
- // Author:
- // Lluis Sanchez Gual (lluis at ximian.com)
-+// Christian Hergert (christian.hergert at gmail.com)
- //
- // Copyright (C) 2004 Novell, Inc.
- //
-@@ -28,16 +29,23 @@
- // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- //
-
--using Mono.Data.Tds.Protocol;
- using System;
-+#if NET_2_0
-+using System.Collections.Generic;
-+#else
- using System.Collections;
-+#endif
- using System.Threading;
-
- namespace Mono.Data.Tds.Protocol
- {
- public class TdsConnectionPoolManager
- {
-+#if NET_2_0
-+ Dictionary <string, TdsConnectionPool> pools = new Dictionary <string, TdsConnectionPool> ();
-+#else
- Hashtable pools = new Hashtable ();
-+#endif
- TdsVersion version;
-
- public TdsConnectionPoolManager (TdsVersion version)
-@@ -49,7 +57,12 @@
- {
- lock (pools)
- {
-- TdsConnectionPool pool = (TdsConnectionPool) pools [connectionString];
-+ TdsConnectionPool pool = null;
-+#if NET_2_0
-+ pools.TryGetValue (connectionString, out pool);
-+#else
-+ pool = (TdsConnectionPool) pools [connectionString];
-+#endif
- if (pool == null) {
- pool = new TdsConnectionPool (this, info);
- pools [connectionString] = pool;
-@@ -58,12 +71,13 @@
- }
- }
-
-- public Hashtable GetConnectionPool ()
-+#if NET_2_0
-+ public IDictionary <string, TdsConnectionPool> GetConnectionPool ()
-+#else
-+ public IDictionary GetConnectionPool ()
-+#endif
- {
-- lock (pools)
-- {
-- return pools;
-- }
-+ return pools;
- }
-
- public virtual ITds CreateConnection (TdsConnectionInfo info)
-@@ -102,20 +116,34 @@
- public int PoolMinSize;
- public int PoolMaxSize;
- }
--
-+
- public class TdsConnectionPool
- {
-- ArrayList list = new ArrayList ();
-+ ITds[] list;
- TdsConnectionInfo info;
-- bool initialized;
- bool pooling = true;
-- int activeConnections = 0;
- TdsConnectionPoolManager manager;
--
-+ ManualResetEvent connAvailable;
-+
- public TdsConnectionPool (TdsConnectionPoolManager manager, TdsConnectionInfo info)
- {
-+ int n = 0;
-+
- this.info = info;
- this.manager = manager;
-+ list = new ITds[info.PoolMaxSize];
-+
-+ // Placeholder for future connections are at the beginning of the array.
-+ for (; n < info.PoolMaxSize - info.PoolMinSize; n++)
-+ list [n] = null;
-+
-+ // Pre-populate with minimum number of connections
-+ for (; n < list.Length; n++) {
-+ list [n] = CreateConnection ();
-+ }
-+
-+ // Event that notifies a connection is available in the pool
-+ connAvailable = new ManualResetEvent (false);
- }
-
- public bool Pooling {
-@@ -128,110 +156,118 @@
- public ITds GetConnection ()
- {
- ITds connection = null;
-- lock (list)
-- {
-- if (!initialized)
-- {
-- for (int n = 0; n < info.PoolMinSize; n++)
-- list.Add (CreateConnection ());
-- initialized = true;
-- }
-- do {
-- if (list.Count > 0)
-- {
-- // There are available connections
-- connection = (ITds) list [list.Count - 1];
-- list.RemoveAt (list.Count - 1);
-+ int index;
-+
-+ retry:
-+ // Reset the connection available event
-+ connAvailable.Reset ();
-+
-+ index = list.Length - 1;
-+
-+ do {
-+ connection = list [index];
-+
-+ if (connection == null) {
-+ // Attempt take-over of array position
-+ connection = CreateConnection ();
-+ (connection as Tds).poolStatus = 1;
-+#if NET_2_0
-+ if (Interlocked.CompareExchange<ITds> (ref list [index], connection, null) != null) {
-+#else
-+ if (Interlocked.CompareExchange (ref (list as object[]) [index], connection, null) != null) {
-+#endif
-+ // Someone beat us to the punch
-+ connection = null;
-+ } else {
-+ continue;
-+ }
-+ } else {
-+ if (Interlocked.CompareExchange (ref (connection as Tds).poolStatus, 1, 0) != 0) {
-+ // Someone else owns this connection
-+ connection = null;
-+ } else {
- if (!connection.Reset ()) {
-- try {
-- connection.Disconnect ();
-- } catch {}
-- connection = null;
-+ ThreadPool.QueueUserWorkItem (new WaitCallback (DestroyConnection), connection);
-+ // remove connection from pool
-+ list [index] = connection = null;
-+ // allow slot be re-used in same run
-+ continue;
-+ } else {
- continue;
- }
- }
-+ }
-+
-+ index--;
-+
-+ if (index < 0) {
-+ // TODO: Maintain a list of indices of released connection to save some loop over
-+ // Honor timeout - if pool is full, and no connections are available within the
-+ // timeout period - just throw the exception
-+ if (info.Timeout > 0
-+ && !connAvailable.WaitOne (new TimeSpan (0, 0, info.Timeout), true))
-+ throw new InvalidOperationException (
-+ "Timeout expired. The timeout period elapsed before a " +
-+ "connection could be obtained. A possible explanation " +
-+ "is that all the connections in the pool are in use, " +
-+ "and the maximum pool size is reached.");
-+ goto retry;
-+ }
-
-- if (connection == null && activeConnections < info.PoolMaxSize)
-- {
-- // No connections available, but the connection limit
-- // has not been reached yet, so a new one can be created
-- connection = CreateConnection();
-- }
--
-- // No available connections in the pool
-- // Wait for somewone to release one.
-- if (connection == null)
-- {
-- Monitor.Wait (list);
-- }
-- }
-- while (connection == null);
-- }
-+ } while (connection == null);
-
- return connection;
- }
-
-- public void ReleaseConnection (ITds tds)
-+ public void ReleaseConnection (ITds connection)
- {
-- lock (list)
-- {
-- list.Add (tds);
-- Monitor.Pulse (list);
-- }
-+ ((Tds) connection).poolStatus = 0;
-+ connAvailable.Set ();
- }
-
- #if NET_2_0
-- public void ReleaseConnection (ref ITds tds)
-+ public void ReleaseConnection (ref ITds connection)
- {
-- lock (list)
-- {
-- if (pooling == false) {
-- try {
-- tds.Disconnect ();
-- } catch {}
-- tds = null;
-- } else {
-- list.Add (tds);
-- Monitor.Pulse (list);
-- }
-+ if (pooling == false) {
-+ int index = Array.IndexOf (list, connection);
-+ ThreadPool.QueueUserWorkItem (new WaitCallback (DestroyConnection), connection);
-+ list [index] = connection = null;
-+ } else {
-+ ((Tds) connection).poolStatus = 0;
- }
-+ connAvailable.Set ();
- }
-
- public void ResetConnectionPool ()
- {
-- lock (list)
-+ ITds connection = null;
-+ int index = list.Length - 1;
-+
-+ while (index >= 0)
- {
-- ITds connection = null;
-- while (list.Count > 0) {
-- // There are available connections
-- connection = (ITds) list [list.Count - 1];
-- list.RemoveAt (list.Count - 1);
-+ connection = list [index];
-+
-+ if (Interlocked.CompareExchange (ref ((Tds) connection).poolStatus, 1, 0) == 0) {
- if (!connection.Reset ()) {
-- try {
-- connection.Disconnect ();
-- } catch {}
-- connection = null;
-+ ThreadPool.QueueUserWorkItem (new WaitCallback (DestroyConnection), connection);
-+ list [index] = connection = null;
-+ connAvailable.Set ();
- }
- }
-+
-+ index--;
- }
- }
-
- public void ResetConnectionPool (ITds connection)
- {
-- lock (list)
-- {
-- if (list.Count > 0) {
-- // There are available connections
-- int index = list.IndexOf (connection);
-- if (index != -1) {
-- list.RemoveAt (index);
-- if (!connection.Reset ()) {
-- try {
-- connection.Disconnect ();
-- } catch {}
-- connection = null;
-- }
-- }
-+ int index = Array.IndexOf (list, connection);
-+
-+ if (index != -1) {
-+ if (connection != null && !connection.Reset ()) {
-+ ThreadPool.QueueUserWorkItem (new WaitCallback (DestroyConnection), connection);
-+ list [index] = connection = null;
-+ connAvailable.Set ();
- }
- }
- }
-@@ -239,10 +275,21 @@
-
- ITds CreateConnection ()
- {
-- activeConnections++;
- return manager.CreateConnection (info);
- }
-
-+ void DestroyConnection (object state)
-+ {
-+ ITds connection = state as ITds;
-+ if (connection != null) {
-+ try {
-+ connection.Disconnect ();
-+ } finally {
-+ connection = null;
-+ }
-+ }
-+ }
-+
- #endregion // Methods
- }
- }
-diff -urNad mono-1.9+dfsg~/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs mono-1.9+dfsg/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs
---- mono-1.9+dfsg~/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs 2007-11-08 23:13:07.000000000 +0100
-+++ mono-1.9+dfsg/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs 2008-07-08 21:16:16.000000000 +0200
-@@ -51,6 +51,9 @@
- using System.Net.Sockets;
- using System.Text;
- using System.Xml;
-+#if NET_2_0
-+using System.Collections.Generic;
-+#endif
-
- namespace System.Data.SqlClient {
- [DefaultEvent ("InfoMessage")]
-@@ -570,8 +573,6 @@
- pool.ReleaseConnection (tds);
- throw;
- }
-- } else if (connectionReset) {
-- tds.Reset ();
- }
-
- disposed = false; // reset this, so using () would call Close ().
-@@ -1684,7 +1685,11 @@
-
- public static void ClearAllPools ()
- {
-+#if NET_2_0
-+ IDictionary <string, TdsConnectionPool> pools = SqlConnection.sqlConnectionPools.GetConnectionPool ();
-+#else
- Hashtable pools = SqlConnection.sqlConnectionPools.GetConnectionPool ();
-+#endif
- foreach (TdsConnectionPool pool in pools.Values) {
- if (pool != null) {
- pool.ResetConnectionPool ();
Deleted: mono/trunk/debian/patches/fix_bound_checking_r98524_r98527.dpatch
===================================================================
--- mono/trunk/debian/patches/fix_bound_checking_r98524_r98527.dpatch 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/patches/fix_bound_checking_r98524_r98527.dpatch 2008-11-11 21:51:28 UTC (rev 3751)
@@ -1,304 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix_bound_checking_r98524_r98527.dpatch by Jo Shields <directhex at apebox.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Pull in two SVN changesets to fix bound checking, which manifests itself
-## DP: as XSP failing to compile on amd64. Changelog entries and init_trampoline
-## DP: routine changes snipped to apply cleanly against 1.9.1
-
- at DPATCH@
-Index: mono/mono/mini/tramp-ia64.c
-===================================================================
---- mono/mono/mini/tramp-ia64.c (revision 98523)
-+++ mono/mono/mini/tramp-ia64.c (revision 98524)
-@@ -76,7 +76,7 @@
- }
-
- void
--mono_arch_patch_callsite (guint8 *code, guint8 *addr)
-+mono_arch_patch_callsite (guint8 *method_start, guint8 *code, guint8 *addr)
- {
- guint8 *callsite_begin;
- guint64 *callsite = (guint64*)(gpointer)(code - 16);
-Index: mono/mono/mini/tramp-arm.c
-===================================================================
---- mono/mono/mini/tramp-arm.c (revision 98523)
-+++ mono/mono/mini/tramp-arm.c (revision 98524)
-@@ -75,7 +75,7 @@
- }
-
- void
--mono_arch_patch_callsite (guint8 *code_ptr, guint8 *addr)
-+mono_arch_patch_callsite (guint8 *method_start, guint8 *code_ptr, guint8 *addr)
- {
- guint32 *code = (guint32*)code_ptr;
-
-Index: mono/mono/mini/mini.h
-===================================================================
---- mono/mono/mini/mini.h (revision 98523)
-+++ mono/mono/mini/mini.h (revision 98524)
-@@ -1254,7 +1254,7 @@
- void mono_arch_save_unwind_info (MonoCompile *cfg) MONO_INTERNAL;
- void mono_arch_register_lowlevel_calls (void) MONO_INTERNAL;
- gpointer mono_arch_get_unbox_trampoline (MonoMethod *m, gpointer addr) MONO_INTERNAL;
--void mono_arch_patch_callsite (guint8 *code, guint8 *addr) MONO_INTERNAL;
-+void mono_arch_patch_callsite (guint8 *method_start, guint8 *code, guint8 *addr) MONO_INTERNAL;
- void mono_arch_patch_plt_entry (guint8 *code, guint8 *addr) MONO_INTERNAL;
- void mono_arch_nullify_class_init_trampoline(guint8 *code, gssize *regs) MONO_INTERNAL;
- void mono_arch_nullify_plt_entry (guint8 *code) MONO_INTERNAL;
-Index: mono/mono/mini/tramp-alpha.c
-===================================================================
---- mono/mono/mini/tramp-alpha.c (revision 98523)
-+++ mono/mono/mini/tramp-alpha.c (revision 98524)
-@@ -523,7 +523,7 @@
- }
-
- void
--mono_arch_patch_callsite (guint8 *code, guint8 *addr)
-+mono_arch_patch_callsite (guint8 *method_start, guint8 *code, guint8 *addr)
- {
- unsigned long *p = (unsigned int *)(code-12);
-
-Index: mono/mono/mini/tramp-s390.c
-===================================================================
---- mono/mono/mini/tramp-s390.c (revision 98523)
-+++ mono/mono/mini/tramp-s390.c (revision 98524)
-@@ -128,7 +128,7 @@
- /*------------------------------------------------------------------*/
-
- void
--mono_arch_patch_callsite (guint8 *orig_code, guint8 *addr)
-+mono_arch_patch_callsite (guint8 *method_start, guint8 *orig_code, guint8 *addr)
- {
- gint32 displace;
- unsigned short opcode;
-Index: mono/mono/mini/tramp-amd64.c
-===================================================================
---- mono/mono/mini/tramp-amd64.c (revision 98523)
-+++ mono/mono/mini/tramp-amd64.c (revision 98524)
-@@ -69,7 +69,7 @@
- * points to the pc right after the call.
- */
- void
--mono_arch_patch_callsite (guint8 *orig_code, guint8 *addr)
-+mono_arch_patch_callsite (guint8 *method_start, guint8 *orig_code, guint8 *addr)
- {
- guint8 *code;
- guint8 buf [16];
-Index: mono/mono/mini/tramp-ppc.c
-===================================================================
---- mono/mono/mini/tramp-ppc.c (revision 98523)
-+++ mono/mono/mini/tramp-ppc.c (revision 98524)
-@@ -85,7 +85,7 @@
- }
-
- void
--mono_arch_patch_callsite (guint8 *code_ptr, guint8 *addr)
-+mono_arch_patch_callsite (guint8 *method_start, guint8 *code_ptr, guint8 *addr)
- {
- guint32 *code = (guint32*)code_ptr;
- /* This is the 'blrl' instruction */
-Index: mono/mono/mini/tramp-hppa.c
-===================================================================
---- mono/mono/mini/tramp-hppa.c (revision 98523)
-+++ mono/mono/mini/tramp-hppa.c (revision 98524)
-@@ -77,7 +77,7 @@
- }
-
- void
--mono_arch_patch_callsite (guint8 *p, guint8 *addr)
-+mono_arch_patch_callsite (guint8 *method_start, guint8 *p, guint8 *addr)
- {
- guint32 *code = (void *)p;
- /* Search for and patch the calling sequence
-Index: mono/mono/mini/mini-trampolines.c
-===================================================================
---- mono/mono/mini/mini-trampolines.c (revision 98523)
-+++ mono/mono/mini/mini-trampolines.c (revision 98524)
-@@ -251,7 +251,7 @@
- mono_jit_info_table_find (mono_domain_get (), mono_get_addr_from_ftnptr (addr));
-
- if (mono_method_same_domain (ji, target_ji))
-- mono_arch_patch_callsite (code, addr);
-+ mono_arch_patch_callsite (ji->code_start, code, addr);
- }
- }
-
-Index: mono/mono/mini/tramp-x86.c
-===================================================================
---- mono/mono/mini/tramp-x86.c (revision 98523)
-+++ mono/mono/mini/tramp-x86.c (revision 98524)
-@@ -58,7 +58,7 @@
- }
-
- void
--mono_arch_patch_callsite (guint8 *orig_code, guint8 *addr)
-+mono_arch_patch_callsite (guint8 *method_start, guint8 *orig_code, guint8 *addr)
- {
- guint8 *code;
- guint8 buf [8];
-Index: mono/mono/mini/tramp-s390x.c
-===================================================================
---- mono/mono/mini/tramp-s390x.c (revision 98523)
-+++ mono/mono/mini/tramp-s390x.c (revision 98524)
-@@ -128,7 +128,7 @@
- /*------------------------------------------------------------------*/
-
- void
--mono_arch_patch_callsite (guint8 *orig_code, guint8 *addr)
-+mono_arch_patch_callsite (guint8 *method_start, guint8 *orig_code, guint8 *addr)
- {
- gint32 displace;
- unsigned short opcode;
-Index: mono/mono/mini/tramp-sparc.c
-===================================================================
---- mono/mono/mini/tramp-sparc.c (revision 98523)
-+++ mono/mono/mini/tramp-sparc.c (revision 98524)
-@@ -58,7 +58,7 @@
- }
-
- void
--mono_arch_patch_callsite (guint8 *code, guint8 *addr)
-+mono_arch_patch_callsite (guint8 *method_start, guint8 *code, guint8 *addr)
- {
- if (sparc_inst_op (*(guint32*)code) == 0x1) {
- sparc_call_simple (code, (guint8*)addr - (guint8*)code);
-Index: mono/mono/mini/mini.h
-===================================================================
---- mono/mono/mini/mini.h (revision 98526)
-+++ mono/mono/mini/mini.h (revision 98527)
-@@ -1318,7 +1318,7 @@
-
- extern gssize mono_breakpoint_info_index [MONO_BREAKPOINT_ARRAY_SIZE];
-
--gboolean mono_breakpoint_clean_code (guint8 *code, guint8 *buf, int size);
-+gboolean mono_breakpoint_clean_code (guint8 *method_start, guint8 *code, int offset, guint8 *buf, int size);
-
- /* Mono Debugger support */
- void mono_debugger_init (void);
-Index: mono/mono/mini/mini-amd64.c
-===================================================================
---- mono/mono/mini/mini-amd64.c (revision 98526)
-+++ mono/mono/mini/mini-amd64.c (revision 98527)
-@@ -5494,12 +5494,33 @@
- return 3;
- }
-
-+/**
-+ * mono_breakpoint_clean_code:
-+ *
-+ * Copy @size bytes from @code - @offset to the buffer @buf. If the debugger inserted software
-+ * breakpoints in the original code, they are removed in the copy.
-+ *
-+ * Returns TRUE if no sw breakpoint was present.
-+ */
- gboolean
--mono_breakpoint_clean_code (guint8 *code, guint8 *buf, int size)
-+mono_breakpoint_clean_code (guint8 *method_start, guint8 *code, int offset, guint8 *buf, int size)
- {
- int i;
- gboolean can_write = TRUE;
-- memcpy (buf, code, size);
-+ /*
-+ * If method_start is non-NULL we need to perform bound checks, since we access memory
-+ * at code - offset we could go before the start of the method and end up in a different
-+ * page of memory that is not mapped or read incorrect data anyway. We zero-fill the bytes
-+ * instead.
-+ */
-+ if (!method_start || code - offset >= method_start) {
-+ memcpy (buf, code - offset, size);
-+ } else {
-+ int diff = code - method_start;
-+ memset (buf, 0, size);
-+ memcpy (buf + offset - diff, method_start, diff + size - offset);
-+ }
-+ code -= offset;
- for (i = 0; i < MONO_BREAKPOINT_ARRAY_SIZE; ++i) {
- int idx = mono_breakpoint_info_index [i];
- guint8 *ptr;
-@@ -5524,8 +5545,8 @@
- gint32 disp;
- guint8 rex = 0;
-
-- mono_breakpoint_clean_code (code - 10, buf, sizeof (buf));
-- code = buf + 10;
-+ mono_breakpoint_clean_code (NULL, code, 9, buf, sizeof (buf));
-+ code = buf + 9;
-
- *displacement = 0;
-
-Index: mono/mono/mini/mini-x86.c
-===================================================================
---- mono/mono/mini/mini-x86.c (revision 98526)
-+++ mono/mono/mini/mini-x86.c (revision 98527)
-@@ -4570,12 +4570,33 @@
- }
- }
-
-+/**
-+ * mono_breakpoint_clean_code:
-+ *
-+ * Copy @size bytes from @code - @offset to the buffer @buf. If the debugger inserted software
-+ * breakpoints in the original code, they are removed in the copy.
-+ *
-+ * Returns TRUE if no sw breakpoint was present.
-+ */
- gboolean
--mono_breakpoint_clean_code (guint8 *code, guint8 *buf, int size)
-+mono_breakpoint_clean_code (guint8 *method_start, guint8 *code, int offset, guint8 *buf, int size)
- {
- int i;
- gboolean can_write = TRUE;
-- memcpy (buf, code, size);
-+ /*
-+ * If method_start is non-NULL we need to perform bound checks, since we access memory
-+ * at code - offset we could go before the start of the method and end up in a different
-+ * page of memory that is not mapped or read incorrect data anyway. We zero-fill the bytes
-+ * instead.
-+ */
-+ if (!method_start || code - offset >= method_start) {
-+ memcpy (buf, code - offset, size);
-+ } else {
-+ int diff = code - method_start;
-+ memset (buf, 0, size);
-+ memcpy (buf + offset - diff, method_start, diff + size - offset);
-+ }
-+ code -= offset;
- for (i = 0; i < MONO_BREAKPOINT_ARRAY_SIZE; ++i) {
- int idx = mono_breakpoint_info_index [i];
- guint8 *ptr;
-@@ -4599,7 +4620,7 @@
- guint8 reg = 0;
- gint32 disp = 0;
-
-- mono_breakpoint_clean_code (code - 8, buf, sizeof (buf));
-+ mono_breakpoint_clean_code (NULL, code, 8, buf, sizeof (buf));
- code = buf + 8;
-
- *displacement = 0;
-Index: mono/mono/mini/tramp-amd64.c
-===================================================================
---- mono/mono/mini/tramp-amd64.c (revision 98526)
-+++ mono/mono/mini/tramp-amd64.c (revision 98527)
-@@ -73,7 +73,7 @@
- {
- guint8 *code;
- guint8 buf [16];
-- gboolean can_write = mono_breakpoint_clean_code (orig_code - 14, buf, sizeof (buf));
-+ gboolean can_write = mono_breakpoint_clean_code (method_start, orig_code, 14, buf, sizeof (buf));
-
- code = buf + 14;
-
-Index: mono/mono/mini/tramp-x86.c
-===================================================================
---- mono/mono/mini/tramp-x86.c (revision 98526)
-+++ mono/mono/mini/tramp-x86.c (revision 98527)
-@@ -62,7 +62,7 @@
- {
- guint8 *code;
- guint8 buf [8];
-- gboolean can_write = mono_breakpoint_clean_code (orig_code - 8, buf, sizeof (buf));
-+ gboolean can_write = mono_breakpoint_clean_code (method_start, orig_code, 8, buf, sizeof (buf));
-
- code = buf + 8;
- if (mono_running_on_valgrind ())
Deleted: mono/trunk/debian/patches/fix_delegate_memory_leak_r79001.dpatch
===================================================================
--- mono/trunk/debian/patches/fix_delegate_memory_leak_r79001.dpatch 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/patches/fix_delegate_memory_leak_r79001.dpatch 2008-11-11 21:51:28 UTC (rev 3751)
@@ -1,47 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix_delegate_memory_leak.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-1.2.4~/mono/metadata/loader.c mono-1.2.4/mono/metadata/loader.c
---- mono-1.2.4~/mono/metadata/loader.c 2007-04-25 20:48:41.000000000 +0200
-+++ mono-1.2.4/mono/metadata/loader.c 2007-07-21 16:02:11.000000000 +0200
-@@ -1551,17 +1551,11 @@
- g_free ((char*)method->name);
- if (mw->method.header)
- g_free ((char*)mw->method.header->code);
-+ g_free (mw->method.header);
- g_free (mw->method_data);
-- }
--
-- if (method->dynamic && !(method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) && ((MonoMethodNormal *)method)->header) {
-- /* FIXME: Ditto */
-- /* mono_metadata_free_mh (((MonoMethodNormal *)method)->header); */
-- g_free (((MonoMethodNormal*)method)->header);
-- }
--
-- if (method->dynamic)
-+ g_free (method->signature);
- g_free (method);
-+ }
- }
-
- void
-diff -urNad mono-1.2.4~/mono/metadata/marshal.c mono-1.2.4/mono/metadata/marshal.c
---- mono-1.2.4~/mono/metadata/marshal.c 2007-05-01 00:49:22.000000000 +0200
-+++ mono-1.2.4/mono/metadata/marshal.c 2007-07-21 16:02:11.000000000 +0200
-@@ -8765,7 +8765,11 @@
-
-
- /* we copy the signature, so that we can modify it */
-- csig = signature_dup (method->klass->image, sig);
-+ if (this)
-+ /* Need to free this later */
-+ csig = mono_metadata_signature_dup (sig);
-+ else
-+ csig = signature_dup (method->klass->image, sig);
- csig->hasthis = 0;
- csig->pinvoke = 1;
-
Deleted: mono/trunk/debian/patches/fix_softfloat_r105848.dpatch
===================================================================
--- mono/trunk/debian/patches/fix_softfloat_r105848.dpatch 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/patches/fix_softfloat_r105848.dpatch 2008-11-11 21:51:28 UTC (rev 3751)
@@ -1,120 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix_softfloat_r105848.dpatch by Mirco Bauer <meebey at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes softfloat issues causing SIGABRT on armel, see
-## DP: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=485112
-## DP: Patch taken from upstream SVN revision 105848.
-
- at DPATCH@
-diff -urNad mono-1.9.1+dfsg~/mono/mini/mini.c mono-1.9.1+dfsg/mono/mini/mini.c
---- mono-1.9.1+dfsg~/mono/mini/mini.c 2008-02-06 21:28:25.000000000 +0100
-+++ mono-1.9.1+dfsg/mono/mini/mini.c 2008-06-17 23:29:29.000000000 +0200
-@@ -622,7 +622,6 @@
- (cfg)->disable_ssa = TRUE; \
- } while (0)
-
--
- #define NEW_INDLOAD(cfg,dest,addr,vtype) do { \
- (dest) = mono_mempool_alloc0 ((cfg)->mempool, sizeof (MonoInst)); \
- (dest)->inst_left = addr; \
-@@ -2857,11 +2856,23 @@
- MONO_INST_NEW (cfg, (ins), OP_NOP); \
- } \
- } while (0)
-+
-+#define NEW_TEMPLOAD_SOFT_FLOAT(cfg,bblock,ins,num) do { \
-+ if ((ins)->opcode == CEE_LDIND_R4) { \
-+ int idx = (num); \
-+ int temp; \
-+ NEW_TEMPLOADA (cfg, (ins), (idx)); \
-+ temp = handle_load_float (cfg, (bblock), (ins), ip); \
-+ NEW_TEMPLOAD (cfg, (ins), (temp)); \
-+ } \
-+ } while (0)
-+
- #else
- #define LDLOC_SOFT_FLOAT(cfg,ins,idx,ip)
- #define STLOC_SOFT_FLOAT(cfg,ins,idx,ip)
- #define LDARG_SOFT_FLOAT(cfg,ins,idx,ip)
- #define STARG_SOFT_FLOAT(cfg,ins,idx,ip)
-+#define NEW_TEMPLOAD_SOFT_FLOAT(cfg,bblock,ins,num)
- #endif
-
- static MonoMethod*
-@@ -3820,14 +3831,7 @@
-
- if (rvar) {
- NEW_TEMPLOAD (cfg, ins, rvar->inst_c0);
--#ifdef MONO_ARCH_SOFT_FLOAT
-- if (ins->opcode == CEE_LDIND_R4) {
-- int temp;
-- NEW_TEMPLOADA (cfg, ins, rvar->inst_c0);
-- temp = handle_load_float (cfg, bblock, ins, ip);
-- NEW_TEMPLOAD (cfg, ins, temp);
-- }
--#endif
-+ NEW_TEMPLOAD_SOFT_FLOAT (cfg, ebblock, ins, rvar->inst_c0);
- *sp++ = ins;
- }
- *last_b = ebblock;
-@@ -5549,7 +5553,6 @@
- //g_assert (returnvar != -1);
- NEW_TEMPSTORE (cfg, store, return_var->inst_c0, *sp);
- store->cil_code = sp [0]->cil_code;
-- /* FIXME: handle CEE_STIND_R4 */
- if (store->opcode == CEE_STOBJ) {
- g_assert_not_reached ();
- NEW_TEMPLOADA (cfg, store, return_var->inst_c0);
-@@ -5923,6 +5926,31 @@
- case CEE_CONV_R_UN:
- CHECK_STACK (1);
- ADD_UNOP (*ip);
-+
-+#ifdef MONO_ARCH_SOFT_FLOAT
-+ /*
-+ * Its rather hard to emit the soft float code during the decompose
-+ * pass, so avoid it in some specific cases.
-+ */
-+ if (ins->opcode == OP_LCONV_TO_R4) {
-+ MonoInst *conv;
-+
-+ ins->opcode = OP_LCONV_TO_R8;
-+ ins->type = STACK_R8;
-+
-+ --sp;
-+ *sp++ = emit_tree (cfg, bblock, ins, ip + 1);
-+
-+ MONO_INST_NEW (cfg, conv, CEE_CONV_R4);
-+ conv->inst_left = sp [-1];
-+ conv->type = STACK_R8;
-+ sp [-1] = ins;
-+
-+ ip++;
-+ break;
-+ }
-+#endif
-+
- if (mono_find_jit_opcode_emulation (ins->opcode)) {
- --sp;
- *sp++ = emit_tree (cfg, bblock, ins, ip + 1);
-@@ -6734,6 +6762,7 @@
- } else {
- temp = mono_emit_method_call_spilled (cfg, bblock, wrapper, mono_method_signature (wrapper), iargs, ip, NULL);
- NEW_TEMPLOAD (cfg, *sp, temp);
-+ NEW_TEMPLOAD_SOFT_FLOAT (cfg, bblock, *sp, temp);
- sp++;
- }
- } else {
-diff -urNad mono-1.9.1+dfsg~/mono/mini/mini.h mono-1.9.1+dfsg/mono/mini/mini.h
---- mono-1.9.1+dfsg~/mono/mini/mini.h 2008-06-17 23:28:42.000000000 +0200
-+++ mono-1.9.1+dfsg/mono/mini/mini.h 2008-06-17 23:29:29.000000000 +0200
-@@ -244,7 +244,7 @@
- mono_container_of(ptr, type, member)*/
-
- #define MONO_INST_LIST_ENTRY(ptr, type, member) \
-- ((type *)(ptr))
-+ ((type *)(gpointer)(ptr))
-
- #define MONO_INST_LIST_FIRST_ENTRY(ptr, type, member) \
- MONO_INST_LIST_ENTRY((ptr)->next, type, member)
Deleted: mono/trunk/debian/patches/fix_stack_alignment_r105650_r105651.dpatch
===================================================================
--- mono/trunk/debian/patches/fix_stack_alignment_r105650_r105651.dpatch 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/patches/fix_stack_alignment_r105650_r105651.dpatch 2008-11-11 21:51:28 UTC (rev 3751)
@@ -1,74 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix_stack_alignment_r105650_r105651.dpatch by Mirco Bauer <meebey at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes stack alignment, caused assertions on AMD64, see:
-## DP: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473119
-## DP: Patch taken from upstream SVN revision 105650 and 105651.
-
- at DPATCH@
-diff -urNad mono-1.9.1+dfsg~/mono/metadata/threads.c mono-1.9.1+dfsg/mono/metadata/threads.c
---- mono-1.9.1+dfsg~/mono/metadata/threads.c 2008-01-29 23:02:34.000000000 +0100
-+++ mono-1.9.1+dfsg/mono/metadata/threads.c 2008-06-17 23:42:04.000000000 +0200
-@@ -700,8 +700,8 @@
- /*
- * mono_thread_get_stack_bounds:
- *
-- * Return the address and size of the current threads stack. Return NULL as the stack
-- * address if the stack address cannot be determined.
-+ * Return the address and size of the current threads stack. Return NULL as the
-+ * stack address if the stack address cannot be determined.
- */
- void
- mono_thread_get_stack_bounds (guint8 **staddr, size_t *stsize)
-@@ -709,6 +709,7 @@
- #if defined(HAVE_PTHREAD_GET_STACKSIZE_NP) && defined(HAVE_PTHREAD_GET_STACKADDR_NP)
- *staddr = (guint8*)pthread_get_stackaddr_np (pthread_self ());
- *stsize = pthread_get_stacksize_np (pthread_self ());
-+ *staddr = (guint8*)((gssize)*staddr & ~(mono_pagesize () - 1));
- return;
- /* FIXME: simplify the mess below */
- #elif !defined(PLATFORM_WIN32)
-@@ -717,28 +718,31 @@
-
- pthread_attr_init (&attr);
- #ifdef HAVE_PTHREAD_GETATTR_NP
-- pthread_getattr_np (pthread_self(), &attr);
-+ pthread_getattr_np (pthread_self(), &attr);
- #else
- #ifdef HAVE_PTHREAD_ATTR_GET_NP
-- pthread_attr_get_np (pthread_self(), &attr);
-+ pthread_attr_get_np (pthread_self(), &attr);
- #elif defined(sun)
-- *staddr = NULL;
-- pthread_attr_getstacksize (&attr, &stsize);
-+ *staddr = NULL;
-+ pthread_attr_getstacksize (&attr, &stsize);
- #else
-- *staddr = NULL;
-- *stsize = 0;
-- return;
-+ *staddr = NULL;
-+ *stsize = 0;
-+ return;
- #endif
- #endif
-
- #ifndef sun
-- pthread_attr_getstack (&attr, (void**)staddr, stsize);
-- if (*staddr)
-- g_assert ((current > *staddr) && (current < *staddr + *stsize));
-+ pthread_attr_getstack (&attr, (void**)staddr, stsize);
-+ if (*staddr)
-+ g_assert ((current > *staddr) && (current < *staddr + *stsize));
- #endif
-
-- pthread_attr_destroy (&attr);
-+ pthread_attr_destroy (&attr);
- #endif
-+
-+ /* When running under emacs, sometimes staddr is not aligned to a page size */
-+ *staddr = (guint8*)((gssize)*staddr & ~(mono_pagesize () - 1));
- }
-
- MonoThread *
Deleted: mono/trunk/debian/patches/fix_xen_support_r103474_r103475.dpatch
===================================================================
--- mono/trunk/debian/patches/fix_xen_support_r103474_r103475.dpatch 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/patches/fix_xen_support_r103474_r103475.dpatch 2008-11-11 21:51:28 UTC (rev 3751)
@@ -1,79 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix_xen.dpatch by Andrew Deason <adeason2 at uiuc.edu>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes Xen-specific build options by actually passing CFLAGS to
-## DP: libgc's Makefile
-
- at DPATCH@
-
---- mono/configure.in 2008-05-19 21:13:13.000000000 -0500
-+++ mono/configure.in 2008-05-19 21:13:21.000000000 -0500
-@@ -36,6 +36,11 @@
- gc_default=boehm
- fi
-
-+# These variables are the CPPFLAGS/CFLAGS passed to libgc's configure
-+# libgc should inherit the original CFLAGS/CPPFLAGS passed to configure, i.e. -O0
-+CPPFLAGS_FOR_LIBGC=$CPPFLAGS
-+CFLAGS_FOR_LIBGC=$CFLAGS
-+
- #
- # These are the flags that need to be stored in the mono.pc file for
- # compiling code that will embed Mono
-@@ -301,6 +306,8 @@
- #AC_DISABLE_FAST_INSTALL
- AM_PROG_LIBTOOL
-
-+DOLT
-+
- # Test whenever ld supports -version-script
- AC_PROG_LD
- AC_PROG_LD_GNU
-@@ -399,6 +406,7 @@
- esac
- fi
- CFLAGS="$CFLAGS -g $WARN"
-+CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -g"
-
- # Where's the 'mcs' source tree?
- if test -d $srcdir/mcs; then
-@@ -556,6 +564,8 @@
- void main () { }
- ], [
- AC_MSG_RESULT(yes)
-+ # Pass it to libgc as well
-+ CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -mno-tls-direct-seg-refs"
- ], [
- AC_MSG_RESULT(no)
- CFLAGS=$ORIG_CFLAGS
-@@ -1981,7 +2001,10 @@
- # We should use a separate variable for this to avoid passing useless and
- # potentially problematic defines to libgc (like -D_FILE_OFFSET_BITS=64)
- # This should be executed late so we pick up the final version of CPPFLAGS
-- ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args \"CPPFLAGS=$CPPFLAGS\""
-+ # The problem with this approach, is that during a reconfigure, the main
-+ # configure scripts gets invoked with these arguments, so we use separate
-+ # variables understood by libgc's configure to pass CPPFLAGS and CFLAGS.
-+ ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args \"CPPFLAGS_FOR_LIBGC=$CPPFLAGS\" \"CFLAGS_FOR_LIBGC=$CFLAGS_FOR_LIBGC\""
- AC_CONFIG_SUBDIRS(libgc)
- ;;
- esac
-
---- mono/libgc/configure.in 2008-05-19 14:08:04 UTC (rev 103473)
-+++ mono/libgc/configure.in 2008-05-19 14:30:46 UTC (rev 103474)
-@@ -39,6 +39,15 @@
-
- . [$]{srcdir}/configure.host
-
-+# We use a separate variable to pass down CPPFLAGS and CFLAGS from the main mono
-+# configure, because of autoconf brokeness
-+if test "x$CPPFLAGS_FOR_LIBGC" != "x"; then
-+ CPPFLAGS=$CPPFLAGS_FOR_LIBGC
-+fi
-+if test "x$CFLAGS_FOR_LIBGC" != "x"; then
-+ CFLAGS=$CFLAGS_FOR_LIBGC
-+fi
-+
- GC_CFLAGS=${gc_cflags}
- AC_SUBST(GC_CFLAGS)
Deleted: mono/trunk/debian/patches/method-signature-testing.dpatch
===================================================================
--- mono/trunk/debian/patches/method-signature-testing.dpatch 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/patches/method-signature-testing.dpatch 2008-11-11 21:51:28 UTC (rev 3751)
@@ -1,29 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
- at DPATCH@
-
-
-Index: mono/mcs/mcs/class.cs
-===================================================================
---- mono/mcs/mcs/class.cs (Revision 94888)
-+++ mono/mcs/mcs/class.cs (Revision 94889)
-@@ -8312,14 +8312,15 @@
- ReturnType = pi.PropertyType;
- else
- return false;
--
-+
- //
- // we use sig.RetType == null to mean `do not check the
- // method return value.
- //
-- if (sig.RetType != null)
-- if (ReturnType != sig.RetType)
-+ if (sig.RetType != null) {
-+ if (!TypeManager.IsEqual (ReturnType, sig.RetType))
- return false;
-+ }
-
- Type [] args;
- if (mi != null)
-
Deleted: mono/trunk/debian/patches/pass_CPPFLAGS_nicely_r98803.dpatch
===================================================================
--- mono/trunk/debian/patches/pass_CPPFLAGS_nicely_r98803.dpatch 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/patches/pass_CPPFLAGS_nicely_r98803.dpatch 2008-11-11 21:51:28 UTC (rev 3751)
@@ -1,52 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## pass_CPPFLAGS_nicely_r98803.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-1.9.1+dfsg~/configure.in mono-1.9.1+dfsg/configure.in
---- mono-1.9.1+dfsg~/configure.in 2008-04-22 20:16:11.000000000 +0200
-+++ mono-1.9.1+dfsg/configure.in 2008-04-22 20:16:15.000000000 +0200
-@@ -670,13 +670,6 @@
- ;;
-
- xincluded)
-- AC_CONFIG_SUBDIRS(libgc)
--
-- # Pass CPPFLAGS to libgc configure
-- # Maybe we should use a separate variable for this to avoid passing useless and
-- # potentially problematic defines to libgc (like -D_FILE_OFFSET_BITS=64)
-- export CPPFLAGS
--
- found_boehm=yes
- gc_headers=yes
- use_included_gc=yes
-@@ -724,9 +717,6 @@
- CPPFLAGS="$CPPFLAGS -DLARGE_CONFIG"
- fi
-
--# tell libgc/configure about what we want
--ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args"
--
- AM_CONDITIONAL(INCLUDED_LIBGC, test x$use_included_gc = xyes)
- AC_SUBST(LIBGC_CFLAGS)
- AC_SUBST(LIBGC_LIBS)
-@@ -1985,6 +1975,17 @@
- CPPFLAGS="$CPPFLAGS -DNO_UNALIGNED_ACCESS"
- fi
-
-+case "x$gc" in
-+ xincluded)
-+ # Pass CPPFLAGS to libgc configure
-+ # We should use a separate variable for this to avoid passing useless and
-+ # potentially problematic defines to libgc (like -D_FILE_OFFSET_BITS=64)
-+ # This should be executed late so we pick up the final version of CPPFLAGS
-+ ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args \"CPPFLAGS=$CPPFLAGS\""
-+ AC_CONFIG_SUBDIRS(libgc)
-+ ;;
-+esac
-+
- PREVIEW=yes
- AC_ARG_WITH(preview, [ --with-preview=yes,no If you want to install the 2.0 FX preview],[
- if test x$with_preview = xno; then
Deleted: mono/trunk/debian/patches/ppc_disable_delegate_trampoline_optimization.dpatch
===================================================================
--- mono/trunk/debian/patches/ppc_disable_delegate_trampoline_optimization.dpatch 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/patches/ppc_disable_delegate_trampoline_optimization.dpatch 2008-11-11 21:51:28 UTC (rev 3751)
@@ -1,33 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ppc_disable_delegate_trampoline_optimization.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-1.2.6~/mono/mini/mini-ppc.h mono-1.2.6/mono/mini/mini-ppc.h
---- mono-1.2.6~/mono/mini/mini-ppc.h 2007-11-08 23:07:34.000000000 +0100
-+++ mono-1.2.6/mono/mini/mini-ppc.h 2007-12-26 23:22:59.000000000 +0100
-@@ -109,7 +109,7 @@
-
- #define MONO_ARCH_HAVE_CREATE_SPECIFIC_TRAMPOLINE
- #define MONO_ARCH_HAVE_CREATE_TRAMPOLINE_FROM_TOKEN
--#define MONO_ARCH_HAVE_CREATE_DELEGATE_TRAMPOLINE
-+/* #define MONO_ARCH_HAVE_CREATE_DELEGATE_TRAMPOLINE */
- #define MONO_ARCH_HAVE_IMT 1
- #define MONO_ARCH_IMT_REG ppc_r12
- #define MONO_ARCH_COMMON_VTABLE_TRAMPOLINE 1
-diff -urNad mono-1.2.6~/mono/mini/tramp-ppc.c mono-1.2.6/mono/mini/tramp-ppc.c
---- mono-1.2.6~/mono/mini/tramp-ppc.c 2007-11-08 23:07:34.000000000 +0100
-+++ mono-1.2.6/mono/mini/tramp-ppc.c 2007-12-26 23:24:31.000000000 +0100
-@@ -261,8 +261,10 @@
- tramp_handler = mono_aot_trampoline;
- else if (tramp_type == MONO_TRAMPOLINE_AOT_PLT)
- tramp_handler = mono_aot_plt_trampoline;
-+#if defined(MONO_ARCH_HAVE_CREATE_DELEGATE_TRAMPOLINE)
- else if (tramp_type == MONO_TRAMPOLINE_DELEGATE)
- tramp_handler = mono_delegate_trampoline;
-+#endif
- else
- tramp_handler = mono_magic_trampoline;
- ppc_lis (buf, ppc_r0, (guint32) tramp_handler >> 16);
Deleted: mono/trunk/debian/patches/ppc_fix_memory_corruption_r81413.dpatch
===================================================================
--- mono/trunk/debian/patches/ppc_fix_memory_corruption_r81413.dpatch 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/patches/ppc_fix_memory_corruption_r81413.dpatch 2008-11-11 21:51:28 UTC (rev 3751)
@@ -1,33 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
- at DPATCH@
-diff -urNad mono-1.2.5~/mono/mini/mini-ppc.c mono-1.2.5/mono/mini/mini-ppc.c
---- mono-1.2.5~/mono/mini/mini-ppc.c 2007-08-17 19:54:05.000000000 +0200
-+++ mono-1.2.5/mono/mini/mini-ppc.c 2007-08-17 19:58:10.000000000 +0200
-@@ -2563,8 +2563,12 @@
- ppc_rlwinm (code, ppc_r11, ppc_r11, 0, 0, 27);
- /* use ctr to store the number of words to 0 if needed */
- if (ins->flags & MONO_INST_INIT) {
-- /* we zero 4 bytes at a time */
-- ppc_addi (code, ppc_r0, ins->sreg1, 3);
-+ /* we zero 4 bytes at a time:
-+ * we add 7 instead of 3 so that we set the counter to
-+ * at least 1, otherwise the bdnz instruction will make
-+ * it negative and iterate billions of times.
-+ */
-+ ppc_addi (code, ppc_r0, ins->sreg1, 7);
- ppc_srawi (code, ppc_r0, ppc_r0, 2);
- ppc_mtctr (code, ppc_r0);
- }
-@@ -2574,7 +2578,10 @@
-
- if (ins->flags & MONO_INST_INIT) {
- /* adjust the dest reg by -4 so we can use stwu */
-- ppc_addi (code, ins->dreg, ppc_sp, (area_offset - 4));
-+ /* we actually adjust -8 because we let the loop
-+ * run at least once
-+ */
-+ ppc_addi (code, ins->dreg, ppc_sp, (area_offset - 8));
- ppc_li (code, ppc_r11, 0);
- zero_loop_start = code;
- ppc_stwu (code, ppc_r11, 4, ins->dreg);
Deleted: mono/trunk/debian/patches/remove_broken_dllmap_from_mono-shlib-cop.dpatch
===================================================================
--- mono/trunk/debian/patches/remove_broken_dllmap_from_mono-shlib-cop.dpatch 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/patches/remove_broken_dllmap_from_mono-shlib-cop.dpatch 2008-11-11 21:51:28 UTC (rev 3751)
@@ -1,15 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## remove_broken_dllmap_from_mono-shlib-cop.dpatch by Mirco Bauer <meebey at meebey.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./mcs/tools/mono-shlib-cop/mono-shlib-cop.exe.config /tmp/dpep-work.cUJt1r/mono-1.1.9/mcs/tools/mono-shlib-cop/mono-shlib-cop.exe.config
---- ./mcs/tools/mono-shlib-cop/mono-shlib-cop.exe.config 2005-07-18 17:02:26.000000000 +0200
-+++ /tmp/dpep-work.cUJt1r/mono-1.1.9/mcs/tools/mono-shlib-cop/mono-shlib-cop.exe.config 2005-09-10 19:53:18.000000000 +0200
-@@ -1,4 +1,3 @@
- <configuration>
-- <dllmap dll="does-not-exist" target="libc.so.6"/>
- <dllmap dll="libgmodule-2.0.so" target="libgmodule-2.0.so.0"/>
- </configuration>
Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/rules 2008-11-11 21:51:28 UTC (rev 3751)
@@ -55,7 +55,8 @@
--with-jit=yes --with-ikvm-native=no --with-preview=yes \
--with-libgdiplus=installed --with-x=yes \
--with-moonlight=yes \
- --with-oprofile=yes
+ --with-oprofile=yes \
+ --enable-quiet-build=no
# Mono's build system doesn't like -j > 1
MAKE_FLAGS += -j1
@@ -74,16 +75,12 @@
configure-arch: patch configure-arch-stamp
configure-arch-stamp:
dh_testdir
- #chmod +x debian/autogen.sh
- #NOCONFIGURE=1 debian/autogen.sh
$(CONFIGURE) --disable-mcs-build
touch configure-arch-stamp
configure-indep: patch configure-indep-stamp
configure-indep-stamp:
dh_testdir
- #chmod +x debian/autogen.sh
- #NOCONFIGURE=1 debian/autogen.sh
$(CONFIGURE)
touch configure-indep-stamp
@@ -160,15 +157,33 @@
#dh_clean -k -i
dh_installdirs -i
cd mcs && \
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp && \
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp PROFILE=net_2_0
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp PROFILE=net_2_1
+ $(MAKE) install NO_DIR_CHECK=1 DESTDIR=$(CURDIR)/debian/tmp && \
+ $(MAKE) install NO_DIR_CHECK=1 DESTDIR=$(CURDIR)/debian/tmp PROFILE=net_2_0 && \
+ $(MAKE) install NO_DIR_CHECK=1 DESTDIR=$(CURDIR)/debian/tmp PROFILE=net_2_1 && \
+ $(MAKE) install NO_DIR_CHECK=1 DESTDIR=$(CURDIR)/debian/tmp PROFILE=net_3_5
+
+ # upstream forgot to remove this one
+ rm -f debian/tmp/usr/bin/mbas
+ # don't want docs of bundled libgc
+ rm -rf debian/tmp/usr/share/libgc-mono
+ # Mono.WebBrowser.dll is linked with CLI 2.0, thus the symlink in 1.0/ doesn't make sense
+ rm -f debian/tmp/usr/lib/mono/1.0/Mono.WebBrowser.dll
+ # Mono.Security.Win32.dll is only useful on windows, as it wrap the win api
+ rm -f $(CURDIR)/usr/lib/mono/gac/Mono.Security.Win32/1.0.5000.0__*/Mono.Security.Win32.dll \
+ $(CURDIR)/usr/lib/mono/gac/Mono.Security.Win32/2.0.0.0__*/Mono.Security.Win32.dll \
+ $(CURDIR)/usr/lib/mono/1.0/Mono.Security.Win32.dll \
+ $(CURDIR)/usr/lib/mono/2.0/Mono.Security.Win32.dll
+
# copy missing 2.0 manpages
cp $(CURDIR)/debian/tmp/usr/share/man/man1/al.1 \
$(CURDIR)/debian/tmp/usr/share/man/man1/al2.1
+ cp $(CURDIR)/debian/tmp/usr/share/man/man1/gacutil.1 \
+ $(CURDIR)/debian/tmp/usr/share/man/man1/gacutil2.1
cp $(CURDIR)/debian/tmp/usr/share/man/man1/mcs.1 \
$(CURDIR)/debian/tmp/usr/share/man/man1/gmcs.1
cp $(CURDIR)/debian/tmp/usr/share/man/man1/mcs.1 \
+ $(CURDIR)/debian/tmp/usr/share/man/man1/gmcs2.1
+ cp $(CURDIR)/debian/tmp/usr/share/man/man1/mcs.1 \
$(CURDIR)/debian/tmp/usr/share/man/man1/smcs.1
cp $(CURDIR)/debian/tmp/usr/share/man/man1/mono-service.1 \
$(CURDIR)/debian/tmp/usr/share/man/man1/mono-service2.1
@@ -182,9 +197,43 @@
$(CURDIR)/debian/tmp/usr/share/man/man1/ilasm2.1
cp $(CURDIR)/debian/tmp/usr/share/man/man1/resgen.1 \
$(CURDIR)/debian/tmp/usr/share/man/man1/resgen2.1
- # move System.Xml.Linq.dll symlink to the correct directory
- mv $(CURDIR)/debian/tmp/usr/lib/mono/3.5/System.Xml.Linq.dll \
- $(CURDIR)/debian/tmp/usr/lib/mono/2.0/
+ cp $(CURDIR)/debian/tmp/usr/share/man/man1/genxs.1 \
+ $(CURDIR)/debian/tmp/usr/share/man/man1/genxs2.1
+ cp $(CURDIR)/debian/tmp/usr/share/man/man1/xsd.1 \
+ $(CURDIR)/debian/tmp/usr/share/man/man1/xsd2.1
+ # copy missing 1.0 manpages
+ cp $(CURDIR)/debian/tmp/usr/share/man/man1/al.1 \
+ $(CURDIR)/debian/tmp/usr/share/man/man1/al1.1
+ cp $(CURDIR)/debian/tmp/usr/share/man/man1/gacutil.1 \
+ $(CURDIR)/debian/tmp/usr/share/man/man1/gacutil1.1
+ cp $(CURDIR)/debian/tmp/usr/share/man/man1/genxs.1 \
+ $(CURDIR)/debian/tmp/usr/share/man/man1/genxs1.1
+ cp $(CURDIR)/debian/tmp/usr/share/man/man1/ilasm.1 \
+ $(CURDIR)/debian/tmp/usr/share/man/man1/ilasm1.1
+ cp $(CURDIR)/debian/tmp/usr/share/man/man1/mcs.1 \
+ $(CURDIR)/debian/tmp/usr/share/man/man1/mcs1.1
+ cp $(CURDIR)/debian/tmp/usr/share/man/man1/mkbundle.1 \
+ $(CURDIR)/debian/tmp/usr/share/man/man1/mkbundle1.1
+ cp $(CURDIR)/debian/tmp/usr/share/man/man1/monop.1 \
+ $(CURDIR)/debian/tmp/usr/share/man/man1/monop1.1
+ cp $(CURDIR)/debian/tmp/usr/share/man/man1/resgen.1 \
+ $(CURDIR)/debian/tmp/usr/share/man/man1/resgen1.1
+ cp $(CURDIR)/debian/tmp/usr/share/man/man1/wsdl.1 \
+ $(CURDIR)/debian/tmp/usr/share/man/man1/wsdl1.1
+ cp $(CURDIR)/debian/tmp/usr/share/man/man1/xsd.1 \
+ $(CURDIR)/debian/tmp/usr/share/man/man1/xsd1.1
+ # copy missing default scripts
+ cp $(CURDIR)/debian/tmp/usr/bin/xsd \
+ $(CURDIR)/debian/tmp/usr/bin/xsd1
+ # copy missing 2.0 scripts
+ cp $(CURDIR)/debian/tmp/usr/bin/gmcs \
+ $(CURDIR)/debian/tmp/usr/bin/gmcs2
+ # gacutil should be 2.0 by default (like all other development tools)
+ mv $(CURDIR)/debian/tmp/usr/bin/gacutil \
+ $(CURDIR)/debian/tmp/usr/bin/gacutil1
+ cp $(CURDIR)/debian/tmp/usr/bin/gacutil2 \
+ $(CURDIR)/debian/tmp/usr/bin/gacutil
+
touch install-indep-stamp
binary: binary-arch binary-indep
@@ -193,22 +242,6 @@
dh_testdir
dh_testroot
- # we do not want nunit, it's a forked version
- # nunit 2.4 API has changed too much, thus needing this nunit 2.2 now
- #rm -f debian/tmp/usr/lib/pkgconfig/mono-nunit.pc
- #rm -f debian/tmp/usr/lib/mono/1.0/nunit*
- #rm -f debian/tmp/usr/lib/mono/2.0/nunit*
- #rm -rf debian/tmp/usr/lib/mono/gac/nunit*
- #rm -f debian/tmp/usr/bin/nunit*
- # upstream forgot to remove this one
- rm -f debian/tmp/usr/bin/mbas
- # don't want docs of bundled libgc
- rm -rf debian/tmp/usr/share/libgc-mono
- # never ever install cecil.pc! mono ships an internal version for GAC only
- # args, mono-tools >= 1.9 needs this now :(
- #rm -f debian/tmp/usr/lib/pkgconfig/cecil.pc
- # Mono.Mozilla.dll is linked with CLI 2.0, thus the symlink in 1.0/ doesn't make sense
- rm -f debian/tmp/usr/lib/mono/1.0/Mono.Mozilla.dll
# that exclude list are programs for arch-dep packages
dh_install -i -Xbin/monodis -Xbin/monograph -Xbin/mono-find-provides -Xbin/mono-find-requires -Xbin/pedump -Xbin/jay
@@ -249,34 +282,37 @@
dh_installdeb -i
#DH_VERBOSE=1 DH_AUTOSCRIPTDIR=$(CURDIR)/debian debian/dh_monoaot -i
debian/dh_makeclilibs -i -m 1.0 internal-mono
- debian/dh_makeclilibs -p libmono1.0-cil -m 1.9 internal-mono
- debian/dh_makeclilibs -p libmono2.0-cil -m 1.9 internal-mono
- debian/dh_makeclilibs -p libmono-cairo1.0-cil -m 1.2.6 internal-mono
- debian/dh_makeclilibs -p libmono-cairo2.0-cil -m 1.2.6 internal-mono
+ debian/dh_makeclilibs -p libmono1.0-cil -m 2.0 internal-mono
+ debian/dh_makeclilibs -p libmono2.0-cil -m 2.0 internal-mono
+ debian/dh_makeclilibs -p libmono-cairo1.0-cil -m 2.0 internal-mono
+ debian/dh_makeclilibs -p libmono-cairo2.0-cil -m 2.0 internal-mono
debian/dh_makeclilibs -p libmono-corlib1.0-cil -m 1.2.2.1 internal-mono
debian/dh_makeclilibs -p libmono-corlib2.0-cil -m 1.2.2.1 internal-mono
- debian/dh_makeclilibs -p libmono-data-tds1.0-cil -m 1.2.6 internal-mono
- debian/dh_makeclilibs -p libmono-data-tds2.0-cil -m 1.2.6 internal-mono
+ debian/dh_makeclilibs -p libmono-data-tds1.0-cil -m 2.0 internal-mono
+ debian/dh_makeclilibs -p libmono-data-tds2.0-cil -m 2.0 internal-mono
debian/dh_makeclilibs -p libmono-ldap1.0-cil -m 1.2.6 internal-mono
debian/dh_makeclilibs -p libmono-ldap2.0-cil -m 1.2.6 internal-mono
debian/dh_makeclilibs -p libmono-oracle2.0-cil -m 1.2.6 internal-mono
debian/dh_makeclilibs -p libmono-microsoft-build2.0-cil -m 1.2.6 internal-mono
debian/dh_makeclilibs -p libmono-system1.0-cil -m 1.2.6 internal-mono
- debian/dh_makeclilibs -p libmono-system2.0-cil -m 1.9 internal-mono
+ debian/dh_makeclilibs -p libmono-system2.0-cil -m 2.0 internal-mono
debian/dh_makeclilibs -p libmono-system-data1.0-cil -m 1.2.6 internal-mono
debian/dh_makeclilibs -p libmono-system-data2.0-cil -m 1.2.6 internal-mono
debian/dh_makeclilibs -p libmono-system-ldap2.0-cil -m 1.2.6 internal-mono
+ debian/dh_makeclilibs -p libmono-system-runtime2.0-cil -m 2.0 internal-mono
debian/dh_makeclilibs -p libmono-system-web2.0-cil -m 1.9.1 internal-mono
- debian/dh_makeclilibs -p libmono-security1.0-cil -m 1.9 internal-mono
- debian/dh_makeclilibs -p libmono-security2.0-cil -m 1.9 internal-mono
+ debian/dh_makeclilibs -p libmono-security1.0-cil -m 2.0 internal-mono
+ debian/dh_makeclilibs -p libmono-security2.0-cil -m 2.0 internal-mono
debian/dh_makeclilibs -p libmono-sqlite1.0-cil -m 1.2.6 internal-mono
debian/dh_makeclilibs -p libmono-sqlite2.0-cil -m 1.2.6 internal-mono
debian/dh_makeclilibs -p libmono-web1.0-cil -m 1.9 internal-mono
- debian/dh_makeclilibs -p libmono-web2.0-cil -m 1.9 internal-mono
+ debian/dh_makeclilibs -p libmono-web2.0-cil -m 2.0 internal-mono
debian/dh_makeclilibs -p libmono-winforms1.0-cil -m 1.2.6 internal-mono
- debian/dh_makeclilibs -p libmono-winforms2.0-cil -m 1.9 internal-mono
+ debian/dh_makeclilibs -p libmono-winforms2.0-cil -m 2.0 internal-mono
debian/dh_makeclilibs -p libmono-relaxng1.0-cil -m 1.9 internal-mono
debian/dh_makeclilibs -p libmono-relaxng2.0-cil -m 1.9 internal-mono
+ # preview APIs get tighter clilibs
+ debian/dh_makeclilibs -p libmono-system2.1-cil -m 2.0 internal-mono
debian/dh_clideps -i -l debian/tmp internal-mono
#DH_VERBOSE=1 debian/dh_clideps -i -l debian/tmp internal-mono
# mono-gac needs special runtime dep, to prevent circular dep (mono-runtime <-> mono-gac)
Modified: mono/trunk/debian/shlibs.local
===================================================================
--- mono/trunk/debian/shlibs.local 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/shlibs.local 2008-11-11 21:51:28 UTC (rev 3751)
@@ -1,7 +1,7 @@
-libMonoPosixHelper 0 libmono0 (>= 1.9.1)
-libgdiplus 0 libgdiplus (>= 1.9)
-libgluezilla 0 libgluezilla (>= 1.9)
-libcairo 2 libcairo2 (>= 1.6.0)
+libMonoPosixHelper 0 libmono0 (>= 2.0)
+libgdiplus 0 libgdiplus (>= 2.0)
+libgluezilla 0 libgluezilla (>= 2.0)
+libcairo 2 libcairo2 (>= 1.6.4-6.1)
libfbclient 2 libfbclient2 (>= 2.0.4)
libsqlite 0 libsqlite0 (>= 2.8.17)
libsqlite3 0 libsqlite3-0 (>= 3.5.9)
Modified: mono/trunk/debian/update-shlibs.local.sh
===================================================================
--- mono/trunk/debian/update-shlibs.local.sh 2008-11-11 21:45:40 UTC (rev 3750)
+++ mono/trunk/debian/update-shlibs.local.sh 2008-11-11 21:51:28 UTC (rev 3751)
@@ -5,6 +5,8 @@
echo -n "Updating shlibs.local for Mono $UPVERSION..."
+# libgamin-dev, libcupsys2-dev, librsvg2-dev, libgtk2.0-dev, libgnomeui-dev
+
cp debian/shlibs.local debian/shlibs.local.backup
rm -f debian/shlibs.local.new
@@ -13,12 +15,12 @@
echo "libgdiplus 0 libgdiplus (>= $UPVERSION)" >> debian/shlibs.local.new
echo "libgluezilla 0 libgluezilla (>= $UPVERSION)" >> debian/shlibs.local.new
-grep --no-filename "libcairo 2" /var/lib/dpkg/info/*.shlibs >> debian/shlibs.local.new
-grep --no-filename "libfbclient 2" /var/lib/dpkg/info/*.shlibs >> debian/shlibs.local.new
-grep --no-filename "libsqlite 0" /var/lib/dpkg/info/*.shlibs >> debian/shlibs.local.new
-grep --no-filename "libsqlite3 0" /var/lib/dpkg/info/*.shlibs >> debian/shlibs.local.new
-grep --no-filename "libasound 2" /var/lib/dpkg/info/*.shlibs >> debian/shlibs.local.new
-grep --no-filename "libgda-2 3" /var/lib/dpkg/info/*.shlibs >> debian/shlibs.local.new
+grep --no-filename "^libcairo 2" /var/lib/dpkg/info/*.shlibs >> debian/shlibs.local.new || echo "ERROR: could not resolve libcairo"
+grep --no-filename "^libfbclient 2" /var/lib/dpkg/info/*.shlibs >> debian/shlibs.local.new || echo "ERROR: could not resolve libfbclient"
+grep --no-filename "^libsqlite 0" /var/lib/dpkg/info/*.shlibs >> debian/shlibs.local.new || echo "ERROR: could not resolve libsqlite"
+grep --no-filename "^libsqlite3 0" /var/lib/dpkg/info/*.shlibs >> debian/shlibs.local.new || echo "ERROR: could not resolve libsqlite3"
+grep --no-filename "^libasound 2" /var/lib/dpkg/info/*.shlibs >> debian/shlibs.local.new || echo "ERROR: could not resolve libasound"
+grep --no-filename "^libgda-2 3" /var/lib/dpkg/info/*.shlibs >> debian/shlibs.local.new || echo "ERROR: could not resolve libgda-2"
cp debian/shlibs.local.new debian/shlibs.local
More information about the Pkg-mono-svn-commits
mailing list