Backport of r121557.

svn path=/branches/mono-2-2/mono/; revision=121560

diff --git a/ChangeLog b/ChangeLog
index 4d0c9cc0cf250563ecebcd47694d9072d612ab9b..a6dd156b27b23a07d1702cd41320af8266399b2f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2008-12-15  Marek Habersack  <mhabersack@novell.com>
+
+       * 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-05  Marek Habersack  <mhabersack@novell.com>
  
        * configure.in: check whether round (3) and rint (3) are present

diff --git a/configure.in b/configure.in
index 1a848aa7d3a3cc6f28049354d23707bebe03fc22..cda5b6a52b410f8ea1734601b0ec95d1084c7ddb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2328,6 +2328,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 efa65d6954c54370e01815b67d233b46588d6673..185b5bac633f6472bfd284c0ee428e6f4fd25e98 100644 (file)
--- 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 (file)
index 0000000..127d868
--- /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