Imported Upstream version 4.4

2018-04-05 14:33:26 +00:00 · 2018-04-05 14:33:26 +00:00 · eb09ad0d74
--- a/Makefile.in
+++ b/Makefile.in
@ -262,6 +262,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -350,6 +351,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/aclocal.m4
+++ b/aclocal.m4
--- a/build/Makefile.in
+++ b/build/Makefile.in
@ -234,6 +234,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -322,6 +323,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/build/m4/Makefile.in
+++ b/build/m4/Makefile.in
@ -174,6 +174,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -262,6 +263,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/config.guess
+++ b/config.guess
@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2014 Free Software Foundation, Inc.
+#   Copyright 1992-2016 Free Software Foundation, Inc.

-timestamp='2014-03-23'
+timestamp='2016-10-02'

 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@ -24,12 +24,12 @@ timestamp='2014-03-23'
 # program.  This Exception is an additional permission under section 7
 # of the GNU General Public License, version 3 ("GPLv3").
 #
-# Originally written by Per Bothner.
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 #
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+# Please send patches to <config-patches@gnu.org>.


 me=`echo "$0" | sed -e 's,.*/,,'`
@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)

 Originally written by Per Bothner.
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2016 Free Software Foundation, Inc.

 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@ -168,19 +168,29 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# Note: NetBSD doesn't particularly care about the vendor
 	# portion of the name.  We always set it to "unknown".
 	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
+	    /sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || \
+	    echo unknown)`
 	case "${UNAME_MACHINE_ARCH}" in
 	    armeb) machine=armeb-unknown ;;
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
 	    sh5el) machine=sh5le-unknown ;;
+	    earmv*)
+		arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+		endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
+		machine=${arch}${endian}-unknown
+		;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
+	# to ELF recently (or will in the future) and ABI.
 	case "${UNAME_MACHINE_ARCH}" in
+	    earm*)
+		os=netbsdelf
+		;;
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
@ -197,6 +207,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		os=netbsd
 		;;
 	esac
+	# Determine ABI tags.
+	case "${UNAME_MACHINE_ARCH}" in
+	    earm*)
+		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
+		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+		;;
+	esac
 	# The OS release
 	# Debian GNU/NetBSD machines have a different userland, and
 	# thus, need a distinct triplet. However, they do not need
@ -207,13 +224,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		release='-gnu'
 		;;
 	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
 		;;
 	esac
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
+	echo "${machine}-${os}${release}${abi}"
 	exit ;;
    *:Bitrig:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
@ -223,6 +240,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
 	exit ;;
+    *:LibertyBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
+	exit ;;
    *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
@ -235,6 +256,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
+    *:Sortix:*:*)
+	echo ${UNAME_MACHINE}-unknown-sortix
+	exit ;;
    alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@ -251,42 +275,42 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
 	case "$ALPHA_CPU_TYPE" in
 	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
+		UNAME_MACHINE=alphaev5 ;;
 	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
+		UNAME_MACHINE=alphaev56 ;;
 	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
+		UNAME_MACHINE=alphapca56 ;;
 	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
+		UNAME_MACHINE=alphapca57 ;;
 	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
+		UNAME_MACHINE=alphaev6 ;;
 	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
+		UNAME_MACHINE=alphaev67 ;;
 	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
+		UNAME_MACHINE=alphaev69 ;;
 	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
+		UNAME_MACHINE=alphaev7 ;;
 	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
+		UNAME_MACHINE=alphaev79 ;;
 	esac
 	# A Pn.n version is a patched version.
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
 	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
 	exitcode=$?
 	trap '' 0
@ -359,16 +383,16 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	exit ;;
    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
-	SUN_ARCH="i386"
+	SUN_ARCH=i386
 	# If there is a compiler, see if it is configured for 64-bit objects.
 	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
 	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
 	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
 		grep IS_64BIT_ARCH >/dev/null
 	    then
-		SUN_ARCH="x86_64"
+		SUN_ARCH=x86_64
 	    fi
 	fi
 	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
@ -393,7 +417,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	exit ;;
    sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
 	case "`/bin/arch`" in
 	    sun3)
 		echo m68k-sun-sunos${UNAME_RELEASE}
@ -579,8 +603,9 @@ EOF
 	else
 		IBM_ARCH=powerpc
 	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
+	if [ -x /usr/bin/lslpp ] ; then
+		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
 	else
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
@ -617,13 +642,13 @@ EOF
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
 		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
 		    case "${sc_cpu_version}" in
-		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
 		      532)                      # CPU_PA_RISC2_0
 			case "${sc_kernel_bits}" in
-			  32) HP_ARCH="hppa2.0n" ;;
-			  64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+			  32) HP_ARCH=hppa2.0n ;;
+			  64) HP_ARCH=hppa2.0w ;;
+			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
 			esac ;;
 		    esac
 		fi
@ -662,11 +687,11 @@ EOF
 		    exit (0);
 		}
 EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
 		fi ;;
 	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
+	if [ ${HP_ARCH} = hppa2.0w ]
 	then
 	    eval $set_cc_for_build

@ -679,12 +704,12 @@ EOF
 	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
 	    # => hppa64-hp-hpux11.23

-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
 		grep -q __LP64__
 	    then
-		HP_ARCH="hppa2.0w"
+		HP_ARCH=hppa2.0w
 	    else
-		HP_ARCH="hppa64"
+		HP_ARCH=hppa64
 	    fi
 	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@ -789,14 +814,14 @@ EOF
 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
 	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
 	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
    5000:UNIX_System_V:4.*:*)
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
 	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
@ -878,7 +903,7 @@ EOF
 	exit ;;
    *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
    i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
@ -901,7 +926,7 @@ EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
    arc:Linux:*:* | arceb:Linux:*:*)
@ -932,6 +957,9 @@ EOF
    crisv32:Linux:*:*)
 	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
+    e2k:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
    frv:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
@ -944,6 +972,9 @@ EOF
    ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
+    k1om:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
    m32r*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
@ -969,6 +1000,9 @@ EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
+    mips64el:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
    openrisc*:Linux:*:*)
 	echo or1k-unknown-linux-${LIBC}
 	exit ;;
@ -1001,6 +1035,9 @@ EOF
    ppcle:Linux:*:*)
 	echo powerpcle-unknown-linux-${LIBC}
 	exit ;;
+    riscv32:Linux:*:* | riscv64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
    s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
@ -1020,7 +1057,7 @@ EOF
 	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 	exit ;;
    x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
 	exit ;;
    xtensa*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
@ -1099,7 +1136,7 @@ EOF
 	# uname -m prints for DJGPP always 'pc', but it prints nothing about
 	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configury will decide that
+	# prints for the "djgpp" host, or else GDB configure will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
 	exit ;;
@ -1248,6 +1285,9 @@ EOF
    SX-8R:SUPER-UX:*:*)
 	echo sx8r-nec-superux${UNAME_RELEASE}
 	exit ;;
+    SX-ACE:SUPER-UX:*:*)
+	echo sxace-nec-superux${UNAME_RELEASE}
+	exit ;;
    Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
@ -1261,9 +1301,9 @@ EOF
 	    UNAME_PROCESSOR=powerpc
 	fi
 	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
-	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
 		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		    (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
 		    grep IS_64BIT_ARCH >/dev/null
 		then
 		    case $UNAME_PROCESSOR in
@ -1285,7 +1325,7 @@ EOF
 	exit ;;
    *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
+	if test "$UNAME_PROCESSOR" = x86; then
 		UNAME_PROCESSOR=i386
 		UNAME_MACHINE=pc
 	fi
@ -1316,7 +1356,7 @@ EOF
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
 	# operating systems.
-	if test "$cputype" = "386"; then
+	if test "$cputype" = 386; then
 	    UNAME_MACHINE=i386
 	else
 	    UNAME_MACHINE="$cputype"
@ -1358,7 +1398,7 @@ EOF
 	echo i386-pc-xenix
 	exit ;;
    i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
 	exit ;;
    i*86:rdos:*:*)
 	echo ${UNAME_MACHINE}-pc-rdos
@ -1369,23 +1409,25 @@ EOF
    x86_64:VMkernel:*:*)
 	echo ${UNAME_MACHINE}-unknown-esx
 	exit ;;
+    amd64:Isilon\ OneFS:*:*)
+	echo x86_64-unknown-onefs
+	exit ;;
 esac

 cat >&2 <<EOF
 $0: unable to guess system type

-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
+This script (version $timestamp), has failed to recognize the
+operating system you are using. If your script is old, overwrite
+config.guess and config.sub with the latest versions from:

-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub

-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
+If $0 has already been updated, send the following data and any
+information you think might be pertinent to config-patches@gnu.org to
+provide the necessary information to handle your system.

 config.guess timestamp = $timestamp

--- a/config.sub
+++ b/config.sub
@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2014 Free Software Foundation, Inc.
+#   Copyright 1992-2016 Free Software Foundation, Inc.

-timestamp='2014-09-11'
+timestamp='2016-11-04'

 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@ -25,7 +25,7 @@ timestamp='2014-09-11'
 # of the GNU General Public License, version 3 ("GPLv3").


-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+# Please send patches to <config-patches@gnu.org>.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@ -33,7 +33,7 @@ timestamp='2014-09-11'
 # Otherwise, we print the canonical config type on stdout and succeed.

 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub

 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@ -53,8 +53,7 @@ timestamp='2014-09-11'
 me=`echo "$0" | sed -e 's,.*/,,'`

 usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
+Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS

 Canonicalize a configuration name.

@ -68,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)

-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2016 Free Software Foundation, Inc.

 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@ -117,8 +116,8 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | \
-  kopensolaris*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
+  kopensolaris*-gnu* | cloudabi*-eabi* | \
  storm-chaos* | os2-emx* | rtmk-nova*)
    os=-$maybe_os
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@ -255,12 +254,13 @@ case $basic_machine in
 	| arc | arceb \
 	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
 	| avr | avr32 \
+	| ba \
 	| be32 | be64 \
 	| bfin \
 	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| epiphany \
-	| fido | fr30 | frv \
+	| e2k | epiphany \
+	| fido | fr30 | frv | ft32 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| hexagon \
 	| i370 | i860 | i960 | ia64 \
@ -301,11 +301,12 @@ case $basic_machine in
 	| open8 | or1k | or1knd | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| pru \
 	| pyramid \
 	| riscv32 | riscv64 \
 	| rl78 | rx \
 	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@ -313,6 +314,7 @@ case $basic_machine in
 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| visium \
 	| we32k \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
@ -327,6 +329,9 @@ case $basic_machine in
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
+	leon|leon[3-9])
+		basic_machine=sparc-$basic_machine
+		;;
 	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
@ -372,12 +377,13 @@ case $basic_machine in
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
+	| ba-* \
 	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| c8051-* | clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
+	| e2k-* | elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
@ -423,13 +429,15 @@ case $basic_machine in
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| pru-* \
 	| pyramid-* \
+	| riscv32-* | riscv64-* \
 	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
 	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tile*-* \
@ -437,6 +445,7 @@ case $basic_machine in
 	| ubicom32-* \
 	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
 	| vax-* \
+	| visium-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
@ -513,6 +522,9 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-aros
 		;;
+	asmjs)
+		basic_machine=asmjs-unknown
+		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@ -633,6 +645,14 @@ case $basic_machine in
 		basic_machine=m68k-bull
 		os=-sysv3
 		;;
+	e500v[12])
+		basic_machine=powerpc-unknown
+		os=$os"spe"
+		;;
+	e500v[12]-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=$os"spe"
+		;;
 	ebmon29k)
 		basic_machine=a29k-amd
 		os=-ebmon
@ -774,6 +794,9 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	leon-*|leon[3-9]-*)
+		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+		;;
 	m68knommu)
 		basic_machine=m68k-unknown
 		os=-linux
@ -1009,7 +1032,7 @@ case $basic_machine in
 	ppc-* | ppcbe-*)
 		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
+	ppcle | powerpclittle)
 		basic_machine=powerpcle-unknown
 		;;
 	ppcle-* | powerpclittle-*)
@ -1019,7 +1042,7 @@ case $basic_machine in
 		;;
 	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+	ppc64le | powerpc64little)
 		basic_machine=powerpc64le-unknown
 		;;
 	ppc64le-* | powerpc64little-*)
@ -1365,18 +1388,18 @@ case $os in
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
 	      | -sym* | -kopensolaris* | -plan9* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* \
+	      | -aos* | -aros* | -cloudabi* | -sortix* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
@ -1385,7 +1408,8 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
+	      | -onefs* | -tirtos* | -phoenix* | -fuchsia*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@ -1517,6 +1541,8 @@ case $os in
 		;;
 	-nacl*)
 		;;
+	-ios)
+		;;
 	-none)
 		;;
 	*)
--- a/2088
+++ b/2088
--- a/configure.ac
+++ b/configure.ac
@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.

 AC_PREREQ([2.53])
-AC_INIT([xsp], [4.2], [http://bugzilla.xamarin.com/])
+AC_INIT([xsp], [4.4], [http://bugzilla.xamarin.com/])
 AC_CANONICAL_SYSTEM
 AC_CONFIG_MACRO_DIR([build/m4])
 AM_INIT_AUTOMAKE([foreign])
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@ -234,6 +234,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -322,6 +323,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/docs/Mono.FastCGI/Makefile.in
+++ b/docs/Mono.FastCGI/Makefile.in
@ -174,6 +174,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -262,6 +263,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/docs/Mono.WebServer/Makefile.in
+++ b/docs/Mono.WebServer/Makefile.in
@ -174,6 +174,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -262,6 +263,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/23
+++ b/23
@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile

-scriptversion=2013-12-25.23; # UTC
+scriptversion=2014-09-12.12; # UTC

 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@ -324,34 +324,41 @@ do
            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
            ;;
          *)
+            # $RANDOM is not portable (e.g. dash);  use it when possible to
+            # lower collision chance
            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-            trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+            trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0

+            # As "mkdir -p" follows symlinks and we work in /tmp possibly;  so
+            # create the $tmpdir first (and fail if unsuccessful) to make sure
+            # that nobody tries to guess the $tmpdir name.
            if (umask $mkdir_umask &&
-                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+                $mkdirprog $mkdir_mode "$tmpdir" &&
+                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
            then
              if test -z "$dir_arg" || {
                   # Check for POSIX incompatibilities with -m.
                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
                   # other-writable bit of parent directory when it shouldn't.
                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-                   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+                   test_tmpdir="$tmpdir/a"
+                   ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
                   case $ls_ld_tmpdir in
                     d????-?r-*) different_mode=700;;
                     d????-?--*) different_mode=755;;
                     *) false;;
                   esac &&
-                   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-                     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+                   $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+                     ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
                   }
                 }
              then posix_mkdir=:
              fi
-              rmdir "$tmpdir/d" "$tmpdir"
+              rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
            else
              # Remove any dirs left behind by ancient mkdir implementations.
-              rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+              rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
            fi
            trap '' 0;;
        esac;;
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@ -255,6 +255,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -343,6 +344,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/ltmain.sh
+++ b/ltmain.sh
--- a/man/Makefile.in
+++ b/man/Makefile.in
@ -207,6 +207,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -295,6 +296,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/packaging/Makefile.in
+++ b/packaging/Makefile.in
@ -234,6 +234,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -322,6 +323,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/packaging/opensuse/Makefile.in
+++ b/packaging/opensuse/Makefile.in
@ -174,6 +174,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -262,6 +263,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@ -18,21 +18,18 @@ bin_SCRIPTS = $(bin2_scripts) $(tool2_scripts) $(tool_scripts) $(bin_scripts) $(

 CLEANFILES = $(bin2_scripts_real) $(tool2_scripts) $(bin_scripts) $(tool_scripts) $(bin4_scripts) $(tool4_scripts) $(binplain_scripts)

-plat_bindir2 = $(prefix)/lib/mono/2.0
-plat_tooldir2 = $(prefix)/lib/xsp/2.0
-
 if NET_4_0
 plat_bindir4 = $(prefix)/lib/mono/4.5
 plat_tooldir4 = $(prefix)/lib/xsp/4.0
 endif

 REWRITE2 = sed \
-	-e 's,@''plat_bindir@,$(plat_bindir2),g'		\
+	-e 's,@''plat_bindir@,$(plat_bindir4),g'		\
 	-e 's,@''exe_file@,'`basename $@ 2`'2.exe,g'		\
 	-e 's,@''RUNTIME@,@RUNTIME@,g'

 REWRITE_TOOLS2 = echo dd $@ dd; sed \
-	-e 's,@''plat_bindir@,$(plat_tooldir2),g'		\
+	-e 's,@''plat_bindir@,$(plat_tooldir4),g'		\
 	-e 's,@''exe_file@,'`basename $@ 2`'2.exe,g'		\
 	-e 's,@''RUNTIME@,@RUNTIME@,g'

--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@ -204,6 +204,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -292,6 +293,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
@ -316,17 +318,15 @@ tool_scripts = asp-state dbsessmgr
 binplain_scripts = mono-fpm
 bin_SCRIPTS = $(bin2_scripts) $(tool2_scripts) $(tool_scripts) $(bin_scripts) $(bin4_scripts) $(tool4_scripts) $(binplain_scripts)
 CLEANFILES = $(bin2_scripts_real) $(tool2_scripts) $(bin_scripts) $(tool_scripts) $(bin4_scripts) $(tool4_scripts) $(binplain_scripts)
-plat_bindir2 = $(prefix)/lib/mono/2.0
-plat_tooldir2 = $(prefix)/lib/xsp/2.0
@NET_4_0_TRUE@plat_bindir4 = $(prefix)/lib/mono/4.5
@NET_4_0_TRUE@plat_tooldir4 = $(prefix)/lib/xsp/4.0
 REWRITE2 = sed \
-	-e 's,@''plat_bindir@,$(plat_bindir2),g'		\
+	-e 's,@''plat_bindir@,$(plat_bindir4),g'		\
 	-e 's,@''exe_file@,'`basename $@ 2`'2.exe,g'		\
 	-e 's,@''RUNTIME@,@RUNTIME@,g'

 REWRITE_TOOLS2 = echo dd $@ dd; sed \
-	-e 's,@''plat_bindir@,$(plat_tooldir2),g'		\
+	-e 's,@''plat_bindir@,$(plat_tooldir4),g'		\
 	-e 's,@''exe_file@,'`basename $@ 2`'2.exe,g'		\
 	-e 's,@''RUNTIME@,@RUNTIME@,g'

--- a/shim/Makefile.in
+++ b/shim/Makefile.in
@ -228,6 +228,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -316,6 +317,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/src/Makefile.in
+++ b/src/Makefile.in
@ -235,6 +235,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -323,6 +324,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/src/Mono.WebServer.Apache/Makefile.in
+++ b/src/Mono.WebServer.Apache/Makefile.in
@ -178,6 +178,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -266,6 +267,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/src/Mono.WebServer.Apache/ModMonoTCPWebSource.cs
+++ b/src/Mono.WebServer.Apache/ModMonoTCPWebSource.cs
@ -40,9 +40,6 @@ namespace Mono.WebServer
 		public ModMonoTCPWebSource (IPAddress address, int port, string lockfile)
 			: base (lockfile)
 		{
-			if (address == IPAddress.Any)
-				address = IPAddress.Loopback;
-
 			SetListenAddress (address, port);
 		}
 		
--- a/src/Mono.WebServer.FastCgi/ApplicationHost.cs
+++ b/src/Mono.WebServer.FastCgi/ApplicationHost.cs
@ -66,7 +66,7 @@ namespace Mono.WebServer.FastCgi
 			wr.SendStatus (301, "Moved Permanently");
 			wr.SendUnknownResponseHeader ("Connection", "close");
 			wr.SendUnknownResponseHeader ("Date", DateTime.Now.ToUniversalTime ().ToString ("r"));
-			wr.SendUnknownResponseHeader ("Location", String.Format ("http://{0}{1}", host, location));
+			wr.SendUnknownResponseHeader ("Location", String.Format ("{0}://{1}{2}", wr.GetProtocol(), host, location));
 			Encoding enc = Encoding.ASCII;
 			wr.SendUnknownResponseHeader ("Content-Type", "text/html; charset=" + enc.WebName);
 			string content = String.Format (CONTENT301, host, location);
--- a/src/Mono.WebServer.FastCgi/Makefile.in
+++ b/src/Mono.WebServer.FastCgi/Makefile.in
@ -176,6 +176,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -264,6 +265,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/src/Mono.WebServer.FastCgi/Sockets/TcpSocket.cs
+++ b/src/Mono.WebServer.FastCgi/Sockets/TcpSocket.cs
@ -35,9 +35,8 @@ namespace Mono.WebServer.FastCgi.Sockets {
 		}
 		
 		public TcpSocket (System.Net.IPAddress address, int port)
-			: this (new System.Net.IPEndPoint (Equals(address, System.Net.IPAddress.Any) ?
-				System.Net.IPAddress.Loopback : address, port))
+			: this (new System.Net.IPEndPoint (address, port))
 		{
 		}
 	}
-}
+}
--- a/src/Mono.WebServer.Fpm/Makefile.in
+++ b/src/Mono.WebServer.Fpm/Makefile.in
@ -176,6 +176,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -264,6 +265,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/src/Mono.WebServer.XSP/Makefile.in
+++ b/src/Mono.WebServer.XSP/Makefile.in
@ -208,6 +208,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -296,6 +297,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/src/Mono.WebServer/Makefile.in
+++ b/src/Mono.WebServer/Makefile.in
@ -177,6 +177,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -265,6 +266,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/test/1.1/Makefile.in
+++ b/test/1.1/Makefile.in
@ -264,6 +264,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -352,6 +353,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/test/1.1/asp.net/Makefile.in
+++ b/test/1.1/asp.net/Makefile.in
@ -207,6 +207,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -295,6 +296,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/test/1.1/authtest/Makefile.in
+++ b/test/1.1/authtest/Makefile.in
@ -204,6 +204,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -292,6 +293,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/test/1.1/customcontrol/Makefile.in
+++ b/test/1.1/customcontrol/Makefile.in
@ -207,6 +207,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -295,6 +296,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/test/1.1/databind/Makefile.in
+++ b/test/1.1/databind/Makefile.in
@ -204,6 +204,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -292,6 +293,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/test/1.1/handlers/Makefile.in
+++ b/test/1.1/handlers/Makefile.in
@ -204,6 +204,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -292,6 +293,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/test/1.1/html/Makefile.in
+++ b/test/1.1/html/Makefile.in
@ -204,6 +204,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -292,6 +293,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/test/1.1/webcontrols/Makefile.in
+++ b/test/1.1/webcontrols/Makefile.in
@ -207,6 +207,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -295,6 +296,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/test/1.1/webcontrols/calendar.aspx
+++ b/test/1.1/webcontrols/calendar.aspx
@ -1,23 +0,0 @@
-<%@ Page Language = "C#" %>
-<%@ Register TagPrefix="mono" TagName="MonoSamplesHeader" src="~/controls/MonoSamplesHeader.ascx" %>
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="/mono-xsp.css">
-<title>Calendar Test</title>
-</head>
-<body><mono:MonoSamplesHeader runat="server"/>
-	<form runat=server>
-		<h3>Calendar and properties</h3>
-		<asp:calendar id="Calendar1"
-		Font-Name="Arial" showtitle="true"
-		runat="server">
-			<SelectedDayStyle BackColor="Blue" 
-					ForeColor="Red"/>
-			<TodayDayStyle BackColor="#CCAACC" 
-					ForeColor="#000000"/>
-		</asp:Calendar>
-
-	</form>
-</body>
-</html>
-
--- a/test/1.1/webcontrols/datalist.aspx
+++ b/test/1.1/webcontrols/datalist.aspx
@ -1,67 +0,0 @@
-<%@ Page Language="C#" %>
-<%@ Register TagPrefix="mono" TagName="MonoSamplesHeader" src="~/controls/MonoSamplesHeader.ascx" %>
-<HTML>
-
-	<HEAD>
-<link rel="stylesheet" type="text/css" href="/mono-xsp.css">
-		<title>DataList</title>
-
-		<script runat="server">
-	void Page_Load (object o, EventArgs e) 
-	{
-		if (!IsPostBack) {
-			ArrayList list = new ArrayList ();
-			list.Add (new Data ("Spain"));
-			list.Add (new Data ("Japan"));
-			list.Add (new Data ("Mexico"));
-			dl.DataSource = list;
-			dl.DataBind ();
-		}
-	}
-
-	public class Data 
-	{
-		private string name;
-
-		public Data (string testname)
-		{
-			this.name = testname;
-		}
-
-		public string Name 
-		{
-			get { return name; }
-		}
-
-		public override string ToString ()
-		{
-			return name;
-		}
-	}
-</script>
-
-	</HEAD>
-
-	<body><mono:MonoSamplesHeader runat="server"/>
-
-		<h3>Datalist sample</h3>
-
-		<form runat="server" ID="Form1">
-
-			<asp:DataList id="dl" runat="server" RepeatDirection="Horizontal"
-RepeatColumns="5">
-
-				<ItemTemplate>
-
-					<asp:Label Text='<%# DataBinder.Eval (Container.DataItem,"Name") %>'
-					runat="server" />
-
-				</ItemTemplate>
-
-			</asp:DataList>
-
-		</form>
-
-	</body>
-
-</HTML>
--- a/test/1.1/webcontrols/dbpage1.aspx
+++ b/test/1.1/webcontrols/dbpage1.aspx
@ -1,186 +0,0 @@
-<%@ Page language="C#" %>
-<%@ Register TagPrefix="mono" TagName="MonoSamplesHeader" src="~/controls/MonoSamplesHeader.ascx" %>
-<%@ import namespace="System.Configuration" %>
-<%@ import namespace="System.Data" %>
-<%@ import namespace="System.Reflection" %>
-<%@ import namespace="System.IO" %>
-<html>
-<script runat=server>
-
-	static Type cncType = null;
-
-	void GetConnectionData (out string providerAssembly, out string cncTypeName, out string cncString)
-	{
-		providerAssembly = null;
-		cncTypeName = null;
-		cncString = null;
-		NameValueCollection config = ConfigurationSettings.AppSettings as NameValueCollection;
-		if (config != null) {
-			foreach (string s in config.Keys) {
-				if (0 == String.Compare ("DBProviderAssembly", s, true)) {
-					providerAssembly = config [s];
-				} else if (0 == String.Compare ("DBConnectionType", s, true)) {
-					cncTypeName = config [s];
-				} else if (0 == String.Compare ("DBConnectionString", s, true)) {
-					cncString = config [s];
-				}
-			}
-		}
-
-	        Version ver = Environment.Version;
-		if (providerAssembly == null || providerAssembly == "")
-			if (ver.Major == 2)
-	                         providerAssembly = "Mono.Data.Sqlite, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756";
-	                else if (ver.Major == 4)
-	            		 providerAssembly = "Mono.Data.Sqlite, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756";
-			else
-				throw new InvalidOperationException (String.Format ("Framework version {0} is not supported by this demo.", ver));
-
-		if (cncTypeName == null || cncTypeName == "")
-			cncTypeName = "Mono.Data.Sqlite.SqliteConnection";
-		
-		if (cncString == null || cncString == "") {
-	                string dbPath = Path.Combine (Path.GetDirectoryName (Request.MapPath (Request.FilePath)), "dbpage1.sqlite");
-			cncString = String.Format ("URI=file:{0},Version=3", dbPath);
-	        }
-	}
-
-	void ShowError (Exception exc)
-	{
-		noDBLine.InnerHtml += "<p><b>The error was:</b>\n<pre> " + exc + "</pre><p>";
-		theForm.Visible = false;
-		noDBLine.Visible = true;
-	}
-
-	IDbConnection cnc;
-	void Page_Init (object sender, EventArgs e)
-	{
-		string connectionTypeName;
-		string providerAssemblyName;
-		string cncString;
-
-		GetConnectionData (out providerAssemblyName, out connectionTypeName, out cncString);
-		if (cncType == null) {		
-			Assembly dbAssembly = Assembly.LoadWithPartialName (providerAssemblyName);
-                        if (dbAssembly == null)
-                                throw new ApplicationException (String.Format ("Data provider assembly '{0}' not found",
-                                                                providerAssemblyName));
-
-			cncType = dbAssembly.GetType (connectionTypeName, true);
-			if (!typeof (IDbConnection).IsAssignableFrom (cncType))
-				throw new ApplicationException ("The type '" + cncType +
-								"' does not implement IDbConnection.\n" +
-								"Check 'DbConnectionType' in server.exe.config.");
-		}
-
-		cnc = (IDbConnection) Activator.CreateInstance (cncType);
-		cnc.ConnectionString = cncString;
-		try {
-			cnc.Open ();
-		} catch (Exception exc) {
-			ShowError (exc);
-		}
-	}
-
-	void Page_Unload ()
-	{
-		if (cnc != null) {
-			try {
-				cnc.Close ();
-			} catch {}
-			cnc = null;
-		}
-	}
-
-	void Page_Load (object sender, EventArgs e)
-	{
-		if (!IsPostBack){
-			PersonFilter.Text = "%";
-			MailFilter.Text = "%";
-			UpdateTable (PersonFilter.Text, MailFilter.Text);
-		}
-	}
-
-	void Filter_Changed (object sender, EventArgs e)
-	{
-		UpdateTable (PersonFilter.Text, MailFilter.Text);
-	}
-
-	void UpdateTable (string filterPerson, string filterMail)
-	{
-		if (cnc == null)
-			return;
-
-		IDbCommand selectCommand = cnc.CreateCommand();
-		IDataReader reader;
-
-		string selectCmd = "SELECT * FROM test " + 
-				   "WHERE person like '" + filterPerson  + "' AND " +
-					 "email like '" + filterMail + "'";
-
-		selectCommand.CommandText = selectCmd;
-                int rowCount = 0;
-		try {
-			reader = selectCommand.ExecuteReader ();
-			while (reader.Read ()) {
-				TableRow row = new TableRow ();
-				for (int i = 0; i < reader.FieldCount; i++) {
-					TableCell cell = new TableCell ();
-					cell.Controls.Add (new LiteralControl (reader.GetValue (i).ToString ()));
-					row.Cells.Add (cell);
-				}
-				myTable.Rows.Add (row);
-				rowCount++;
-			}
-			if (rowCount == 0) {
-				TableRow row = new TableRow ();
-				TableCell cell = new TableCell ();
-				cell.Controls.Add (new LiteralControl ("No results returned from query."));
-				row.Cells.Add (cell);
-				myTable.Rows.Add (row);
-			}
-		} catch (Exception exc) {
-			ShowError (exc);
-		}
-	}
-
-</script>
-<head>
-<link rel="stylesheet" type="text/css" href="/mono-xsp.css">
-<title>Some DB testing</title>
-</head>
-<body><mono:MonoSamplesHeader runat="server"/>
-<span runat="server" visible="false" id="noDBLine">
-<h3>Database Error</h3>
-Sorry, a database error has occurred.
-<p>
-You should set up a database of your choice and then modify the variables DBProviderAssembly, DBConnectionType and
-DBConnectionString in <tt>xsp.exe.config</tt> (or <tt>mod-mono-server.exe.config</tt> if running the tests under Apache/mod_mono)
-file to fit your needs.
-<p>
-The database should have a table called customers created with the following command (or similar):
-<pre>
-CREATE TABLE "test" (
-	"person" character varying(256) NOT NULL,
-	"email" character varying(256) NOT NULL
-);
-
-</pre>
-</span>
-
-<form id="theForm" runat="server">
-Choose the SQL filters and click 'Submit'.
-<p>
-<asp:Label runat="server" Text="Person Filter: "/>
-<asp:TextBox id="PersonFilter" Text="" TextMode="singleLine" runat="server" maxlength="40" />
-<p>
-<asp:Label runat="server" Text="Mail Filter: " />
-<asp:TextBox id="MailFilter" Text="" TextMode="singleLine" runat="server" maxlength="40" />
-<p>
-<asp:Button id="btn" runat="server" Text="Submit" OnClick="Filter_Changed" />
-<p>
-<asp:Table id="myTable" HorizontalAlign="Left" Font-Size="12pt" GridLines="both" 
-CellPadding="5" runat="server"/>
-</form>
-</body>
-</html>
--- a/test/1.1/webcontrols/dbpage1.sqlite
+++ b/test/1.1/webcontrols/dbpage1.sqlite
--- a/test/1.1/webcontrols/dbpage2.aspx
+++ b/test/1.1/webcontrols/dbpage2.aspx
@ -1,396 +0,0 @@
-<%@ Page language="C#" %>
-<%@ Register TagPrefix="mono" TagName="MonoSamplesHeader" src="~/controls/MonoSamplesHeader.ascx" %>
-<%@ import namespace="System.Data" %>
-<%@ import namespace="System.Data.SqlClient" %>
-<%@ import namespace="System.Reflection" %>
-<%@ Import namespace="System.IO" %>
-<%@ Register TagPrefix="Mono" Namespace="Mono.Controls" assembly="tabcontrol2" %>
-<html>
-<!-- You must compile tabcontrol2.cs and copy the dll to the output/ directory -->
-<!-- Authors:
--	Gonzalo Paniagua Javier (gonzalo@ximian.com)
--	(c) 2002 Ximian, Inc (http://www.ximian.com)
-->
-<script runat=server>
-
-	static Type cncType = null;
-
-	void GetConnectionData (out string providerAssembly, out string cncTypeName, out string cncString)
-	{
-		providerAssembly = null;
-		cncTypeName = null;
-		cncString = null;
-		NameValueCollection config = ConfigurationSettings.AppSettings as NameValueCollection;
-		if (config != null) {
-			foreach (string s in config.Keys) {
-				if (0 == String.Compare ("DBProviderAssembly", s, true)) {
-					providerAssembly = config [s];
-				} else if (0 == String.Compare ("DBConnectionType", s, true)) {
-					cncTypeName = config [s];
-				} else if (0 == String.Compare ("DBConnectionString", s, true)) {
-					cncString = config [s];
-				}
-			}
-		}
-
-	        Version ver = Environment.Version;
-		if (providerAssembly == null || providerAssembly == "")
-	                if (ver.Major == 2)
-	                         providerAssembly = "Mono.Data.Sqlite, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756";
-	                else if (ver.Major == 4)
-	            		 providerAssembly = "Mono.Data.Sqlite, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756";
-			else
-				throw new InvalidOperationException (String.Format ("Framework version {0} is not supported by this demo.", ver));
-
-		if (cncTypeName == null || cncTypeName == "")
-			cncTypeName = "Mono.Data.Sqlite.SqliteConnection";
-		
-		if (cncString == null || cncString == "") {
-	                string dbPath = Path.Combine (Path.GetDirectoryName (Request.MapPath (Request.FilePath)), "dbpage2.sqlite");
-			cncString = String.Format ("URI=file:{0},Version=3", dbPath);
-	        }
-
-	}
-
-	void Page_Unload ()
-	{
-		if (cnc != null) {
-			try {
-				cnc.Close ();
-			} catch {}
-			cnc = null;
-		}
-	}
-
-	void ShowError (Exception exc)
-	{
-		noDBLine.InnerHtml += "<p><b>The error was:</b>\n<pre> " + exc + "</pre><p>";
-		theForm.Visible = false;
-		noDBLine.Visible = true;
-	}
-
-	IDbConnection cnc;
-	void Page_Init (object sender, EventArgs e)
-	{
-		string connectionTypeName;
-		string providerAssemblyName;
-		string cncString;
-
-		GetConnectionData (out providerAssemblyName, out connectionTypeName, out cncString);
-		if (cncType == null) {		
-			Assembly dbAssembly = Assembly.LoadWithPartialName (providerAssemblyName);
-                        if (dbAssembly == null)
-                                throw new ApplicationException (String.Format ("Data provider assembly '{0}' not found",
-                                                                providerAssemblyName));
-			cncType = dbAssembly.GetType (connectionTypeName, true);
-			if (!typeof (IDbConnection).IsAssignableFrom (cncType))
-				throw new ApplicationException ("The type '" + cncType +
-								"' does not implement IDbConnection.\n" +
-								"Check 'DbConnectionType' in server.exe.config.");
-		}
-
-		cnc = (IDbConnection) Activator.CreateInstance (cncType);
-		cnc.ConnectionString = cncString;
-		try {
-			cnc.Open ();
-		} catch (Exception exc) {
-			ShowError (exc);
-		}
-	}
-
-	void Page_PreRender (object sender, EventArgs e)
-	{
-		if (cnc == null)
-			return;
-
-		if (tabs.CurrentTabName == "Browse") {
-			string selectCmd = "SELECT id, name, address FROM customers ORDER by id";
-			UpdateTable (selectCmd, browse);
-			return;
-		}
-
-		if (deleteID.Visible == true)
-			deleteIDLabel.InnerHtml = "ID: ";
-
-		if (confirmDelete.Visible == true){
-			string s_deleteID = deleteID.Text.Trim ();
-                        if (s_deleteID != null && s_deleteID.Length > 0) {
-			       uint dbid = UInt32.Parse (s_deleteID);
-			       string selectCmd = String.Format ("SELECT id, name, address FROM customers WHERE id = {0}", dbid);
-			       UpdateTable (selectCmd, deleteTable);
-                        }
-			return;
-		}
-	}
-
-	private void UpdateTable (string selectCmd, Table table)
-	{
-		IDbCommand selectCommand = cnc.CreateCommand();
-
-		selectCommand.CommandText = selectCmd;
-		try {
-			IDataReader reader = selectCommand.ExecuteReader ();
-			table.Rows.Clear ();
-			while (reader.Read ()) {
-				TableRow row = new TableRow ();
-				for (int i = 0; i < reader.FieldCount; i++) {
-					TableCell cell = new TableCell ();
-					object data = reader.GetValue (i);
-					if (data == null)
-						data = "(null)";
-					cell.Controls.Add (new LiteralControl (data.ToString ()));
-					row.Cells.Add (cell);
-				}
-				table.Rows.Add (row);
-			}
-			reader.Close ();
-		} catch (Exception exc) {
-			ShowError (exc);
-		}
-	}
-
-	private void DoInsert (uint dbid, string dbname, string dbaddress)
-	{
-		string dbNameRep = dbname.Replace ("'", "\\'");
-		string dbAddressRep = dbaddress.Replace ("'", "\\'");
-
-		string insertCmd = String.Format ("INSERT INTO customers VALUES ({0}, '{1}', '{2}')",
-						   dbid, dbNameRep, dbAddressRep);
-		IDbCommand insertCommand = cnc.CreateCommand();
-		insertCommand.CommandText = insertCmd;
-		int i;
-		try {
-			i = insertCommand.ExecuteNonQuery ();
-			statusLine.InnerHtml = String.Format ("{0} rows(s) inserted", i);
-			dbID.Text = "";
-			dbName.Text = "";
-			dbAddress.Text = "";
-		} catch (Exception e) {
-			errorLine.InnerHtml = "<b>Error inserting row: " + e.Message + "</b>";
-		}
-	}
-	
-	void InsertData (object o, EventArgs args)
-	{
-		string s_dbid = dbID.Text.Trim ();
-		string s_dbname = dbName.Text.Trim ();
-		string s_dbaddress = dbAddress.Text.Trim ();
-		if (s_dbid == "" || s_dbname == "" || s_dbaddress == "") {
-			errorLine.InnerHtml = "<b>All fields must be filled</b>";
-			return;
-		}
-
-		try {
-			uint dbid = UInt32.Parse (s_dbid);
-			DoInsert (dbid, s_dbname, s_dbaddress);
-		} catch (Exception e) {
-			errorLine.InnerHtml = "<b>Error parsing ID: " + e.Message + "</b>";
-		}
-	}
-
-	void DeleteData (object o, EventArgs args)
-	{
-		string s_deleteID = deleteID.Text.Trim ();
-		if (s_deleteID == "") {
-			errorLine.InnerHtml = "<b>Empty ID!</b>";
-			return;
-		}
-
-		try {
-			uint dbid = UInt32.Parse (s_deleteID);
-			deleteSubmit.Visible = false;
-			deleteID.Visible = false;
-			deleteTable.Visible = true;
-			confirmDelete.Visible = true;
-			deleteIDLabel.InnerHtml = "ID: " + dbid;
-		} catch (Exception e) {
-			errorLine.InnerHtml = "<b>Error parsing ID: " + e.Message + "</b>" + " " + s_deleteID;
-		}
-	}
-
-	void ConfirmDeleteData (object o, EventArgs args)
-	{
-		string s_deleteID = deleteIDLabel.InnerHtml.Substring (4).Trim ();
-		try {
-			uint dbid = UInt32.Parse (s_deleteID);
-			DoDelete (dbid);
-		} catch (Exception e) {
-			errorLine.InnerHtml = "<b>Error parsing ID: " + e.Message + "</b>" + " " + s_deleteID;
-		}
-
-		deleteSubmit.Visible = true;
-		deleteID.Visible = true;
-		deleteIDLabel.InnerHtml = "ID: ";
-		deleteTable.Visible = false;
-		deleteID.Text = "";
-	}
-
-	private void DoDelete (uint dbid)
-	{
-		string deleteCmd = String.Format ("DELETE FROM customers WHERE id = {0}", dbid);
-		IDbCommand deleteCommand = cnc.CreateCommand();
-		deleteCommand.CommandText = deleteCmd;
-		int i;
-		try {
-			i = deleteCommand.ExecuteNonQuery ();
-			statusLine.InnerHtml = String.Format ("{0} row(s) deleted", i);
-		} catch (Exception e) {
-			errorLine.InnerHtml = "<b>Error deleting row: " + e.Message + "</b>";
-		}
-	}
-
-	void UpdateData (object o, EventArgs args)
-	{
-		uint dbid = 0;
-		try {
-			dbid = UInt32.Parse (updateID.Text.Trim ());
-		} catch (Exception e) {
-			errorLine.InnerHtml = "<b>Error parsing ID: " + e.Message + "</b>" + " " + updateID.Text;
-			return;
-		}
-
-		string s_updatename = updateName.Text.Trim ();
-		string s_updateaddress = updateAddress.Text.Trim ();
-		if (s_updatename == "" && s_updateaddress == "") {
-			errorLine.InnerHtml = "<b>At least one of name or address must be filled.</b>";
-			return;
-		}
-
-		DoUpdate (dbid, s_updatename, s_updateaddress);
-	}
-
-	void RefreshUpdateData (object o, EventArgs args)
-	{
-		uint dbid = 0;
-		try {
-			dbid = UInt32.Parse (updateID.Text.Trim ());
-		} catch (Exception e) {
-			errorLine.InnerHtml = "<b>Error parsing ID: " + e.Message + "</b>" + " " + updateID.Text;
-			return;
-		}
-
-		string selectCmd = String.Format ("SELECT name, address FROM customers WHERE id = {0}", dbid);
-		
-		IDbCommand selectCommand = cnc.CreateCommand();
-		selectCommand.CommandText = selectCmd;
-		IDataReader reader = selectCommand.ExecuteReader ();
-		if (!reader.Read ()) {
-			errorLine.InnerHtml = "<b>No such ID: " + dbid + "</b>";
-			updateName.Text = "";
-			updateAddress.Text = "";
-			reader.Close ();
-			return;
-		}
-		updateName.Text = reader.GetValue (0) as string;
-		updateAddress.Text = reader.GetValue (1) as string;
-		reader.Close ();
-	}
-
-	private void DoUpdate (uint dbid, string dbname, string dbaddress)
-	{
-		string dbNameRep = dbname.Replace ("'", "\\'");
-		string dbAddressRep = dbaddress.Replace ("'", "\\'");
-
-		string updateCmd = String.Format ("UPDATE customers SET name = '{1}', address = '{2}' WHERE id = {0}",
-						   dbid, dbNameRep, dbAddressRep);
-		IDbCommand updateCommand = cnc.CreateCommand();
-		updateCommand.CommandText = updateCmd;
-		int i;
-		try {
-			i = updateCommand.ExecuteNonQuery ();
-			statusLine.InnerHtml = String.Format ("{0} rows(s) updated", i);
-			updateID.Text = "";
-			updateName.Text = "";
-			updateAddress.Text = "";
-		} catch (Exception e) {
-			errorLine.InnerHtml = "<b>Error updating row: " + e.Message + "</b>";
-		}
-	}
-</script>
-<head>
-<link rel="stylesheet" type="text/css" href="/mono-xsp.css">
-<title>More DB testing plus tabcontrol2.dll</title>
-</head>
-<body><mono:MonoSamplesHeader runat="server"/>
-<span runat="server" visible="false" id="noDBLine">
-<h3>Database Error</h3>
-Sorry, could not connect to a database.
-<p>
-You should set up a database for user <i>'monotest'</i>,
-password <i>'monotest'</i> and dbname <i>'monotest'</i>
-<p>
-Then modify the variables DBProviderAssembly, DBConnectionType and
-DBConnectionString in server.exe.config file to fit your needs.
-<p>
-The database should have a table called customers created with the following command:
-<pre>
-CREATE TABLE "customers" (
-	"id" integer NOT NULL,
-	"name" character varying(256) NOT NULL,
-	"address" character varying(256) NOT NULL
-);
-
-CREATE UNIQUE INDEX id_idx ON customers USING btree (id);
-</pre>
-</span>
-<form id="theForm" runat="server">
-	<Mono:Tabs2 runat="server" id="tabs">
-		<Mono:TabContent id="BrowseTab" runat="server" label="Browse">
-			<p>
-			Below, the rows of the table are displayed (if any).
-			<p>
-			<asp:Table EnableViewState="false" id="browse" HorizontalAlign="Left" Font-Size="12pt"
-				   GridLines="both" CellPadding="5" runat="server"/>
-			<br>
-			<p>
-			<asp:Button runat="server" id="refreshBrowse" Text="Refresh" />
-		</Mono:TabContent>
-		<Mono:TabContent id="InsertTab" runat="server" label="Insert">
-			<p>
-			Fill in the data and click the button when done. All fields are mandatory.
-			<p>
-			ID: <asp:TextBox runat="server" id="dbID" columns="10" />
-			<p>
-			Name: <asp:TextBox runat="server" id="dbName" columns="40" />
-			<p>
-			Address: <asp:TextBox runat="server" id="dbAddress" columns="40" />
-			<p>
-			<asp:Button runat="server" id="insertSubmit" Text="Insert data" OnClick="InsertData" />
-		</Mono:TabContent>
-		<Mono:TabContent id="DeleteTab" runat="server" label="Delete">
-			<p>
-			Deletes a row by its ID.
-			<p>
-			<span runat="server" id="deleteIDLabel">ID:</span>
-			<asp:TextBox runat="server" id="deleteID" columns="10" />
-			<p>
-			<asp:Table EnableViewState="false" visible="false" id="deleteTable" HorizontalAlign="Left" 
-				   Font-Size="12pt" GridLines="both" CellPadding="5" runat="server"/>
-			<br>
-			<p>
-			<asp:Button runat="server" id="deleteSubmit" Text="Delete" OnClick="DeleteData" />
-			<asp:Button runat="server" id="confirmDelete" Visible="false" Text="Really delete?" OnClick="ConfirmDeleteData" />
-		</Mono:TabContent>
-		<Mono:TabContent id="UpdateTab" runat="server" label="Update">
-			<p> The ID field acts as unique index. The other fields will be modified.<br>
-			If you fill the ID, you can push "Refresh data" to get name and address from the database.
-			<p>
-			ID: <asp:TextBox runat="server" id="updateID" columns="10" />
-			<p>
-			Name: <asp:TextBox runat="server" id="updateName" columns="40" />
-			<p>
-			Address: <asp:TextBox runat="server" id="updateAddress" columns="40" />
-			<p>
-			<asp:Button runat="server" id="updateSubmit" Text="Update DB" OnClick="UpdateData" />
-			<asp:Button runat="server" id="refreshUpdateSubmit" Text="Refresh data" OnClick="RefreshUpdateData" />
-		</Mono:TabContent>
-	</Mono:Tabs2>
-	<p>
-	<span runat="server" style="color: blue;" EnableViewState="false" id="statusLine" Text="" />
-	&nbsp;
-	<p>
-	<span runat="server" style="color: red;" EnableViewState="false" id="errorLine" Text="" />
-</form>
-</body>
-</html>
-
--- a/test/1.1/webcontrols/dbpage2.sqlite
+++ b/test/1.1/webcontrols/dbpage2.sqlite
--- a/test/1.1/webcontrols/dbpage_test_setup.cs
+++ b/test/1.1/webcontrols/dbpage_test_setup.cs
@ -1,85 +0,0 @@
-using System;
-using System.IO;
-using Mono.Data.Sqlite;
-
-class App
-{
-	static string[] emails = {
-		"Joe Doe", "joe.doe@domain.com",
-		"Jane Doe", "jane.doe@domain.com",
-		"Bart Simpson", "bart@simpsons.com",
-		"Donald Duck", "donald.duck@donaldinho.com",
-		"Shrek Ogre", "shrek@farfaraway.com"
-	};
-
-	static object[] addresses = {
-		1, "Joe Doe", "Somewhere, 12456",
-		2, "Jane Doe", "Somewhere Else, 12345",
-		3, "Bart Simpson", "Smallville, 12313",
-		4, "Donald Duck", "Metropolis 13141",
-		5, "Shrek Ogre", "The Swamp, 12314"
-	};
-	
-	public static int Main ()
-	{
-		File.Delete ("dbpage1.sqlite");
-		
-		SqliteConnection conn = new SqliteConnection ();
-		conn.ConnectionString = "URI=file:dbpage1.sqlite, Version=3";
-		conn.Open ();
-		
-		SqliteCommand cmd = new SqliteCommand ();
-		cmd.Connection = conn;
-		cmd.CommandText =
-			@"CREATE TABLE test (
-			 person VARCHAR (256) NOT NULL,
-			 email VARCHAR (256) NOT NULL
-			)";
-		cmd.ExecuteNonQuery ();
-
-		cmd.CommandText =
-			@"INSERT INTO test (person, email)
-                         VALUES (:person, :email)";
-
-		for (int i = emails.Length - 1; i > 0; i -= 2) {
-			cmd.Parameters.Add (new SqliteParameter ("email", emails [i]));
-			cmd.Parameters.Add (new SqliteParameter ("person", emails [i - 1]));
-			cmd.ExecuteNonQuery ();
-			cmd.Parameters.Clear ();
-		}
-		
-		conn.Close ();
-
-		File.Delete ("dbpage2.sqlite");
-		conn = new SqliteConnection ();
-		conn.ConnectionString = "URI=file:dbpage2.sqlite, Version=3";
-		conn.Open ();
-
-		cmd = new SqliteCommand ();
-		cmd.Connection = conn;
-		cmd.CommandText =
-			@"CREATE TABLE customers (
-                          id INTEGER NOT NULL,
-                          name VARCHAR (256) NOT NULL,
-                          address VARCHAR (256) NOT NULL
-                         )";
-		cmd.ExecuteNonQuery ();
-
-		cmd.CommandText =
-			@"INSERT INTO customers (id, name, address)
-                         VALUES (:id, :name, :address)";
-
-		for (int i = addresses.Length - 1; i > 0; i -= 3) {
-			cmd.Parameters.Add (new SqliteParameter ("id", addresses [i - 2]));
-			cmd.Parameters.Add (new SqliteParameter ("name", addresses [i - 1]));
-			cmd.Parameters.Add (new SqliteParameter ("address", addresses [i]));
-			
-			cmd.ExecuteNonQuery ();
-			cmd.Parameters.Clear ();
-		}
-		
-		conn.Close ();
-		
-		return 0;
-	}
-}
--- a/test/1.1/webcontrols/index.aspx
+++ b/test/1.1/webcontrols/index.aspx
@ -1,19 +0,0 @@
-<%@ Page Language="C#" %>
-<%@ Register TagPrefix="mono" TagName="MonoSamplesHeader" src="~/controls/MonoSamplesHeader.ascx" %>
-<%@ Register TagPrefix="mono" TagName="FileList" src="~/controls/FileList.ascx" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>Directory index</title>
-<link rel="stylesheet" type="text/css" href="/mono-xsp.css">
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-</head>
-<body><mono:MonoSamplesHeader runat="server"/>
-<form runat="server">
-  <p>The following directories and files are found in this directory:</p>
-  <blockquote>
-    <mono:FileList runat="server"/>
-  </blockquote>
-</form>
-</body>
-</html>
--- a/test/1.1/webcontrols/listitem.aspx
+++ b/test/1.1/webcontrols/listitem.aspx
@ -1,24 +0,0 @@
-<%@ Page language="c#" %>
-<%@ Register TagPrefix="mono" TagName="MonoSamplesHeader" src="~/controls/MonoSamplesHeader.ascx" %>
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="/mono-xsp.css">
-<title>List Items</title>
-</head>
-<body><mono:MonoSamplesHeader runat="server"/>
-
-    <h3>ListItem test</h3>
-    <form runat="server">
-        <asp:DropDownList id="NumberList" runat="server">
-          <asp:ListItem>One</asp:ListItem>
-          <asp:ListItem>Two</asp:ListItem>
-          <asp:ListItem>Three</asp:ListItem>
-          <asp:ListItem>Cuatro</asp:ListItem>
-          <asp:ListItem>Five</asp:ListItem>
-          <asp:ListItem>Six</asp:ListItem>
-          <asp:ListItem>Seven</asp:ListItem>
-          <asp:ListItem>Eight</asp:ListItem>
-        </asp:DropDownList>       
-    </form>
-</body>
-</html>
--- a/test/1.1/webcontrols/people.xml
+++ b/test/1.1/webcontrols/people.xml
@ -1,70 +0,0 @@
-<People>
-   <Person>
-      <Name>
-         <FirstName>Joe</FirstName>
-         <LastName>Suits</LastName>
-      </Name>
-      <Address>
-         <Street>1800 Success Way</Street>
-         <City>Redmond</City>
-         <State>WA</State>
-         <ZipCode>98052</ZipCode>
-      </Address>
-      <Job>
-         <Title>CEO</Title>
-         <Description>Wears the nice suit</Description>
-      </Job>
-   </Person>
-
-   <Person>
-      <Name>
-         <FirstName>Linda</FirstName>
-         <LastName>Sue</LastName>
-      </Name>
-      <Address>
-         <Street>1302 American St.</Street>
-         <City>Paso Robles</City>
-         <State>CA</State>
-         <ZipCode>93447</ZipCode>
-      </Address>
-      <Job>
-         <Title>Attorney</Title>
-         <Description>Stands up for justice</Description>
-      </Job>
-   </Person>
-
-   <Person>
-      <Name>
-         <FirstName>Jeremy</FirstName>
-         <LastName>Boards</LastName>
-      </Name>
-      <Address>
-         <Street>34 Palm Avenue</Street>
-         <City>Waikiki</City>
-         <State>HI</State>
-         <ZipCode>98052</ZipCode>
-      </Address>
-      <Job>
-         <Title>Pro Surfer</Title>
-         <Description>Rides the big waves</Description>
-      </Job>
-   </Person>
-
-   <Person>
-      <Name>
-         <FirstName>Joan</FirstName>
-         <LastName>Page</LastName>
-      </Name>
-      <Address>
-         <Street>700 Webmaster Road</Street>
-         <City>Redmond</City>
-         <State>WA</State>
-         <ZipCode>98073</ZipCode>
-      </Address>
-      <Job>
-         <Title>Web Site Developer</Title>
-         <Description>Writes the pretty pages</Description>
-      </Job>
-   </Person>
-</People>
-
--- a/test/1.1/webcontrols/peopletable.xsl
+++ b/test/1.1/webcontrols/peopletable.xsl
@ -1,56 +0,0 @@
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-   <xsl:template match="/People">
-      <xsl:apply-templates select="Person" />
-   </xsl:template>
-  
-   <xsl:template match="Person">
-      <table width="100%" border="1">
-         <tr>
-            <td>
-               <b>
-                  <xsl:value-of select="Name/FirstName" />
-                  &#160;
-                  <xsl:value-of select="Name/LastName" />
-               </b>
-            </td>
-         </tr>
-         <tr>
-            <td>
-               <xsl:value-of select="Address/Street" /><br />
-               <xsl:value-of select="Address/City" />
-               , 
-               <xsl:value-of select="Address/State" /> 
-               <xsl:value-of select="Address/Zip" />
-            </td>
-         </tr>
-         <tr>
-            <td>
-               Job Title: <xsl:value-of select="Job/Title" /><br />
-               Description: <xsl:value-of select="Job/Description" />
-            </td>
-         </tr>
-      </table>
-   </xsl:template>
-
-   <xsl:template match="bookstore">
-      <!-- Prices and books -->
-      <bookstore>
-         <xsl:apply-templates select="book"/>
-      </bookstore>
-   </xsl:template>
-
-   <xsl:template match="book">
-      <book>
-         <xsl:attribute name="ISBN">
-            <xsl:value-of select="@ISBN"/>
-         </xsl:attribute>
-         <price>
-            <xsl:value-of select="price"/>
-         </price>
-         <xsl:text>
-         </xsl:text>
-      </book>
-   </xsl:template>
-
-</xsl:stylesheet>
-
--- a/test/1.1/webcontrols/temperature.aspx
+++ b/test/1.1/webcontrols/temperature.aspx
@ -1,97 +0,0 @@
-<%@ Page Language="C#" %>
-<%@ Register TagPrefix="mono" TagName="MonoSamplesHeader" src="~/controls/MonoSamplesHeader.ascx" %>
-<html>
-<script runat=server>
-	void Clicked (object o, EventArgs e)
-	{
-		if (!Page.IsValid)
-			return;
-
-		double val;
-		try {
-			val = Double.Parse (degrees.Text);
-		} catch (Exception) {
-			result.Text = "<font color=\"red\">Invalid number in degrees</font>";
-			return;
-		}
-
-		double kval;
-		switch (fromScale.SelectedIndex) {
-		case 0:
-			kval = val + 373;
-			break;
-		case 1:
-			kval = 373 + (val - 32) * 5 / 9;
-			break;
-		case 2:
-			if (val < 0) {
-				result.Text = "<font color=\"red\">Kelvin is not defined for negtive numbers</font>";
-				return;
-			}
-			kval = val;
-			break;
-		default:
-			result.Text = "<font color=\"red\">Invalid from index</font>";
-			return;
-		}
-
-		switch (toScale.SelectedIndex) {
-		case 0:
-			kval -= 373;
-			break;
-		case 1:
-			kval = ((kval - 373) * 9 / 5) + 32;
-			break;
-		case 2:
-			// Do nothing
-			break;
-		default:
-			result.Text = "<font color=\"red\">Invalid from index</font>";
-			return;
-		}
-
-		result.Text = String.Format ("Converting {0} from {1} to {2} gives <b>{3}</b>",
-								val,
-								fromScale.Value,
-								toScale.Value,
-								Math.Round (kval, 3));
-	}
-</script>
-<head>
-<link rel="stylesheet" type="text/css" href="/mono-xsp.css">
-<title>Temperature conversion</title>
-</head>
-<body><mono:MonoSamplesHeader runat="server"/>
-<h3>Temperature conversion</h3>
-Choose to/from and enter degrees.
-<form runat="server">
-	<span>From: </span>
-	<select id="fromScale" runat="server">
-		<option selected="true">Celsius</option>
-		<option>Farenheit</option>
-		<option>Kelvin</option>
-	</select>
-	&nbsp;
-	<span>Degrees: </span>
-	<asp:TextBox id="degrees" Text="" runat="server" />
-	&nbsp;
-	<span>To: </span>
-	<select id="toScale" runat="server">
-		<option>Celsius</option>
-		<option selected="true">Farenheit</option>
-		<option>Kelvin</option>
-	</select>
-	<p>
-	<asp:Label runat=server id="result" Text="" />
-	<p>
-	<asp:Button id="btn"
-	     Text="Calculate"
-	     OnClick="Clicked"
-	     runat="server"/>
-	<p>	
-	<asp:RequiredFieldValidator runat="server" id="vDegrees"
-	     ControlToValidate="degrees" display="Dynamic"
-	     ErrorMessage="Degrees not filled!" />
-</form>
-</body>
-</html>
--- a/test/1.1/webcontrols/validator1.aspx
+++ b/test/1.1/webcontrols/validator1.aspx
@ -1,38 +0,0 @@
-<%@ Page language="C#" %>
-<%@ Register TagPrefix="mono" TagName="MonoSamplesHeader" src="~/controls/MonoSamplesHeader.ascx" %>
-<html>
-<script runat=server>
-	void txt_Changed (object sender, EventArgs e)
-	{
-	}
-</script>
-<head>
-<link rel="stylesheet" type="text/css" href="/mono-xsp.css">
-<title>The textboxes should be filled</title>
-</head>
-<body><mono:MonoSamplesHeader runat="server"/>
-<form runat="server">
-Multiline:
-<br>
-<asp:TextBox id="txt1" Text="multiline" TextMode="MultiLine" OnTextChanged="txt_Changed" runat="server" rows=5 />
-<asp:RequiredFieldValidator runat="server" id="validTxt1" ControlToValidate="txt1" display="Dynamic" ErrorMessage="Not filled!" />
-<br>
-Single:
-<br>
-<asp:TextBox id="txt2" Text="singleline" TextMode="singleLine" OnTextChanged="txt_Changed" runat="server" maxlength=40 />
-<asp:RequiredFieldValidator runat="server" id="validtxt2" ControlToValidate="txt2" display="Dynamic" ErrorMessage="Not filled!" />
-<br>
-<br>
-Password:
-<br>
-<asp:TextBox id="txt3" Text="badifyouseethis" TextMode="password" OnTextChanged="txt_Changed" runat="server" maxlength=15 />
-<br>
-<asp:RequiredFieldValidator runat="server" id="validtxt3" ControlToValidate="txt3" display="Dynamic" ErrorMessage="Not filled!" />
-<br>
-<asp:Button id="btn"
-     Text="Submit"
-     runat="server"/>
-</form>
-</body>
-</html>
-
--- a/test/1.1/webcontrols/web_adrotator.aspx
+++ b/test/1.1/webcontrols/web_adrotator.aspx
@ -1,16 +0,0 @@
-<%@ Page language="C#" %>
-<%@ Register TagPrefix="mono" TagName="MonoSamplesHeader" src="~/controls/MonoSamplesHeader.ascx" %>
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="/mono-xsp.css">
-<title>AdRotator</title>
-</head>
-<body><mono:MonoSamplesHeader runat="server"/>
-<form runat="server">
-<asp:AdRotator id="adr" runat="server"
-	AdvertisementFile="web_adrotator.xml"
-	Target="_top" />
-</form>
-</body>
-</html>
-
--- a/test/1.1/webcontrols/web_adrotator.xml
+++ b/test/1.1/webcontrols/web_adrotator.xml
@ -1,12 +0,0 @@
-<Advertisements>
-<Ad>
-<AlternateText>Dancing monkey</AlternateText>
-<ImageUrl>http://www.mono-project.com/files/8/8d/Mono-gorilla-aqua.100px.png</ImageUrl>
-<NavigateUrl>http://www.ximian.com</NavigateUrl>
-</Ad>
-<Ad>
-<AlternateText>Mono</AlternateText>
-<ImageUrl>http://www.go-mono.com/images/mono-new.gif</ImageUrl>
-<NavigateUrl>http://www.go-mono.com</NavigateUrl>
-</Ad>
-</Advertisements>
--- a/test/1.1/webcontrols/web_button.aspx
+++ b/test/1.1/webcontrols/web_button.aspx
@ -1,22 +0,0 @@
-<%@ Page language="C#" %>
-<%@ Register TagPrefix="mono" TagName="MonoSamplesHeader" src="~/controls/MonoSamplesHeader.ascx" %>
-<html>
-<script runat=server>
-	void Clicked (object o, EventArgs e)
-	{
-	}
-</script>
-<head>
-<link rel="stylesheet" type="text/css" href="/mono-xsp.css">
-<title>Button</title>
-</head>
-<body><mono:MonoSamplesHeader runat="server"/>
-
-<form runat="server">
-<asp:Button id="btn"
-     Text="Submit"
-     OnClick="Clicked"
-     runat="server"/>
-</form>
-</body>
-</html>
--- a/test/1.1/webcontrols/web_checkbox.aspx
+++ b/test/1.1/webcontrols/web_checkbox.aspx
@ -1,29 +0,0 @@
-<%@ Page language="C#" %>
-<%@ Register TagPrefix="mono" TagName="MonoSamplesHeader" src="~/controls/MonoSamplesHeader.ascx" %>
-<html>
-<script runat=server>
-	void Clicked (object o, EventArgs e)
-	{
-	}
-</script>
-<head>
-<link rel="stylesheet" type="text/css" href="/mono-xsp.css">
-<title>CheckBox</title>
-</head>
-<body><mono:MonoSamplesHeader runat="server"/>
-<form runat="server">
-<asp:CheckBox id="chk"
-	Text="Click here!"
-	AutoPostBack="True"
-	OnCheckedChanged="Clicked"
-	runat="server"/>
-<br>
-<asp:CheckBox id="chk2"
-	Text="Click also here!"
-	AutoPostBack="True"
-	align=right
-	OnCheckedChanged="Clicked"
-	runat="server"/>
-</form>
-</body>
-</html>
--- a/test/1.1/webcontrols/web_checkboxlist.aspx
+++ b/test/1.1/webcontrols/web_checkboxlist.aspx
@ -1,30 +0,0 @@
-<%@ Page Language="C#" %>
-<%@ Register TagPrefix="mono" TagName="MonoSamplesHeader" src="~/controls/MonoSamplesHeader.ascx" %>
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="/mono-xsp.css">
-<title>CheckBoxList</title>
-</head>
-<body><mono:MonoSamplesHeader runat="server"/>
-<form runat="server">
-Flow layout:
-<p>
-<asp:CheckBoxList id="l1" RepeatLayout="flow" runat="server">
-<asp:ListItem>One</asp:ListItem>
-<asp:ListItem>Two</asp:ListItem>
-<asp:ListItem>Three</asp:ListItem>
-<asp:ListItem>Five</asp:ListItem>
-</asp:CheckBoxList>
-<p>
-Table layout:
-<p>
-<asp:CheckBoxList id="l2" RepeatLayout="table" runat="server">
-<asp:ListItem>One</asp:ListItem>
-<asp:ListItem>Two</asp:ListItem>
-<asp:ListItem>Three</asp:ListItem>
-<asp:ListItem>Five</asp:ListItem>
-</asp:CheckBoxList>
-</form>
-</body>
-</html>
-
--- a/test/1.1/webcontrols/web_comparevalidator.aspx
+++ b/test/1.1/webcontrols/web_comparevalidator.aspx
@ -1,35 +0,0 @@
-<%@ Page Language="C#" %>
-<%@ Register TagPrefix="mono" TagName="MonoSamplesHeader" src="~/controls/MonoSamplesHeader.ascx" %>
-<html>
-<script runat="server">
-void Check_Click(Object src, EventArgs E) {
-	message.Text = "Entered data is " + (Page.IsValid ? "valid." : "invalid!");
-}
-</script>
-
-<head>
-<link rel="stylesheet" type="text/css" href="/mono-xsp.css">
-<title>CompareValidator</title>
-</head>
-
-<body><mono:MonoSamplesHeader runat="server"/>
-<form runat="server">
-<asp:Label text="Enter twice the same string:" runat="server"/><br>
-<asp:TextBox id="Text1" runat="server" /> ==
-<asp:TextBox id="Text2" runat="server" />
-<asp:CompareValidator runat="server"
-	EnableClientScript="true"
-	ControlToValidate="Text1" ControlToCompare="Text2" Operation="Equal"
-	ErrorMessage="Strings do not match!"/><br />
-	
-<br />
-
-<asp:Button text="Check" onclick="Check_Click" runat="server"/><br/ >
-
-<br />
-
-<asp:Label id="message" runat="server"/>
-</form>
-</body>
-</html>
-
--- a/test/1.1/webcontrols/web_datagrid.aspx
+++ b/test/1.1/webcontrols/web_datagrid.aspx
@ -1,91 +0,0 @@
-<%@ Page Language="C#" %>
-<%@ Register TagPrefix="mono" TagName="MonoSamplesHeader" src="~/controls/MonoSamplesHeader.ascx" %>
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="/mono-xsp.css">
-<title>DataGrid</title>
-<style type="text/css">
-<!--
-
-.Normal
-{
-    font-family: Verdana, Helvetica, sans-serif;
-    font-size: 11px;
-    font-weight: normal;
-    line-height: 12px    
-}
-
-.Bold
-{
-    font-family: Verdana, Helvetica, sans-serif;
-    font-size: 11px;
-    font-weight: bold
-}
-//-->
-</style>
-<script runat="server">
-	void Page_Load (object o, EventArgs e) 
-	{
-		if (!IsPostBack) {
-			ArrayList list = new ArrayList ();
-			list.Add (new Datum ("Spain", "es", "Europe"));
-			list.Add (new Datum ("Japan", "jp", "Asia"));
-			list.Add (new Datum ("Mexico", "mx", "America"));
-			dg.DataSource = list;
-			dg.DataBind ();
-		}
-	}
-
-	public class Datum 
-	{
-		private string country;
-		private string abbr;
-		private string continent;
-
-		public Datum (string country, string abbr, string continent)
-		{
-			this.country = country;
-			this.abbr = abbr;
-			this.continent = continent;
-		}
-
-		public string Country 
-		{
-			get { return country; }
-		}
-
-		public string Abbr 
-		{
-			get { return abbr; }
-		}
-
-		public string Continent 
-		{
-			get { return continent; }
-		}
-
-		public override string ToString ()
-		{
-			return country + " " + abbr + " " + continent;
-		}
-	}
-</script>
-</head>
-<body><mono:MonoSamplesHeader runat="server"/>
-<h3>DataGrid sample</h3>
-<form runat="server">
-	<asp:datagrid id="dg" border="1" AutoGenerateColumns="false"
-		EnableViewState="false" runat="server">
-	    <Columns>
-		<asp:BoundColumn HeaderText="Country" DataField="Country"
-			ItemStyle-CssClass="Normal" HeaderStyle-Cssclass="Bold" />
-		<asp:BoundColumn HeaderText="Continent" DataField="Continent"
-			ItemStyle-CssClass="Normal" HeaderStyle-Cssclass="Bold"/>
-		<asp:BoundColumn HeaderText="Abbr" DataField="Abbr"
-			ItemStyle-CssClass="Normal" HeaderStyle-Cssclass="Bold"/>
-	    </Columns>
-	</asp:datagrid>
-</form>
-</body>
-</html>
-
--- a/test/1.1/webcontrols/web_datagrid_command.aspx
+++ b/test/1.1/webcontrols/web_datagrid_command.aspx
@ -1,142 +0,0 @@
-<%@ Page Language="C#" %>
-<%@ Register TagPrefix="mono" TagName="MonoSamplesHeader" src="~/controls/MonoSamplesHeader.ascx" %>
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="/mono-xsp.css">
-<title>DataGrid + Remove command</title>
-<style type="text/css">
-<!--
-.Normal
-{
-    font-family: Verdana, Helvetica, sans-serif;
-    font-size: 11px;
-    font-weight: normal;
-    line-height: 12px    
-}
-
-.Bold
-{
-    font-family: Verdana, Helvetica, sans-serif;
-    font-size: 11px;
-    font-weight: bold
-}
-//-->
-</style>
-<script runat="server">
-	// Most of the code in the script is dealing with the ArrayList stuff,
-	// but you can use other sources for your data.
-	ArrayList list;
-
-	// InitList is only called once per session when a GET is received for the page.
-	void InitList ()
-	{
-		list = new ArrayList ();
-		list.Add (new Datum ("Spain", "es", "Europe"));
-		list.Add (new Datum ("Japan", "jp", "Asia"));
-		list.Add (new Datum ("Austria", "at", "Europe"));
-		list.Add (new Datum ("France", "fr", "Europe"));
-		list.Add (new Datum ("Great Britain", "gb", "Europe"));
-		list.Add (new Datum ("Italia", "it", "Europe"));
-		list.Add (new Datum ("India", "in", "Asia"));
-		list.Add (new Datum ("Brazil", "br", "America"));
-		list.Add (new Datum ("Germany", "de", "Europe"));
-		list.Add (new Datum ("Mexico", "mx", "America"));
-	}
-
-	void Page_Load (object o, EventArgs e)
-	{
-		// For this sample, we keep the list in ViewState.
-		// If you use a database, get the data from there.
-		if (!IsPostBack || ViewState ["%%list"] == null) {
-			// Create initial data list and keep it in ViewState.
-			// If your data is in a DB, you don't need this.
-			InitList ();
-			ViewState ["%%list"] = list;
-		} else {
-			// IsPostBack is true when we get a POST, so we restore the list from
-			// the viewstate here.
-			list = (ArrayList) ViewState ["%%list"];
-		}
-
-		dg.DataSource = list;
-		// DataBind actually creates the control hierarchy for the DataGrid.
-		// Ie, all those headers, rows, cells, linkbuttons are created after DataBind is called on dg.
-		dg.DataBind ();
-	}
-
-	// This is invoked whenever a 'Delete' linkbutton is pressed for a row.
-	void dg_Delete (object sender, DataGridCommandEventArgs e)
-	{
-		// e.Item.ItemIndex contains the row index starting from 0.
-		Console.WriteLine ("Delete for " + e.Item.ItemIndex);
-		
-		// Remove the item from our datasource.
-		// If you use a database, you should do a Delete from xxx here.
-		list.RemoveAt (e.Item.ItemIndex);
-		
-		// Recreate the control hierarchy because the datasource has been changed.
-		dg.DataBind ();
-	}
-
-	// In our case, this class needs to be serializable because it's gonna be serialized using the
-	// BinaryFormatter when LosFormatter finds this elements inside the ArrayList
-	// If you use a dataset to feed the datagrid, you don't need this code.
-	[Serializable]
-	public class Datum 
-	{
-		private string country;
-		private string abbr;
-		private string continent;
-
-		public Datum (string country, string abbr, string continent)
-		{
-			this.country = country;
-			this.abbr = abbr;
-			this.continent = continent;
-		}
-
-		public string Country 
-		{
-			get { return country; }
-		}
-
-		public string Abbr 
-		{
-			get { return abbr; }
-		}
-
-		public string Continent 
-		{
-			get { return continent; }
-		}
-
-		public override string ToString ()
-		{
-			return country + " " + abbr + " " + continent;
-		}
-	}
-</script>
-</head>
-<body><mono:MonoSamplesHeader runat="server"/>
-<h3>DataGrid sample</h1>
-<form runat="server">
-	<asp:datagrid id="dg" border="1" AutoGenerateColumns="false"
-		EnableViewState="false" runat="server" OnDeleteCommand="dg_Delete">
-	    <Columns>
-	    	<%-- This is a column which has a 'Delete' LinkButton in it 
-		---- When the button is clicked, DeleteCommand in the DataGrid will be called.
-		--%>
-		<asp:ButtonColumn ButtonType="LinkButton" HeaderText="Delete row" CommandName="Delete" Text="Delete"
-			ItemStyle-CssClass="Normal" HeaderStyle-Cssclass="Bold" />
-		<asp:BoundColumn HeaderText="Country" DataField="Country"
-			ItemStyle-CssClass="Normal" HeaderStyle-Cssclass="Bold" />
-		<asp:BoundColumn HeaderText="Continent" DataField="Continent"
-			ItemStyle-CssClass="Normal" HeaderStyle-Cssclass="Bold"/>
-		<asp:BoundColumn HeaderText="Abbr" DataField="Abbr"
-			ItemStyle-CssClass="Normal" HeaderStyle-Cssclass="Bold"/>
-	    </Columns>
-	</asp:datagrid>
-</form>
-</body>
-</html>
-
--- a/test/1.1/webcontrols/web_dropdownlist.aspx
+++ b/test/1.1/webcontrols/web_dropdownlist.aspx
@ -1,31 +0,0 @@
-<%@ Page language="C#" %>
-<%@ Register TagPrefix="mono" TagName="MonoSamplesHeader" src="~/controls/MonoSamplesHeader.ascx" %>
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="/mono-xsp.css">
-<script language="C#" runat="server">
-	void Click (object o, EventArgs e) 
-	{
-		 lbl.Text = "You selected '" + ddl.SelectedItem.Text +
-			    "' (index #" + ddl.SelectedIndex + ").";  
-	}
-</script>
-<title>DropDownList</title>
-</head>
-<h3>DropDownList test</h3>
-<body><mono:MonoSamplesHeader runat="server"/>
-	<form runat="server">
-		<asp:DropDownList id="ddl" runat="server">
-			<asp:ListItem>Item 1</asp:ListItem>
-			<asp:ListItem>Item 2</asp:ListItem>
-			<asp:ListItem>Item 3</asp:ListItem>
-			<asp:ListItem>Item 4</asp:ListItem> 
-		</asp:DropDownList>
-		<br><br>
-		<asp:Button id="btn" Text="Submit"
-			    OnClick="Click" runat="server"/>
-		<hr>
-		<asp:Label id="lbl" runat="server"/>
-	</form>
-</body>
-
--- a/test/1.1/webcontrols/web_hyperlink.aspx
+++ b/test/1.1/webcontrols/web_hyperlink.aspx
@ -1,19 +0,0 @@
-<%@ Page language="C#" %>
-<%@ Register TagPrefix="mono" TagName="MonoSamplesHeader" src="~/controls/MonoSamplesHeader.ascx" %>
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="/mono-xsp.css">
-<title>HyperLink</title>
-</head>
-<body><mono:MonoSamplesHeader runat="server"/>
-<asp:HyperLink id="hyper"
-	ImageUrl="http://www.mono-project.com/files/8/8d/Mono-gorilla-aqua.100px.png"
-	NavigateUrl="http://www.ximian.com"
-	Text="Ximian"
-	Target="_top"
-	runat="server">
-
-</asp:HyperLink>
-
-</body>
-</html>
--- a/test/1.1/webcontrols/web_image.aspx
+++ b/test/1.1/webcontrols/web_image.aspx
@ -1,16 +0,0 @@
-<%@ Page language="C#" %>
-<%@ Register TagPrefix="mono" TagName="MonoSamplesHeader" src="~/controls/MonoSamplesHeader.ascx" %>
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="/mono-xsp.css">
-<title>Image</title>
-</head>
-<body><mono:MonoSamplesHeader runat="server"/>
-<form runat="server">
-<asp:Image id="im" runat="server"
-	AlternateText="Yes, powered by Mono"
-	ImageAlign="left"
-	ImageUrl="http://www.mono-project.com/files/0/08/Mono-powered.png"/>
-</form>
-</body>
-</html>
--- a/test/1.1/webcontrols/web_imagebutton.aspx
+++ b/test/1.1/webcontrols/web_imagebutton.aspx
@ -1,23 +0,0 @@
-<%@ Page Language="C#" %>
-<%@ Register TagPrefix="mono" TagName="MonoSamplesHeader" src="~/controls/MonoSamplesHeader.ascx" %>
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="/mono-xsp.css">
-<script runat="server">
-	void Clicked (object o, ImageClickEventArgs e)
-	{
-		// e.X -> x coordinate of the click
-		// e.Y -> y coordinate of the click
-	}
-</script>
-<title>ImageButton</title>
-</head>
-<body><mono:MonoSamplesHeader runat="server"/>
-<form runat="server">
-<asp:ImageButton id="imgButton" AlternateText="Image button" 
-OnClick="Clicked" ImageUrl="http://www.mono-project.com/files/0/08/Mono-powered.png" 
-ImageAlign="left" runat="server"/>
-</form>
-</body>
-</html>
-
--- a/test/1.1/webcontrols/web_label.aspx
+++ b/test/1.1/webcontrols/web_label.aspx
@ -1,22 +0,0 @@
-<%@ Page language="C#" %>
-<%@ Register TagPrefix="mono" TagName="MonoSamplesHeader" src="~/controls/MonoSamplesHeader.ascx" %>
-<html>
-<link rel="stylesheet" type="text/css" href="/mono-xsp.css">
-<script runat=server>
-	void Page_Load (object o, EventArgs e)
-	{
-		lbl1.Text += ". This added in Page_Load.";
-	}
-</script>
-<head>
-<title>Label</title>
-</head>
-<body><mono:MonoSamplesHeader runat="server"/>
-<form runat="server">
-<asp:label id="lbl1" Text="Text as property" runat="server"/>
-<br>
-<asp:label id="lbl2" runat="server">Text between tags</asp:label>
-</form>
-</body>
-</html>
-
--- a/test/1.1/webcontrols/web_linkbutton.aspx
+++ b/test/1.1/webcontrols/web_linkbutton.aspx
@ -1,34 +0,0 @@
-<%@ Page Language="C#" %>
-<%@ Register TagPrefix="mono" TagName="MonoSamplesHeader" src="~/controls/MonoSamplesHeader.ascx" %>
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="/mono-xsp.css">
-<script runat="server">
-	void Clicked (object sender, EventArgs e)
-	{
-	       label1.Text = " &lt;- you've just clicked it!";
-	}
-
-	void OnLb2Command (object sender, CommandEventArgs e)
-	{
-	       if (e.CommandName == "Remove_this") {
-	              lb2.Visible = false;
-	              label2.Text = "There used to be a link here, but you have removed it";
-	       }
-	}
-</script>
-<title>LinkButton as submit and command</title>
-</head>
-<body><mono:MonoSamplesHeader runat="server"/>
-<form runat="server">
-<asp:LinkButton id="lb1" Text="Click me!" OnClick="Clicked" runat="server"/>
-<asp:Label id="label1" Text="" runat="server"/>
-<br>
-<asp:LinkButton id="lb2" CommandName="Remove_this" OnCommand="OnLb2Command" runat="server">
-Remove this link.
-</asp:LinkButton>
-<asp:Label id="label2" Text="" runat="server"/>
-</form>
-</body>
-</html>
-
--- a/test/1.1/webcontrols/web_listbox.aspx
+++ b/test/1.1/webcontrols/web_listbox.aspx
@ -1,42 +0,0 @@
-<%@ Page language="C#" %>
-<%@ Register TagPrefix="mono" TagName="MonoSamplesHeader" src="~/controls/MonoSamplesHeader.ascx" %>
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="/mono-xsp.css">
-<title>ListBox</title>
-</head>
-<body><mono:MonoSamplesHeader runat="server"/>
-<form runat="server">
-Single selection:
-<p>
-<asp:ListBox id="lbs" rows="5" SelectionMode="single" Width="80px" runat="server">
-	<asp:ListItem>1</asp:ListItem>
-	<asp:ListItem>2</asp:ListItem>
-	<asp:ListItem>3</asp:ListItem>
-	<asp:ListItem>4</asp:ListItem> 
-	<asp:ListItem>5</asp:ListItem> 
-	<asp:ListItem>6</asp:ListItem>
-	<asp:ListItem>7</asp:ListItem>
-	<asp:ListItem>8</asp:ListItem>
-	<asp:ListItem>9</asp:ListItem> 
-	<asp:ListItem>10</asp:ListItem> 
-</asp:ListBox>
-<p>
-Multiple selection:
-<p>
-<asp:ListBox id="lbm" rows="5" SelectionMode="Multiple" Width="80px" runat="server">
-	<asp:ListItem>1</asp:ListItem>
-	<asp:ListItem>2</asp:ListItem>
-	<asp:ListItem>3</asp:ListItem>
-	<asp:ListItem>4</asp:ListItem> 
-	<asp:ListItem>5</asp:ListItem> 
-	<asp:ListItem>6</asp:ListItem>
-	<asp:ListItem>7</asp:ListItem>
-	<asp:ListItem>8</asp:ListItem>
-	<asp:ListItem>9</asp:ListItem> 
-	<asp:ListItem>10</asp:ListItem> 
-</asp:ListBox>
-</form>
-</body>
-</html>
-
--- a/test/1.1/webcontrols/web_literal.aspx
+++ b/test/1.1/webcontrols/web_literal.aspx
@ -1,14 +0,0 @@
-<%@ Page language="C#" %>
-<%@ Register TagPrefix="mono" TagName="MonoSamplesHeader" src="~/controls/MonoSamplesHeader.ascx" %>
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="/mono-xsp.css">
-<title>Literal</title>
-</head>
-<body><mono:MonoSamplesHeader runat="server"/>
-<form runat="server">
-<asp:literal id="lit" Text="Hi there!" runat="server"/>
-</form>
-</body>
-</html>
-
--- a/test/1.1/webcontrols/web_panel.aspx
+++ b/test/1.1/webcontrols/web_panel.aspx
@ -1,16 +0,0 @@
-<%@ Page language="C#" %>
-<%@ Register TagPrefix="mono" TagName="MonoSamplesHeader" src="~/controls/MonoSamplesHeader.ascx" %>
-<html>
-<link rel="stylesheet" type="text/css" href="/mono-xsp.css">
-<title>Panel with a HyperLink</title>
-<body><mono:MonoSamplesHeader runat="server"/>
-<form runat="server">
-<asp:Panel id="pan" runat="server" ForeColor="green" Height="100px" Width="150px">
-<asp:HyperLink id="hyper" NavigateUrl="http://www.go-mono.com"
-Text="Mono site" Target="_top" runat="server"/>
-<p>
-</asp:Panel>
-</form>
-</body>
-</html>
-
--- a/test/1.1/webcontrols/web_placeholder.aspx
+++ b/test/1.1/webcontrols/web_placeholder.aspx
@ -1,30 +0,0 @@
-<%@ Page language="C#" %>
-<%@ Register TagPrefix="mono" TagName="MonoSamplesHeader" src="~/controls/MonoSamplesHeader.ascx" %>
-<script runat="server">
-	void Page_Load(Object sender, EventArgs e)
-	{
-		ControlCollection cc = ph.Controls;
-		CheckBox chk = new CheckBox ();
-		chk.Text = "Wow?";
-		cc.Add (chk);
-
-		cc.Add (new LiteralControl ("\n<br>\n"));
-		HyperLink lnk = new HyperLink ();
-		lnk.NavigateUrl = "http://www.go-mono.com";
-		lnk.Text = "Mono project Home Page";
-		lnk.Target="_top";
-		cc.Add (lnk);
-	}
-</script>
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="/mono-xsp.css">
-<title>PlaceHolder with a CheckBox and a HyperLink added in Page_Load</title>
-</head>
-<body><mono:MonoSamplesHeader runat="server"/>
-<form runat="server">
-	<asp:PlaceHolder id="ph" runat="server"/>
-</form>
-</body>
-</html>
-
--- a/test/1.1/webcontrols/web_radiobutton.aspx
+++ b/test/1.1/webcontrols/web_radiobutton.aspx
@ -1,24 +0,0 @@
-<%@ Page language="C#" %>
-<%@ Register TagPrefix="mono" TagName="MonoSamplesHeader" src="~/controls/MonoSamplesHeader.ascx" %>
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="/mono-xsp.css">
-<title>RadioButton</title>
-</head>
-<body><mono:MonoSamplesHeader runat="server"/>
-<form runat="server">
-	<asp:RadioButton id="r1" Text="One" GroupName="group1" runat="server" Checked="True" />
-	<br>
-	<asp:RadioButton id="r2" Text="Two" GroupName="group1" runat="server"/>
-	<br>
-	<asp:RadioButton id="r3"  Text="Three" GroupName="group1" runat="server"/>
-	<br>
-	Here another group of radio buttons.
-	<br>
-	<asp:RadioButton id="r4" Text="Ein" GroupName="group2" runat="server"/>
-	<br>
-	<asp:RadioButton id="r5"  Text="Zwei" GroupName="group2" runat="server" checked="true"/>
-	<br>
-</form>
-</body>
-</html>
--- a/test/1.1/webcontrols/web_radiobuttonlist.aspx
+++ b/test/1.1/webcontrols/web_radiobuttonlist.aspx
@ -1,35 +0,0 @@
-<%@ Page language="C#" %>
-<%@ Register TagPrefix="mono" TagName="MonoSamplesHeader" src="~/controls/MonoSamplesHeader.ascx" %>
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="/mono-xsp.css">
-<title>RadioButtonList</title>
-</head>
-<body><mono:MonoSamplesHeader runat="server"/>
-
-<form runat="server">
-Horizontal:
-<p>
-<asp:RadioButtonList id="rbl1" repeatDIrection="horizontal" runat="server">
-	<asp:ListItem>Seven</asp:ListItem>
-	<asp:ListItem>Eleven</asp:ListItem>
-	<asp:ListItem>Thirteen</asp:ListItem>
-	<asp:ListItem>Seventeen</asp:ListItem>
-	<asp:ListItem>Twenty-three</asp:ListItem>
-	<asp:ListItem>Twenty-nine</asp:ListItem>
-</asp:RadioButtonList>
-<p>
-Vertical:
-<p>
-<asp:RadioButtonList id="rbl2" repeatDirection="vertical" runat="server">
-	<asp:ListItem>Seven</asp:ListItem>
-	<asp:ListItem>Eleven</asp:ListItem>
-	<asp:ListItem>Thirteen</asp:ListItem>
-	<asp:ListItem>Seventeen</asp:ListItem>
-	<asp:ListItem>Twenty-three</asp:ListItem>
-	<asp:ListItem>Twenty-nine</asp:ListItem>
-</asp:RadioButtonList>
-</form>
-</body>
-</html>
-
--- a/test/1.1/webcontrols/web_regularexpressionvalidator.aspx
+++ b/test/1.1/webcontrols/web_regularexpressionvalidator.aspx
@ -1,61 +0,0 @@
-<%@ Page language="C#" %>
-<%@ Register TagPrefix="mono" TagName="MonoSamplesHeader" src="~/controls/MonoSamplesHeader.ascx" %>
-<html>
-<script runat="server">
-void Check_Click(Object src, EventArgs E) {
-	message.Text = "Entered data is " + (Page.IsValid ? "valid." : "invalid!");
-}
-</script>
-
-<head>
-<link rel="stylesheet" type="text/css" href="/mono-xsp.css">
-<title>RegularExpressionValidator</title>
-</head>
-
-<body><mono:MonoSamplesHeader runat="server"/>
-
-<p>RegularExpressionValidator returns true if input string is empty.
-So we added RequiredFieldValidator to make sure 
-that all field are not empty and valid.
-</p>
-<form runat="server">
-<asp:Label text="Year (1900-2099, 2 or 4 digits):" runat="server"/><br>
-<asp:TextBox id="year" runat="server" columns="4" maxLength="4"/><br>
-<asp:RequiredFieldValidator runat="server"
-     ControlToValidate="year"
-     ErrorMessage="empty!"/>
-<asp:RegularExpressionValidator runat="server"
-     ControlToValidate="year"
-     ValidationExpression="(19|20)?\d{2}"
-     ErrorMessage="invalid!"/><br>
-<br>
-
-<asp:Label text="US Zip Code (xxxxx or xxxxx-xxxx):" runat="server"/><br>
-<asp:TextBox id="zipcode" runat="server" columns="10" maxLength="10"/><br>
-<asp:RequiredFieldValidator runat="server"
-     ControlToValidate="zipcode"
-     ErrorMessage="empty!"/>
-<asp:RegularExpressionValidator runat="server"
-     ControlToValidate="zipcode"
-     ValidationExpression="\d{5}(-\d{4})?"
-     ErrorMessage="invalid format!"/><br>
-<br>
-
-<asp:Label text="Email address (e.g. someone@somewhere.com):" runat="server"/><br>
-<asp:TextBox id="email" runat="server" columns="40"/><br>
-<asp:RequiredFieldValidator runat="server"
-     ControlToValidate="email"
-     ErrorMessage="empty!"/>
-<asp:RegularExpressionValidator runat="server"
-     ControlToValidate="email"
-     ValidationExpression="[\w\.\-]+@[a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]+)*(\.[a-zA-Z]{2,3}){1,2}"
-     ErrorMessage="invalid format!"/><br>
-<br>
-
-<asp:Button text="Check" onclick="Check_Click" runat="server"/><br>
-<br>
-<asp:Label id="message" runat="server"/>
-</form>
-</body>
-</html>
-
--- a/test/1.1/webcontrols/web_repeater.aspx
+++ b/test/1.1/webcontrols/web_repeater.aspx
@ -1,86 +0,0 @@
-<%@ Page language="C#" %>
-<%@ Register TagPrefix="mono" TagName="MonoSamplesHeader" src="~/controls/MonoSamplesHeader.ascx" %>
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="/mono-xsp.css">
-<title>Data bound Repeater</title>
-<script runat="server">
-	void Page_Load (object o, EventArgs e) 
-	{
-		if (!IsPostBack) {
-			ArrayList list = new ArrayList ();
-			list.Add (new Datum ("Spain", "es", "Europe"));
-			list.Add (new Datum ("Japan", "jp", "Asia"));
-			list.Add (new Datum ("Mexico", "mx", "America"));
-			rep.DataSource = list;
-			rep.DataBind ();
-		}
-	}
-
-	public class Datum 
-	{
-		private string country;
-		private string abbr;
-		private string continent;
-
-		public Datum (string country, string abbr, string continent)
-		{
-			this.country = country;
-			this.abbr = abbr;
-			this.continent = continent;
-		}
-
-		public string Country 
-		{
-			get { return country; }
-		}
-
-		public string Abbr 
-		{
-			get { return abbr; }
-		}
-
-		public string Continent 
-		{
-			get { return continent; }
-		}
-
-		public override string ToString ()
-		{
-			return country + " " + abbr + " " + continent;
-		}
-	} 
-</script>
-</head>
-<body><mono:MonoSamplesHeader runat="server"/>
-<form runat="server">
-<asp:Repeater id=rep runat="server">
-	<HeaderTemplate>
-	<table border=2>
-		<tr>
-		<td><b>Country</b></td> 
-		<td><b>Abbreviation</b></td>
-		<td><b>Continent</b></td>
-		</tr>
-	</HeaderTemplate>
-	<ItemTemplate>
-	<tr>
-	<td> 
-	<%# DataBinder.Eval (Container.DataItem, "Country") %> 
-	</td>
-	<td> 
-	<%# DataBinder.Eval (Container.DataItem, "Abbr") %>
-	</td>
-	<td> 
-	<%# DataBinder.Eval (Container.DataItem, "Continent") %>
-	</td>
-	</tr>
-	</ItemTemplate>
-	<FooterTemplate>
-	</table>
-	</FooterTemplate>
-</asp:Repeater>
-</form>
-</html>
-</body>
-
--- a/test/1.1/webcontrols/web_table.aspx
+++ b/test/1.1/webcontrols/web_table.aspx
@ -1,29 +0,0 @@
-<%@ Page language="C#" %>
-<%@ Register TagPrefix="mono" TagName="MonoSamplesHeader" src="~/controls/MonoSamplesHeader.ascx" %>
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="/mono-xsp.css">
-<title>HtmlTable, HtmlTableRow, HtmlTableCell</title>
-<script runat="server">
-	void Page_Load(Object sender, EventArgs e) 
-	{
-		for (int i = 0; i < 5; i++){
-			TableRow row = new TableRow ();
-			for (int j = 0; j < 4; j++){
-				TableCell cell = new TableCell ();
-				cell.Controls.Add (new LiteralControl ("Row " + i + ", cell " + j));
-				row.Cells.Add (cell);
-			}
-			myTable.Rows.Add (row);
-		}
-	}
-</script>
-</head>
-<body><mono:MonoSamplesHeader runat="server"/>  
-<form runat="server">
-<asp:Table id="myTable" HorizontalAlign="Center" Font-Size="12pt" GridLines="both" 
-CellPadding="5" runat="server"/>
-</form>
-</body>
-</html>
-
--- a/test/1.1/webcontrols/web_table2.aspx
+++ b/test/1.1/webcontrols/web_table2.aspx
@ -1,18 +0,0 @@
-<%@ Page language="C#" %>
-<%@ Register TagPrefix="mono" TagName="MonoSamplesHeader" src="~/controls/MonoSamplesHeader.ascx" %>
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="/mono-xsp.css">
-</head>
-<body><mono:MonoSamplesHeader runat="server"/>
-<form runat="server">
-<asp:Table runat='server'>
-<asp:TableRow runat='server'>
-<asp:TableCell runat='server'>
-TEST
-</asp:TableCell>
-</asp:TableRow>
-</asp:Table>
-</form>
-</body>
-</html>
--- a/test/1.1/webcontrols/web_textbox.aspx
+++ b/test/1.1/webcontrols/web_textbox.aspx
@ -1,30 +0,0 @@
-<%@ Page language="C#" %>
-<%@ Register TagPrefix="mono" TagName="MonoSamplesHeader" src="~/controls/MonoSamplesHeader.ascx" %>
-<html>
-<script runat=server>
-	void txt_Changed (object sender, EventArgs e)
-	{
-	}
-</script>
-<head>
-<link rel="stylesheet" type="text/css" href="/mono-xsp.css">
-<title>TextBox: MultiLine, SingleLine and Password</title>
-</head>
-<body><mono:MonoSamplesHeader runat="server"/>
-<form runat="server">
-Multiline:
-<br>
-<asp:TextBox id="txt1" Text="multiline" TextMode="MultiLine" OnTextChanged="txt_Changed" runat="server" rows=5 />
-<br>
-Single:
-<br>
-<asp:TextBox id="txt2" Text="singleline" TextMode="singleLine" OnTextChanged="txt_Changed" runat="server" maxlength=40 />
-<br>
-Password:
-<br>
-<asp:TextBox id="txt3" Text="badifyouseethis" TextMode="password" OnTextChanged="txt_Changed" runat="server" maxlength=15 />
-<br>
-</form>
-</body>
-</html>
-
--- a/test/1.1/webcontrols/web_xml.aspx
+++ b/test/1.1/webcontrols/web_xml.aspx
@ -1,17 +0,0 @@
-<%@ Page language="C#" %>
-<%@ Register TagPrefix="mono" TagName="MonoSamplesHeader" src="~/controls/MonoSamplesHeader.ascx" %>
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="/mono-xsp.css">
-</head>
-<body><mono:MonoSamplesHeader runat="server"/>
-   <h3>Xml Example</h3>
-   <form runat="server">
-      <asp:Xml id="xml1" 
-           DocumentSource="people.xml" 
-           TransformSource="peopletable.xsl" 
-           runat="server" />
-   </form>
-</body>
-</html>
-
--- a/test/1.1/webservice/Makefile.in
+++ b/test/1.1/webservice/Makefile.in
@ -207,6 +207,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -295,6 +296,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/test/2.0/Makefile.in
+++ b/test/2.0/Makefile.in
@ -264,6 +264,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -352,6 +353,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/test/2.0/gridview/Makefile.in
+++ b/test/2.0/gridview/Makefile.in
@ -204,6 +204,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -292,6 +293,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/test/2.0/masterpages/Makefile.in
+++ b/test/2.0/masterpages/Makefile.in
@ -204,6 +204,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -292,6 +293,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/test/2.0/menu/Makefile.in
+++ b/test/2.0/menu/Makefile.in
@ -204,6 +204,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -292,6 +293,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/test/2.0/treeview/Makefile.in
+++ b/test/2.0/treeview/Makefile.in
@ -207,6 +207,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -295,6 +296,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/test/App_Code/Makefile.in
+++ b/test/App_Code/Makefile.in
@ -204,6 +204,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -292,6 +293,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/test/Makefile.in
+++ b/test/Makefile.in
@ -264,6 +264,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -352,6 +353,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/test/controls/Makefile.in
+++ b/test/controls/Makefile.in
@ -204,6 +204,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -292,6 +293,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@ -234,6 +234,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -322,6 +323,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/tools/asp_state/Makefile.in
+++ b/tools/asp_state/Makefile.in
@ -207,6 +207,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -295,6 +296,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/tools/dbsessmgr/Makefile.in
+++ b/tools/dbsessmgr/Makefile.in
@ -207,6 +207,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -295,6 +296,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/tools/mono-asp-apps/Makefile.in
+++ b/tools/mono-asp-apps/Makefile.in
@ -174,6 +174,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -262,6 +263,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/unittests/Makefile.in
+++ b/unittests/Makefile.in
@ -264,6 +264,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -352,6 +353,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/unittests/Tests.XSP.Security/Makefile.in
+++ b/unittests/Tests.XSP.Security/Makefile.in
@ -206,6 +206,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -294,6 +295,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@
--- a/unittests/webroot/Makefile.in
+++ b/unittests/webroot/Makefile.in
@ -204,6 +204,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEFLAGS = @MAKEFLAGS@
 MAKEINFO = @MAKEINFO@
@ -292,6 +293,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shavedir = @shavedir@