bring branch 2.0.0 in sync with p4 releases/2.0.0

2013-03-25 14:31:59 +00:00 · 2013-03-25 14:31:59 +00:00 · fc4a08ba78
parent dedac1b286
commit fc4a08ba78
32 changed files with 2436 additions and 12586 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -22,7 +22,7 @@ else
  PYTHON_OPT =
 endif
-SUBDIRS = src tools definitions samples ifs_samples/grib1 ifs_samples/grib1_mlgrib2 ifs_samples/grib1_mlgrib2_ieee64 tests mars_tests tigge $(FORTRAN_MOD) examples/C $(F90_CHECK) $(PERL_OPT) python examples/python
+SUBDIRS = src tools definitions samples ifs_samples/grib1 ifs_samples/grib1_mlgrib2 ifs_samples/grib1_mlgrib2_ieee64 tests tigge $(FORTRAN_MOD) examples/C $(F90_CHECK) $(PERL_OPT) python examples/python
 EXTRA_DIST = README AUTHORS NOTICE LICENSE ChangeLog version.sh html \
                src/extrules.am \
@ -93,12 +93,12 @@ EXTRA_DIST = README AUTHORS NOTICE LICENSE ChangeLog version.sh html \
 				data/spherical_pressure_level.grib1 \
 				data/missing.grib2 \
 				data/gfs.c255.grib2 \
-            data/constant_field.grib1 \
+                data/constant_field.grib1 \
-            data/reduced_gaussian_pressure_level_constant.grib1 \
+                data/reduced_gaussian_pressure_level_constant.grib1 \
-            data/reduced_latlon_surface_constant.grib1 \
+                data/reduced_latlon_surface_constant.grib1 \
-            data/regular_gaussian_pressure_level_constant.grib1 \
+                data/regular_gaussian_pressure_level_constant.grib1 \
-            data/regular_latlon_surface_constant.grib1 \
+                data/regular_latlon_surface_constant.grib1 \
-            data/reduced_gaussian_sub_area.grib1 \
+                data/reduced_gaussian_sub_area.grib1 \
 				data/constant_field.grib1 \
 				data/60_model_levels \
 				data/list_points \
--- a/config/config.guess
+++ b/config/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
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
-timestamp='2008-01-23'
+timestamp='2009-11-20'
 # 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 @@ timestamp='2008-01-23'
 # the same distribution terms that you use for the rest of that program.
-# Originally written by Per Bothner <per@bothner.com>.
+# Originally written by Per Bothner.  Please send patches (context
-# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# diff and a properly formatted ChangeLog entry.
+# 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
+# You can get the latest version of this script from:
-# don't specify an explicit build system type.
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 me=`echo "$0" | sed -e 's,.*/,,'`
@ -139,6 +139,16 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 case "${UNAME_MACHINE}" in
    i?86)
 	test -z "$VENDOR" && VENDOR=pc
 	;;
    *)
 	test -z "$VENDOR" && VENDOR=unknown
 	;;
 esac
 test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
 # Note: order is significant - the case branches are not exclusive.
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@ -170,7 +180,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    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?
@ -203,19 +213,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	exit ;;
    *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	echo ${UNAME_MACHINE_ARCH}-${VENDOR}-openbsd${UNAME_RELEASE}
 	exit ;;
    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	echo ${UNAME_MACHINE}-${VENDOR}-ekkobsd${UNAME_RELEASE}
 	exit ;;
    *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	echo ${UNAME_MACHINE}-${VENDOR}-solidbsd${UNAME_RELEASE}
 	exit ;;
    macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	echo powerpc-${VENDOR}-mirbsd${UNAME_RELEASE}
 	exit ;;
    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	echo ${UNAME_MACHINE}-${VENDOR}-mirbsd${UNAME_RELEASE}
 	exit ;;
    alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
@ -280,13 +290,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo alpha-dec-winnt3.5
 	exit ;;
    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
+	echo m68k-${VENDOR}-sysv4
 	exit ;;
    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
+	echo ${UNAME_MACHINE}-${VENDOR}-amigaos
 	exit ;;
    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
+	echo ${UNAME_MACHINE}-${VENDOR}-morphos
 	exit ;;
    *:OS/390:*:*)
 	echo i370-ibm-openedition
@ -301,7 +311,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit ;;
    arm:riscos:*:*|arm:RISCOS:*:*)
-	echo arm-unknown-riscos
+	echo arm-${VENDOR}-riscos
 	exit ;;
    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
@ -324,14 +334,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	case `/usr/bin/uname -p` in
 	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
    s390x:SunOS:*:*)
 	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
    sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
    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.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	eval $set_cc_for_build
 	SUN_ARCH="i386"
 	# If there is a compiler, see if it is configured for 64-bit objects.
 	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
 	# This test works for both compilers.
 	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
 	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
 		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
 		grep IS_64BIT_ARCH >/dev/null
 	    then
 		SUN_ARCH="x86_64"
 	    fi
 	fi
 	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
    sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
@ -390,7 +419,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
        echo m68k-hades-mint${UNAME_RELEASE}
        exit ;;
    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
+        echo m68k-${VENDOR}-mint${UNAME_RELEASE}
        exit ;;
    m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
@ -640,7 +669,7 @@ EOF
 	    # => 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
@ -701,9 +730,9 @@ EOF
 	exit ;;
    i*86:OSF1:*:*)
 	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	    echo ${UNAME_MACHINE}-${VENDOR}-osf1mk
 	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
+	    echo ${UNAME_MACHINE}-${VENDOR}-osf1
 	fi
 	exit ;;
    parisc*:Lites*:*:*)
@ -763,19 +792,19 @@ EOF
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit ;;
    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	echo sparc-${VENDOR}-bsdi${UNAME_RELEASE}
 	exit ;;
    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	echo ${UNAME_MACHINE}-${VENDOR}-bsdi${UNAME_RELEASE}
 	exit ;;
    *:FreeBSD:*:*)
 	case ${UNAME_MACHINE} in
 	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo i386-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo x86_64-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo ${UNAME_MACHINE}-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
 	exit ;;
    i*:CYGWIN*:*)
@ -791,21 +820,24 @@ EOF
    i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    *:Interix*:[3456]*)
+    *:Interix*:*)
    	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
-	    EM64T | authenticamd)
+	    authenticamd | genuineintel | EM64T)
-		echo x86_64-unknown-interix${UNAME_RELEASE}
+		echo x86_64-${VENDOR}-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
-		echo ia64-unknown-interix${UNAME_RELEASE}
+		echo ia64-${VENDOR}-interix${UNAME_RELEASE}
 		exit ;;
 	esac ;;
    [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
@ -816,111 +848,25 @@ EOF
 	echo ${UNAME_MACHINE}-pc-uwin
 	exit ;;
    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
+	echo x86_64-${VENDOR}-cygwin
 	exit ;;
    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
+	echo powerpcle-${VENDOR}-cygwin
 	exit ;;
    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	echo powerpcle-${VENDOR}-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
    *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-${VENDOR}-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit ;;
    *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
 	exit ;;
    i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
    arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
 	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 	else
 	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
 	fi
 	exit ;;
    avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
    cris:Linux:*:*)
 	echo cris-axis-linux-gnu
 	exit ;;
    crisv32:Linux:*:*)
 	echo crisv32-axis-linux-gnu
 	exit ;;
    frv:Linux:*:*)
    	echo frv-unknown-linux-gnu
 	exit ;;
    ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
    m32r*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
    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:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#undef CPU
 	#undef mips64
 	#undef mips64el
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
 	CPU=mips64el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
 	CPU=mips64
 	#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; }
 	;;
    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 ;;
@ -931,105 +877,115 @@ EOF
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+	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}
+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC}
 	exit ;;
    arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
 	    echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	else
 	    echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabi
 	fi
 	exit ;;
    avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	exit ;;
    cris:Linux:*:*)
 	echo cris-axis-linux-gnu
 	exit ;;
    crisv32:Linux:*:*)
 	echo crisv32-axis-linux-gnu
 	exit ;;
    frv:Linux:*:*)
    	echo frv-${VENDOR}-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}-${VENDOR}-linux-${LIBC}"
 	exit ;;
    ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	exit ;;
    m32r*:Linux:*:*)
 	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	exit ;;
    m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	exit ;;
    mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#undef CPU
 	#undef ${UNAME_MACHINE}
 	#undef ${UNAME_MACHINE}el
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
 	CPU=${UNAME_MACHINE}el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
 	CPU=${UNAME_MACHINE}
 	#else
 	CPU=
 	#endif
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
 	;;
    or32:Linux:*:*)
 	echo or32-${VENDOR}-linux-gnu
 	exit ;;
    padre:Linux:*:*)
 	echo sparc-${VENDOR}-linux-gnu
 	exit ;;
    parisc64:Linux:*:* | hppa64:Linux:*:*)
 	echo hppa64-${VENDOR}-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
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	  PA7*) echo hppa1.1-${VENDOR}-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	  PA8*) echo hppa2.0-${VENDOR}-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
+	  *)    echo hppa-${VENDOR}-linux-gnu ;;
 	esac
 	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
+    ppc64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+	echo powerpc64-${VENDOR}-linux-gnu
 	exit ;;
    ppc:Linux:*:*)
 	echo powerpc-${VENDOR}-linux-gnu
 	exit ;;
    s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
    sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+    	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	exit ;;
    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	exit ;;
    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	exit ;;
    vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
+	echo x86_64-${VENDOR}-linux-gnu
 	exit ;;
    xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+    	echo ${UNAME_MACHINE}-${VENDOR}-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 ;;
 	  coff-i386)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
 		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
@ -1050,16 +1006,16 @@ EOF
 	echo ${UNAME_MACHINE}-pc-os2-emx
 	exit ;;
    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
+	echo ${UNAME_MACHINE}-${VENDOR}-stop
 	exit ;;
    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
+	echo ${UNAME_MACHINE}-${VENDOR}-atheos
 	exit ;;
    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}
+	echo i386-${VENDOR}-lynxos${UNAME_RELEASE}
 	exit ;;
    i*86:*DOS:*:*)
 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
@ -1079,7 +1035,7 @@ EOF
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	echo ${UNAME_MACHINE}-${VENDOR}-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
 	exit ;;
    i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
@ -1102,8 +1058,11 @@ EOF
    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 i386.
+        # the processor, so we play safe by assuming i586.
-	echo i386-pc-msdosdjgpp
+	# 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 ;;
    Intel:Mach:3*:*)
 	echo i386-pc-mach3
@ -1115,7 +1074,7 @@ EOF
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
 	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	  echo i860-${VENDOR}-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
 	fi
 	exit ;;
    mini*:CTIX:SYS*5:*)
@ -1141,20 +1100,30 @@ EOF
    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
        /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 \
 	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
 	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
 	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
 	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	echo m68k-${VENDOR}-lynxos${UNAME_RELEASE}
 	exit ;;
    mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
 	exit ;;
    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	echo sparc-${VENDOR}-lynxos${UNAME_RELEASE}
 	exit ;;
    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	echo rs6000-${VENDOR}-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}
+	echo powerpc-${VENDOR}-lynxos${UNAME_RELEASE}
 	exit ;;
    SM[BE]S:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
@ -1204,7 +1173,7 @@ EOF
 	if [ -d /usr/nec ]; then
 	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
+	        echo mips-${VENDOR}-sysv${UNAME_RELEASE}
 	fi
        exit ;;
    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
@ -1216,6 +1185,9 @@ EOF
    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
 	exit ;;
    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
 	echo i586-pc-haiku
 	exit ;;
    SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@ -1234,9 +1206,6 @@ EOF
    SX-8R:SUPER-UX:*:*)
 	echo sx8r-nec-superux${UNAME_RELEASE}
 	exit ;;
    SX-9:SUPER-UX:*:*)
 	echo sx9-nec-superux${UNAME_RELEASE}
 	exit ;;
    Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
@ -1246,6 +1215,16 @@ EOF
    *: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}
@ -1285,13 +1264,13 @@ EOF
 	else
 	    UNAME_MACHINE="$cputype"
 	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
+	echo ${UNAME_MACHINE}-${VENDOR}-plan9
 	exit ;;
    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
+	echo pdp10-${VENDOR}-tops10
 	exit ;;
    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
+	echo pdp10-${VENDOR}-tenex
 	exit ;;
    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
 	echo pdp10-dec-tops20
@ -1300,16 +1279,16 @@ EOF
 	echo pdp10-xkl-tops20
 	exit ;;
    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
+	echo pdp10-${VENDOR}-tops20
 	exit ;;
    *:ITS:*:*)
-	echo pdp10-unknown-its
+	echo pdp10-${VENDOR}-its
 	exit ;;
    SEI:*:*:SEIUX)
        echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	echo ${UNAME_MACHINE}-${VENDOR}-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
    *:*VMS:*:*)
    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
@ -1327,6 +1306,9 @@ EOF
    i*86:rdos:*:*)
 	echo ${UNAME_MACHINE}-pc-rdos
 	exit ;;
    i*86:AROS:*:*)
 	echo ${UNAME_MACHINE}-pc-aros
 	exit ;;
 esac
 #echo '(No uname command or uname output not recognized.)' 1>&2
--- a/config/config.sub
+++ b/config/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
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
-timestamp='2008-01-16'
+timestamp='2009-11-20'
 # 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 @@ timestamp='2008-01-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.
@ -122,6 +125,7 @@ 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* | \
  kopensolaris*-gnu* | \
  storm-chaos* | os2-emx* | rtmk-nova*)
    os=-$maybe_os
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@ -148,10 +152,13 @@ case $os in
 	-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
@ -249,13 +256,16 @@ case $basic_machine in
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep \
+	| maxq | mb | microblaze | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
+	| mips64octeon | mips64octeonel \
 	| mips64orion | mips64orionel \
 	| mips64r5900 | mips64r5900el \
 	| mips64vr | mips64vrel \
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
@ -268,6 +278,7 @@ case $basic_machine in
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
 	| moxie \
 	| mt \
 	| msp430 \
 	| nios | nios2 \
@ -276,20 +287,22 @@ case $basic_machine in
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
 	| rx \
 	| score \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[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 \
 	| ubicom32 \
 	| v850 | v850e \
 	| we32k \
 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k)
+	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
 		os=-none
@ -329,14 +342,17 @@ case $basic_machine in
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
+	| mips64octeon-* | mips64octeonel-* \
 	| mips64orion-* | mips64orionel-* \
 	| mips64r5900-* | mips64r5900el-* \
 	| mips64vr-* | mips64vrel-* \
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
@ -357,21 +373,22 @@ case $basic_machine in
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
-	| romp-* | rs6000-* \
+	| romp-* | rs6000-* | rx-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| 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-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
 	| tron-* \
 	| ubicom32-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
 	| xstormy16-* | xtensa*-* \
 	| ymp-* \
-	| z8k-*)
+	| z8k-* | z80-*)
 		;;
 	# Recognize the basic CPU types without company name, with glob match.
 	xtensa*)
@ -439,6 +456,10 @@ case $basic_machine in
 		basic_machine=m68k-apollo
 		os=-bsd
 		;;
 	aros)
 		basic_machine=i386-pc
 		os=-aros
 		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@ -455,10 +476,18 @@ case $basic_machine in
 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
 	bluegene*)
 		basic_machine=powerpc-ibm
 		os=-cnk
 		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
        cegcc)
 		basic_machine=arm-unknown
 		os=-cegcc
 		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@ -526,6 +555,10 @@ case $basic_machine in
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
 	dicos)
 		basic_machine=i686-pc
 		os=-dicos
 		;;
 	djgpp)
 		basic_machine=i586-pc
 		os=-msdosdjgpp
@ -699,6 +732,9 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
        microblaze)
 		basic_machine=microblaze-xilinx
 		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
@ -1128,6 +1164,10 @@ case $basic_machine in
 		basic_machine=z8k-unknown
 		os=-sim
 		;;
 	z80-*-coff)
 		basic_machine=z80-unknown
 		os=-sim
 		;;
 	none)
 		basic_machine=none-none
 		os=-none
@ -1166,7 +1206,7 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+	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)
@ -1216,6 +1256,9 @@ case $os in
        # 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|'`
 		;;
@ -1236,10 +1279,11 @@ case $os in
 	# 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]*\
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
 	      | -sym* | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
+	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
@ -1248,7 +1292,7 @@ case $os in
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
@ -1258,7 +1302,7 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@ -1388,6 +1432,9 @@ case $os in
 	-zvmoe)
 		os=-zvmoe
 		;;
 	-dicos*)
 		os=-dicos
 		;;
 	-none)
 		;;
 	*)
@ -1585,7 +1632,7 @@ case $basic_machine in
 			-sunos*)
 				vendor=sun
 				;;
-			-aix*)
+			-cnk*|-aix*)
 				vendor=ibm
 				;;
 			-beos*)
--- a/config/depcomp
+++ b/config/depcomp
@ -1,9 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
-scriptversion=2003-11-08.23
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 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
@ -16,9 +17,7 @@ scriptversion=2003-11-08.23
 # 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
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@ -43,17 +42,18 @@ Environment variables:
  depmode     Dependency tracking mode.
  source      Source file read by `PROGRAMS ARGS'.
  object      Object file output by `PROGRAMS ARGS'.
  DEPDIR      directory where to store dependencies.
  depfile     Dependency file to output.
  tmpdepfile  Temporary file to use when outputing dependencies.
  libtool     Whether libtool is used (yes/no).
 Report bugs to <bug-automake@gnu.org>.
 EOF
-    exit 0
+    exit $?
    ;;
  -v | --v*)
    echo "depcomp $scriptversion"
-    exit 0
+    exit $?
    ;;
 esac
@ -61,18 +61,10 @@ if test -z "$depmode" || test -z "$source" || test -z "$object"; then
  echo "depcomp: Variables source, object and depmode must be set" 1>&2
  exit 1
 fi
 # `libtool' can also be set to `yes' or `no'.
 if test -z "$depfile"; then
   base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
   dir=`echo "$object" | sed 's,/.*$,/,'`
   if test "$dir" = "$object"; then
      dir=
   fi
   # FIXME: should be _deps on DOS.
   depfile="$dir.deps/$base"
 fi
 # Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
 depfile=${depfile-`echo "$object" |
  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
 tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
 rm -f "$tmpdepfile"
@ -93,12 +85,34 @@ if test "$depmode" = dashXmstdout; then
   depmode=dashmstdout
 fi
 cygpath_u="cygpath -u -f -"
 if test "$depmode" = msvcmsys; then
   # This is just like msvisualcpp but w/o cygpath translation.
   # Just convert the backslash-escaped backslashes to single forward
   # slashes to satisfy depend.m4
   cygpath_u="sed s,\\\\\\\\,/,g"
   depmode=msvisualcpp
 fi
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
 ## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
 ## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
 ## the command line argument order; so add the flags where they
 ## appear in depend2.am.  Note that the slowdown incurred here
 ## affects only configure: in makefiles, %FASTDEP% shortcuts this.
  for arg
  do
    case $arg in
    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
    *)  set fnord "$@" "$arg" ;;
    esac
    shift # fnord
    shift # $arg
  done
  "$@"
  stat=$?
  if test $stat -eq 0; then :
  else
@ -185,14 +199,14 @@ sgi)
 ' < "$tmpdepfile" \
    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
    tr '
-' ' ' >> $depfile
+' ' ' >> "$depfile"
-    echo >> $depfile
+    echo >> "$depfile"
    # The second pass generates a dummy entry for each header file.
    tr ' ' '
 ' < "$tmpdepfile" \
   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
+   >> "$depfile"
  else
    # The sourcefile does not contain any dependencies, so just
    # store a dummy comment line, to avoid errors with the Makefile
@ -208,34 +222,39 @@ aix)
  # current directory.  Also, the AIX compiler puts `$object:' at the
  # start of each line; $object doesn't have directory information.
  # Version 6 uses the directory in both cases.
-  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  tmpdepfile="$stripped.u"
+  test "x$dir" = "x$object" && dir=
  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
  if test "$libtool" = yes; then
    tmpdepfile1=$dir$base.u
    tmpdepfile2=$base.u
    tmpdepfile3=$dir.libs/$base.u
    "$@" -Wc,-M
  else
    tmpdepfile1=$dir$base.u
    tmpdepfile2=$dir$base.u
    tmpdepfile3=$dir$base.u
    "$@" -M
  fi
  stat=$?
  if test -f "$tmpdepfile"; then :
  else
    stripped=`echo "$stripped" | sed 's,^.*/,,'`
    tmpdepfile="$stripped.u"
  fi
  if test $stat -eq 0; then :
  else
-    rm -f "$tmpdepfile"
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
    exit $stat
  fi
  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
  do
    test -f "$tmpdepfile" && break
  done
  if test -f "$tmpdepfile"; then
    outname="$stripped.o"
    # Each line is of the form `foo.o: dependent.h'.
    # Do two passes, one to just change these to
    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
+    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+    # That's a tab and a space in the [].
    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
  else
    # The sourcefile does not contain any dependencies, so just
    # store a dummy comment line, to avoid errors with the Makefile
@ -283,6 +302,51 @@ icc)
  rm -f "$tmpdepfile"
  ;;
 hp2)
  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
  # compilers, which have integrated preprocessors.  The correct option
  # to use with these is +Maked; it writes dependencies to a file named
  # 'foo.d', which lands next to the object file, wherever that
  # happens to be.
  # Much of this is similar to the tru64 case; see comments there.
  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
  test "x$dir" = "x$object" && dir=
  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
  if test "$libtool" = yes; then
    tmpdepfile1=$dir$base.d
    tmpdepfile2=$dir.libs/$base.d
    "$@" -Wc,+Maked
  else
    tmpdepfile1=$dir$base.d
    tmpdepfile2=$dir$base.d
    "$@" +Maked
  fi
  stat=$?
  if test $stat -eq 0; then :
  else
     rm -f "$tmpdepfile1" "$tmpdepfile2"
     exit $stat
  fi
  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
  do
    test -f "$tmpdepfile" && break
  done
  if test -f "$tmpdepfile"; then
    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
    # Add `dependent.h:' lines.
    sed -ne '2,${
 	       s/^ *//
 	       s/ \\*$//
 	       s/$/:/
 	       p
 	     }' "$tmpdepfile" >> "$depfile"
  else
    echo "#dummy" > "$depfile"
  fi
  rm -f "$tmpdepfile" "$tmpdepfile2"
  ;;
 tru64)
   # The Tru64 compiler uses -MD to generate dependencies as a side
   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
@ -294,27 +358,43 @@ tru64)
   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
   if test "$libtool" = yes; then
-      tmpdepfile1="$dir.libs/$base.lo.d"
+      # With Tru64 cc, shared objects can also be used to make a
-      tmpdepfile2="$dir.libs/$base.d"
+      # static library.  This mechanism is used in libtool 1.4 series to
      # handle both shared and static libraries in a single compilation.
      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
      #
      # With libtool 1.5 this exception was removed, and libtool now
      # generates 2 separate objects for the 2 libraries.  These two
      # compilations output dependencies in $dir.libs/$base.o.d and
      # in $dir$base.o.d.  We have to check for both files, because
      # one of the two compilations can be disabled.  We should prefer
      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
      # automatically cleaned when .libs/ is deleted, while ignoring
      # the former would cause a distcleancheck panic.
      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
      tmpdepfile2=$dir$base.o.d          # libtool 1.5
      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
      "$@" -Wc,-MD
   else
-      tmpdepfile1="$dir$base.o.d"
+      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2="$dir$base.d"
+      tmpdepfile2=$dir$base.d
      tmpdepfile3=$dir$base.d
      tmpdepfile4=$dir$base.d
      "$@" -MD
   fi
   stat=$?
   if test $stat -eq 0; then :
   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2"
+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
      exit $stat
   fi
-   if test -f "$tmpdepfile1"; then
+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-      tmpdepfile="$tmpdepfile1"
+   do
-   else
+     test -f "$tmpdepfile" && break
-      tmpdepfile="$tmpdepfile2"
+   done
   fi
   if test -f "$tmpdepfile"; then
      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
      # That's a tab and a space in the [].
@ -336,7 +416,7 @@ dashmstdout)
  # Remove the call to Libtool.
  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
      shift
    done
    shift
@ -387,32 +467,39 @@ makedepend)
  "$@" || exit $?
  # Remove any Libtool call
  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
      shift
    done
    shift
  fi
  # X makedepend
  shift
-  cleared=no
+  cleared=no eat=no
-  for arg in "$@"; do
+  for arg
  do
    case $cleared in
    no)
      set ""; shift
      cleared=yes ;;
    esac
    if test $eat = yes; then
      eat=no
      continue
    fi
    case "$arg" in
    -D*|-I*)
      set fnord "$@" "$arg"; shift ;;
    # Strip any option that makedepend may not understand.  Remove
    # the object too, otherwise makedepend will parse it as a source file.
    -arch)
      eat=yes ;;
    -*|$object)
      ;;
    *)
      set fnord "$@" "$arg"; shift ;;
    esac
  done
-  obj_suffix="`echo $object | sed 's/^.*\././'`"
+  obj_suffix=`echo "$object" | sed 's/^.*\././'`
  touch "$tmpdepfile"
  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
  rm -f "$depfile"
@ -432,7 +519,7 @@ cpp)
  # Remove the call to Libtool.
  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
      shift
    done
    shift
@ -458,7 +545,8 @@ cpp)
  done
  "$@" -E |
-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
    sed '$ s: \\$::' > "$tmpdepfile"
  rm -f "$depfile"
  echo "$object : \\" > "$depfile"
@ -469,13 +557,27 @@ cpp)
 msvisualcpp)
  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o,
+  # always write the preprocessed file to stdout.
  # because we must use -o when running libtool.
  "$@" || exit $?
  # Remove the call to Libtool.
  if test "$libtool" = yes; then
    while test "X$1" != 'X--mode=compile'; do
      shift
    done
    shift
  fi
  IFS=" "
  for arg
  do
    case "$arg" in
    -o)
      shift
      ;;
    $object)
      shift
      ;;
    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
 	set fnord "$@"
 	shift
@ -488,16 +590,23 @@ msvisualcpp)
 	;;
    esac
  done
-  "$@" -E |
+  "$@" -E 2>/dev/null |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
  rm -f "$depfile"
  echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
  echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
  rm -f "$tmpdepfile"
  ;;
 msvcmsys)
  # This case exists only to let depend.m4 do its work.  It works by
  # looking at the text of this script.  This case will never be run,
  # since it is checked for above.
  exit 1
  ;;
 none)
  exec "$@"
  ;;
@ -516,5 +625,6 @@ exit 0
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
 # time-stamp-end: "; # UTC"
 # End:
--- a/config/install-sh
+++ b/config/install-sh
@ -1,276 +1,520 @@
 #!/bin/sh
 #
 # install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
+
 scriptversion=2009-04-28.21; # UTC
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
 # following copyright and license.
 #
-# Copyright 1991 by the Massachusetts Institute of Technology
+# Copyright (C) 1994 X Consortium
 #
-# Permission to use, copy, modify, distribute, and sell this software and its
+# Permission is hereby granted, free of charge, to any person obtaining a copy
-# documentation for any purpose is hereby granted without fee, provided that
+# of this software and associated documentation files (the "Software"), to
-# the above copyright notice appear in all copies and that both that
+# deal in the Software without restriction, including without limitation the
-# copyright notice and this permission notice appear in supporting
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# documentation, and that the name of M.I.T. not be used in advertising or
+# sell copies of the Software, and to permit persons to whom the Software is
-# publicity pertaining to distribution of the software without specific,
+# furnished to do so, subject to the following conditions:
-# written prior permission.  M.I.T. makes no representations about the
+#
-# suitability of this software for any purpose.  It is provided "as is"
+# The above copyright notice and this permission notice shall be included in
-# without express or implied warranty.
+# all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
 # X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
 # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
 # TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 # Except as contained in this notice, the name of the X Consortium shall not
 # be used in advertising or otherwise to promote the sale, use or other deal-
 # ings in this Software without prior written authorization from the X Consor-
 # tium.
 #
 #
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
 # `make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
+# from scratch.
 # shared with many OS's install programs.
 nl='
 '
 IFS=" ""	$nl"
 # set DOITPROG to echo to test this script
 # Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
+doit=${DOITPROG-}
 if test -z "$doit"; then
  doit_exec=exec
 else
  doit_exec=$doit
 fi
 # Put in absolute file names if you don't have them in your path;
 # or use environment vars.
-# put in absolute paths if you don't have them in your path; or use env. vars.
+chgrpprog=${CHGRPPROG-chgrp}
 chmodprog=${CHMODPROG-chmod}
 chownprog=${CHOWNPROG-chown}
 cmpprog=${CMPPROG-cmp}
 cpprog=${CPPROG-cp}
 mkdirprog=${MKDIRPROG-mkdir}
 mvprog=${MVPROG-mv}
 rmprog=${RMPROG-rm}
 stripprog=${STRIPPROG-strip}
-mvprog="${MVPROG-mv}"
+posix_glob='?'
-cpprog="${CPPROG-cp}"
+initialize_posix_glob='
-chmodprog="${CHMODPROG-chmod}"
+  test "$posix_glob" != "?" || {
-chownprog="${CHOWNPROG-chown}"
+    if (set -f) 2>/dev/null; then
-chgrpprog="${CHGRPPROG-chgrp}"
+      posix_glob=
-stripprog="${STRIPPROG-strip}"
+    else
-rmprog="${RMPROG-rm}"
+      posix_glob=:
-mkdirprog="${MKDIRPROG-mkdir}"
+    fi
  }
 '
-transformbasename=""
+posix_mkdir=
-transform_arg=""
+
-instcmd="$mvprog"
+# Desired mode of installed file.
-chmodcmd="$chmodprog 0755"
+mode=0755
-chowncmd=""
+
-chgrpcmd=""
+chgrpcmd=
-stripcmd=""
+chmodcmd=$chmodprog
 chowncmd=
 mvcmd=$mvprog
 rmcmd="$rmprog -f"
-mvcmd="$mvprog"
+stripcmd=
 src=""
 dst=""
 dir_arg=""
-while [ x"$1" != x ]; do
+src=
-    case $1 in
+dst=
-	-c) instcmd=$cpprog
+dir_arg=
-	    shift
+dst_arg=
 	    continue;;
-	-d) dir_arg=true
+copy_on_change=false
-	    shift
+no_target_directory=
 	    continue;;
-	-m) chmodcmd="$chmodprog $2"
+usage="\
-	    shift
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-	    shift
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
-	    continue;;
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
   or: $0 [OPTION]... -d DIRECTORIES...
-	-o) chowncmd="$chownprog $2"
+In the 1st form, copy SRCFILE to DSTFILE.
-	    shift
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-	    shift
+In the 4th, create DIRECTORIES.
 	    continue;;
-	-g) chgrpcmd="$chgrpprog $2"
+Options:
-	    shift
+     --help     display this help and exit.
-	    shift
+     --version  display version info and exit.
 	    continue;;
-	-s) stripcmd=$stripprog
+  -c            (ignored)
-	    shift
+  -C            install only if different (preserve the last data modification time)
-	    continue;;
+  -d            create directories instead of installing files.
  -g GROUP      $chgrpprog installed files to GROUP.
  -m MODE       $chmodprog installed files to MODE.
  -o USER       $chownprog installed files to USER.
  -s            $stripprog installed files.
  -t DIRECTORY  install into DIRECTORY.
  -T            report an error if DSTFILE is a directory.
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
+Environment variables override the default commands:
-	    shift
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
-	    continue;;
+  RMPROG STRIPPROG
 "
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+while test $# -ne 0; do
-	    shift
+  case $1 in
-	    continue;;
+    -c) ;;
-	*)  if [ x"$src" = x ]
+    -C) copy_on_change=true;;
-	    then
+
-		src=$1
+    -d) dir_arg=true;;
-	    else
+
-		# this colon is to work around a 386BSD /bin/sh bug
+    -g) chgrpcmd="$chgrpprog $2"
-		:
+	shift;;
-		dst=$1
+
-	    fi
+    --help) echo "$usage"; exit $?;;
-	    shift
+
-	    continue;;
+    -m) mode=$2
 	case $mode in
 	  *' '* | *'	'* | *'
 '*	  | *'*'* | *'?'* | *'['*)
 	    echo "$0: invalid mode: $mode" >&2
 	    exit 1;;
 	esac
 	shift;;
    -o) chowncmd="$chownprog $2"
 	shift;;
    -s) stripcmd=$stripprog;;
    -t) dst_arg=$2
 	shift;;
    -T) no_target_directory=true;;
    --version) echo "$0 $scriptversion"; exit $?;;
    --)	shift
 	break;;
    -*)	echo "$0: invalid option: $1" >&2
 	exit 1;;
    *)  break;;
  esac
  shift
 done
 if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
  # When -d is used, all remaining arguments are directories to create.
  # When -t is used, the destination is already specified.
  # Otherwise, the last argument is the destination.  Remove it from $@.
  for arg
  do
    if test -n "$dst_arg"; then
      # $@ is not empty: it contains at least $arg.
      set fnord "$@" "$dst_arg"
      shift # fnord
    fi
    shift # arg
    dst_arg=$arg
  done
 fi
 if test $# -eq 0; then
  if test -z "$dir_arg"; then
    echo "$0: no input file specified." >&2
    exit 1
  fi
  # It's OK to call `install-sh -d' without argument.
  # This can happen when creating conditional directories.
  exit 0
 fi
 if test -z "$dir_arg"; then
  trap '(exit $?); exit' 1 2 13 15
  # Set umask so as not to create temps with too-generous modes.
  # However, 'strip' requires both read and write access to temps.
  case $mode in
    # Optimize common cases.
    *644) cp_umask=133;;
    *755) cp_umask=22;;
    *[0-7])
      if test -z "$stripcmd"; then
 	u_plus_rw=
      else
 	u_plus_rw='% 200'
      fi
      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
    *)
      if test -z "$stripcmd"; then
 	u_plus_rw=
      else
 	u_plus_rw=,u+rw
      fi
      cp_umask=$mode$u_plus_rw;;
  esac
 fi
 for src
 do
  # Protect names starting with `-'.
  case $src in
    -*) src=./$src;;
  esac
  if test -n "$dir_arg"; then
    dst=$src
    dstdir=$dst
    test -d "$dstdir"
    dstdir_status=$?
  else
    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
    # might cause directories to be created, which would be especially bad
    # if $src (and thus $dsttmp) contains '*'.
    if test ! -f "$src" && test ! -d "$src"; then
      echo "$0: $src does not exist." >&2
      exit 1
    fi
    if test -z "$dst_arg"; then
      echo "$0: no destination specified." >&2
      exit 1
    fi
    dst=$dst_arg
    # Protect names starting with `-'.
    case $dst in
      -*) dst=./$dst;;
    esac
 done
-if [ x"$src" = x ]
+    # If destination is a directory, append the input filename; won't work
-then
+    # if double slashes aren't ignored.
-	echo "$0: no input file specified" >&2
+    if test -d "$dst"; then
      if test -n "$no_target_directory"; then
 	echo "$0: $dst_arg: Is a directory" >&2
 	exit 1
-else
+      fi
-	:
+      dstdir=$dst
-fi
+      dst=$dstdir/`basename "$src"`
      dstdir_status=0
    else
      # Prefer dirname, but fall back on a substitute if dirname fails.
      dstdir=`
 	(dirname "$dst") 2>/dev/null ||
 	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	     X"$dst" : 'X\(//\)[^/]' \| \
 	     X"$dst" : 'X\(//\)$' \| \
 	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
 	echo X"$dst" |
 	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 		   s//\1/
 		   q
 		 }
 		 /^X\(\/\/\)[^/].*/{
 		   s//\1/
 		   q
 		 }
 		 /^X\(\/\/\)$/{
 		   s//\1/
 		   q
 		 }
 		 /^X\(\/\).*/{
 		   s//\1/
 		   q
 		 }
 		 s/.*/./; q'
      `
-if [ x"$dir_arg" != x ]; then
+      test -d "$dstdir"
-	dst=$src
+      dstdir_status=$?
-	src=""
+    fi
  fi
-	if [ -d "$dst" ]; then
+  obsolete_mkdir_used=false
-		instcmd=:
+
-		chmodcmd=""
+  if test $dstdir_status != 0; then
    case $posix_mkdir in
      '')
 	# Create intermediate dirs using mode 755 as modified by the umask.
 	# This is like FreeBSD 'install' as of 1997-10-28.
 	umask=`umask`
 	case $stripcmd.$umask in
 	  # Optimize common cases.
 	  *[2367][2367]) mkdir_umask=$umask;;
 	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
 	  *[0-7])
 	    mkdir_umask=`expr $umask + 22 \
 	      - $umask % 100 % 40 + $umask % 20 \
 	      - $umask % 10 % 4 + $umask % 2
 	    `;;
 	  *) mkdir_umask=$umask,go-w;;
 	esac
 	# With -d, create the new directory with the user-specified mode.
 	# Otherwise, rely on $mkdir_umask.
 	if test -n "$dir_arg"; then
 	  mkdir_mode=-m$mode
 	else
-		instcmd=$mkdirprog
+	  mkdir_mode=
 	fi
 else
 # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
 # might cause directories to be created, which would be especially bad
 # if $src (and thus $dsttmp) contains '*'.
 	if [ -f "$src" ] || [ -d "$src" ]
 	then
 		:
 	else
 		echo "$0: $src does not exist" >&2
 		exit 1
 	fi
-	if [ x"$dst" = x ]
+	posix_mkdir=false
-	then
+	case $umask in
-		echo "$0: no destination specified" >&2
+	  *[123567][0-7][0-7])
-		exit 1
+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
 	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
 	    ;;
 	  *)
 	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
 	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
 	    if (umask $mkdir_umask &&
 		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
 	    then
 	      if test -z "$dir_arg" || {
 		   # Check for POSIX incompatibilities with -m.
 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
 		   # other-writeable bit of parent directory when it shouldn't.
 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
 		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
 		   case $ls_ld_tmpdir in
 		     d????-?r-*) different_mode=700;;
 		     d????-?--*) different_mode=755;;
 		     *) false;;
 		   esac &&
 		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
 		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
 		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
 		   }
 		 }
 	      then posix_mkdir=:
 	      fi
 	      rmdir "$tmpdir/d" "$tmpdir"
 	    else
 	      # Remove any dirs left behind by ancient mkdir implementations.
 	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
 	    fi
 	    trap '' 0;;
 	esac;;
    esac
    if
      $posix_mkdir && (
 	umask $mkdir_umask &&
 	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
      )
    then :
    else
      # The umask is ridiculous, or mkdir does not conform to POSIX,
      # or it failed possibly due to a race condition.  Create the
      # directory the slow way, step by step, checking for races as we go.
      case $dstdir in
 	/*) prefix='/';;
 	-*) prefix='./';;
 	*)  prefix='';;
      esac
      eval "$initialize_posix_glob"
      oIFS=$IFS
      IFS=/
      $posix_glob set -f
      set fnord $dstdir
      shift
      $posix_glob set +f
      IFS=$oIFS
      prefixes=
      for d
      do
 	test -z "$d" && continue
 	prefix=$prefix$d
 	if test -d "$prefix"; then
 	  prefixes=
 	else
-		:
+	  if $posix_mkdir; then
 	    (umask=$mkdir_umask &&
 	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
 	    # Don't fail if two instances are running concurrently.
 	    test -d "$prefix" || exit 1
 	  else
 	    case $prefix in
 	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
 	      *) qprefix=$prefix;;
 	    esac
 	    prefixes="$prefixes '$qprefix'"
 	  fi
 	fi
 	prefix=$prefix/
      done
-# If destination is a directory, append the input filename; if your system
+      if test -n "$prefixes"; then
-# does not like double slashes in filenames, you may need to add some logic
+	# Don't fail if two instances are running concurrently.
 	(umask $mkdir_umask &&
 	 eval "\$doit_exec \$mkdirprog $prefixes") ||
 	  test -d "$dstdir" || exit 1
 	obsolete_mkdir_used=true
      fi
    fi
  fi
-	if [ -d "$dst" ]
+  if test -n "$dir_arg"; then
-	then
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-		dst=$dst/`basename "$src"`
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-	else
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-		:
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
-	fi
+  else
 fi
-## this sed command emulates the dirname command
+    # Make a couple of temp file names in the proper directory.
-dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+    dsttmp=$dstdir/_inst.$$_
    rmtmp=$dstdir/_rm.$$_
-# Make sure that the destination directory exists.
+    # Trap to clean up those temp files at exit.
-#  this part is taken from Noah Friedman's mkinstalldirs script
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-# Skip lots of stat calls in the usual case.
+    # Copy the file name to the temp name.
-if [ ! -d "$dstdir" ]; then
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
 defaultIFS='
 	'
 IFS="${IFS-$defaultIFS}"
-oIFS=$IFS
+    # and set any options; do chmod last to preserve setuid bits.
-# Some sh's can't handle IFS=/ for some reason.
+    #
-IFS='%'
+    # If any of these fail, we abort the whole thing.  If we want to
-set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+    # ignore errors from any of these, just make sure not to ignore
-IFS=$oIFS
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
    #
    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-pathcomp=''
+    # If -C, don't bother to copy if it wouldn't change the file.
    if $copy_on_change &&
       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-while [ $# -ne 0 ] ; do
+       eval "$initialize_posix_glob" &&
-	pathcomp=$pathcomp$1
+       $posix_glob set -f &&
-	shift
+       set X $old && old=:$2:$4:$5:$6 &&
       set X $new && new=:$2:$4:$5:$6 &&
       $posix_glob set +f &&
-	if [ ! -d "$pathcomp" ] ;
+       test "$old" = "$new" &&
-        then
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-		$mkdirprog "$pathcomp"
+    then
-	else
+      rm -f "$dsttmp"
-		:
+    else
-	fi
+      # Rename the file to the real destination.
      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-	pathcomp=$pathcomp/
+      # The rename failed, perhaps because mv can't rename something else
      # to itself, or perhaps because mv is so ancient that it does not
      # support -f.
      {
 	# Now remove or move aside any old file at destination location.
 	# We try this two ways since rm can't unlink itself on some
 	# systems and the destination file might be busy for other
 	# reasons.  In this case, the final cleanup might fail but the new
 	# file should still install successfully.
 	{
 	  test ! -f "$dst" ||
 	  $doit $rmcmd -f "$dst" 2>/dev/null ||
 	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
 	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
 	  } ||
 	  { echo "$0: cannot unlink or rename $dst" >&2
 	    (exit 1); exit 1
 	  }
 	} &&
 	# Now rename the file to the real destination.
 	$doit $mvcmd "$dsttmp" "$dst"
      }
    fi || exit 1
    trap '' 0
  fi
 done
 fi
-if [ x"$dir_arg" != x ]
+# Local variables:
-then
+# eval: (add-hook 'write-file-hooks 'time-stamp)
-	$doit $instcmd "$dst" &&
+# time-stamp-start: "scriptversion="
-
+# time-stamp-format: "%:y-%02m-%02d.%02H"
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
+# time-stamp-time-zone: "UTC"
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
+# time-stamp-end: "; # UTC"
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
+# End:
 	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
 else
 # If we're going to rename the final executable, determine the name now.
 	if [ x"$transformarg" = x ]
 	then
 		dstfile=`basename "$dst"`
 	else
 		dstfile=`basename "$dst" $transformbasename |
 			sed $transformarg`$transformbasename
 	fi
 # don't allow the sed command to completely eliminate the filename
 	if [ x"$dstfile" = x ]
 	then
 		dstfile=`basename "$dst"`
 	else
 		:
 	fi
 # Make a couple of temp file names in the proper directory.
 	dsttmp=$dstdir/#inst.$$#
 	rmtmp=$dstdir/#rm.$$#
 # Trap to clean up temp files at exit.
 	trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
 	trap '(exit $?); exit' 1 2 13 15
 # Move or copy the file name to the temp name
 	$doit $instcmd "$src" "$dsttmp" &&
 # and set any options; do chmod last to preserve setuid bits
 # If any of these fail, we abort the whole thing.  If we want to
 # ignore errors from any of these, just make sure not to ignore
 # errors from the above "$doit $instcmd $src $dsttmp" command.
 	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
 	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
 	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
 	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
 # Now remove or move aside any old file at destination location.  We try this
 # two ways since rm can't unlink itself on some systems and the destination
 # file might be busy for other reasons.  In this case, the final cleanup
 # might fail but the new file should still install successfully.
 {
 	if [ -f "$dstdir/$dstfile" ]
 	then
 		$doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
 		$doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
 		{
 		  echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
 		  (exit 1); exit
 		}
 	else
 		:
 	fi
 } &&
 # Now rename the file to the real destination.
 	$doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
 fi &&
 # The final little trick to "correctly" pass the exit status to the exit trap.
 {
 	(exit 0); exit
 }
--- a/config/missing
+++ b/config/missing
@ -1,6 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
+
 scriptversion=2009-04-28.21; # UTC
 # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
 # 2008, 2009 Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 # This program is free software; you can redistribute it and/or modify
@ -14,9 +18,7 @@
 # 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
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@ -29,6 +31,8 @@ if test $# -eq 0; then
 fi
 run=:
 sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
 sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
 # In the cases where this matters, `missing' is being run in the
 # srcdir already.
@ -38,18 +42,24 @@ else
  configure_ac=configure.in
 fi
-case "$1" in
+msg="missing on your system"
 case $1 in
 --run)
  # Try to run requested program, and just exit if it succeeds.
  run=
  shift
  "$@" && exit 0
  # Exit code 63 means version mismatch.  This often happens
  # when the user try to use an ancient version of a tool on
  # a file that requires a minimum version.  In this case we
  # we should proceed has if the program had been absent, or
  # if --run hadn't been passed.
  if test $? = 63; then
    run=:
    msg="probably too old"
  fi
  ;;
 esac
 # If it does not exist, or fails to run (possibly an outdated version),
 # try to emulate it.
 case "$1" in
  -h|--h|--he|--hel|--help)
    echo "\
@ -67,6 +77,7 @@ Supported PROGRAM values:
  aclocal      touch file \`aclocal.m4'
  autoconf     touch file \`configure'
  autoheader   touch file \`config.h.in'
  autom4te     touch the output file, or create a stub one
  automake     touch all \`Makefile.in' files
  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
  flex         create \`lex.yy.c', if possible, from existing .c
@ -74,11 +85,18 @@ Supported PROGRAM values:
  lex          create \`lex.yy.c', if possible, from existing .c
  makeinfo     touch the output file
  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
 \`g' are ignored when checking the name.
 Send bug reports to <bug-automake@gnu.org>."
    exit $?
    ;;
  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing 0.4 - GNU automake"
+    echo "missing $scriptversion (GNU Automake)"
    exit $?
    ;;
  -*)
@ -87,42 +105,69 @@ Supported PROGRAM values:
    exit 1
    ;;
-  aclocal*)
+esac
 # normalize program name to check for.
 program=`echo "$1" | sed '
  s/^gnu-//; t
  s/^gnu//; t
  s/^g//; t'`
 # Now exit if we have it, but it failed.  Also exit now if we
 # don't have it and --version was passed (most likely to detect
 # the program).  This is about non-GNU programs, so use $1 not
 # $program.
 case $1 in
  lex*|yacc*)
    # Not GNU programs, they don't have --version.
    ;;
  tar*)
    if test -n "$run"; then
       echo 1>&2 "ERROR: \`tar' requires --run"
       exit 1
    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
       exit 1
    fi
    ;;
  *)
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
       # We have it, but it failed.
       exit 1
    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
       # Could not run --version or --help.  This is probably someone
       # running `$TOOL --version' or `$TOOL --help' to check whether
       # $TOOL exists and not knowing $TOOL uses missing.
       exit 1
    fi
    ;;
 esac
 # If it does not exist, or fails to run (possibly an outdated version),
 # try to emulate it.
 case $program in
  aclocal*)
    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
         to install the \`Automake' and \`Perl' packages.  Grab them from
         any GNU archive site."
    touch aclocal.m4
    ;;
-  autoconf)
+  autoconf*)
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
       # We have it, but it failed.
       exit 1
    fi
    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
         you modified \`${configure_ac}'.  You might want to install the
         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
         archive site."
    touch configure
    ;;
-  autoheader)
+  autoheader*)
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
       # We have it, but it failed.
       exit 1
    fi
    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
         from any GNU archive site."
@ -130,7 +175,7 @@ WARNING: \`$1' is missing on your system.  You should only need it if
    test -z "$files" && files="config.h"
    touch_files=
    for f in $files; do
-      case "$f" in
+      case $f in
      *:*) touch_files="$touch_files "`echo "$f" |
 				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
      *) touch_files="$touch_files $f.in";;
@ -140,13 +185,8 @@ WARNING: \`$1' is missing on your system.  You should only need it if
    ;;
  automake*)
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
       # We have it, but it failed.
       exit 1
    fi
    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
         You might want to install the \`Automake' and \`Perl' packages.
         Grab them from any GNU archive site."
@ -155,21 +195,16 @@ WARNING: \`$1' is missing on your system.  You should only need it if
 	   while read f; do touch "$f"; done
    ;;
-  autom4te)
+  autom4te*)
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
       # We have it, but it failed.
       exit 1
    fi
    echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
+WARNING: \`$1' is needed, but is $msg.
-         system.  You might have modified some files without having the
+         You might have modified some files without having the
         proper tools for further handling them.
-         You can get \`$1Help2man' as part of \`Autoconf' from any GNU
+         You can get \`$1' as part of \`Autoconf' from any GNU
         archive site."
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
    if test -f "$file"; then
 	touch $file
    else
@ -183,111 +218,108 @@ WARNING: \`$1' is needed, and you do not seem to have it handy on your
    fi
    ;;
-  bison|yacc)
+  bison*|yacc*)
    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' $msg.  You should only need it if
         you modified a \`.y' file.  You may need the \`Bison' package
         in order for those modifications to take effect.  You can get
         \`Bison' from any GNU archive site."
    rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
        eval LASTARG="\${$#}"
-	case "$LASTARG" in
+	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.c
 	    fi
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.h
 	    fi
 	  ;;
 	esac
    fi
-    if [ ! -f y.tab.h ]; then
+    if test ! -f y.tab.h; then
 	echo >y.tab.h
    fi
-    if [ ! -f y.tab.c ]; then
+    if test ! -f y.tab.c; then
 	echo 'main() { return 0; }' >y.tab.c
    fi
    ;;
-  lex|flex)
+  lex*|flex*)
    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
         you modified a \`.l' file.  You may need the \`Flex' package
         in order for those modifications to take effect.  You can get
         \`Flex' from any GNU archive site."
    rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
        eval LASTARG="\${$#}"
-	case "$LASTARG" in
+	case $LASTARG in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" lex.yy.c
 	    fi
 	  ;;
 	esac
    fi
-    if [ ! -f lex.yy.c ]; then
+    if test ! -f lex.yy.c; then
 	echo 'main() { return 0; }' >lex.yy.c
    fi
    ;;
-  help2man)
+  help2man*)
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
       # We have it, but it failed.
       exit 1
    fi
    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
 	 you modified a dependency of a manual page.  You may need the
 	 \`Help2man' package in order for those modifications to take
 	 effect.  You can get \`Help2man' from any GNU archive site."
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
-    if test -z "$file"; then
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+    if test -f "$file"; then
    fi
    if [ -f "$file" ]; then
 	touch $file
    else
 	test -z "$file" || exec >$file
 	echo ".ab help2man is required to generate this page"
-	exit 1
+	exit $?
    fi
    ;;
-  makeinfo)
+  makeinfo*)
    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
       # We have makeinfo, but it failed.
       exit 1
    fi
    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
         you modified a \`.texi' or \`.texinfo' file, or any other file
         indirectly affecting the aspect of the manual.  The spurious
         call might also be the consequence of using a buggy \`make' (AIX,
         DU, IRIX).  You might want to install the \`Texinfo' package or
         the \`GNU make' package.  Grab either from any GNU archive site."
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    # The file to touch is that specified with -o ...
    file=`echo "$*" | sed -n "$sed_output"`
    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
    if test -z "$file"; then
-      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      # ... or it is the one specified with @setfilename ...
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
+      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
      file=`sed -n '
 	/^@setfilename/{
 	  s/.* \([^ ]*\) *$/\1/
 	  p
 	  q
 	}' $infile`
      # ... or it is derived from the source name (dir/f.texi becomes f.info)
      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
    fi
    # If the file does not exist, the user really needs makeinfo;
    # let's fail without touching anything.
    test -f $file || exit 1
    touch $file
    ;;
-  tar)
+  tar*)
    shift
    if test -n "$run"; then
      echo 1>&2 "ERROR: \`tar' requires --run"
      exit 1
    fi
    # We have already tried tar in the generic part.
    # Look for gnutar/gtar before invocation to avoid ugly error
@ -300,13 +332,13 @@ WARNING: \`$1' is missing on your system.  You should only need it if
    fi
    firstarg="$1"
    if shift; then
-	case "$firstarg" in
+	case $firstarg in
 	*o*)
 	    firstarg=`echo "$firstarg" | sed s/o//`
 	    tar "$firstarg" "$@" && exit 0
 	    ;;
 	esac
-	case "$firstarg" in
+	case $firstarg in
 	*h*)
 	    firstarg=`echo "$firstarg" | sed s/h//`
 	    tar "$firstarg" "$@" && exit 0
@ -323,10 +355,10 @@ WARNING: I can't seem to be able to run \`tar' with the given arguments.
  *)
    echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
+WARNING: \`$1' is needed, and is $msg.
-         system.  You might have modified some files without having the
+         You might have modified some files without having the
         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequirements for installing
+         it often tells you about the needed prerequisites for installing
         this package.  You may also peek at any GNU archive site, in case
         some other package would contain this missing \`$1' program."
    exit 1
@ -334,3 +366,11 @@ WARNING: \`$1' is needed, and you do not seem to have it handy on your
 esac
 exit 0
 # Local variables:
 # 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-end: "; # UTC"
 # End:
--- a/configure.ac
+++ b/configure.ac
@ -82,10 +82,10 @@ fi
 if test $GRIB_PTHREADS -eq 1
 then
-   AC_GRIB_PTHREADS
+AC_GRIB_PTHREADS
-   AC_GRIB_LINUX_PTHREADS
+AC_GRIB_LINUX_PTHREADS
 else
-   GRIB_LINUX_PTHREADS=0
+GRIB_LINUX_PTHREADS=0
 fi
 AC_DEFINE_UNQUOTED(GRIB_PTHREADS,$GRIB_PTHREADS,1->pthreads enabled 0->pthreads disabled)
@ -128,10 +128,10 @@ AC_CHECK_FUNC([posix_memalign],
 AC_ARG_ENABLE([align-memory],
  [AS_HELP_STRING([--enable-align-memory],[enable memory alignment [by default disabled]])],
-                  AC_DEFINE_UNQUOTED(GRIB_MEM_ALIGN,1,memory alignment required),
+AC_DEFINE_UNQUOTED(GRIB_MEM_ALIGN,1,memory alignment required) ,
-)
+	 )
-dnl use vectorised code
+dnl use vectorised code     
 AC_ARG_ENABLE([vector],
  [AS_HELP_STRING([--enable-vector],[enable vectorised code [by default disabled]] )],
 	 [vectorise=${enableval}],[vectorise=no])
@ -167,7 +167,6 @@ fi
 AC_SUBST(DEVEL_RULES)
 AC_SUBST(GRIB_DEVEL)
 AM_CONDITIONAL([WITH_MARS_TESTS], [test $GRIB_DEVEL -eq 1])
 dnl Large file support
 AC_FUNC_FSEEKO
@ -268,7 +267,7 @@ then
    AC_MSG_ERROR([unable to find compiler flag for modules inclusion])
  fi
  F90_MODULE_FLAG=$ax_cv_f90_modflag
-  AC_SUBST([F90_MODULE_FLAG])
+     AC_SUBST([F90_MODULE_FLAG])
 fi
 dnl ifs_samples
@ -633,7 +632,7 @@ AC_CHECK_FUNCS([bzero gettimeofday])
 AX_LINUX_DISTRIBUTION
-AC_OUTPUT( Makefile src/Makefile fortran/Makefile tools/Makefile definitions/Makefile samples/Makefile ifs_samples/grib1/Makefile ifs_samples/grib1_mlgrib2/Makefile ifs_samples/grib1_mlgrib2_ieee64/Makefile tests/Makefile mars_tests/Makefile examples/C/Makefile examples/F90/Makefile tigge/Makefile perl/GRIB-API/Makefile.PL perl/Makefile python/Makefile examples/python/Makefile rpms/grib_api.spec rpms/grib_api.pc rpms/grib_api_f90.pc)
+AC_OUTPUT( Makefile src/Makefile fortran/Makefile tools/Makefile definitions/Makefile samples/Makefile ifs_samples/grib1/Makefile ifs_samples/grib1_mlgrib2/Makefile ifs_samples/grib1_mlgrib2_ieee64/Makefile tests/Makefile examples/C/Makefile examples/F90/Makefile tigge/Makefile perl/GRIB-API/Makefile.PL perl/Makefile python/Makefile examples/python/Makefile rpms/grib_api.spec rpms/grib_api.pc rpms/grib_api_f90.pc)
 AC_MSG_NOTICE([
--- a/definitions/create_def.pl
+++ b/definitions/create_def.pl
--- a/doxygen/grib_api_wiz.cfg
+++ b/doxygen/grib_api_wiz.cfg
@ -8,6 +8,7 @@ PROJECT_NUMBER         =
 OUTPUT_DIRECTORY       = 
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
 USE_WINDOWS_ENCODING   = NO
 BRIEF_MEMBER_DESC      = YES
 REPEAT_BRIEF           = YES
 ABBREVIATE_BRIEF       = "The $name class" \
@ -29,6 +30,7 @@ STRIP_FROM_INC_PATH    =
 SHORT_NAMES            = NO
 JAVADOC_AUTOBRIEF      = YES
 MULTILINE_CPP_IS_BRIEF = NO
 DETAILS_AT_TOP         = NO
 INHERIT_DOCS           = YES
 SEPARATE_MEMBER_PAGES  = NO
 TAB_SIZE               = 8
@ -65,6 +67,7 @@ GENERATE_DEPRECATEDLIST= YES
 ENABLED_SECTIONS       = 
 MAX_INITIALIZER_LINES  = 30
 SHOW_USED_FILES        = YES
 SHOW_DIRECTORIES       = NO
 FILE_VERSION_FILTER    = 
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
@ -102,7 +105,7 @@ INPUT                  = grib_api.dox \
                         ../tools/grib_keys.dox \
                         ../tools/grib_copy.dox \
                         ../tools/grib_index_build.dox \
-                         ../python/eccode.py
+                         ../python/gribapi.py
 FILE_PATTERNS          = *.c \
                         *.cc \
                         *.cxx \
@ -181,6 +184,7 @@ HTML_FILE_EXTENSION    = .html
 HTML_HEADER            =
 HTML_FOOTER            = 
 HTML_STYLESHEET        = 
 HTML_ALIGN_MEMBERS     = YES
 GENERATE_HTMLHELP      = NO
 CHM_FILE               = 
 HHC_LOCATION           = 
@ -281,6 +285,8 @@ DIRECTORY_GRAPH        = YES
 DOT_IMAGE_FORMAT       = png
 DOT_PATH               = 
 DOTFILE_DIRS           = 
 MAX_DOT_GRAPH_WIDTH    = 1024
 MAX_DOT_GRAPH_HEIGHT   = 1024
 MAX_DOT_GRAPH_DEPTH    = 1000
 DOT_TRANSPARENT        = NO
 DOT_MULTI_TARGETS      = NO
--- a/grib_api_for_mars/definitions/grib1/local.98.35.def
+++ b/grib_api_for_mars/definitions/grib1/local.98.35.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/grib_api_for_mars/definitions/grib1/section.4.def
+++ b/grib_api_for_mars/definitions/grib1/section.4.def
@ -2,10 +2,11 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
 # START grib1::section
 # SECTION 4, Binary data section
 #  Length of section
--- a/m4/ax_python_devel.m4
+++ b/m4/ax_python_devel.m4
@ -1,325 +0,0 @@
 # ===========================================================================
 #      http://www.gnu.org/software/autoconf-archive/ax_python_devel.html
 # ===========================================================================
 #
 # SYNOPSIS
 #
 #   AX_PYTHON_DEVEL([version])
 #
 # DESCRIPTION
 #
 #   Note: Defines as a precious variable "PYTHON_VERSION". Don't override it
 #   in your configure.ac.
 #
 #   This macro checks for Python and tries to get the include path to
 #   'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LDFLAGS)
 #   output variables. It also exports $(PYTHON_EXTRA_LIBS) and
 #   $(PYTHON_EXTRA_LDFLAGS) for embedding Python in your code.
 #
 #   You can search for some particular version of Python by passing a
 #   parameter to this macro, for example ">= '2.3.1'", or "== '2.4'". Please
 #   note that you *have* to pass also an operator along with the version to
 #   match, and pay special attention to the single quotes surrounding the
 #   version number. Don't use "PYTHON_VERSION" for this: that environment
 #   variable is declared as precious and thus reserved for the end-user.
 #
 #   This macro should work for all versions of Python >= 2.1.0. As an end
 #   user, you can disable the check for the python version by setting the
 #   PYTHON_NOVERSIONCHECK environment variable to something else than the
 #   empty string.
 #
 #   If you need to use this macro for an older Python version, please
 #   contact the authors. We're always open for feedback.
 #
 # LICENSE
 #
 #   Copyright (c) 2009 Sebastian Huber <sebastian-huber@web.de>
 #   Copyright (c) 2009 Alan W. Irwin <irwin@beluga.phys.uvic.ca>
 #   Copyright (c) 2009 Rafael Laboissiere <rafael@laboissiere.net>
 #   Copyright (c) 2009 Andrew Collier <colliera@ukzn.ac.za>
 #   Copyright (c) 2009 Matteo Settenvini <matteo@member.fsf.org>
 #   Copyright (c) 2009 Horst Knorr <hk_classes@knoda.org>
 #
 #   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 3 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, see <http://www.gnu.org/licenses/>.
 #
 #   As a special exception, the respective Autoconf Macro's copyright owner
 #   gives unlimited permission to copy, distribute and modify the configure
 #   scripts that are the output of Autoconf when processing the Macro. You
 #   need not follow the terms of the GNU General Public License when using
 #   or distributing such scripts, even though portions of the text of the
 #   Macro appear in them. The GNU General Public License (GPL) does govern
 #   all other use of the material that constitutes the Autoconf Macro.
 #
 #   This special exception to the GPL applies to versions of the Autoconf
 #   Macro released by the Autoconf Archive. When you make and distribute a
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 #serial 8
 AU_ALIAS([AC_PYTHON_DEVEL], [AX_PYTHON_DEVEL])
 AC_DEFUN([AX_PYTHON_DEVEL],[
 	#
 	# Allow the use of a (user set) custom python version
 	#
 	AC_ARG_VAR([PYTHON_VERSION],[The installed Python
 		version to use, for example '2.3'. This string
 		will be appended to the Python interpreter
 		canonical name.])
 	AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]])
 	if test -z "$PYTHON"; then
 	   AC_MSG_ERROR([Cannot find python$PYTHON_VERSION in your system path])
 	   PYTHON_VERSION=""
 	fi
 	#
 	# Check for a version of Python >= 2.1.0
 	#
 	AC_MSG_CHECKING([for a version of Python >= '2.1.0'])
 	ac_supports_python_ver=`$PYTHON -c "import sys; \
 		ver = sys.version.split ()[[0]]; \
 		print (ver >= '2.1.0')"`
 	if test "$ac_supports_python_ver" != "True"; then
 		if test -z "$PYTHON_NOVERSIONCHECK"; then
 			AC_MSG_RESULT([no])
 			AC_MSG_FAILURE([
 This version of the AC@&t@_PYTHON_DEVEL macro
 doesn't work properly with versions of Python before
 2.1.0. You may need to re-run configure, setting the
 variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG,
 PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand.
 Moreover, to disable this check, set PYTHON_NOVERSIONCHECK
 to something else than an empty string.
 ])
 		else
 			AC_MSG_RESULT([skip at user request])
 		fi
 	else
 		AC_MSG_RESULT([yes])
 	fi
 	#
 	# if the macro parameter ``version'' is set, honour it
 	#
 	if test -n "$1"; then
 		AC_MSG_CHECKING([for a version of Python $1])
 		ac_supports_python_ver=`$PYTHON -c "import sys; \
 			ver = sys.version.split ()[[0]]; \
 			print (ver $1)"`
 		if test "$ac_supports_python_ver" = "True"; then
 		   AC_MSG_RESULT([yes])
 		else
 			AC_MSG_RESULT([no])
 			AC_MSG_ERROR([this package requires Python $1.
 If you have it installed, but it isn't the default Python
 interpreter in your system path, please pass the PYTHON_VERSION
 variable to configure. See ``configure --help'' for reference.
 ])
 			PYTHON_VERSION=""
 		fi
 	fi
 	#
 	# Check if you have distutils, else fail
 	#
 	AC_MSG_CHECKING([for the distutils Python package])
 	ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
 	if test -z "$ac_distutils_result"; then
 		AC_MSG_RESULT([yes])
 	else
 		AC_MSG_RESULT([no])
 		AC_MSG_ERROR([cannot import Python module "distutils".
 Please check your Python installation. The error was:
 $ac_distutils_result])
 		PYTHON_VERSION=""
 	fi
 	#
 	# Check for Python include path
 	#
 	AC_MSG_CHECKING([for Python include path])
 	if test -z "$PYTHON_CPPFLAGS"; then
 		python_path=`$PYTHON -c "import distutils.sysconfig; \
 			print (distutils.sysconfig.get_python_inc ());"`
 		if test -n "${python_path}"; then
 			python_path="-I$python_path"
 		fi
 		PYTHON_CPPFLAGS=$python_path
 	fi
 	AC_MSG_RESULT([$PYTHON_CPPFLAGS])
 	AC_SUBST([PYTHON_CPPFLAGS])
 	#
 	# Check for Python library path
 	#
 	AC_MSG_CHECKING([for Python library path])
 	if test -z "$PYTHON_LDFLAGS"; then
 		# (makes two attempts to ensure we've got a version number
 		# from the interpreter)
 		ac_python_version=`cat<<EOD | $PYTHON -
 # join all versioning strings, on some systems
 # major/minor numbers could be in different list elements
 from distutils.sysconfig import *
 ret = ''
 for e in get_config_vars ('VERSION'):
 	if (e != None):
 		ret += e
 print (ret)
 EOD`
 		if test -z "$ac_python_version"; then
 			if test -n "$PYTHON_VERSION"; then
 				ac_python_version=$PYTHON_VERSION
 			else
 				ac_python_version=`$PYTHON -c "import sys; \
 					print (sys.version[[:3]])"`
 			fi
 		fi
 		# Make the versioning information available to the compiler
 		AC_DEFINE_UNQUOTED([HAVE_PYTHON], ["$ac_python_version"],
                                   [If available, contains the Python version number currently in use.])
 		# First, the library directory:
 		ac_python_libdir=`cat<<EOD | $PYTHON -
 # There should be only one
 import distutils.sysconfig
 for e in distutils.sysconfig.get_config_vars ('LIBDIR'):
 	if e != None:
 		print (e)
 		break
 EOD`
 		# Before checking for libpythonX.Y, we need to know
 		# the extension the OS we're on uses for libraries
 		# (we take the first one, if there's more than one fix me!):
 		ac_python_soext=`$PYTHON -c \
 		  "import distutils.sysconfig; \
 		  print (distutils.sysconfig.get_config_vars('SO')[[0]])"`
 		# Now, for the library:
 		ac_python_soname=`$PYTHON -c \
 		  "import distutils.sysconfig; \
 		  print (distutils.sysconfig.get_config_vars('LDLIBRARY')[[0]])"`
 		# Strip away extension from the end to canonicalize its name:
 		ac_python_library=`echo "$ac_python_soname" | sed "s/${ac_python_soext}$//"`
 		# This small piece shamelessly adapted from PostgreSQL python macro;
 		# credits goes to momjian, I think. I'd like to put the right name
 		# in the credits, if someone can point me in the right direction... ?
 		#
 		if test -n "$ac_python_libdir" -a -n "$ac_python_library" \
 			-a x"$ac_python_library" != x"$ac_python_soname"
 		then
 			# use the official shared library
 			ac_python_library=`echo "$ac_python_library" | sed "s/^lib//"`
 			PYTHON_LDFLAGS="-L$ac_python_libdir -l$ac_python_library"
 		else
 			# old way: use libpython from python_configdir
 			ac_python_libdir=`$PYTHON -c \
 			  "from distutils.sysconfig import get_python_lib as f; \
 			  import os; \
 			  print (os.path.join(f(plat_specific=1, standard_lib=1), 'config'));"`
 			PYTHON_LDFLAGS="-L$ac_python_libdir -lpython$ac_python_version"
 		fi
 		if test -z "PYTHON_LDFLAGS"; then
 			AC_MSG_ERROR([
  Cannot determine location of your Python DSO. Please check it was installed with
  dynamic libraries enabled, or try setting PYTHON_LDFLAGS by hand.
 			])
 		fi
 	fi
 	AC_MSG_RESULT([$PYTHON_LDFLAGS])
 	AC_SUBST([PYTHON_LDFLAGS])
 	#
 	# Check for site packages
 	#
 	AC_MSG_CHECKING([for Python site-packages path])
 	if test -z "$PYTHON_SITE_PKG"; then
 		PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \
 			print (distutils.sysconfig.get_python_lib(0,0));"`
 	fi
 	AC_MSG_RESULT([$PYTHON_SITE_PKG])
 	AC_SUBST([PYTHON_SITE_PKG])
 	#
 	# libraries which must be linked in when embedding
 	#
 	AC_MSG_CHECKING(python extra libraries)
 	if test -z "$PYTHON_EXTRA_LIBS"; then
 	   PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
                conf = distutils.sysconfig.get_config_var; \
                print (conf('LOCALMODLIBS') + ' ' + conf('LIBS') + ' ' + conf('SYSLIBS'))"`
 	fi
 	AC_MSG_RESULT([$PYTHON_EXTRA_LIBS])
 	AC_SUBST(PYTHON_EXTRA_LIBS)
 	#
 	# linking flags needed when embedding
 	#
 	AC_MSG_CHECKING(python extra linking flags)
 	if test -z "$PYTHON_EXTRA_LDFLAGS"; then
 		PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \
 			conf = distutils.sysconfig.get_config_var; \
 			print (conf('LINKFORSHARED'))"`
 	fi
 	AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS])
 	AC_SUBST(PYTHON_EXTRA_LDFLAGS)
 	#
 	# final check to see if everything compiles alright
 	#
 	AC_MSG_CHECKING([consistency of all components of python development environment])
 	# save current global flags
 	ac_save_LIBS="$LIBS"
 	ac_save_CPPFLAGS="$CPPFLAGS"
 	LIBS="$ac_save_LIBS $PYTHON_LDFLAGS $PYTHON_EXTRA_LDFLAGS $PYTHON_EXTRA_LIBS"
 	CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
 	AC_LANG_PUSH([C])
 	AC_LINK_IFELSE([
 		AC_LANG_PROGRAM([[#include <Python.h>]],
 				[[Py_Initialize();]])
 		],[pythonexists=yes],[pythonexists=no])
 	AC_LANG_POP([C])
 	# turn back to default flags
 	CPPFLAGS="$ac_save_CPPFLAGS"
 	LIBS="$ac_save_LIBS"
 	AC_MSG_RESULT([$pythonexists])
        if test ! "x$pythonexists" = "xyes"; then
 	   AC_MSG_FAILURE([
  Could not link test program to Python. Maybe the main Python library has been
  installed in some non-standard library path. If so, pass it to configure,
  via the LDFLAGS environment variable.
  Example: ./configure LDFLAGS="-L/usr/non-standard-path/python/lib"
  ============================================================================
   ERROR!
   You probably have to install the development version of the Python package
   for your distribution.  The exact name of this package varies among them.
  ============================================================================
 	   ])
 	  PYTHON_VERSION=""
 	fi
 	#
 	# all done!
 	#
 ])
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
--- a/m4/ltoptions.m4
+++ b/m4/ltoptions.m4
@ -1,369 +0,0 @@
 # Helper functions for option handling.                    -*- Autoconf -*-
 #
 #   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
 #   Inc.
 #   Written by Gary V. Vaughan, 2004
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 # serial 7 ltoptions.m4
 # This is to help aclocal find these macros, as it can't see m4_define.
 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
 # _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
 # ------------------------------------------
 m4_define([_LT_MANGLE_OPTION],
 [[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
 # _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
 # ---------------------------------------
 # Set option OPTION-NAME for macro MACRO-NAME, and if there is a
 # matching handler defined, dispatch to it.  Other OPTION-NAMEs are
 # saved as a flag.
 m4_define([_LT_SET_OPTION],
 [m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
 m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
        _LT_MANGLE_DEFUN([$1], [$2]),
    [m4_warning([Unknown $1 option `$2'])])[]dnl
 ])
 # _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
 # ------------------------------------------------------------
 # Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
 m4_define([_LT_IF_OPTION],
 [m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
 # _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
 # -------------------------------------------------------
 # Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
 # are set.
 m4_define([_LT_UNLESS_OPTIONS],
 [m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
 	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
 		      [m4_define([$0_found])])])[]dnl
 m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
 ])[]dnl
 ])
 # _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
 # ----------------------------------------
 # OPTION-LIST is a space-separated list of Libtool options associated
 # with MACRO-NAME.  If any OPTION has a matching handler declared with
 # LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
 # the unknown option and exit.
 m4_defun([_LT_SET_OPTIONS],
 [# Set options
 m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
    [_LT_SET_OPTION([$1], _LT_Option)])
 m4_if([$1],[LT_INIT],[
  dnl
  dnl Simply set some default values (i.e off) if boolean options were not
  dnl specified:
  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
  ])
  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
  ])
  dnl
  dnl If no reference was made to various pairs of opposing options, then
  dnl we run the default mode handler for the pair.  For example, if neither
  dnl `shared' nor `disable-shared' was passed, we enable building of shared
  dnl archives by default:
  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
  		   [_LT_ENABLE_FAST_INSTALL])
  ])
 ])# _LT_SET_OPTIONS
 ## --------------------------------- ##
 ## Macros to handle LT_INIT options. ##
 ## --------------------------------- ##
 # _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
 # -----------------------------------------
 m4_define([_LT_MANGLE_DEFUN],
 [[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
 # LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
 # -----------------------------------------------
 m4_define([LT_OPTION_DEFINE],
 [m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
 ])# LT_OPTION_DEFINE
 # dlopen
 # ------
 LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
 ])
 AU_DEFUN([AC_LIBTOOL_DLOPEN],
 [_LT_SET_OPTION([LT_INIT], [dlopen])
 AC_DIAGNOSE([obsolete],
 [$0: Remove this warning and the call to _LT_SET_OPTION when you
 put the `dlopen' option into LT_INIT's first parameter.])
 ])
 dnl aclocal-1.4 backwards compatibility:
 dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
 # win32-dll
 # ---------
 # Declare package support for building win32 dll's.
 LT_OPTION_DEFINE([LT_INIT], [win32-dll],
 [enable_win32_dll=yes
 case $host in
 *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
  AC_CHECK_TOOL(AS, as, false)
  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
  AC_CHECK_TOOL(OBJDUMP, objdump, false)
  ;;
 esac
 test -z "$AS" && AS=as
 _LT_DECL([], [AS],      [1], [Assembler program])dnl
 test -z "$DLLTOOL" && DLLTOOL=dlltool
 _LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
 test -z "$OBJDUMP" && OBJDUMP=objdump
 _LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
 ])# win32-dll
 AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 _LT_SET_OPTION([LT_INIT], [win32-dll])
 AC_DIAGNOSE([obsolete],
 [$0: Remove this warning and the call to _LT_SET_OPTION when you
 put the `win32-dll' option into LT_INIT's first parameter.])
 ])
 dnl aclocal-1.4 backwards compatibility:
 dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
 # _LT_ENABLE_SHARED([DEFAULT])
 # ----------------------------
 # implement the --enable-shared flag, and supports the `shared' and
 # `disable-shared' LT_INIT options.
 # DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
 m4_define([_LT_ENABLE_SHARED],
 [m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
 AC_ARG_ENABLE([shared],
    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
 	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
    [p=${PACKAGE-default}
    case $enableval in
    yes) enable_shared=yes ;;
    no) enable_shared=no ;;
    *)
      enable_shared=no
      # Look at the argument we got.  We use all the common list separators.
      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
      for pkg in $enableval; do
 	IFS="$lt_save_ifs"
 	if test "X$pkg" = "X$p"; then
 	  enable_shared=yes
 	fi
      done
      IFS="$lt_save_ifs"
      ;;
    esac],
    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
    _LT_DECL([build_libtool_libs], [enable_shared], [0],
 	[Whether or not to build shared libraries])
 ])# _LT_ENABLE_SHARED
 LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
 LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
 # Old names:
 AC_DEFUN([AC_ENABLE_SHARED],
 [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
 ])
 AC_DEFUN([AC_DISABLE_SHARED],
 [_LT_SET_OPTION([LT_INIT], [disable-shared])
 ])
 AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
 AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
 dnl aclocal-1.4 backwards compatibility:
 dnl AC_DEFUN([AM_ENABLE_SHARED], [])
 dnl AC_DEFUN([AM_DISABLE_SHARED], [])
 # _LT_ENABLE_STATIC([DEFAULT])
 # ----------------------------
 # implement the --enable-static flag, and support the `static' and
 # `disable-static' LT_INIT options.
 # DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
 m4_define([_LT_ENABLE_STATIC],
 [m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
 AC_ARG_ENABLE([static],
    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
 	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
    [p=${PACKAGE-default}
    case $enableval in
    yes) enable_static=yes ;;
    no) enable_static=no ;;
    *)
     enable_static=no
      # Look at the argument we got.  We use all the common list separators.
      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
      for pkg in $enableval; do
 	IFS="$lt_save_ifs"
 	if test "X$pkg" = "X$p"; then
 	  enable_static=yes
 	fi
      done
      IFS="$lt_save_ifs"
      ;;
    esac],
    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
    _LT_DECL([build_old_libs], [enable_static], [0],
 	[Whether or not to build static libraries])
 ])# _LT_ENABLE_STATIC
 LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
 LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
 # Old names:
 AC_DEFUN([AC_ENABLE_STATIC],
 [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
 ])
 AC_DEFUN([AC_DISABLE_STATIC],
 [_LT_SET_OPTION([LT_INIT], [disable-static])
 ])
 AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
 AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
 dnl aclocal-1.4 backwards compatibility:
 dnl AC_DEFUN([AM_ENABLE_STATIC], [])
 dnl AC_DEFUN([AM_DISABLE_STATIC], [])
 # _LT_ENABLE_FAST_INSTALL([DEFAULT])
 # ----------------------------------
 # implement the --enable-fast-install flag, and support the `fast-install'
 # and `disable-fast-install' LT_INIT options.
 # DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
 m4_define([_LT_ENABLE_FAST_INSTALL],
 [m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
 AC_ARG_ENABLE([fast-install],
    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
    [p=${PACKAGE-default}
    case $enableval in
    yes) enable_fast_install=yes ;;
    no) enable_fast_install=no ;;
    *)
      enable_fast_install=no
      # Look at the argument we got.  We use all the common list separators.
      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
      for pkg in $enableval; do
 	IFS="$lt_save_ifs"
 	if test "X$pkg" = "X$p"; then
 	  enable_fast_install=yes
 	fi
      done
      IFS="$lt_save_ifs"
      ;;
    esac],
    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
 _LT_DECL([fast_install], [enable_fast_install], [0],
 	 [Whether or not to optimize for fast installation])dnl
 ])# _LT_ENABLE_FAST_INSTALL
 LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
 LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
 # Old names:
 AU_DEFUN([AC_ENABLE_FAST_INSTALL],
 [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
 AC_DIAGNOSE([obsolete],
 [$0: Remove this warning and the call to _LT_SET_OPTION when you put
 the `fast-install' option into LT_INIT's first parameter.])
 ])
 AU_DEFUN([AC_DISABLE_FAST_INSTALL],
 [_LT_SET_OPTION([LT_INIT], [disable-fast-install])
 AC_DIAGNOSE([obsolete],
 [$0: Remove this warning and the call to _LT_SET_OPTION when you put
 the `disable-fast-install' option into LT_INIT's first parameter.])
 ])
 dnl aclocal-1.4 backwards compatibility:
 dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
 dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
 # _LT_WITH_PIC([MODE])
 # --------------------
 # implement the --with-pic flag, and support the `pic-only' and `no-pic'
 # LT_INIT options.
 # MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
 m4_define([_LT_WITH_PIC],
 [AC_ARG_WITH([pic],
    [AS_HELP_STRING([--with-pic],
 	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
    [pic_mode="$withval"],
    [pic_mode=default])
 test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
 _LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
 ])# _LT_WITH_PIC
 LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
 LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
 # Old name:
 AU_DEFUN([AC_LIBTOOL_PICMODE],
 [_LT_SET_OPTION([LT_INIT], [pic-only])
 AC_DIAGNOSE([obsolete],
 [$0: Remove this warning and the call to _LT_SET_OPTION when you
 put the `pic-only' option into LT_INIT's first parameter.])
 ])
 dnl aclocal-1.4 backwards compatibility:
 dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
 ## ----------------- ##
 ## LTDL_INIT Options ##
 ## ----------------- ##
 m4_define([_LTDL_MODE], [])
 LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
 		 [m4_define([_LTDL_MODE], [nonrecursive])])
 LT_OPTION_DEFINE([LTDL_INIT], [recursive],
 		 [m4_define([_LTDL_MODE], [recursive])])
 LT_OPTION_DEFINE([LTDL_INIT], [subproject],
 		 [m4_define([_LTDL_MODE], [subproject])])
 m4_define([_LTDL_TYPE], [])
 LT_OPTION_DEFINE([LTDL_INIT], [installable],
 		 [m4_define([_LTDL_TYPE], [installable])])
 LT_OPTION_DEFINE([LTDL_INIT], [convenience],
 		 [m4_define([_LTDL_TYPE], [convenience])])
--- a/m4/ltsugar.m4
+++ b/m4/ltsugar.m4
@ -1,123 +0,0 @@
 # ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
 #
 # Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
 # Written by Gary V. Vaughan, 2004
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 # serial 6 ltsugar.m4
 # This is to help aclocal find these macros, as it can't see m4_define.
 AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
 # lt_join(SEP, ARG1, [ARG2...])
 # -----------------------------
 # Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
 # associated separator.
 # Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
 # versions in m4sugar had bugs.
 m4_define([lt_join],
 [m4_if([$#], [1], [],
       [$#], [2], [[$2]],
       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
 m4_define([_lt_join],
 [m4_if([$#$2], [2], [],
       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
 # lt_car(LIST)
 # lt_cdr(LIST)
 # ------------
 # Manipulate m4 lists.
 # These macros are necessary as long as will still need to support
 # Autoconf-2.59 which quotes differently.
 m4_define([lt_car], [[$1]])
 m4_define([lt_cdr],
 [m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
       [$#], 1, [],
       [m4_dquote(m4_shift($@))])])
 m4_define([lt_unquote], $1)
 # lt_append(MACRO-NAME, STRING, [SEPARATOR])
 # ------------------------------------------
 # Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
 # Note that neither SEPARATOR nor STRING are expanded; they are appended
 # to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
 # No SEPARATOR is output if MACRO-NAME was previously undefined (different
 # than defined and empty).
 #
 # This macro is needed until we can rely on Autoconf 2.62, since earlier
 # versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
 m4_define([lt_append],
 [m4_define([$1],
 	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
 # lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
 # ----------------------------------------------------------
 # Produce a SEP delimited list of all paired combinations of elements of
 # PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
 # has the form PREFIXmINFIXSUFFIXn.
 # Needed until we can rely on m4_combine added in Autoconf 2.62.
 m4_define([lt_combine],
 [m4_if(m4_eval([$# > 3]), [1],
       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
 [[m4_foreach([_Lt_prefix], [$2],
 	     [m4_foreach([_Lt_suffix],
 		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
 	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
 # lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
 # -----------------------------------------------------------------------
 # Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
 # by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
 m4_define([lt_if_append_uniq],
 [m4_ifdef([$1],
 	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
 		 [lt_append([$1], [$2], [$3])$4],
 		 [$5])],
 	  [lt_append([$1], [$2], [$3])$4])])
 # lt_dict_add(DICT, KEY, VALUE)
 # -----------------------------
 m4_define([lt_dict_add],
 [m4_define([$1($2)], [$3])])
 # lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
 # --------------------------------------------
 m4_define([lt_dict_add_subkey],
 [m4_define([$1($2:$3)], [$4])])
 # lt_dict_fetch(DICT, KEY, [SUBKEY])
 # ----------------------------------
 m4_define([lt_dict_fetch],
 [m4_ifval([$3],
 	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
 # lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
 # -----------------------------------------------------------------
 m4_define([lt_if_dict_fetch],
 [m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
 	[$5],
    [$6])])
 # lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
 # --------------------------------------------------------------
 m4_define([lt_dict_filter],
 [m4_if([$5], [], [],
  [lt_join(m4_quote(m4_default([$4], [[, ]])),
           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
 		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
 ])
--- a/m4/ltversion.m4
+++ b/m4/ltversion.m4
@ -1,23 +0,0 @@
 # ltversion.m4 -- version numbers			-*- Autoconf -*-
 #
 #   Copyright (C) 2004 Free Software Foundation, Inc.
 #   Written by Scott James Remnant, 2004
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 # @configure_input@
 # serial 3293 ltversion.m4
 # This file is part of GNU Libtool
 m4_define([LT_PACKAGE_VERSION], [2.4])
 m4_define([LT_PACKAGE_REVISION], [1.3293])
 AC_DEFUN([LTVERSION_VERSION],
 [macro_version='2.4'
 macro_revision='1.3293'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
--- a/m4/lt~obsolete.m4
+++ b/m4/lt~obsolete.m4
@ -1,98 +0,0 @@
 # lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 #
 #   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
 #   Written by Scott James Remnant, 2004.
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 # serial 5 lt~obsolete.m4
 # These exist entirely to fool aclocal when bootstrapping libtool.
 #
 # In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
 # which have later been changed to m4_define as they aren't part of the
 # exported API, or moved to Autoconf or Automake where they belong.
 #
 # The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
 # in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
 # using a macro with the same name in our local m4/libtool.m4 it'll
 # pull the old libtool.m4 in (it doesn't see our shiny new m4_define
 # and doesn't know about Autoconf macros at all.)
 #
 # So we provide this file, which has a silly filename so it's always
 # included after everything else.  This provides aclocal with the
 # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
 # because those macros already exist, or will be overwritten later.
 # We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
 #
 # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
 # Yes, that means every name once taken will need to remain here until
 # we give up compatibility with versions before 1.7, at which point
 # we need to keep only those names which we still refer to.
 # This is to help aclocal find these macros, as it can't see m4_define.
 AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
 m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
 m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
 m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
 m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
 m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
 m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
 m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
 m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
 m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
 m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
 m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
 m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
 m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
 m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
 m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
 m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
 m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
 m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
 m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
 m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
 m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
 m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
 m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
 m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
 m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
 m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
 m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
 m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
 m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
 m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
 m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
 m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
 m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
 m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
 m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
 m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
 m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
 m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
 m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
 m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
 m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
 m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
 m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
 m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
 m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
 m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
 m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
 m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
 m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
 m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
 m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
 m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
 m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
 m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
 m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
 m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
 m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
 m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
 m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
 m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
 m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
--- a/mars_tests/Makefile.am
+++ b/mars_tests/Makefile.am
@ -1,12 +0,0 @@
 if WITH_MARS_TESTS
     TESTS = ls.sh
     noinst_PROGRAMS = 
     LDADD = $(top_builddir)/src/libgrib_api.a $(EMOS_LIB)
     INCLUDES   = -I$(top_builddir)/src
     EXTRA_DIST = $(TESTS)
 endif   
--- a/mars_tests/include.sh
+++ b/mars_tests/include.sh
@ -1,53 +0,0 @@
 # Copyright 2005-2012 ECMWF.
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
 # 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 set -ea
 echo
 echo "TEST: $0"
 data_dir=""
 # save current working dir
 save=`pwd`
 if [ -z "${data_dir}" ]
 then
  cd ../
  cpath=`pwd`
  GRIB_DEFINITION_PATH=$cpath/definitions
  export GRIB_DEFINITION_PATH
  GRIB_SAMPLES_PATH=$cpath/samples
  export GRIB_SAMPLES_PATH
  tools_dir=$cpath/tools/
  tigge_dir=$cpath/tigge/
  data_dir=$cpath/data
  test_dir=$cpath/tests
  def_dir=$cpath/definitions
 else
  tools_dir=""
  tigge_dir=""
 fi
 if [ -z "${GRIB_API_INCLUDE}" ]
 then 
  GRIB_API_INCLUDE=`pwd`/src
 fi
 if [ -z "${GRIB_API_LIB}" ]
 then 
  GRIB_API_LIB=`pwd`/src
 fi
 #${tools_dir}grib_info
 # go back to current working dir
 cd $save
 set -u
--- a/mars_tests/ls.sh
+++ b/mars_tests/ls.sh
@ -1,60 +0,0 @@
 #!/bin/sh
 # Copyright 2005-2012 ECMWF.
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
 # 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 . ./include.sh
 rm -f log | true
 workdir=`pwd`
 cd ${data_dir}
 infile=regular_gaussian_model_level.grib1
 ${tools_dir}grib_ls -P count $infile > log
 ${tools_dir}grib_ls -p count,step $infile >> log
 ${tools_dir}grib_ls $infile >> log
 ${tools_dir}grib_ls -l 0,0,1 $infile >> log
 ${tools_dir}grib_get -l 0,0,1 $infile >> log
 ${tools_dir}grib_get -p count,step $infile >> log
 ${tools_dir}grib_get -P count $infile >> log
 files=" reduced_gaussian_lsm.grib1
 reduced_gaussian_model_level.grib1
 reduced_gaussian_model_level.grib2
 reduced_gaussian_pressure_level.grib1
 reduced_gaussian_pressure_level.grib2
 reduced_gaussian_pressure_level_constant.grib1
 reduced_gaussian_pressure_level_constant.grib2
 reduced_gaussian_sub_area.grib1
 reduced_gaussian_sub_area.grib2
 reduced_gaussian_surface.grib1
 reduced_gaussian_surface.grib2
 reduced_latlon_surface.grib1
 reduced_latlon_surface.grib2
 regular_gaussian_model_level.grib1
 regular_gaussian_model_level.grib2
 regular_gaussian_pressure_level.grib1
 regular_gaussian_pressure_level.grib2
 regular_gaussian_pressure_level_constant.grib1
 regular_gaussian_pressure_level_constant.grib2
 regular_gaussian_surface.grib1
 regular_gaussian_surface.grib2
 regular_latlon_surface.grib1
 regular_latlon_surface.grib2
 "
 for file in $files
 do 
 	echo $file >> log
 	${tools_dir}grib_ls -l 40,28 $file  | grep index | awk '{print $4;}' >> log
 done
 diff log ls.log 
 rm -f log
 cd $workdir
--- a/python/gribapi.py
+++ b/python/gribapi.py
--- a/src/grib_accessor_class_codetable.c
+++ b/src/grib_accessor_class_codetable.c
@ -199,75 +199,75 @@ static void init(grib_accessor* a, const long len, grib_arguments* params) {
 static grib_codetable* load_table(grib_accessor_codetable* self)
 {
-    size_t size = 0;
+  size_t size = 0;
-    grib_handle*    h = ((grib_accessor*)self)->parent->h;
+  grib_handle*    h = ((grib_accessor*)self)->parent->h;
-    grib_context*   c = h->context;
+  grib_context*   c = h->context;
-    grib_codetable* t = NULL;
+  grib_codetable* t = NULL;
-    grib_codetable* next=NULL ;
+  grib_codetable* next=NULL ;
-    grib_accessor* a=(grib_accessor*)self;
+  grib_accessor* a=(grib_accessor*)self;
-    char *filename=0;
+  char *filename=0;
-    char name[1024]={0,};
+  char name[1024]={0,};
-    char recomposed[1024]={0,};
+  char recomposed[1024]={0,};
-    char localRecomposed[1024]={0,};
+  char localRecomposed[1024]={0,};
-    char *localFilename=0;
+  char *localFilename=0;
-    char localName[1024]={0,};
+  char localName[1024]={0,};
-    char masterDir[1024]={0,};
+  char masterDir[1024]={0,};
-    char localDir[1024]={0,};
+  char localDir[1024]={0,};
-    size_t len=1024;
+  size_t len=1024;
-    if (self->masterDir != NULL)
+  if (self->masterDir != NULL)
-        grib_get_string(h,self->masterDir,masterDir,&len);
+    grib_get_string(h,self->masterDir,masterDir,&len);
-    len=1024;
+  len=1024;
-    if (self->localDir != NULL)
+  if (self->localDir != NULL)
-        grib_get_string(h,self->localDir,localDir,&len);
+    grib_get_string(h,self->localDir,localDir,&len);
-    if (*masterDir!=0) {
+  if (*masterDir!=0) {
-        sprintf(name,"%s/%s",masterDir,self->tablename);
+    sprintf(name,"%s/%s",masterDir,self->tablename);
-        grib_recompose_name(h, NULL,name, recomposed,0);
+    grib_recompose_name(h, NULL,name, recomposed,0);
-        filename=grib_context_full_defs_path(c,recomposed);
+    filename=grib_context_full_defs_path(c,recomposed);
-    } else {
+  } else {
-        grib_recompose_name(h, NULL,self->tablename, recomposed,0);
+    grib_recompose_name(h, NULL,self->tablename, recomposed,0);
-        filename=grib_context_full_defs_path(c,recomposed);
+    filename=grib_context_full_defs_path(c,recomposed);
-    }
+  }
-    if (*localDir!=0) {
+  if (*localDir!=0) {
-        sprintf(localName,"%s/%s",localDir,self->tablename);
+    sprintf(localName,"%s/%s",localDir,self->tablename);
-        grib_recompose_name(h, NULL,localName, localRecomposed,0);
+    grib_recompose_name(h, NULL,localName, localRecomposed,0);
-        localFilename=grib_context_full_defs_path(c,localRecomposed);
+    localFilename=grib_context_full_defs_path(c,localRecomposed);
-    }
+  }
  next=c->codetable;
  while(next) {
    if((filename && next->filename[0] && strcmp(filename,next->filename[0]) == 0) &&
       ((localFilename==0 && next->filename[1]==NULL) ||
           ((localFilename!=0 && next->filename[1]!=NULL)
           && strcmp(localFilename,next->filename[1]) ==0)) )
      return next;
    next = next->next;
  }
-    next=c->codetable;
+  if (a->flags & GRIB_ACCESSOR_FLAG_TRANSIENT) {
-    while(next) {
+	  Assert(a->vvalue!=NULL);
-        if((filename && next->filename[0] && strcmp(filename,next->filename[0]) == 0) &&
+    size=a->vvalue->length*8;
-                ((localFilename==0 && next->filename[1]==NULL) ||
+  } else {
-                 ((localFilename!=0 && next->filename[1]!=NULL)
+    size = grib_byte_count((grib_accessor*)self) * 8;
-                  && strcmp(localFilename,next->filename[1]) ==0)) )
+  }
-            return next;
+  size = grib_power(size,2);
        next = next->next;
    }
-    if (a->flags & GRIB_ACCESSOR_FLAG_TRANSIENT) {
+  t = (grib_codetable*)grib_context_malloc_clear_persistent(c,sizeof(grib_codetable) +
-        Assert(a->vvalue!=NULL);
+      (size-1)*sizeof(code_table_entry));
        size=a->vvalue->length*8;
    } else {
        size = grib_byte_count((grib_accessor*)self) * 8;
    }
    size = grib_power(size,2);
-    t = (grib_codetable*)grib_context_malloc_clear_persistent(c,sizeof(grib_codetable) +
+  if (filename!=0) grib_load_codetable(c,filename,recomposed,size,t);
            (size-1)*sizeof(code_table_entry));
-    if (filename!=0) grib_load_codetable(c,filename,recomposed,size,t);
+  if (localFilename!=0) grib_load_codetable(c,localFilename,localRecomposed,size,t);
-    if (localFilename!=0) grib_load_codetable(c,localFilename,localRecomposed,size,t);
+  if (t->filename[0]==NULL && t->filename[1]==NULL) {
-
+    grib_context_free_persistent(c,t);
-    if (t->filename[0]==NULL && t->filename[1]==NULL) {
+    return NULL;
-        grib_context_free_persistent(c,t);
+  }
-        return NULL;
+  
-    }
+  return t;
    return t;
 }
@ -533,74 +533,74 @@ static long value_count(grib_accessor* a)
 static int pack_string(grib_accessor* a, const char* buffer, size_t *len)
 {
-	grib_accessor_codetable* self = (grib_accessor_codetable*)a;
+  grib_accessor_codetable* self = (grib_accessor_codetable*)a;
-	grib_codetable*          table ;
+  grib_codetable*          table ;
-	long i;
+  long i;
-	size_t size = 1;
+  size_t size = 1;
-	typedef int (*cmpproc)(const char*, const char*);
+  typedef int (*cmpproc)(const char*, const char*);
 #ifndef _WIN32
-	cmpproc cmp = a->flags | GRIB_ACCESSOR_FLAG_LOWERCASE ? strcasecmp : strcmp;
+  cmpproc cmp = a->flags | GRIB_ACCESSOR_FLAG_LOWERCASE ? strcasecmp : strcmp;
 #else
 	/* Microsoft Windows Visual Studio support */
 	cmpproc cmp = a->flags | GRIB_ACCESSOR_FLAG_LOWERCASE ? stricmp : strcmp;
 #endif
-	if(!self->table) self->table = load_table(self);
+  if(!self->table) self->table = load_table(self);
-	table=self->table;
+  table=self->table;
-	if(!table)
+  if(!table)
-		return GRIB_ENCODING_ERROR;
+    return GRIB_ENCODING_ERROR;
-	if (a->set) {
+  if (a->set) {
-		int err=grib_set_string(a->parent->h,a->set,buffer,len);
+	  int err=grib_set_string(a->parent->h,a->set,buffer,len);
-		if (err!=0) return err;
+	  if (err!=0) return err;
-	}
+  }
-	for(i = 0 ; i < table->size; i++)
+  for(i = 0 ; i < table->size; i++)
-		if(table->entries[i].abbreviation)
+    if(table->entries[i].abbreviation)
-			if(cmp(table->entries[i].abbreviation,buffer) == 0)
+		  if(cmp(table->entries[i].abbreviation,buffer) == 0)
-				return grib_pack_long(a,&i,&size);
+        return grib_pack_long(a,&i,&size);
-	if (a->flags & GRIB_ACCESSOR_FLAG_NO_FAIL) {
+  if (a->flags & GRIB_ACCESSOR_FLAG_NO_FAIL) {
-		grib_action* act=(grib_action*)(a->creator);
+	  grib_action* act=(grib_action*)(a->creator);
-		if (act->default_value!=NULL) {
+	  if (act->default_value!=NULL) {
-			const char* p = 0;
+		  const char* p = 0;
-			size_t len = 1;
+		  size_t len = 1;
-			long l;
+		  long l;
-			int ret=0;
+		  int ret=0;
-			double d;
+		  double d;
-			char tmp[1024];
+		  char tmp[1024];
-			grib_expression* expression=grib_arguments_get_expression(a->parent->h,act->default_value,0);
+		  grib_expression* expression=grib_arguments_get_expression(a->parent->h,act->default_value,0);
-			int type = grib_expression_native_type(a->parent->h,expression);
+		  int type = grib_expression_native_type(a->parent->h,expression);
-			switch(type) {
+		  switch(type) {
-			case GRIB_TYPE_DOUBLE:
+			  case GRIB_TYPE_DOUBLE:
-				grib_expression_evaluate_double(a->parent->h,expression,&d);
+				  grib_expression_evaluate_double(a->parent->h,expression,&d);
-				grib_pack_double(a,&d,&len);
+				  grib_pack_double(a,&d,&len);
-				break;
+				  break;
-			case GRIB_TYPE_LONG:
+			  case GRIB_TYPE_LONG:
-				grib_expression_evaluate_long(a->parent->h,expression,&l);
+				  grib_expression_evaluate_long(a->parent->h,expression,&l);
-				grib_pack_long(a,&l,&len);
+				  grib_pack_long(a,&l,&len);
-				break;
+				  break;
-			default:
+			  default:
-				len = sizeof(tmp);
+				  len = sizeof(tmp);
-				p = grib_expression_evaluate_string(a->parent->h,expression,tmp,&len,&ret);
+				  p = grib_expression_evaluate_string(a->parent->h,expression,tmp,&len,&ret);
-				if (ret != GRIB_SUCCESS) {
+				  if (ret != GRIB_SUCCESS) {
-					grib_context_log(a->parent->h->context,GRIB_LOG_FATAL,
+					  grib_context_log(a->parent->h->context,GRIB_LOG_FATAL,
-							"unable to evaluate %s as string",a->name);
+									   "unable to evaluate %s as string",a->name);
-					return ret;
+					  return ret;
-				}
+				  }
-				len = strlen(p)+1;
+				  len = strlen(p)+1;
-				pack_string(a,p,&len);
+				  pack_string(a,p,&len);
-				break;
+				  break;
-			}
+		  }
-			return GRIB_SUCCESS;
+		  return GRIB_SUCCESS;
-		}
+	  }
-
+	
-	}
+  }
-	return GRIB_ENCODING_ERROR;
+  return GRIB_ENCODING_ERROR;
 }
 static int pack_expression(grib_accessor* a, grib_expression *e){
--- a/src/grib_context.c
+++ b/src/grib_context.c
@ -210,10 +210,10 @@ static  grib_context default_grib_context = {
 		0,                            /* no_abort                   */
 		0,                            /* io_buffer_size             */
 		0,                            /* no_big_group_split         */
-		0,                            /* no_spd                     */
+		0,                            /* no_spd         */
-		0,                            /* keep_matrix                */
+		0,                            /* keep_matrix         */
 		0,                            /* grib_definition_files_path */
-		0,                            /* grib_samples_path          */
+		0,                            /* grib_samples_path        */
 		0,                            /* grib_concept_path          */
 		0,                            /* grib_reader                */
 		0,                            /* user data                  */
--- a/src/grib_errors.c.in
+++ b/src/grib_errors.c.in
@ -35,7 +35,7 @@ void grib_check(const char* call,const char*  file,int line,int e,const char* ms
    }
 }
-void grib_fail(const char* expr,const char* file,int line) {
+void grib_fail(const char* expr,const char*  file,int line) {
   fprintf(stderr,"%s at line %d: assertion failure Assert(%s)\n",file,line,expr);
   abort();
 }
--- a/src/grib_expression_class.h
+++ b/src/grib_expression_class.h
@ -1,12 +0,0 @@
 /* This file is automatically generated by ./make_class.pl, do not edit */
 extern grib_expression_class* grib_expression_class_accessor;
 extern grib_expression_class* grib_expression_class_binop;
 extern grib_expression_class* grib_expression_class_column;
 extern grib_expression_class* grib_expression_class_constant;
 extern grib_expression_class* grib_expression_class_double;
 extern grib_expression_class* grib_expression_class_functor;
 extern grib_expression_class* grib_expression_class_long;
 extern grib_expression_class* grib_expression_class_string;
 extern grib_expression_class* grib_expression_class_string_compare;
 extern grib_expression_class* grib_expression_class_true;
 extern grib_expression_class* grib_expression_class_unop;
--- a/src/grib_expression_factory.h
+++ b/src/grib_expression_factory.h
@ -1,12 +0,0 @@
 /* This file is automatically generated by ./make_class.pl, do not edit */
 { "accessor", &grib_expression_class_accessor, },
 { "binop", &grib_expression_class_binop, },
 { "column", &grib_expression_class_column, },
 { "constant", &grib_expression_class_constant, },
 { "double", &grib_expression_class_double, },
 { "functor", &grib_expression_class_functor, },
 { "long", &grib_expression_class_long, },
 { "string", &grib_expression_class_string, },
 { "string_compare", &grib_expression_class_string_compare, },
 { "true", &grib_expression_class_true, },
 { "unop", &grib_expression_class_unop, },
--- a/src/grib_io.c
+++ b/src/grib_io.c
@ -906,7 +906,7 @@ void *wmo_read_gts_from_file_malloc(FILE* f,int headers_only,size_t *size,off_t
 	r.headers_only = headers_only;
 	*err           = read_any_gts(&r);
-	*size	         = r.message_size;
+	*size	       = r.message_size;
 	*offset		   = r.offset;
 	return u.buffer;
@ -929,7 +929,7 @@ static void *_wmo_read_any_from_file_malloc(FILE* f,int* err,size_t *size,off_t
 	r.headers_only = headers_only;
 	*err           = read_any(&r,grib_ok,bufr_ok);
-	*size		      = r.message_size;
+	*size		   = r.message_size;
 	*offset		   = r.offset;
 	return u.buffer;
@ -992,9 +992,9 @@ int grib_read_any_headers_only_from_file_alloc(grib_context* ctx,FILE* f,void **
 	err            = read_any(&r,1,GRIB_API_READS_BUFR);
- *buffer        = u.buffer;
+	*buffer        = u.buffer;
- *length        = u.length;
+	*length        = u.length;
- *offset		   = r.offset;
+	*offset		   = r.offset;
 	return err;
 }
@ -1019,12 +1019,12 @@ int grib_read_any_from_file_alloc(grib_context* ctx,FILE* f,void **buffer,size_t
 	err            = read_any(&r,1,GRIB_API_READS_BUFR);
- *buffer        = u.buffer;
+	*buffer        = u.buffer;
- *length        = u.length;
+	*length        = u.length;
 	return err;
 }
- */
+*/
 int grib_read_any_headers_only_from_file(grib_context* ctx,FILE* f,void* buffer,size_t* len)
@ -1057,7 +1057,7 @@ int grib_read_any_from_file(grib_context* ctx,FILE* f,void* buffer,size_t* len)
 	int         err;
 	user_buffer u; 
 	reader      r; 
-	off_t       offset;
+	off_t 		offset;
 	u.user_buffer  = buffer;
 	u.buffer_size  = *len;
--- a/src/grib_util.c
+++ b/src/grib_util.c
--- a/src/grib_value.c
+++ b/src/grib_value.c
--- a/tests/fortran_interface.sh
+++ b/tests/fortran_interface.sh
@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Copyright 2005-2012 ECMWF.
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
--- a/tests/local.sh
+++ b/tests/local.sh
@ -70,7 +70,7 @@ do
 	${tools_dir}grib_set -s edition=2 loc1.grib1 loc1.grib2
 	${tools_dir}grib_get -p localDefinitionNumber loc1.grib1 >> local.log
 	${tools_dir}grib_get -p localDefinitionNumber loc1.grib2 >> local.log
-	
+
 	for localEps in 1 15 26 30
 	do
 		${tools_dir}grib_set -s localDefinitionNumber=$localEps,eps=1,perturbationNumber=2,numberOfForecastsInEnsemble=50 loc1.grib2 eps.grib2
--- a/tools/grib1to2
+++ b/tools/grib1to2
@ -8,7 +8,7 @@ then
   exit 1
 fi
-grib_filter=/var/tmp/masn/p4/grib_api/main/bin/grib_filter
+grib_filter=/var/tmp/masn/p4/grib_api/releases/2.0.0/bin/grib_filter
 rules_filter=rules.filter$$
 force=0
@ -53,7 +53,7 @@ $grib_filter -o $out  $rules_filter  $in
 error=$?
-rm -f $rules_filter 
+rm -f  $rules_filter 
 exit $error