--- lasso-2.3.5.orig/config.guess
+++ lasso-2.3.5/config.guess
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011 Free Software Foundation, Inc.
 
-timestamp='2009-04-27'
+timestamp='2011-05-11'
 
 # 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
@@ -27,16 +27,16 @@
 # the same distribution terms that you use for the rest of that program.
 
 
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
 # exits with 0.  Otherwise, it exits with 1.
 #
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# 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
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -56,8 +56,9 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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."
@@ -170,7 +171,7 @@
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
+			| grep -q __ELF__
 		then
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 		    # Return netbsd for either.  FIX?
@@ -180,7 +181,7 @@
 		fi
 		;;
 	    *)
-	        os=netbsd
+		os=netbsd
 		;;
 	esac
 	# The OS release
@@ -223,7 +224,7 @@
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -269,7 +270,10 @@
 	# 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'`
-	exit ;;
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -295,7 +299,7 @@
 	echo s390-ibm-zvmoe
 	exit ;;
     *:OS400:*:*)
-        echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
@@ -333,6 +337,9 @@
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
 	SUN_ARCH="i386"
@@ -391,23 +398,23 @@
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+	exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@@ -477,8 +484,8 @@
 	echo m88k-motorola-sysv3
 	exit ;;
     AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 	then
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -491,7 +498,7 @@
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit ;;
+	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit ;;
@@ -548,7 +555,7 @@
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[456])
+    *:AIX:*:[4567])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -591,52 +598,52 @@
 	    9000/[678][0-9][0-9])
 		if [ -x /usr/bin/getconf ]; then
 		    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
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
+		    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
+		      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
-                        esac ;;
-                    esac
+			esac ;;
+		    esac
 		fi
 		if [ "${HP_ARCH}" = "" ]; then
 		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
+		    sed 's/^		//' << EOF >$dummy.c
+
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
+
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
 
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
 EOF
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -656,7 +663,7 @@
 	    # => hppa64-hp-hpux11.23
 
 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
+		grep -q __LP64__
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -727,22 +734,22 @@
 	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit ;;
+	exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit ;;
+	exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit ;;
+	exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit ;;
+	exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit ;;
+	exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
@@ -766,14 +773,14 @@
 	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_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
+	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/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	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:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -801,18 +808,18 @@
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
     i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
 	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    *:Interix*:[3456]*)
-    	case ${UNAME_MACHINE} in
+    *:Interix*:*)
+	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
-	    EM64T | authenticamd | genuineintel)
+	    authenticamd | genuineintel | EM64T)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
@@ -822,6 +829,9 @@
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -851,6 +861,20 @@
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+	esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -858,7 +882,13 @@
 	then
 	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 	else
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
@@ -871,7 +901,18 @@
 	echo crisv32-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
+	echo frv-unknown-linux-gnu
+	exit ;;
+    i*86:Linux:*:*)
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -882,78 +923,34 @@
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    mips64:Linux:*:*)
+    mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#undef CPU
-	#undef mips64
-	#undef mips64el
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
+	CPU=${UNAME_MACHINE}el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
+	CPU=${UNAME_MACHINE}
 	#else
 	CPU=
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
 	echo or32-unknown-linux-gnu
 	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
     padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
 	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -962,14 +959,17 @@
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -977,6 +977,9 @@
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-tilera-linux-gnu
+	exit ;;
     vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
@@ -984,68 +987,8 @@
 	echo x86_64-unknown-linux-gnu
 	exit ;;
     xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^LIBC/{
-		s: ::g
-		p
-	    }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
@@ -1053,11 +996,11 @@
 	echo i386-sequent-sysv4
 	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
 	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
+	# Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit ;;
     i*86:OS/2:*:*)
@@ -1074,7 +1017,7 @@
     i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
 	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     i*86:*DOS:*:*)
@@ -1089,7 +1032,7 @@
 	fi
 	exit ;;
     i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
@@ -1117,13 +1060,13 @@
 	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i586.
+	# 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
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
-        exit ;;
+	exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit ;;
@@ -1158,8 +1101,8 @@
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 	OS_REL='.3'
 	test -r /etc/.relid \
@@ -1182,7 +1125,7 @@
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     SM[BE]S:UNIX_SV:*:*)
@@ -1202,10 +1145,10 @@
 		echo ns32k-sni-sysv
 	fi
 	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
@@ -1231,11 +1174,11 @@
 	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
+		echo mips-nec-sysv${UNAME_RELEASE}
 	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
+		echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit ;;
+	exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit ;;
@@ -1275,6 +1218,16 @@
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
+	    i386)
+		eval $set_cc_for_build
+		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) | \
+		      grep IS_64BIT_ARCH >/dev/null
+		  then
+		      UNAME_PROCESSOR="x86_64"
+		  fi
+		fi ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1290,6 +1243,9 @@
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
     NSE-?:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
@@ -1335,13 +1291,13 @@
 	echo pdp10-unknown-its
 	exit ;;
     SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
+	echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
 	    A*) echo alpha-dec-vms ; exit ;;
 	    I*) echo ia64-dec-vms ; exit ;;
@@ -1381,11 +1337,11 @@
 #include <sys/param.h>
   printf ("m68k-sony-newsos%s\n",
 #ifdef NEWSOS4
-          "4"
+	"4"
 #else
-	  ""
+	""
 #endif
-         ); exit (0);
+	); exit (0);
 #endif
 #endif
 
--- lasso-2.3.5.orig/config.sub
+++ lasso-2.3.5/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011 Free Software Foundation, Inc.
 
-timestamp='2009-04-17'
+timestamp='2011-03-23'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -32,13 +32,16 @@
 
 
 # Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# diff and a properly formatted GNU ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # 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
+
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@@ -72,8 +75,9 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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."
@@ -120,8 +124,9 @@
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
@@ -149,10 +154,13 @@
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
+	-apple | -axis | -knuth | -cray | -microblaze)
 		os=
 		basic_machine=$1
 		;;
+	-bluegene*)
+		os=-cnk
+		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
@@ -167,10 +175,10 @@
 		os=-chorusos
 		basic_machine=$1
 		;;
- 	-chorusrdb)
- 		os=-chorusrdb
+	-chorusrdb)
+		os=-chorusrdb
 		basic_machine=$1
- 		;;
+		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -275,26 +283,39 @@
 	| moxie \
 	| mt \
 	| msp430 \
+	| nds32 | nds32le | nds32be \
 	| nios | nios2 \
 	| ns16k | ns32k \
+	| open8 \
 	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
+	| rx \
 	| score \
 	| 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 \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| ubicom32 \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
 		os=-none
@@ -305,6 +326,18 @@
 		basic_machine=mt-unknown
 		;;
 
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
@@ -325,7 +358,7 @@
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
 	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
@@ -337,7 +370,7 @@
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -359,24 +392,28 @@
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
 	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
-	| romp-* | rs6000-* \
+	| 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-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile-* | tilegx-* \
 	| tron-* \
+	| ubicom32-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
 	| ymp-* \
 	| z8k-* | z80-*)
@@ -401,7 +438,7 @@
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-    	abacus)
+	abacus)
 		basic_machine=abacus-unknown
 		;;
 	adobe68k)
@@ -467,11 +504,24 @@
 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
-        cegcc)
+	cegcc)
 		basic_machine=arm-unknown
 		os=-cegcc
 		;;
@@ -503,7 +553,7 @@
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16)
+	cr16 | cr16-*)
 		basic_machine=cr16-unknown
 		os=-elf
 		;;
@@ -719,6 +769,9 @@
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
+	microblaze)
+		basic_machine=microblaze-xilinx
+		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
@@ -823,6 +876,12 @@
 	np1)
 		basic_machine=np1-gould
 		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -905,9 +964,10 @@
 		;;
 	power)	basic_machine=power-ibm
 		;;
-	ppc)	basic_machine=powerpc-unknown
+	ppc | ppcbe)	basic_machine=powerpc-unknown
 		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
@@ -1001,6 +1061,9 @@
 		basic_machine=i860-stratus
 		os=-sysv4
 		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	sun2)
 		basic_machine=m68000-sun
 		;;
@@ -1057,17 +1120,10 @@
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
+	# This must be matched before tile*.
+	tilegx*)
+		basic_machine=tilegx-unknown
+		os=-linux-gnu
 		;;
 	tile*)
 		basic_machine=tile-unknown
@@ -1140,6 +1196,9 @@
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
 	ymp)
 		basic_machine=ymp-cray
 		os=-unicos
@@ -1237,9 +1296,12 @@
 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
+		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
@@ -1260,9 +1322,9 @@
 	# 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* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -kopensolaris* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1275,7 +1337,8 @@
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -mingw32* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1283,7 +1346,7 @@
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1322,7 +1385,7 @@
 	-opened*)
 		os=-openedition
 		;;
-        -os400*)
+	-os400*)
 		os=-os400
 		;;
 	-wince*)
@@ -1371,7 +1434,7 @@
 	-sinix*)
 		os=-sysv4
 		;;
-        -tpf*)
+	-tpf*)
 		os=-tpf
 		;;
 	-triton*)
@@ -1416,6 +1479,8 @@
 	-dicos*)
 		os=-dicos
 		;;
+	-nacl*)
+		;;
 	-none)
 		;;
 	*)
@@ -1438,10 +1503,10 @@
 # system, and we'll never get to this point.
 
 case $basic_machine in
-        score-*)
+	score-*)
 		os=-elf
 		;;
-        spu-*)
+	spu-*)
 		os=-elf
 		;;
 	*-acorn)
@@ -1453,8 +1518,17 @@
 	arm*-semi)
 		os=-aout
 		;;
-        c4x-* | tic4x-*)
-        	os=-coff
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
@@ -1481,7 +1555,7 @@
 	m68*-cisco)
 		os=-aout
 		;;
-        mep-*)
+	mep-*)
 		os=-elf
 		;;
 	mips*-cisco)
@@ -1508,7 +1582,7 @@
 	*-ibm)
 		os=-aix
 		;;
-    	*-knuth)
+	*-knuth)
 		os=-mmixware
 		;;
 	*-wec)
@@ -1613,7 +1687,7 @@
 			-sunos*)
 				vendor=sun
 				;;
-			-aix*)
+			-cnk*|-aix*)
 				vendor=ibm
 				;;
 			-beos*)
--- lasso-2.3.5.orig/debian/changelog
+++ lasso-2.3.5/debian/changelog
@@ -0,0 +1,338 @@
+lasso (2.3.5-4build1) precise; urgency=low
+
+  * Rebuild for Perl 5.14.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 15 Nov 2011 13:28:49 +0000
+
+lasso (2.3.5-4) unstable; urgency=low
+
+  * Don't force gcc 4.4 anymore; /facepalm. (closes: #635640)
+
+ -- Frederic Peters <fpeters@debian.org>  Thu, 28 Jul 2011 08:16:14 +0200
+
+lasso (2.3.5-3) unstable; urgency=low
+
+  * debian/control.in, debian/rules: disable liblasso-java on all
+    architectures, at the moment it is too complicated to have reliable builds
+    with java activated. (closes: #624777)
+  * build against a newer perl version. (closes: #635446)
+
+ -- Frederic Peters <fpeters@debian.org>  Tue, 26 Jul 2011 22:36:27 +0200
+
+lasso (2.3.5-2) unstable; urgency=low
+
+  * debian/liblasso-perl.install: fixed module name (uppercase L).
+    (closes: #622114)
+  * debian/liblasso3-dev.install: do not install libtool archive file.
+    (closes: #620909, #621560)
+  * debian/control.in: add build-dependency on gcc-4.4, to match the gcj
+    version that is used.
+  * debian/rules:
+    + force gcc 4.4, because of gcj 4.4.
+    + remove rpath from Lasso.so Perl module.
+    + remove obsolete call to dh_python.
+
+ -- Frederic Peters <fpeters@debian.org>  Mon, 11 Apr 2011 09:35:48 +0200
+
+lasso (2.3.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Frederic Peters <fpeters@debian.org>  Tue, 08 Feb 2011 09:58:03 +0100
+
+lasso (2.2.1-4) unstable; urgency=low
+
+  * debian/control, debian/rules: updated build-depends for recent gcj
+    changes, and to use the default gcc version. (Closes: #566895)
+
+ -- Frederic Peters <fpeters@debian.org>  Mon, 25 Jan 2010 22:34:55 +0100
+
+lasso (2.2.1-3) unstable; urgency=low
+
+  * debian/control, debian/rules: add missing dependency on phpapi-$foo.
+    (Closes: #566288)
+
+ -- Frederic Peters <fpeters@debian.org>  Sun, 24 Jan 2010 16:25:18 +0100
+
+lasso (2.2.1-2) unstable; urgency=high
+
+  * Correctly check for signature validity (CVE-2009-0050) (Closes: #511262)
+
+ -- Frederic Peters <fpeters@debian.org>  Fri, 09 Jan 2009 10:30:58 +0100
+
+lasso (2.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Frederic Peters <fpeters@debian.org>  Tue, 22 Jul 2008 15:51:52 +0200
+
+lasso (2.2.0-1) unstable; urgency=low
+
+  * New upstream release.
+    * Acknowledge NMU.
+    * Fixed missing quotes in configure.in (Closes: #487816)
+  * debian/control:
+    * Updated package descriptions,
+    * Used new Homepage field.
+    * Moved liblasso-perl to perl section.
+  * debian/rules:
+    * remove config.log on clean.
+    * remove empty id-wsf include directory.
+
+ -- Frederic Peters <fpeters@debian.org>  Sun, 13 Jul 2008 12:06:12 +0200
+
+lasso (2.1.98-4.1) unstable; urgency=high
+
+  * NMU.
+  * Don't build-depend on gcj and gcj-4.3 on alpha, arm, hppa (same as for
+    java-gcj-compat). Closes: #477870.
+  * Adjust list of architectures for liblasso-java. Closes: #479737.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 25 May 2008 11:28:09 +0200
+
+lasso (2.1.98-4) unstable; urgency=low
+
+  * debian/rules: create control from control.in, so liblasso-java is not
+    built on architectures lacking gcj.
+
+ -- Frederic Peters <fpeters@debian.org>  Sun, 04 May 2008 12:17:10 +0200
+
+lasso (2.1.98-3) unstable; urgency=low
+
+  * debian/liblasso-perl.install: really fix building with Perl 5.10.
+
+ -- Frederic Peters <fpeters@debian.org>  Sat, 03 May 2008 12:30:41 +0200
+
+lasso (2.1.98-2) unstable; urgency=low
+
+  * debian/liblasso-perl.install: use wildcard for minor version number; so it
+    still works with Perl 5.10.  (closes: #479065)
+
+ -- Frederic Peters <fpeters@debian.org>  Fri, 02 May 2008 16:30:09 +0200
+
+lasso (2.1.98-1) unstable; urgency=low
+
+  * New upstream release (RC).
+  * debian/control:
+    * build new php5-lasso package.
+    * limit liblasso-java to architecture with gcj (closes: #477870).
+    * add Homepage field.
+    * liblasso3-dev: Replace ${Source-Version} with ${binary:Version}
+      (from Ubuntu patch)
+  * debian/rules:
+    * ignore liblasso-java package on architectures without gcj.
+    * update to match new upstream language bindings layout.
+    * don't ignore a make clean error.  (from Ubuntu patch)
+
+ -- Frederic Peters <fpeters@debian.org>  Tue, 29 Apr 2008 22:03:51 +0200
+
+lasso (2.1.1-3) unstable; urgency=low
+
+  * debian/rules: added call to dh_perl; debian/control: added ${perl:Depends}
+    (closes: #463097)
+  * configure(.ac): fixed gcj check to work with gcj-4.3; debian/control:
+    updated build-deps for gcj 4.3 and added gcc-4.3; debian/rules: force
+    gcc-4.3 so jni.h is found and the java interface is built.
+    (closes: #464319)
+
+ -- Frederic Peters <fpeters@debian.org>  Tue, 25 Mar 2008 16:48:15 +0100
+
+lasso (2.1.1-2) unstable; urgency=low
+
+  * debian/rules, debian/*.files: updated from dh_movefiles to dh_install
+    * really install files in liblasso-perl package (closes: #446578)
+
+ -- Frederic Peters <fpeters@debian.org>  Mon, 15 Oct 2007 17:12:37 +0200
+
+lasso (2.1.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control: added liblasso-perl, Perl bindings for the library.
+  * debian/rules: --enable-perl
+
+ -- Frederic Peters <fpeters@debian.org>  Wed, 22 Aug 2007 18:08:12 +0200
+
+lasso (2.0.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control: removes php4-lasso since PHP4 is no longer provided.
+    (closes: #432422, #418268)
+
+ -- Frederic Peters <fpeters@debian.org>  Mon, 09 Jul 2007 22:55:58 +0200
+
+lasso (0.6.5-3) unstable; urgency=low
+
+  * Converted to new Python policy (merged from unreported Ubuntu patch)
+    * debian/control: keep conflict on python2.4-lasso which is unnecessary
+      for Debian but will reduce Ubuntu changes.
+
+ -- Frederic Peters <fpeters@debian.org>  Sat, 21 Oct 2006 17:31:47 +0200
+
+lasso (0.6.5-2) unstable; urgency=low
+
+  * debian/control: adding libgcj-dev and fastjar to build-depends since
+    liblasso-java is now built.
+
+ -- Frederic Peters <fpeters@debian.org>  Wed, 22 Mar 2006 11:06:56 +0100
+
+lasso (0.6.5-1) unstable; urgency=low
+
+  * New upstream release.
+    * Incorporates Ubuntu patch for phpapi version.
+
+ -- Frederic Peters <fpeters@debian.org>  Tue, 21 Mar 2006 10:48:05 +0100
+
+lasso (0.6.4-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Frederic Peters <fpeters@debian.org>  Mon, 13 Mar 2006 11:38:09 +0100
+
+lasso (0.6.3-4) unstable; urgency=low
+
+  * debian/control: removed mono packages from build-depends since the -cil
+    package is no longer built.
+
+ -- Frederic Peters <fpeters@debian.org>  Thu,  6 Oct 2005 14:18:56 +0200
+
+lasso (0.6.3-3) unstable; urgency=low
+
+  * debian/control: fixed php depends line. (closes: #331710)
+
+ -- Frederic Peters <fpeters@debian.org>  Tue,  4 Oct 2005 22:59:17 +0200
+
+lasso (0.6.3-2) unstable; urgency=low
+
+  * php/Makefile.am: don't patch autogenerated swig file if swig was not
+    present (which implies the file has already been patched)
+  * debian/rules: touch swig generated files after configure so swig is
+    not called; even if available. (closes: #331699)
+
+ -- Frederic Peters <fpeters@debian.org>  Tue,  4 Oct 2005 21:52:25 +0200
+
+lasso (0.6.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/copyright: new FSF address.
+
+ -- Frederic Peters <fpeters@debian.org>  Fri, 30 Sep 2005 01:07:49 +0200
+
+lasso (0.6.2-3) unstable; urgency=low
+
+  * debian/control: removed liblasso-cil package since the .net assembly
+    doesn't work (and don't even compile anymore) (closes: #320898)
+
+ -- Frederic Peters <fpeters@debian.org>  Fri, 19 Aug 2005 23:08:43 +0200
+
+lasso (0.6.2-2) unstable; urgency=low
+
+  * debian/rules: removed call to dh_makenetshlibs which is no longer shipped
+    with Mono 1.1 packages. (closes: #311837)
+  * debian/control, debian/rules: updated to new CLI policy. 
+
+ -- Frederic Peters <fpeters@debian.org>  Fri,  3 Jun 2005 20:15:12 +0200
+
+lasso (0.6.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Frederic Peters <fpeters@debian.org>  Thu, 26 May 2005 11:56:42 +0200
+
+lasso (0.6.1-3) unstable; urgency=low
+
+  * debian/control: fixed Depends line, this is no longer -zts.
+  * debian/control: updated Build-depends to php4-dev (>= 4:4.3.10-10)
+    (closes: #301330)
+
+ -- Frederic Peters <fpeters@debian.org>  Fri, 25 Mar 2005 10:15:22 +0100
+
+lasso (0.6.1-2) unstable; urgency=low
+
+  * Rebuilt with PHP Zend Thread Safety disabled.
+  * lasso/xml/lib_authn_request.c, lasso/id-ff/login.c: backported
+    AssertionConsumerServiceID fix from CVS.
+  * python/lasso_wrap.c, python/lasso.py: regenerated with SWIG 1.3.22;
+    1.3.24 created a buggy binding.
+  * debian/control: Build-depends on mono-utils (>= 1.0)
+
+ -- Frederic Peters <fpeters@debian.org>  Fri, 25 Mar 2005 08:50:39 +0100
+
+lasso (0.6.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * lasso/id-ff/login.c: backported SAML 1.0 compatibility fix from CVS.
+
+ -- Frederic Peters <fpeters@debian.org>  Sun,  6 Mar 2005 14:07:45 +0100
+
+lasso (0.6.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Rebuilt with new PHP API. (closes: #294003)
+
+ -- Frederic Peters <fpeters@debian.org>  Tue,  8 Feb 2005 13:42:24 +0100
+
+lasso (0.4.1-3) unstable; urgency=low
+
+  * debian/control: added libexpat1-dev to build-depends; it is required for
+    the PHP binding.
+
+ -- Frederic Peters <fpeters@debian.org>  Mon, 13 Sep 2004 09:26:34 +0200
+
+lasso (0.4.1-2) unstable; urgency=low
+
+  * debian/control: added python to build-depends
+
+ -- Frederic Peters <fpeters@debian.org>  Sun, 12 Sep 2004 21:40:57 +0200
+
+lasso (0.4.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Frederic Peters <fpeters@debian.org>  Wed,  8 Sep 2004 10:40:56 +0200
+
+lasso (0.4.0-1) unstable; urgency=low
+
+  * New upstream release.
+    * changed soname, liblasso0 -> liblasso1
+  * Packaging of PHP4 binding and .NET assemblies.
+
+ -- Frederic Peters <fpeters@debian.org>  Mon,  6 Sep 2004 19:18:38 +0200
+
+lasso (0.3.0-6) unstable; urgency=low
+
+  * debian/control: improved package description (closes: #266556)
+  * python/: backported fix to use libtool correctly; should fix the build
+    failures on hppa and amd64 (closes: #267556, #268198)
+
+ -- Frederic Peters <fpeters@debian.org>  Thu, 26 Aug 2004 17:01:13 +0200
+
+lasso (0.3.0-4) unstable; urgency=low
+
+  * debian/copyright: fixed address of the FSF; add a pointer to
+    /usr/share/common-licenses/GPL.
+  * debian/control: lasso source package goes in section libs and liblasso-dev
+    goes in section libdevel
+  * debian/control: -dev package renamed to liblasso0-dev; provides
+    liblasso-dev (per Debian Library Packaging guide)
+
+ -- Frederic Peters <fpeters@debian.org>  Sun,  8 Aug 2004 10:55:39 +0200
+
+lasso (0.3.0-3) unstable; urgency=low
+
+  * fixed lasso.pc
+
+ -- Frederic Peters <fpeters@debian.org>  Thu, 29 Jul 2004 23:24:57 +0200
+
+lasso (0.3.0-2) unstable; urgency=low
+
+  * debian/liblasso0-python2.3.files: don't include static library in Python
+    package. [brown bag]
+
+ -- Frederic Peters <fpeters@debian.org>  Tue, 27 Jul 2004 17:23:07 +0200
+
+lasso (0.3.0-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Frederic Peters <fpeters@debian.org>  Tue, 27 Jul 2004 16:50:43 +0200
+
--- lasso-2.3.5.orig/debian/liblasso3.dirs
+++ lasso-2.3.5/debian/liblasso3.dirs
@@ -0,0 +1 @@
+usr/lib
--- lasso-2.3.5.orig/debian/rules
+++ lasso-2.3.5/debian/rules
@@ -0,0 +1,169 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+DEB_TARGET_ARCH     := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+with_java := no
+no_java_archs := alpha arm hppa hurd-i386
+ifneq ($(DEB_TARGET_ARCH),i386)
+ ifneq ($(DEB_TARGET_ARCH),amd64)
+  ifeq ($(DEB_TARGET_ARCH), $(findstring $(DEB_TARGET_ARCH),$(no_java_archs)))
+   with_java := disabled for architecture $(DEB_TARGET_ARCH)
+  endif
+ endif
+endif
+
+PYDEF		:= $(shell pyversions -vd)
+PYVERS		:= $(shell pyversions -vr debian/control)
+OTHERPYVERS	:= $(filter-out $(PYDEF), $(PYVERS))
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+version=`ls src/.libs/lib*.so.* | \
+ awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
+major=`ls src/.libs/lib*.so.* | \
+ awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
+
+CONFIGURE_ARGS := \
+	--prefix=/usr \
+	--mandir=\$${prefix}/share/man \
+	--infodir=\$${prefix}/share/info \
+	--enable-tests=no \
+	--disable-gtk-doc \
+	--enable-perl \
+	--disable-csharp \
+	--disable-php4 \
+	--with-php5-config-dir=/etc/php5/conf.d/
+
+
+ifeq ($(with_java),yes)
+  CONFIGURE_ARGS += --enable-java
+else
+  CONFIGURE_ARGS += --disable-java
+endif
+
+
+config.status: configure
+	dh_testdir
+	# Add here commands to configure the package.
+	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(CONFIGURE_ARGS)
+
+
+build: build-stamp
+build-stamp:  config.status
+	dh_testdir
+
+	# Add here commands to compile the package.
+	$(MAKE)
+	set -e; \
+	for v in $(OTHERPYVERS); do \
+	  rm -rf bindings/python$$v; \
+	  cp -a bindings/python bindings/python$$v; \
+	  sed "s/$(PYDEF)/$$v/g" bindings/python/Makefile > bindings/python$$v/Makefile; \
+	  $(MAKE) -C bindings/python$$v clean; \
+	  $(MAKE) -C bindings/python$$v; \
+	done
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp 
+
+ifeq ($(with_java),yes)
+	sed -e 's/^#JAVA#//' < debian/control.in > debian/control
+else
+	sed -e 's/^#JAVA#.*//' < debian/control.in > debian/control
+endif
+
+
+	[ ! -f Makefile ] || $(MAKE) distclean
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess config.guess
+endif
+
+	for v in $(OTHERPYVERS); do \
+	  rm -rf bindings/python$$v; \
+	done
+
+	rm -f config.log
+
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+
+	# Add here commands to install the package into debian/tmp
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp \
+		GACUTIL="/usr/bin/gacutil -root $(CURDIR)/debian/tmp/usr/lib"
+	set -e; \
+	for v in $(OTHERPYVERS); do \
+	  $(MAKE) -C bindings/python$$v install DESTDIR=$(CURDIR)/debian/tmp; \
+	done
+
+	mkdir $(CURDIR)/debian/tmp/usr/lib/jni/
+	if [ -e $(CURDIR)/debian/tmp/usr/lib/java ]; then \
+	  mv $(CURDIR)/debian/tmp/usr/lib/java/*.so $(CURDIR)/debian/tmp/usr/lib/jni/ ; \
+	fi
+
+	# remove id-wsf directory if it is empty
+	-rmdir $(CURDIR)/debian/tmp/usr/include/lasso/id-wsf/
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+	#dh_makeclilibs -L liblasso-cil -r
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+	dh_installdocs
+	dh_installexamples -XCVS
+	dh_installman
+	dh_install
+	chrpath -d $(CURDIR)/debian/liblasso-perl/usr/lib/perl5/auto/Lasso/Lasso.so
+	dh_link
+	dh_strip
+	dh_perl
+	dh_pycentral -ppython-lasso
+	dh_compress
+	dh_fixperms
+	dh_makeshlibs -a -V
+	dh_installdeb
+	dh_shlibdeps -a
+	echo "php:Depends=phpapi-`php-config5 --phpapi`" >> $(CURDIR)/debian/php5-lasso.substvars
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install 
--- lasso-2.3.5.orig/debian/pycompat
+++ lasso-2.3.5/debian/pycompat
@@ -0,0 +1 @@
+2
--- lasso-2.3.5.orig/debian/liblasso-java.install
+++ lasso-2.3.5/debian/liblasso-java.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/jni/*.so
+debian/tmp/usr/share/java/*.jar
--- lasso-2.3.5.orig/debian/compat
+++ lasso-2.3.5/debian/compat
@@ -0,0 +1 @@
+5
--- lasso-2.3.5.orig/debian/liblasso3-dev.install
+++ lasso-2.3.5/debian/liblasso3-dev.install
@@ -0,0 +1,4 @@
+debian/tmp/usr/include/lasso
+debian/tmp/usr/lib/liblasso.a
+debian/tmp/usr/lib/liblasso.so
+debian/tmp/usr/lib/pkgconfig/lasso.pc
--- lasso-2.3.5.orig/debian/liblasso3.install
+++ lasso-2.3.5/debian/liblasso3.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/lib*.so.*
--- lasso-2.3.5.orig/debian/control
+++ lasso-2.3.5/debian/control
@@ -0,0 +1,85 @@
+Source: lasso
+Priority: optional
+Section: libs
+Maintainer: Frederic Peters <fpeters@debian.org>
+Build-Depends: debhelper (>= 5.0.37.2), libxml2-dev, libxslt1-dev, libxmlsec1-dev, libxmlsec1-openssl, libglib2.0-dev, python-all-dev (>= 2.3.5-11), libexpat1-dev, fastjar, python-central (>= 0.5), php5-dev, python-lxml, chrpath
+XS-Python-Version: all
+Standards-Version: 3.8.0
+Homepage: http://lasso.entrouvert.org
+
+Package: liblasso3-dev
+Section: libdevel
+Architecture: any
+Depends: liblasso3 (= ${binary:Version}), libxml2-dev, libxmlsec1-dev, libglib2.0-dev
+Provides: liblasso-dev
+Conflicts: liblasso-dev, liblasso0, liblasso1
+Description: Library for Liberty Alliance and SAML protocols - development kit
+ Lasso is an implementation of Liberty Alliance and related protocols, for
+ network identity federations, single sign-on and other web services protocols.
+ The main specifications implemented by the library are ID-FF, ID-WSF and SAML.
+ .
+ This package contains the development files for Lasso.
+ 
+Package: liblasso3
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Library for Liberty Alliance and SAML protocols - runtime library
+ Lasso is an implementation of Liberty Alliance and related protocols, for
+ network identity federations, single sign-on and other web services protocols.
+ The main specifications implemented by the library are ID-FF, ID-WSF and SAML.
+ .
+ This package contains liblasso library used by applications to gain Library
+ Alliance support.
+
+Package: python-lasso
+Conflicts: liblasso0-python2.3, python2.3-lasso, python2.4-lasso
+Replaces: liblasso0-python2.3, python2.3-lasso, python2.4-lasso
+Provides: liblasso0-python2.3, ${python:Provides}
+Section: python
+Architecture: any
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:depends}
+XB-Python-Version: ${python:Versions}
+Description: Library for Liberty Alliance and SAML protocols - Python bindings
+ Lasso is an implementation of Liberty Alliance and related protocols, for
+ network identity federations, single sign-on and other web services protocols.
+ The main specifications implemented by the library are ID-FF, ID-WSF and SAML.
+ .
+ This package contains Python bindings for liblasso, needed to use lasso
+ in Python applications.
+
+
+
+
+
+
+
+
+
+
+
+
+
+Package: liblasso-perl
+Section: perl
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:depends}, ${perl:Depends}
+Description: Library for Liberty Alliance and SAML protocols - Perl bindings
+ Lasso is an implementation of Liberty Alliance and related protocols, for
+ network identity federations, single sign-on and other web services protocols.
+ The main specifications implemented by the library are ID-FF, ID-WSF and SAML.
+ .
+ This package contains Perl bindings for liblasso, needed to use lasso
+ in Perl applications.
+
+Package: php5-lasso
+Section: web
+Architecture: any
+Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:depends}
+Description: Library for Liberty Alliance and SAML protocols - PHP 5 bindings
+ Lasso is an implementation of Liberty Alliance and related protocols, for
+ network identity federations, single sign-on and other web services protocols.
+ The main specifications implemented by the library are ID-FF, ID-WSF and SAML.
+ .
+ This package contains PHP bindings for liblasso, needed to use lasso
+ in PHP applications.
--- lasso-2.3.5.orig/debian/liblasso3-dev.dirs
+++ lasso-2.3.5/debian/liblasso3-dev.dirs
@@ -0,0 +1,2 @@
+usr/lib
+usr/include
--- lasso-2.3.5.orig/debian/dirs
+++ lasso-2.3.5/debian/dirs
@@ -0,0 +1,2 @@
+usr/bin
+usr/sbin
--- lasso-2.3.5.orig/debian/liblasso-java.dirs
+++ lasso-2.3.5/debian/liblasso-java.dirs
@@ -0,0 +1 @@
+usr/lib/jni/
--- lasso-2.3.5.orig/debian/copyright
+++ lasso-2.3.5/debian/copyright
@@ -0,0 +1,44 @@
+This package was debianized by Frederic Peters <fpeters@debian.org> on
+Fri, 16 Jul 2004 14:50:19 +0200.
+
+It was downloaded from http://lasso.entrouvert.org
+
+Upstream Authors:
+
+  Nicolas Clapies <nclapies@entrouvert.com>
+  Valery Febvre   <vfebvre@easter-eggs.com>
+  (complete list in AUTHORS)
+
+
+Copyright (c) 2004 Entr'ouvert
+Excepted the Lasso logo, copyright (c) 2004, Entr'ouvert & Florent Monnier
+
+License is GNU GPL v2 or later plus OpenSSL exception clause.
+
+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 the Free
+Software Foundation; either version 2 of the License, or (at your option)
+any later version.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin St, Fifth Floor, Boston, MA  02110-1301,  USA.
+
+In addition, as a special exception, Entr'ouvert gives permission to link
+the code of its release of Lasso with the OpenSSL project's "OpenSSL"
+library (or with modified versions of it that use the same license as the
+"OpenSSL" library), and distribute the linked executables.  You must obey
+the GNU General Public License in all respects for all of the code used
+other than "OpenSSL".  If you modify this file, you may extend this
+exception to your version of the file, but you are not obligated to do so.
+If you do not wish to do so, delete this exception statement from your
+version.
+
+On Debian GNU/Linux systems, the complete text of the GNU General Public
+License can be found in `/usr/share/common-licenses/GPL'.
+
--- lasso-2.3.5.orig/debian/python-lasso.install
+++ lasso-2.3.5/debian/python-lasso.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/python*/site-packages/*.py
+debian/tmp/usr/lib/python*/site-packages/*.so
--- lasso-2.3.5.orig/debian/control.in
+++ lasso-2.3.5/debian/control.in
@@ -0,0 +1,85 @@
+Source: lasso
+Priority: optional
+Section: libs
+Maintainer: Frederic Peters <fpeters@debian.org>
+Build-Depends: debhelper (>= 5.0.37.2), libxml2-dev, libxslt1-dev, libxmlsec1-dev, libxmlsec1-openssl, libglib2.0-dev, python-all-dev (>= 2.3.5-11), libexpat1-dev, fastjar, python-central (>= 0.5), php5-dev, python-lxml, chrpath
+XS-Python-Version: all
+Standards-Version: 3.8.0
+Homepage: http://lasso.entrouvert.org
+
+Package: liblasso3-dev
+Section: libdevel
+Architecture: any
+Depends: liblasso3 (= ${binary:Version}), libxml2-dev, libxmlsec1-dev, libglib2.0-dev
+Provides: liblasso-dev
+Conflicts: liblasso-dev, liblasso0, liblasso1
+Description: Library for Liberty Alliance and SAML protocols - development kit
+ Lasso is an implementation of Liberty Alliance and related protocols, for
+ network identity federations, single sign-on and other web services protocols.
+ The main specifications implemented by the library are ID-FF, ID-WSF and SAML.
+ .
+ This package contains the development files for Lasso.
+ 
+Package: liblasso3
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Library for Liberty Alliance and SAML protocols - runtime library
+ Lasso is an implementation of Liberty Alliance and related protocols, for
+ network identity federations, single sign-on and other web services protocols.
+ The main specifications implemented by the library are ID-FF, ID-WSF and SAML.
+ .
+ This package contains liblasso library used by applications to gain Library
+ Alliance support.
+
+Package: python-lasso
+Conflicts: liblasso0-python2.3, python2.3-lasso, python2.4-lasso
+Replaces: liblasso0-python2.3, python2.3-lasso, python2.4-lasso
+Provides: liblasso0-python2.3, ${python:Provides}
+Section: python
+Architecture: any
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:depends}
+XB-Python-Version: ${python:Versions}
+Description: Library for Liberty Alliance and SAML protocols - Python bindings
+ Lasso is an implementation of Liberty Alliance and related protocols, for
+ network identity federations, single sign-on and other web services protocols.
+ The main specifications implemented by the library are ID-FF, ID-WSF and SAML.
+ .
+ This package contains Python bindings for liblasso, needed to use lasso
+ in Python applications.
+
+#JAVA#Package: liblasso-java
+#JAVA#Section: libs
+#JAVA#Architecture: amd64 armel i386 ia64 mips mipsel powerpc ppc64 s390 sparc kfreebsd-i386 kfreebsd-amd64
+#JAVA#Depends: ${shlibs:Depends}, ${misc:depends}
+#JAVA#Description: Library for Liberty Alliance and SAML protocols - Java bindings
+#JAVA# Lasso is an implementation of Liberty Alliance and related protocols, for
+#JAVA# network identity federations, single sign-on and other web services protocols.
+#JAVA# The main specifications implemented by the library are ID-FF, ID-WSF and SAML.
+#JAVA# .
+#JAVA# This package provides the Java interface to liblasso, needed to use lasso in
+#JAVA# Java applications.
+
+Package: liblasso-perl
+Section: perl
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:depends}, ${perl:Depends}
+Description: Library for Liberty Alliance and SAML protocols - Perl bindings
+ Lasso is an implementation of Liberty Alliance and related protocols, for
+ network identity federations, single sign-on and other web services protocols.
+ The main specifications implemented by the library are ID-FF, ID-WSF and SAML.
+ .
+ This package contains Perl bindings for liblasso, needed to use lasso
+ in Perl applications.
+
+Package: php5-lasso
+Section: web
+Architecture: any
+Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:depends}
+Description: Library for Liberty Alliance and SAML protocols - PHP 5 bindings
+ Lasso is an implementation of Liberty Alliance and related protocols, for
+ network identity federations, single sign-on and other web services protocols.
+ The main specifications implemented by the library are ID-FF, ID-WSF and SAML.
+ .
+ This package contains PHP bindings for liblasso, needed to use lasso
+ in PHP applications.
--- lasso-2.3.5.orig/debian/liblasso-perl.install
+++ lasso-2.3.5/debian/liblasso-perl.install
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/perl/5.*.*/Lasso.pm usr/lib/perl5/
+debian/tmp/usr/lib/perl/5.*.*/auto/Lasso/Lasso.bs usr/lib/perl5/auto/Lasso/
+debian/tmp/usr/lib/perl/5.*.*/auto/Lasso/Lasso.so usr/lib/perl5/auto/Lasso/
--- lasso-2.3.5.orig/debian/php5-lasso.install
+++ lasso-2.3.5/debian/php5-lasso.install
@@ -0,0 +1,3 @@
+debian/tmp/etc/php5/
+debian/tmp/usr/share/php/
+debian/tmp/usr/lib/php5/*/lasso.so
--- lasso-2.3.5.orig/debian/docs
+++ lasso-2.3.5/debian/docs
@@ -0,0 +1,2 @@
+README
+AUTHORS