From 5e46d16102f591cb6f8cee7d66257e074f3be73c Mon Sep 17 00:00:00 2001 From: Marek Habersack Date: Mon, 15 Dec 2008 22:36:35 +0000 Subject: [PATCH] 2008-12-15 Marek Habersack * data/Makefile.am (EXTRA_DIST): added system.web.extensions_1.0.pc.in. Also added to pkgconfig_DATA * data/system.web.extensions_1.0.pc.in: added. This file serves the purpose of making MonoDevelop see the 1.0 version of the System.Web.Extensions assembly in the project references editor. This will also make legacy 2.0 ASP.NET apps not fail when they reference the 1.0 version of the assembly in their project files. * configure.in: added data/system.web.extensions_1.0.pc to AC_OUTPUT svn path=/trunk/mono/; revision=121557 --- ChangeLog | 14 ++++++++++++++ configure.in | 1 + data/Makefile.am | 8 ++++---- data/system.web.extensions_1.0.pc.in | 4 ++++ 4 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 data/system.web.extensions_1.0.pc.in diff --git a/ChangeLog b/ChangeLog index 853a8d26b1c..768a63639b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2008-12-15 Marek Habersack + + * data/Makefile.am (EXTRA_DIST): added + system.web.extensions_1.0.pc.in. Also added to pkgconfig_DATA + + * data/system.web.extensions_1.0.pc.in: added. This file serves + the purpose of making MonoDevelop see the 1.0 version of the + System.Web.Extensions assembly in the project references + editor. This will also make legacy 2.0 ASP.NET apps not fail when + they reference the 1.0 version of the assembly in their project + files. + + * configure.in: added data/system.web.extensions_1.0.pc to AC_OUTPUT + 2008-12-11 Mark Mason * configure.in: introduce SIZEOF_REGISTER - usually ==SIZEOF_VOID_P, except on mips/n32 diff --git a/configure.in b/configure.in index 34f17c9002c..c76b3449e29 100644 --- a/configure.in +++ b/configure.in @@ -2355,6 +2355,7 @@ data/dotnet35.pc data/wcf.pc data/cecil.pc data/smcs.pc +data/system.web.extensions_1.0.pc samples/Makefile support/Makefile data/config diff --git a/data/Makefile.am b/data/Makefile.am index efa65d6954c..185b5bac633 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -7,21 +7,21 @@ EXTRA_DIST = \ browscap.ini mono.supp mono.d README \ mono.pc.in mint.pc.in dotnet.pc.in dotnet35.pc.in wcf.pc.in monodoc.pc.in \ mono-nunit.pc.in mono-cairo.pc.in mono-options.pc.in cecil.pc.in smcs.pc.in \ - mono-lineeditor.pc.in + mono-lineeditor.pc.in system.web.extensions_1.0.pc.in pkgconfigdir = $(libdir)/pkgconfig if JIT_SUPPORTED if INTERP_SUPPORTED -pkgconfig_DATA= mono.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc smcs.pc monodoc.pc mono-lineeditor.pc +pkgconfig_DATA= mono.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc smcs.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc else -pkgconfig_DATA= mono.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc smcs.pc monodoc.pc mono-lineeditor.pc +pkgconfig_DATA= mono.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc smcs.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc endif else pkgconfig_DATA= mint.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc smcs.pc monodoc.pc mono-lineeditor.pc endif -DISTCLEANFILES= mono.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc smcs.pc monodoc.pc mono-lineeditor.pc +DISTCLEANFILES= mono.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc smcs.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc mono_DATA = config \ browscap.ini diff --git a/data/system.web.extensions_1.0.pc.in b/data/system.web.extensions_1.0.pc.in new file mode 100644 index 00000000000..127d868874f --- /dev/null +++ b/data/system.web.extensions_1.0.pc.in @@ -0,0 +1,4 @@ +Name: System.Web.Extensions +Description: System.Web.Extensions ASP.NET 2.0 add-on +Version: 1.0.61025.0 +Libs: -r:@prefix@/lib/mono/gac/System.Web.Extensions/1.0.61025.0__31bf3856ad364e35/System.Web.Extensions.dll -- 2.25.1