Imported Upstream version 4.7.1

2020-01-21 19:51:50 +00:00 · 2020-01-21 19:51:50 +00:00 · 734d5f011b
--- a/Makefile.in
+++ b/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -590,7 +590,7 @@ distdir: $(DISTFILES)
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
 	$(am__post_remove_distdir)

 dist-bzip2: distdir
@ -616,7 +616,7 @@ dist-shar: distdir
 	@echo WARNING: "Support for shar distribution archives is" \
 	               "deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)

 dist-zip: distdir
@ -634,7 +634,7 @@ dist dist-all:
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lz*) \
@ -644,7 +644,7 @@ distcheck: dist
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
--- a/aclocal.m4
+++ b/aclocal.m4
@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15 -*- Autoconf -*-
+# generated automatically by aclocal 1.15.1 -*- Autoconf -*-

-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.

 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -9343,7 +9343,7 @@ AS_VAR_COPY([$1], [pkg_cv_][$1])
 AS_VAR_IF([$1], [""], [$5], [$4])dnl
 ])dnl PKG_CHECK_VAR

-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -9358,7 +9358,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.15'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.15], [],
+m4_if([$1], [1.15.1], [],
      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])

@ -9374,14 +9374,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.15])dnl
+[AM_AUTOMAKE_VERSION([1.15.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-

-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -9433,7 +9433,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`

 # AM_CONDITIONAL                                            -*- Autoconf -*-

-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -9464,7 +9464,7 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])

-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -9655,7 +9655,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl

 # Generate code to set up dependency tracking.              -*- Autoconf -*-

-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -9731,7 +9731,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],

 # Do all the work for Automake.                             -*- Autoconf -*-

-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -9928,7 +9928,7 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])

-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -9949,7 +9949,7 @@ if test x"${install_sh+set}" != xset; then
 fi
 AC_SUBST([install_sh])])

-# Copyright (C) 2003-2014 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -9971,7 +9971,7 @@ AC_SUBST([am__leading_dot])])
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering

-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -10006,7 +10006,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])

 # Check to see how 'make' treats includes.	            -*- Autoconf -*-

-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -10056,7 +10056,7 @@ rm -f confinc confmf

 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-

-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -10095,7 +10095,7 @@ fi

 # Helper functions for option handling.                     -*- Autoconf -*-

-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -10124,7 +10124,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])

-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -10171,7 +10171,7 @@ AC_LANG_POP([C])])
 # For backward compatibility.
 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])

-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -10190,7 +10190,7 @@ AC_DEFUN([AM_RUN_LOG],

 # Check to make sure that the build environment is sane.    -*- Autoconf -*-

-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -10271,7 +10271,7 @@ AC_CONFIG_COMMANDS_PRE(
 rm -f conftest.file
 ])

-# Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -10331,7 +10331,7 @@ AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])

-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -10359,7 +10359,7 @@ fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])

-# Copyright (C) 2006-2014 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -10378,7 +10378,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])

 # Check how to create a tarball.                            -*- Autoconf -*-

-# Copyright (C) 2004-2014 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/build/Makefile.in
+++ b/build/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/build/m4/Makefile.in
+++ b/build/m4/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/config.guess
+++ b/config.guess
--- a/config.sub
+++ b/config.sub
@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2016 Free Software Foundation, Inc.
+#   Copyright 1992-2018 Free Software Foundation, Inc.

-timestamp='2016-11-04'
+timestamp='2018-02-22'

 # 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
@ -15,7 +15,7 @@ timestamp='2016-11-04'
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@ -33,7 +33,7 @@ timestamp='2016-11-04'
 # 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
+# https://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
@ -57,7 +57,7 @@ Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS

 Canonicalize a configuration name.

-Operation modes:
+Options:
  -h, --help         print this help, then exit
  -t, --time-stamp   print date of last modification, then exit
  -v, --version      print version number, then exit
@ -67,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)

-Copyright 1992-2016 Free Software Foundation, Inc.
+Copyright 1992-2018 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."
@ -94,7 +94,7 @@ while test $# -gt 0 ; do

    *local*)
       # First pass through any local machine types.
-       echo $1
+       echo "$1"
       exit ;;

    * )
@ -112,7 +112,7 @@ esac

 # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
 # Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+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* | \
@ -120,16 +120,16 @@ case $maybe_os in
  kopensolaris*-gnu* | cloudabi*-eabi* | \
  storm-chaos* | os2-emx* | rtmk-nova*)
    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    ;;
  android-linux)
    os=-linux-android
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
    ;;
  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
+    basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
+    if [ "$basic_machine" != "$1" ]
+    then os=`echo "$1" | sed 's/.*-/-/'`
    else os=; fi
    ;;
 esac
@ -178,44 +178,44 @@ case $os in
 		;;
 	-sco6)
 		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco5)
 		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco4)
 		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco3.2.[4-9]*)
 		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco3.2v[4-9]*)
 		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco5v6*)
 		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco*)
 		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-isc)
 		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-clix*)
 		basic_machine=clipper-intergraph
 		;;
 	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
 		;;
 	-lynx*178)
 		os=-lynxos178
@ -227,10 +227,7 @@ case $os in
 		os=-lynxos
 		;;
 	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
 		;;
 	-psos*)
 		os=-psos
@ -263,7 +260,7 @@ case $basic_machine in
 	| fido | fr30 | frv | ft32 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| hexagon \
-	| i370 | i860 | i960 | ia64 \
+	| i370 | i860 | i960 | ia16 | ia64 \
 	| ip2k | iq2000 \
 	| k1om \
 	| le32 | le64 \
@ -299,7 +296,7 @@ case $basic_machine in
 	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
 	| open8 | or1k | or1knd | or32 \
-	| pdp10 | pdp11 | pj | pjl \
+	| pdp10 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pru \
 	| pyramid \
@ -315,7 +312,7 @@ case $basic_machine in
 	| ubicom32 \
 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 	| visium \
-	| we32k \
+	| wasm32 \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
@ -336,7 +333,7 @@ case $basic_machine in
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
 		;;
 	ms1)
 		basic_machine=mt-unknown
@ -365,7 +362,7 @@ case $basic_machine in
 	  ;;
 	# Object if more than one company name word.
 	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
@ -388,7 +385,7 @@ case $basic_machine in
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| hexagon-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
+	| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
 	| ip2k-* | iq2000-* \
 	| k1om-* \
 	| le32-* | le64-* \
@ -446,6 +443,7 @@ case $basic_machine in
 	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
 	| vax-* \
 	| visium-* \
+	| wasm32-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
@ -459,7 +457,7 @@ case $basic_machine in
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
-		basic_machine=i386-unknown
+		basic_machine=i386-pc
 		os=-bsd
 		;;
 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
@ -493,7 +491,7 @@ case $basic_machine in
 		basic_machine=x86_64-pc
 		;;
 	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	amdahl)
 		basic_machine=580-amdahl
@ -538,7 +536,7 @@ case $basic_machine in
 		os=-linux
 		;;
 	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
 	bluegene*)
@ -546,13 +544,13 @@ case $basic_machine in
 		os=-cnk
 		;;
 	c54x-*)
-		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	c55x-*)
-		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	c6x-*)
-		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	c90)
 		basic_machine=c90-cray
@ -641,7 +639,7 @@ case $basic_machine in
 		basic_machine=rs6000-bull
 		os=-bosx
 		;;
-	dpx2* | dpx2*-bull)
+	dpx2*)
 		basic_machine=m68k-bull
 		os=-sysv3
 		;;
@ -650,7 +648,7 @@ case $basic_machine in
 		os=$os"spe"
 		;;
 	e500v[12]-*)
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		os=$os"spe"
 		;;
 	ebmon29k)
@ -742,9 +740,6 @@ case $basic_machine in
 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
 		basic_machine=hppa1.0-hp
 		;;
-	hppa-next)
-		os=-nextstep3
-		;;
 	hppaosf)
 		basic_machine=hppa1.1-hp
 		os=-osf
@ -757,26 +752,26 @@ case $basic_machine in
 		basic_machine=i370-ibm
 		;;
 	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
 		;;
 	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
 		os=-sysv4
 		;;
 	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
 		os=-sysv
 		;;
 	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
 		os=-solaris2
 		;;
 	i386mach)
 		basic_machine=i386-mach
 		os=-mach
 		;;
-	i386-vsta | vsta)
+	vsta)
 		basic_machine=i386-unknown
 		os=-vsta
 		;;
@ -795,19 +790,16 @@ case $basic_machine in
 		os=-sysv
 		;;
 	leon-*|leon[3-9]-*)
-		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+		basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
 		;;
 	m68knommu)
 		basic_machine=m68k-unknown
 		os=-linux
 		;;
 	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
 	magnum | m3230)
 		basic_machine=mips-mips
 		os=-sysv
@ -839,10 +831,10 @@ case $basic_machine in
 		os=-mint
 		;;
 	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
 		;;
 	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
 		;;
 	monitor)
 		basic_machine=m68k-rom68k
@ -861,7 +853,7 @@ case $basic_machine in
 		os=-msdos
 		;;
 	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
 		;;
 	msys)
 		basic_machine=i686-pc
@ -903,7 +895,7 @@ case $basic_machine in
 		basic_machine=v70-nec
 		os=-sysv
 		;;
-	next | m*-next )
+	next | m*-next)
 		basic_machine=m68k-next
 		case $os in
 		    -nextstep* )
@ -948,6 +940,12 @@ case $basic_machine in
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
+	nsv-tandem)
+		basic_machine=nsv-tandem
+		;;
+	nsx-tandem)
+		basic_machine=nsx-tandem
+		;;
 	op50n-* | op60c-*)
 		basic_machine=hppa1.1-oki
 		os=-proelf
@ -980,7 +978,7 @@ case $basic_machine in
 		os=-linux
 		;;
 	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
 	pbd)
@ -996,7 +994,7 @@ case $basic_machine in
 		basic_machine=i386-pc
 		;;
 	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
@ -1011,16 +1009,16 @@ case $basic_machine in
 		basic_machine=i786-pc
 		;;
 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	pn)
 		basic_machine=pn-gould
@ -1030,23 +1028,23 @@ case $basic_machine in
 	ppc | ppcbe)	basic_machine=powerpc-unknown
 		;;
 	ppc-* | ppcbe-*)
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle)
 		basic_machine=powerpcle-unknown
 		;;
 	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	ppc64)	basic_machine=powerpc64-unknown
 		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+	ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	ppc64le | powerpc64little)
 		basic_machine=powerpc64le-unknown
 		;;
 	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	ps2)
 		basic_machine=i386-ibm
@ -1100,17 +1098,10 @@ case $basic_machine in
 	sequent)
 		basic_machine=i386-sequent
 		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
 	sh5el)
 		basic_machine=sh5le-unknown
 		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
+	simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
 		;;
@ -1129,7 +1120,7 @@ case $basic_machine in
 		os=-sysv4
 		;;
 	strongarm-* | thumb-*)
-		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 		;;
 	sun2)
 		basic_machine=m68000-sun
@ -1251,6 +1242,9 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
+	x64)
+		basic_machine=x86_64-pc
+		;;
 	xbox)
 		basic_machine=i686-pc
 		os=-mingw32
@ -1259,20 +1253,12 @@ case $basic_machine in
 		basic_machine=xps100-honeywell
 		;;
 	xscale-* | xscalee[bl]-*)
-		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
 		;;
 	ymp)
 		basic_machine=ymp-cray
 		os=-unicos
 		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	z80-*-coff)
-		basic_machine=z80-unknown
-		os=-sim
-		;;
 	none)
 		basic_machine=none-none
 		os=-none
@ -1301,10 +1287,6 @@ case $basic_machine in
 	vax)
 		basic_machine=vax-dec
 		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
 	pdp11)
 		basic_machine=pdp11-dec
 		;;
@ -1314,9 +1296,6 @@ case $basic_machine in
 	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-		basic_machine=sparc-sun
-		;;
 	cydra)
 		basic_machine=cydra-cydrome
 		;;
@ -1336,7 +1315,7 @@ case $basic_machine in
 		# Make sure to match an already-canonicalized machine name.
 		;;
 	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
 		exit 1
 		;;
 esac
@ -1344,10 +1323,10 @@ esac
 # Here we canonicalize certain aliases for manufacturers.
 case $basic_machine in
 	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
 		;;
 	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
 		;;
 	*)
 		;;
@ -1358,8 +1337,8 @@ esac
 if [ x"$os" != x"" ]
 then
 case $os in
-	# First match some system type aliases
-	# that might get confused with valid system types.
+	# First match some system type aliases that might get confused
+	# with valid system types.
 	# -solaris* is a basic system type, with this one exception.
 	-auroraux)
 		os=-auroraux
@ -1370,18 +1349,19 @@ case $os in
 	-solaris)
 		os=-solaris2
 		;;
-	-svr4*)
-		os=-sysv4
-		;;
 	-unixware*)
 		os=-sysv4.2uw
 		;;
 	-gnu/linux*)
 		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
 		;;
-	# First accept the basic system types.
+	# es1800 is here to avoid being matched by es* (a different OS)
+	-es1800*)
+		os=-ose
+		;;
+	# Now accept the basic system types.
 	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
+	# Each alternative MUST end in a * to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
@ -1391,25 +1371,26 @@ case $os in
 	      | -aos* | -aros* | -cloudabi* | -sortix* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
 	      | -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* \
+	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -morphos* | -superux* | -rtmk* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
 	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
-	      | -onefs* | -tirtos* | -phoenix* | -fuchsia*)
+	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
+	      | -midnightbsd*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@ -1426,12 +1407,12 @@ case $os in
 	-nto*)
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+	-sim | -xray | -os68k* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
+		os=`echo "$os" | sed -e 's|mac|macos|'`
 		;;
 	-linux-dietlibc)
 		os=-linux-dietlibc
@ -1440,10 +1421,10 @@ case $os in
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
 	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
 		;;
 	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
 		;;
 	-opened*)
 		os=-openedition
@ -1454,12 +1435,6 @@ case $os in
 	-wince*)
 		os=-wince
 		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
 	-utek*)
 		os=-bsd
 		;;
@ -1484,7 +1459,7 @@ case $os in
 	-nova*)
 		os=-rtmk-nova
 		;;
-	-ns2 )
+	-ns2)
 		os=-nextstep2
 		;;
 	-nsk*)
@ -1506,7 +1481,7 @@ case $os in
 	-oss*)
 		os=-sysv3
 		;;
-	-svr4)
+	-svr4*)
 		os=-sysv4
 		;;
 	-svr3)
@ -1521,24 +1496,28 @@ case $os in
 	-ose*)
 		os=-ose
 		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
 	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 		os=-mint
 		;;
-	-aros*)
-		os=-aros
-		;;
 	-zvmoe)
 		os=-zvmoe
 		;;
 	-dicos*)
 		os=-dicos
 		;;
+	-pikeos*)
+		# Until real need of OS specific support for
+		# particular features comes up, bare metal
+		# configurations are quite functional.
+		case $basic_machine in
+		    arm*)
+			os=-eabi
+			;;
+		    *)
+			os=-elf
+			;;
+		esac
+		;;
 	-nacl*)
 		;;
 	-ios)
@ -1548,7 +1527,7 @@ case $os in
 	*)
 		# Get rid of the `-' at the beginning of $os.
 		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
 		exit 1
 		;;
 esac
@ -1638,12 +1617,12 @@ case $basic_machine in
 	sparc-* | *-sun)
 		os=-sunos4.1.1
 		;;
+	pru-*)
+		os=-elf
+		;;
 	*-be)
 		os=-beos
 		;;
-	*-haiku)
-		os=-haiku
-		;;
 	*-ibm)
 		os=-aix
 		;;
@ -1683,7 +1662,7 @@ case $basic_machine in
 	m88k-omron*)
 		os=-luna
 		;;
-	*-next )
+	*-next)
 		os=-nextstep
 		;;
 	*-sequent)
@ -1698,9 +1677,6 @@ case $basic_machine in
 	i370-*)
 		os=-mvs
 		;;
-	*-next)
-		os=-nextstep3
-		;;
 	*-gould)
 		os=-sysv
 		;;
@ -1810,15 +1786,15 @@ case $basic_machine in
 				vendor=stratus
 				;;
 		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
 		;;
 esac

-echo $basic_machine$os
+echo "$basic_machine$os"
 exit

 # Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'write-file-functions 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
--- a/56
+++ b/56
@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xsp 4.5.
+# Generated by GNU Autoconf 2.69 for xsp 4.7.1.
 #
 # Report bugs to <http://bugzilla.xamarin.com/>.
 #
@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xsp'
 PACKAGE_TARNAME='xsp'
-PACKAGE_VERSION='4.5'
-PACKAGE_STRING='xsp 4.5'
+PACKAGE_VERSION='4.7.1'
+PACKAGE_STRING='xsp 4.7.1'
 PACKAGE_BUGREPORT='http://bugzilla.xamarin.com/'
 PACKAGE_URL=''

@ -654,10 +654,6 @@ RUNTIME
 WEBTRACING
 XSP_ONLY_FALSE
 XSP_ONLY_TRUE
-NET_4_0_FALSE
-NET_4_0_TRUE
-NET_2_0_FALSE
-NET_2_0_TRUE
 PLATFORM_WIN32_FALSE
 PLATFORM_WIN32_TRUE
 UNITTESTS_FALSE
@ -1387,7 +1383,7 @@ if test "$ac_init_help" = "long"; then
  # Omit some internal or obsolete options to make the list less imposing.
  # This message is too long to be a string in the A/UX 3.1 sh.
  cat <<_ACEOF
-\`configure' configures xsp 4.5 to adapt to many kinds of systems.
+\`configure' configures xsp 4.7.1 to adapt to many kinds of systems.

 Usage: $0 [OPTION]... [VAR=VALUE]...

@ -1459,7 +1455,7 @@ fi

 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of xsp 4.5:";;
+     short | recursive ) echo "Configuration of xsp 4.7.1:";;
   esac
  cat <<\_ACEOF

@ -1586,7 +1582,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-xsp configure 4.5
+xsp configure 4.7.1
 generated by GNU Autoconf 2.69

 Copyright (C) 2012 Free Software Foundation, Inc.
@ -1864,7 +1860,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.

-It was created by xsp $as_me 4.5, which was
+It was created by xsp $as_me 4.7.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

  $ $0 $@
@ -2839,7 +2835,7 @@ fi

 # Define the identity of the package.
 PACKAGE='xsp'
- VERSION='4.5'
+ VERSION='4.7.1'


 cat >>confdefs.h <<_ACEOF
@ -12601,10 +12597,10 @@ if test "x$DMCS" = "xno" ; then
 	as_fn_error $? "No $CS compiler found. dmcs must be installed." "$LINENO" 5
 fi

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mono 4.0 GAC for Mono.Data.Sqlite.dll" >&5
-$as_echo_n "checking for Mono 4.0 GAC for Mono.Data.Sqlite.dll... " >&6; }
-if test -e "$($PKG_CONFIG --variable=libdir mono)/mono/4.0/Mono.Data.Sqlite.dll" -o \
-        -e "$($PKG_CONFIG --variable=prefix mono)/lib/mono/4.0/Mono.Data.Sqlite.dll"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mono 4.5 GAC for Mono.Data.Sqlite.dll" >&5
+$as_echo_n "checking for Mono 4.5 GAC for Mono.Data.Sqlite.dll... " >&6; }
+if test -e "$($PKG_CONFIG --variable=libdir mono)/mono/4.5/Mono.Data.Sqlite.dll" -o \
+        -e "$($PKG_CONFIG --variable=prefix mono)/lib/mono/4.5/Mono.Data.Sqlite.dll"; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
 $as_echo "found" >&6; }
 	HAVE_MONO_SQLITE=yes
@ -12726,22 +12722,6 @@ else
  PLATFORM_WIN32_FALSE=
 fi

- if test ! x$DMCS = xno; then
-  NET_2_0_TRUE=
-  NET_2_0_FALSE='#'
-else
-  NET_2_0_TRUE='#'
-  NET_2_0_FALSE=
-fi
-
- if test ! x$DMCS = xno; then
-  NET_4_0_TRUE=
-  NET_4_0_FALSE='#'
-else
-  NET_4_0_TRUE='#'
-  NET_4_0_FALSE=
-fi
-
 if test x$platform_win32 = xyes; then
  XSP_ONLY_TRUE=
  XSP_ONLY_FALSE='#'
@ -13066,14 +13046,6 @@ if test -z "${PLATFORM_WIN32_TRUE}" && test -z "${PLATFORM_WIN32_FALSE}"; then
  as_fn_error $? "conditional \"PLATFORM_WIN32\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${NET_2_0_TRUE}" && test -z "${NET_2_0_FALSE}"; then
-  as_fn_error $? "conditional \"NET_2_0\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${NET_4_0_TRUE}" && test -z "${NET_4_0_FALSE}"; then
-  as_fn_error $? "conditional \"NET_4_0\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${XSP_ONLY_TRUE}" && test -z "${XSP_ONLY_FALSE}"; then
  as_fn_error $? "conditional \"XSP_ONLY\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@ -13475,7 +13447,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xsp $as_me 4.5, which was
+This file was extended by xsp $as_me 4.7.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

  CONFIG_FILES    = $CONFIG_FILES
@ -13532,7 +13504,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-xsp config.status 4.5
+xsp config.status 4.7.1
 configured by $0, generated by GNU Autoconf 2.69,
  with options \\"\$ac_cs_config\\"

--- 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.5], [http://bugzilla.xamarin.com/])
+AC_INIT([xsp], [4.7.1], [http://bugzilla.xamarin.com/])
 AC_CANONICAL_SYSTEM
 AC_CONFIG_MACRO_DIR([build/m4])
 AM_INIT_AUTOMAKE([foreign])
@ -72,9 +72,9 @@ if test "x$DMCS" = "xno" ; then
 	AC_MSG_ERROR([No $CS compiler found. dmcs must be installed.])
 fi

-AC_MSG_CHECKING([for Mono 4.0 GAC for Mono.Data.Sqlite.dll])
-if test -e "$($PKG_CONFIG --variable=libdir mono)/mono/4.0/Mono.Data.Sqlite.dll" -o \
-        -e "$($PKG_CONFIG --variable=prefix mono)/lib/mono/4.0/Mono.Data.Sqlite.dll"; then
+AC_MSG_CHECKING([for Mono 4.5 GAC for Mono.Data.Sqlite.dll])
+if test -e "$($PKG_CONFIG --variable=libdir mono)/mono/4.5/Mono.Data.Sqlite.dll" -o \
+        -e "$($PKG_CONFIG --variable=prefix mono)/lib/mono/4.5/Mono.Data.Sqlite.dll"; then
 	AC_MSG_RESULT([found])
 	HAVE_MONO_SQLITE=yes
 else
@ -96,8 +96,6 @@ esac

 AM_CONDITIONAL(UNITTESTS, test x${UNIT_TESTS} = xyes)
 AM_CONDITIONAL(PLATFORM_WIN32, test x$platform_win32 = xyes)
-AM_CONDITIONAL(NET_2_0, test ! x$DMCS = xno)
-AM_CONDITIONAL(NET_4_0, test ! x$DMCS = xno)
 AM_CONDITIONAL(XSP_ONLY, test x$platform_win32 = xyes)

 # Put the version in the new required format (for svn revisions)
--- a/6
+++ b/6
@ -1,9 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects

-scriptversion=2013-05-30.07; # UTC
+scriptversion=2016-01-11.22; # UTC

-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.

 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@ -786,6 +786,6 @@ exit 0
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/docs/Mono.FastCGI/Makefile.in
+++ b/docs/Mono.FastCGI/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/docs/Mono.WebServer/Makefile.in
+++ b/docs/Mono.WebServer/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/man/Makefile.in
+++ b/man/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/packaging/Makefile.in
+++ b/packaging/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/packaging/opensuse/Makefile.in
+++ b/packaging/opensuse/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@ -4,10 +4,8 @@ bin2_scripts_real = xsp2 mod-mono-server2 fastcgi-mono-server2
 bin2_scripts = $(bin2_scripts_real)
 tool2_scripts = asp-state2 dbsessmgr2

-if NET_4_0
 bin4_scripts = xsp4 mod-mono-server4 fastcgi-mono-server4
 tool4_scripts = asp-state4 dbsessmgr4
-endif

 bin_scripts = xsp mod-mono-server fastcgi-mono-server
 tool_scripts = asp-state dbsessmgr
@ -18,19 +16,17 @@ 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)

-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_bindir4),g'		\
-	-e 's,@''exe_file@,'`basename $@ 2`'2.exe,g'		\
+	-e 's,@''exe_file@,'`basename $@ 2`'4.exe,g'		\
 	-e 's,@''RUNTIME@,@RUNTIME@,g'

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

 REWRITEPLAIN = sed \
@ -38,7 +34,6 @@ REWRITEPLAIN = sed \
 	-e 's,@''exe_file@,'`basename $@ 4`'.exe,g'		\
 	-e 's,@''RUNTIME@,@RUNTIME@,g'

-if NET_4_0
 REWRITE4 = sed \
 	-e 's,@''plat_bindir@,$(plat_bindir4),g'		\
 	-e 's,@''exe_file@,'`basename $@ 4`'4.exe,g'		\
@ -48,7 +43,6 @@ REWRITE_TOOLS4 = echo dd $@ dd; sed \
 	-e 's,@''plat_bindir@,$(plat_tooldir4),g'		\
 	-e 's,@''exe_file@,'`basename $@ 4`'4.exe,g'		\
 	-e 's,@''RUNTIME@,@RUNTIME@,g'
-endif

 $(bin2_scripts): $(srcdir)/script.in Makefile.am
 	$(REWRITE2) $(srcdir)/script.in > $@.tmp
@ -70,7 +64,6 @@ $(tool_scripts): $(srcdir)/script.in Makefile.am
 	$(REWRITE_TOOLS2) $(srcdir)/script.in > $@.tmp
 	mv $@.tmp $@

-if NET_4_0
 $(bin4_scripts): $(srcdir)/script.in Makefile.am
 	$(REWRITE4) $(srcdir)/script.in > $@.tmp
 	mv $@.tmp $@
@ -78,4 +71,3 @@ $(bin4_scripts): $(srcdir)/script.in Makefile.am
 $(tool4_scripts): $(srcdir)/script.in Makefile.am
 	$(REWRITE_TOOLS4) $(srcdir)/script.in > $@.tmp
 	mv $@.tmp $@
-endif
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -311,23 +311,23 @@ EXTRA_DIST = script.in
 bin2_scripts_real = xsp2 mod-mono-server2 fastcgi-mono-server2
 bin2_scripts = $(bin2_scripts_real)
 tool2_scripts = asp-state2 dbsessmgr2
-@NET_4_0_TRUE@bin4_scripts = xsp4 mod-mono-server4 fastcgi-mono-server4
-@NET_4_0_TRUE@tool4_scripts = asp-state4 dbsessmgr4
+bin4_scripts = xsp4 mod-mono-server4 fastcgi-mono-server4
+tool4_scripts = asp-state4 dbsessmgr4
 bin_scripts = xsp mod-mono-server fastcgi-mono-server
 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)
-@NET_4_0_TRUE@plat_bindir4 = $(prefix)/lib/mono/4.5
-@NET_4_0_TRUE@plat_tooldir4 = $(prefix)/lib/xsp/4.0
+plat_bindir4 = $(prefix)/lib/mono/4.5
+plat_tooldir4 = $(prefix)/lib/xsp/4.0
 REWRITE2 = sed \
 	-e 's,@''plat_bindir@,$(plat_bindir4),g'		\
-	-e 's,@''exe_file@,'`basename $@ 2`'2.exe,g'		\
+	-e 's,@''exe_file@,'`basename $@ 2`'4.exe,g'		\
 	-e 's,@''RUNTIME@,@RUNTIME@,g'

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

 REWRITEPLAIN = sed \
@ -335,15 +335,15 @@ REWRITEPLAIN = sed \
 	-e 's,@''exe_file@,'`basename $@ 4`'.exe,g'		\
 	-e 's,@''RUNTIME@,@RUNTIME@,g'

-@NET_4_0_TRUE@REWRITE4 = sed \
-@NET_4_0_TRUE@	-e 's,@''plat_bindir@,$(plat_bindir4),g'		\
-@NET_4_0_TRUE@	-e 's,@''exe_file@,'`basename $@ 4`'4.exe,g'		\
-@NET_4_0_TRUE@	-e 's,@''RUNTIME@,@RUNTIME@,g'
+REWRITE4 = sed \
+	-e 's,@''plat_bindir@,$(plat_bindir4),g'		\
+	-e 's,@''exe_file@,'`basename $@ 4`'4.exe,g'		\
+	-e 's,@''RUNTIME@,@RUNTIME@,g'

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

 all: all-am

@ -597,13 +597,13 @@ $(tool_scripts): $(srcdir)/script.in Makefile.am
 	$(REWRITE_TOOLS2) $(srcdir)/script.in > $@.tmp
 	mv $@.tmp $@

-@NET_4_0_TRUE@$(bin4_scripts): $(srcdir)/script.in Makefile.am
-@NET_4_0_TRUE@	$(REWRITE4) $(srcdir)/script.in > $@.tmp
-@NET_4_0_TRUE@	mv $@.tmp $@
+$(bin4_scripts): $(srcdir)/script.in Makefile.am
+	$(REWRITE4) $(srcdir)/script.in > $@.tmp
+	mv $@.tmp $@

-@NET_4_0_TRUE@$(tool4_scripts): $(srcdir)/script.in Makefile.am
-@NET_4_0_TRUE@	$(REWRITE_TOOLS4) $(srcdir)/script.in > $@.tmp
-@NET_4_0_TRUE@	mv $@.tmp $@
+$(tool4_scripts): $(srcdir)/script.in Makefile.am
+	$(REWRITE_TOOLS4) $(srcdir)/script.in > $@.tmp
+	mv $@.tmp $@

 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/shim/Makefile.in
+++ b/shim/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/shim/shim.c
+++ b/shim/shim.c
@ -45,7 +45,7 @@ void log1 (char * str)
    printf("%s\n", str);
 }

-void log(char * fmt, ...)
+void shim_log (char * fmt, ...)
 {
    if(!debug) return;
    print_prefix ();
@ -67,7 +67,7 @@ ssize_t send_int (int fd, int value)
    char buffer [size + 1];
    snprintf (buffer, size + 1, "%d", value);
    buffer [size] = 0;
-    log("%d (%s) has size %d", value, buffer, size);
+    shim_log ("%d (%s) has size %d", value, buffer, size);
    return send_string (fd, buffer);
 }

@ -131,14 +131,14 @@ pid_t spawn (int fd, char * params [])
    child = fork ();
    if (child) {
        send_int (fd, child);
-        log ("Sent pid %d", child);
+        shim_log ("Sent pid %d", child);
        exit (0);
        return -1;
    }

    log1 ("Reforked!");

-    log ("Running %s", *params);
+    shim_log ("Running %s", *params);

    if (execv (*params, params) == -1) {
        perror ("execv");
@ -197,7 +197,7 @@ int main (int argc, char * argv [], char *envp[])
    debug = debug_env && (debug_env[0] == 'y' || debug_env[0] == 'Y');

    log1 ("Started.");
-    log ("I'm uid %d euid %d gid %d egid %d", getuid (), geteuid (), getgid (), getegid ());
+    shim_log ("I'm uid %d euid %d gid %d egid %d", getuid (), geteuid (), getgid (), getegid ());

    if (argc <= 2) {
        fprintf (stderr, "Usage: %s <socket> <command>\n", argv [0]);
@ -207,7 +207,7 @@ int main (int argc, char * argv [], char *envp[])
    const char * path = argv [1];
 	char ** params = argv + 2;

-    log ("Will run %s", *params);
+    shim_log ("Will run %s", *params);

    int local_fd;
    if (!start_server (path, &local_fd))
--- a/src/Makefile.in
+++ b/src/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/src/Mono.WebServer.Apache/Makefile.in
+++ b/src/Mono.WebServer.Apache/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/src/Mono.WebServer.FastCgi/Makefile.am
+++ b/src/Mono.WebServer.FastCgi/Makefile.am
@ -19,7 +19,7 @@ build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
 EXTRA_DIST = $(sources) AssemblyInfo.cs.in $(resources) Mono.WebServer.FastCgi.sources

 fastcgi-mono-server4.exe: $(build_sources)
-	$(DMCS) -d:NET_2_0 -d:NET_4_0 $(MCSFLAGS) $(references4) /out:$@ \
+	$(DMCS) $(MCSFLAGS) $(references4) /out:$@ \
 		$(build_sources)
 	$(SN) -q -R $(builddir)/$@ $(srcdir)/../mono.snk

--- a/src/Mono.WebServer.FastCgi/Makefile.in
+++ b/src/Mono.WebServer.FastCgi/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -486,7 +486,7 @@ uninstall-am: uninstall-local


 fastcgi-mono-server4.exe: $(build_sources)
-	$(DMCS) -d:NET_2_0 -d:NET_4_0 $(MCSFLAGS) $(references4) /out:$@ \
+	$(DMCS) $(MCSFLAGS) $(references4) /out:$@ \
 		$(build_sources)
 	$(SN) -q -R $(builddir)/$@ $(srcdir)/../mono.snk

--- a/src/Mono.WebServer.Fpm/Makefile.am
+++ b/src/Mono.WebServer.Fpm/Makefile.am
@ -18,7 +18,7 @@ build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
 EXTRA_DIST = $(sources) AssemblyInfo.cs.in $(resources) Mono.WebServer.Fpm.sources

 mono-fpm.exe: $(build_sources)
-	$(DMCS) -d:NET_2_0 -d:NET_4_0 $(MCSFLAGS) $(references) /out:$@ \
+	$(DMCS) $(MCSFLAGS) $(references) /out:$@ \
 		$(build_sources)
 	$(SN) -q -R $(builddir)/$@ $(srcdir)/../mono.snk

--- a/src/Mono.WebServer.Fpm/Makefile.in
+++ b/src/Mono.WebServer.Fpm/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -486,7 +486,7 @@ uninstall-am: uninstall-local


 mono-fpm.exe: $(build_sources)
-	$(DMCS) -d:NET_2_0 -d:NET_4_0 $(MCSFLAGS) $(references) /out:$@ \
+	$(DMCS) $(MCSFLAGS) $(references) /out:$@ \
 		$(build_sources)
 	$(SN) -q -R $(builddir)/$@ $(srcdir)/../mono.snk

--- a/src/Mono.WebServer.XSP/ConfigurationManager.cs
+++ b/src/Mono.WebServer.XSP/ConfigurationManager.cs
@ -28,7 +28,6 @@

 using System.Net;
 using Mono.WebServer.Options.Settings;
-using TP = Mono.Security.Protocol.Tls;
 using Mono.WebServer.Options;

 namespace Mono.WebServer.XSP {
@ -38,9 +37,6 @@ namespace Mono.WebServer.XSP {
 		readonly BoolSetting nonstop = new BoolSetting ("nonstop", "Don't stop the server by pressing enter. Must be used when the server has no controlling terminal.");
 		readonly BoolSetting quiet = new BoolSetting ("quiet", "Disable the initial start up information.");
 		readonly BoolSetting randomPort = new BoolSetting ("random-port", "Listen on a randomly assigned port. The port numer will be reported to the caller via a text file.");
-		readonly BoolSetting https = new BoolSetting ("https", "Enable SSL for the server.");
-		readonly BoolSetting httpsClientAccept = new BoolSetting ("https-client-accept", "Enable SSL for the server with optional client certificates.");
-		readonly BoolSetting httpsClientRequire = new BoolSetting ("https-client-require", "Enable SSL for the server with mandatory client certificates.");
 		readonly BoolSetting noHidden = new BoolSetting ("no-hidden", "Allow access to hidden files (see 'man xsp' for details).");

 		readonly NullableInt32Setting minThreads = new NullableInt32Setting ("minThreads", "The minimum number of threads the thread pool creates on startup. Increase this value to handle a sudden inflow of connections.");
@ -52,7 +48,6 @@ namespace Mono.WebServer.XSP {
 		readonly StringSetting pkPwd = new StringSetting ("pkpwd", "Password to decrypt the private key.");
 		readonly StringSetting pidFile = new StringSetting ("pidfile", "Write the process PID to the specified file.");

-		readonly EnumSetting<TP.SecurityProtocolType> protocols = new EnumSetting<TP.SecurityProtocolType> ("protocols", "specify which protocols are available for SSL. Possible values: Default (all), Tls, Ssl2, Ssl3", defaultValue: TP.SecurityProtocolType.Default);
 		#endregion

 		#region Typesafe properties
@ -65,15 +60,6 @@ namespace Mono.WebServer.XSP {
 		public bool RandomPort {
 			get { return randomPort; }
 		}
-		public bool Https {
-			get { return https; }
-		}
-		public bool HttpsClientAccept {
-			get { return httpsClientAccept; }
-		}
-		public bool HttpsClientRequire {
-			get { return httpsClientRequire; }
-		}
 		public bool NoHidden {
 			get { return noHidden; }
 		}
@ -101,9 +87,6 @@ namespace Mono.WebServer.XSP {
 			get { return pidFile; }
 		}

-		public TP.SecurityProtocolType Protocols {
-			get { return protocols; }
-		}
 		#endregion

 		public override string ProgramName {
@ -118,10 +101,9 @@ namespace Mono.WebServer.XSP {

 		public ConfigurationManager (string name, bool quietDefault) : base (name)
 		{
-			Add (nonstop, quiet, randomPort, https, httpsClientAccept, httpsClientRequire, noHidden,
+			Add (nonstop, quiet, randomPort, noHidden,
 			     minThreads, port,
-			     p12File, cert, pkFile, pkPwd, pidFile,
-			     protocols);
+			     p12File, cert, pkFile, pkPwd, pidFile);
 			address.MaybeUpdate (SettingSource.Default, IPAddress.Any);
 			quiet.MaybeUpdate (SettingSource.Default, quietDefault);
 		}
--- a/src/Mono.WebServer.XSP/Makefile.am
+++ b/src/Mono.WebServer.XSP/Makefile.am
@ -23,7 +23,7 @@ build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
 EXTRA_DIST = $(sources) Mono.WebServer.XSP.sources AssemblyInfo.cs.in

 xsp4.exe: $(build_sources)
-	$(DMCS) -d:NET_2_0 -d:NET_4_0 $(MCSFLAGS) $(references4) /out:$@ $(build_sources)
+	$(DMCS) $(MCSFLAGS) $(references4) /out:$@ $(build_sources)
 	$(SN) -q -R $(builddir)/$@ $(srcdir)/../mono.snk

 install-data-local:
--- a/src/Mono.WebServer.XSP/Makefile.in
+++ b/src/Mono.WebServer.XSP/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -550,7 +550,7 @@ uninstall-am: uninstall-local uninstall-pkgconfigDATA


 xsp4.exe: $(build_sources)
-	$(DMCS) -d:NET_2_0 -d:NET_4_0 $(MCSFLAGS) $(references4) /out:$@ $(build_sources)
+	$(DMCS) $(MCSFLAGS) $(references4) /out:$@ $(build_sources)
 	$(SN) -q -R $(builddir)/$@ $(srcdir)/../mono.snk

 install-data-local:
--- a/src/Mono.WebServer.XSP/SecurityConfiguration.cs
+++ b/src/Mono.WebServer.XSP/SecurityConfiguration.cs
@ -36,7 +36,6 @@ using System.Text;
 using Mono.Security.Authenticode;
 using MSX = Mono.Security.X509;
 using Mono.Security.X509.Extensions;
-using SecurityProtocolType = Mono.Security.Protocol.Tls.SecurityProtocolType;

 namespace Mono.WebServer.XSP {

@ -49,7 +48,6 @@ namespace Mono.WebServer.XSP {

 		public SecurityConfiguration ()
 		{
-			Protocol = SecurityProtocolType.Default;
 		}

 		// properties
@ -87,8 +85,6 @@ namespace Mono.WebServer.XSP {
 			}
 		}

-		public SecurityProtocolType Protocol { get; set; }
-
 		// methods

 		public void CheckSecurityContextValidity ()
@ -108,39 +104,12 @@ namespace Mono.WebServer.XSP {
 				return "(non-secure)";

 			var sb = new StringBuilder ("(");
-			switch (Protocol) {
-			case SecurityProtocolType.Default:
-				sb.Append ("auto-detect SSL3/TLS1");
-				break;
-			case SecurityProtocolType.Ssl3:
-				sb.Append ("SSL3");
-				break;
-			case SecurityProtocolType.Tls:
-				sb.Append ("TLS1");
-				break;
-			}
 			if (RequireClientCertificates)
 				sb.Append (" with mandatory client certificates");
 			sb.Append (")");
 			return sb.ToString ();
 		}

-		[Obsolete("Use the typesafe Protocol property")]
-		public void SetProtocol (string protocol)
-		{
-			if (protocol != null) {
-				try {
-					Protocol = (SecurityProtocolType) Enum.Parse (typeof (SecurityProtocolType), protocol);
-				}
-				catch (Exception e) {
-					string message = String.Format ("The value '{0}' given for security protocol is invalid.", protocol);
-					throw new CryptographicException (message, e);
-				}
-			} else {
-				Protocol = SecurityProtocolType.Default;
-			}
-		}
-
 		// private stuff

 		void LoadCertificate (string filename)
--- a/src/Mono.WebServer.XSP/XSPWebSource.cs
+++ b/src/Mono.WebServer.XSP/XSPWebSource.cs
@ -30,9 +30,7 @@
 using System;
 using System.Net;
 using System.Net.Sockets;
-using Mono.Security.Protocol.Tls;
 using Mono.WebServer.XSP;
-using SecurityProtocolType = Mono.Security.Protocol.Tls.SecurityProtocolType;
 using X509Certificate = System.Security.Cryptography.X509Certificates.X509Certificate;

 namespace Mono.WebServer {
@ -43,22 +41,16 @@ namespace Mono.WebServer {
 	public class XSPWebSource: WebSource
 	{
 		IPEndPoint bindAddress;
-		readonly bool secureConnection;
-		readonly SecurityProtocolType securityProtocol;
 		readonly X509Certificate cert;
-		readonly PrivateKeySelectionCallback keyCB;
 		readonly bool allowClientCert;
 		readonly bool requireClientCert;

-		public XSPWebSource(IPAddress address, int port, SecurityProtocolType securityProtocol,
-				    X509Certificate cert, PrivateKeySelectionCallback keyCB, 
+		public XSPWebSource(IPAddress address, int port,
+				    X509Certificate cert,
 				    bool allowClientCert, bool requireClientCert, bool single_app)
 		{			
-			secureConnection = (cert != null && keyCB != null);
 			bindAddress = new IPEndPoint (address, port);
-			this.securityProtocol = securityProtocol;
 			this.cert = cert;
-			this.keyCB = keyCB;
 			this.allowClientCert = allowClientCert;
 			this.requireClientCert = requireClientCert;
 		}
@ -101,7 +93,7 @@ namespace Mono.WebServer {
 		public override Worker CreateWorker (Socket client, ApplicationServer server)
 		{
 			return new XSPWorker (client, client.LocalEndPoint, server,
-				secureConnection, securityProtocol, cert, keyCB, allowClientCert, requireClientCert);
+				cert, allowClientCert, requireClientCert);
 		}
 		
 		public override Type GetApplicationHostType ()
--- a/src/Mono.WebServer.XSP/XSPWorker.cs
+++ b/src/Mono.WebServer.XSP/XSPWorker.cs
@ -33,9 +33,7 @@ using System.Net;
 using System.Net.Sockets;
 using System.Security.Cryptography.X509Certificates;
 using System.Threading;
-using Mono.Security.Protocol.Tls;
-using Mono.WebServer.Log;
-using SecurityProtocolType = Mono.Security.Protocol.Tls.SecurityProtocolType;
+using Mono.WebServer.Log;

 namespace Mono.WebServer.XSP
 {
@ -58,29 +56,12 @@ namespace Mono.WebServer.XSP
 		int reuses;

 		public XSPWorker (Socket client, EndPoint localEP, ApplicationServer server,
-			bool secureConnection,
-			SecurityProtocolType securityProtocol,
 			X509Certificate cert,
-			PrivateKeySelectionCallback keyCB,
 			bool allowClientCert,
 			bool requireClientCert) 
 		{
-			if (secureConnection) {
-				ssl = new SslInformation {
-					AllowClientCertificate = allowClientCert,
-					RequireClientCertificate = requireClientCert,
-					RawServerCertificate = cert.GetRawCertData ()
-				};
-
-				netStream = new LingeringNetworkStream (client, true);
-				var s = new SslServerStream (netStream, cert, requireClientCert, false);
-				s.PrivateKeyCertSelectionDelegate += keyCB;
-				s.ClientCertValidationDelegate += ClientCertificateValidation;
-				stream = s;
-			} else {
-				netStream = new LingeringNetworkStream (client, false);
-				stream = netStream;
-			}
+			netStream = new LingeringNetworkStream (client, false);
+			stream = netStream;

 			sock = client;
 			this.server = server;
@ -178,12 +159,6 @@ namespace Mono.WebServer.XSP
 			broker = (XSPRequestBroker) vapp.RequestBroker;
 			requestId = broker.RegisterRequest (this);

-			if (ssl != null) {
-				var s = (stream as SslServerStream);
-				ssl.KeySize = s.CipherStrength;
-				ssl.SecretKeySize = s.KeyExchangeStrength;
-			}
-
 			try {
 				string redirect;
 				vapp.Redirect (rdata.Path, out redirect);
@ -212,8 +187,8 @@ namespace Mono.WebServer.XSP
 		{
 			try {
 				stream.Write (buffer, position, size);
-			} catch (Exception ex) {
-				Logger.Write (LogLevel.Error, "Peer unexpectedly closed the connection on write. Closing our end.");
+			} catch (Exception ex) {
+				Logger.Write (LogLevel.Error, "Peer unexpectedly closed the connection on write. Closing our end.");
 				Logger.Write (ex);
 				Close ();
 			}
--- a/src/Mono.WebServer.XSP/XSPWorkerRequest.cs
+++ b/src/Mono.WebServer.XSP/XSPWorkerRequest.cs
@ -748,8 +748,8 @@ namespace Mono.WebServer
 			if (secure || no_libc)
 				return 0;
 			// 6 -> SOL_TCP, 3 -> TCP_CORK
-			bool t = val;
-			return setsockopt ((int) socket, 6, 3, ref t, (IntPtr) IntPtr.Size);
+			int t = val ? 1 : 0;
+			return setsockopt ((int) socket, 6, 3, ref t, (IntPtr) sizeof(int));
 		}

 		unsafe int Send (byte [] buffer, int offset, int len)
@ -776,7 +776,7 @@ namespace Mono.WebServer
 		}

 		[DllImport ("libc", SetLastError=true)]
-		extern static int setsockopt (int handle, int level, int opt, ref bool val, IntPtr len);
+		extern static int setsockopt (int handle, int level, int opt, ref int val, IntPtr len);

 		[DllImport ("libc", SetLastError=true)]
 		extern static int sendfile (int out_fd, int in_fd, ref long offset, IntPtr count);
--- a/src/Mono.WebServer.XSP/main.cs
+++ b/src/Mono.WebServer.XSP/main.cs
@ -33,8 +33,8 @@ using System.IO;
 using System.Reflection;
 using System.Threading;
 using System.Security.Cryptography;
-using System.Security.Cryptography.X509Certificates;
-using Mono.WebServer.Log;
+using System.Security.Cryptography.X509Certificates;
+using Mono.WebServer.Log;
 using Mono.WebServer.Options;

 namespace Mono.WebServer.XSP
@ -54,10 +54,10 @@ namespace Mono.WebServer.XSP
 		{
 			var ex = (Exception)e.ExceptionObject;

-			Logger.Write (LogLevel.Error, "Handling exception type {0}", ex.GetType ().Name);
-			Logger.Write (LogLevel.Error, "Message is {0}", ex.Message);
+			Logger.Write (LogLevel.Error, "Handling exception type {0}", ex.GetType ().Name);
+			Logger.Write (LogLevel.Error, "Message is {0}", ex.Message);
 			Logger.Write (LogLevel.Error, "IsTerminating is set to {0}", e.IsTerminating);
-			if (e.IsTerminating)
+			if (e.IsTerminating)
 				Logger.Write(ex);
 		}

@ -124,23 +124,7 @@ namespace Mono.WebServer.XSP

 			configurationManager.SetupLogger ();

-			WebSource webSource;
-			if (security.Enabled) {
-				try {
-					key = security.KeyPair;
-					webSource = new XSPWebSource (configurationManager.Address,
-						configurationManager.RandomPort ? default(ushort) : configurationManager.Port,
-						security.Protocol, security.ServerCertificate,
-						GetPrivateKey, security.AcceptClientCertificates,
-						security.RequireClientCertificates, !root);
-				}
-				catch (CryptographicException ce) {
-					Logger.Write (ce);
-					return new CompatTuple<int,string,ApplicationServer> (1, "Error while setting up https", null);
-				}
-			} else {
-				webSource = new XSPWebSource (configurationManager.Address, configurationManager.Port, !root);
-			}
+			WebSource webSource = new XSPWebSource (configurationManager.Address, configurationManager.Port, !root);

 			var server = new ApplicationServer (webSource, configurationManager.Root) {
 				Verbose = configurationManager.Verbose,
@ -170,9 +154,9 @@ namespace Mono.WebServer.XSP
 			}
 			server.AppHost = ext_apphost;

-			if (!configurationManager.Quiet) {
-				Logger.Write(LogLevel.Notice, Assembly.GetExecutingAssembly().GetName().Name);
-				Logger.Write(LogLevel.Notice, "Listening on address: {0}", configurationManager.Address);
+			if (!configurationManager.Quiet) {
+				Logger.Write(LogLevel.Notice, Assembly.GetExecutingAssembly().GetName().Name);
+				Logger.Write(LogLevel.Notice, "Listening on address: {0}", configurationManager.Address);
 				Logger.Write(LogLevel.Notice, "Root directory: {0}", configurationManager.Root);
 			}

@ -181,7 +165,7 @@ namespace Mono.WebServer.XSP
 					return new CompatTuple<int,string,ApplicationServer> (2, "Error while starting server", server);

 				if (!configurationManager.Quiet) {
-					// MonoDevelop depends on this string. If you change it, let them know.
+					// MonoDevelop depends on this string. If you change it, let them know.
 					Logger.Write(LogLevel.Notice, "Listening on port: {0} {1}", server.Port, security);
 				}
 				if (configurationManager.RandomPort && !configurationManager.Quiet)
@ -209,8 +193,8 @@ namespace Mono.WebServer.XSP
 					}
 					server.Stop ();
 				}
-			} catch (Exception e) {
-				if (!(e is ThreadAbortException))
+			} catch (Exception e) {
+				if (!(e is ThreadAbortException))
 					Logger.Write (e);
 				else
 					server.ShutdownSockets ();
@ -226,21 +210,6 @@ namespace Mono.WebServer.XSP
 				return false;
 			
 			// TODO: add mutual exclusivity rules
-			if(manager.Https)
-				security.Enabled = true;
-
-			if (manager.HttpsClientAccept) {
-				security.Enabled = true;
-				security.AcceptClientCertificates = true;
-				security.RequireClientCertificates = false;
-			}
-
-			if (manager.HttpsClientRequire) {
-				security.Enabled = true;
-				security.AcceptClientCertificates = true;
-				security.RequireClientCertificates = true;
-			}
-
 			if (manager.P12File != null)
 				security.Pkcs12File = manager.P12File;

@ -253,8 +222,6 @@ namespace Mono.WebServer.XSP
 			if (manager.PkPwd != null)
 				security.Password = manager.PkPwd;

-			security.Protocol = manager.Protocols;
-
 			int minThreads = manager.MinThreads ?? 0;
 			if(minThreads > 0)
 				ThreadPool.SetMinThreads (minThreads, minThreads);
--- a/src/Mono.WebServer/Makefile.am
+++ b/src/Mono.WebServer/Makefile.am
@ -19,7 +19,7 @@ monowebserver4_build_sources = $(addprefix $(srcdir)/, $(sources)) $(addprefix $

 4.0/Mono.WebServer2.dll: $(monowebserver4_build_sources)
 	-$(MKDIR_P) 4.0
-	$(DMCS) -d:NET_2_0 -d:NET_4_0 $(MCSFLAGS) $(monowebserver4_references) /target:library /out:$@ $(monowebserver4_build_sources)
+	$(DMCS) $(MCSFLAGS) $(monowebserver4_references) /target:library /out:$@ $(monowebserver4_build_sources)
 	$(SN) -q -R $(builddir)/$@ $(srcdir)/../mono.snk

 install-data-local:
--- a/src/Mono.WebServer/Makefile.in
+++ b/src/Mono.WebServer/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -492,7 +492,7 @@ uninstall-am: uninstall-local

 4.0/Mono.WebServer2.dll: $(monowebserver4_build_sources)
 	-$(MKDIR_P) 4.0
-	$(DMCS) -d:NET_2_0 -d:NET_4_0 $(MCSFLAGS) $(monowebserver4_references) /target:library /out:$@ $(monowebserver4_build_sources)
+	$(DMCS) $(MCSFLAGS) $(monowebserver4_references) /target:library /out:$@ $(monowebserver4_build_sources)
 	$(SN) -q -R $(builddir)/$@ $(srcdir)/../mono.snk

 install-data-local:
--- a/src/Mono.WebServer/MonoWorkerRequest.cs
+++ b/src/Mono.WebServer/MonoWorkerRequest.cs
@ -280,11 +280,7 @@ namespace Mono.WebServer
 			string hostVPath = HostVPath;
 			int hostVPathLen = HostVPath.Length;
 			int pathLen = path != null ? path.Length : 0;
-#if NET_2_0
 			bool inThisApp = path.StartsWith (hostVPath, StringComparison.Ordinal);
-#else
-			bool inThisApp = path.StartsWith (hostVPath);
-#endif
 			if (pathLen == 0 || (inThisApp && (pathLen == hostVPathLen || (pathLen == hostVPathLen + 1 && path [pathLen - 1] == '/')))) {
 				if (needToReplacePathSeparator)
 					return HostPath.Replace ('/', pathSeparatorChar);
--- a/src/Mono.WebServer/Platform.cs
+++ b/src/Mono.WebServer/Platform.cs
@ -43,8 +43,7 @@ namespace Mono.WebServer {
 		
 		public static bool IsUnix {
 			get {
-				var platform = Environment.OSVersion.Platform;
-				return platform == PlatformID.Unix || platform == PlatformID.MacOSX || platform == (PlatformID)128;
+				return Value == FinePlatformID.Linux || Value == FinePlatformID.MacOSX;
 			}
 		}

--- a/test/1.1/Makefile.in
+++ b/test/1.1/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/test/1.1/asp.net/Makefile.in
+++ b/test/1.1/asp.net/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/test/1.1/authtest/Makefile.in
+++ b/test/1.1/authtest/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/test/1.1/customcontrol/Makefile.in
+++ b/test/1.1/customcontrol/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/test/1.1/databind/Makefile.in
+++ b/test/1.1/databind/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/test/1.1/handlers/Makefile.in
+++ b/test/1.1/handlers/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/test/1.1/html/Makefile.in
+++ b/test/1.1/html/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/test/1.1/webcontrols/Makefile.am
+++ b/test/1.1/webcontrols/Makefile.am
@ -37,7 +37,7 @@ samples_DATA = \
 		peopletable.xsl \
 		index.aspx

-EXTRA_DIST = $(samples_DATA)
+EXTRA_DIST = $(samples_DATA) dbpage_test_setup.cs

 if USE_SQLITE
 sqlitedir = $(pkglibdir)/test/1.1/webcontrols
--- a/test/1.1/webcontrols/Makefile.in
+++ b/test/1.1/webcontrols/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -350,7 +350,7 @@ samples_DATA = \
 		peopletable.xsl \
 		index.aspx

-EXTRA_DIST = $(samples_DATA) $(am__append_1)
+EXTRA_DIST = $(samples_DATA) dbpage_test_setup.cs $(am__append_1)
@USE_SQLITE_TRUE@sqlitedir = $(pkglibdir)/test/1.1/webcontrols
@USE_SQLITE_TRUE@sqlite_DATA = dbpage1.sqlite \
@USE_SQLITE_TRUE@	      dbpage2.sqlite
--- a/test/1.1/webcontrols/dbpage1.sqlite
+++ b/test/1.1/webcontrols/dbpage1.sqlite
--- 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
@ -0,0 +1,85 @@
+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/webservice/Makefile.in
+++ b/test/1.1/webservice/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/test/2.0/Makefile.in
+++ b/test/2.0/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/test/2.0/gridview/Makefile.in
+++ b/test/2.0/gridview/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/test/2.0/masterpages/Makefile.in
+++ b/test/2.0/masterpages/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/test/2.0/menu/Makefile.in
+++ b/test/2.0/menu/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/test/2.0/treeview/Makefile.in
+++ b/test/2.0/treeview/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/test/App_Code/Makefile.in
+++ b/test/App_Code/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/test/Makefile.in
+++ b/test/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/test/controls/Makefile.in
+++ b/test/controls/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/tools/asp_state/Makefile.am
+++ b/tools/asp_state/Makefile.am
@ -1,12 +1,10 @@
 MCSFLAGS= -debug+ -debug:full -nologo

-if NET_4_0
 scripts4 = asp-state4.exe
 data4 = asp-state4.exe.config
 aspstate4dir = $(prefix)/lib/xsp/4.0
 aspstate4_SCRIPTS = $(scripts4)
 aspstate4_DATA = $(data4)
-endif

 EXTRA_DIST = $(aspstate_input) asp-state4.exe.config
 CLEANFILES = *.exe *.mdb
@ -16,7 +14,5 @@ aspstate_input = AssemblyInfo.cs.in \

 aspstate_sources = $(aspstate_input:.in=)

-if NET_4_0
 asp-state4.exe: $(aspstate_sources)
 	$(DMCS) $(MCSFLAGS) /out:$@ $^
-endif
--- a/tools/asp_state/Makefile.in
+++ b/tools/asp_state/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -311,11 +311,11 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 MCSFLAGS = -debug+ -debug:full -nologo
-@NET_4_0_TRUE@scripts4 = asp-state4.exe
-@NET_4_0_TRUE@data4 = asp-state4.exe.config
-@NET_4_0_TRUE@aspstate4dir = $(prefix)/lib/xsp/4.0
-@NET_4_0_TRUE@aspstate4_SCRIPTS = $(scripts4)
-@NET_4_0_TRUE@aspstate4_DATA = $(data4)
+scripts4 = asp-state4.exe
+data4 = asp-state4.exe.config
+aspstate4dir = $(prefix)/lib/xsp/4.0
+aspstate4_SCRIPTS = $(scripts4)
+aspstate4_DATA = $(data4)
 EXTRA_DIST = $(aspstate_input) asp-state4.exe.config
 CLEANFILES = *.exe *.mdb
 aspstate_input = AssemblyInfo.cs.in \
@ -578,8 +578,8 @@ uninstall-am: uninstall-aspstate4DATA uninstall-aspstate4SCRIPTS
 .PRECIOUS: Makefile


-@NET_4_0_TRUE@asp-state4.exe: $(aspstate_sources)
-@NET_4_0_TRUE@	$(DMCS) $(MCSFLAGS) /out:$@ $^
+asp-state4.exe: $(aspstate_sources)
+	$(DMCS) $(MCSFLAGS) /out:$@ $^

 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/tools/dbsessmgr/Makefile.am
+++ b/tools/dbsessmgr/Makefile.am
@ -1,12 +1,10 @@
 MCSFLAGS= -debug+ -debug:full -nologo

-if NET_4_0
 scripts4 = dbsessmgr4.exe
 data4 = dbsessmgr4.exe.config
 dbsessmgr4dir = $(prefix)/lib/xsp/4.0
 dbsessmgr4_SCRIPTS = $(scripts4)
 dbsessmgr4_DATA = $(data4)
-endif

 EXTRA_DIST = $(dbsessmgr_input) dbsessmgr4.exe.config
 CLEANFILES = *.exe *.mdb
@ -16,7 +14,5 @@ dbsessmgr_input = AssemblyInfo.cs.in \

 dbsessmgr_sources = $(dbsessmgr_input:.in=)

-if NET_4_0
 dbsessmgr4.exe: $(dbsessmgr_sources)
 	$(DMCS) $(MCSFLAGS) -r:System.Data.dll -r:System.Configuration.dll -out:$@ $^
-endif
--- a/tools/dbsessmgr/Makefile.in
+++ b/tools/dbsessmgr/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -311,11 +311,11 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 MCSFLAGS = -debug+ -debug:full -nologo
-@NET_4_0_TRUE@scripts4 = dbsessmgr4.exe
-@NET_4_0_TRUE@data4 = dbsessmgr4.exe.config
-@NET_4_0_TRUE@dbsessmgr4dir = $(prefix)/lib/xsp/4.0
-@NET_4_0_TRUE@dbsessmgr4_SCRIPTS = $(scripts4)
-@NET_4_0_TRUE@dbsessmgr4_DATA = $(data4)
+scripts4 = dbsessmgr4.exe
+data4 = dbsessmgr4.exe.config
+dbsessmgr4dir = $(prefix)/lib/xsp/4.0
+dbsessmgr4_SCRIPTS = $(scripts4)
+dbsessmgr4_DATA = $(data4)
 EXTRA_DIST = $(dbsessmgr_input) dbsessmgr4.exe.config
 CLEANFILES = *.exe *.mdb
 dbsessmgr_input = AssemblyInfo.cs.in \
@ -578,8 +578,8 @@ uninstall-am: uninstall-dbsessmgr4DATA uninstall-dbsessmgr4SCRIPTS
 .PRECIOUS: Makefile


-@NET_4_0_TRUE@dbsessmgr4.exe: $(dbsessmgr_sources)
-@NET_4_0_TRUE@	$(DMCS) $(MCSFLAGS) -r:System.Data.dll -r:System.Configuration.dll -out:$@ $^
+dbsessmgr4.exe: $(dbsessmgr_sources)
+	$(DMCS) $(MCSFLAGS) -r:System.Data.dll -r:System.Configuration.dll -out:$@ $^

 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/tools/mono-asp-apps/Makefile.in
+++ b/tools/mono-asp-apps/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/unittests/Makefile.in
+++ b/unittests/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/unittests/Tests.XSP.Security/Makefile.in
+++ b/unittests/Tests.XSP.Security/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/unittests/webroot/Makefile.in
+++ b/unittests/webroot/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,