# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1249249117 -7200
# Node ID ffe807a862881a0714ad7d2e82bd52ef54c69c78
# Parent  e4bb05790f3f546d70b3b218a8d8c4c31223077c# Parent  7e7290acccc18d28d37ca9ad2d1ccb89a3b0c4f3
Merge the queue with all new component versions.

diff -r e4bb05790f3f -r ffe807a86288 configure
--- a/configure	Sun Aug 02 23:33:38 2009 +0200
+++ b/configure	Sun Aug 02 23:38:37 2009 +0200
@@ -327,12 +327,12 @@
              ver='^GNU Make (3.[89][[:digit:]]|[4-9])'  \
              err="GNU 'make' 3.80 or above was not found"
 has_or_abort prog=gcc
-has_or_abort prog=awk
+has_or_abort prog="awk gawk" ver='^GNU Awk' err="GNU 'awk' was not found"
 has_or_abort prog=bison
 has_or_abort prog=flex
 has_or_abort prog=makeinfo
 has_or_abort prog=automake                                                      \
-             ver='\(GNU automake\) (1\.[[:digit:]]{2,}\.|[2-9][[:digit:]]*\.)'  \
+             ver='\(GNU automake\) (1\.[[:digit:]]{2,}|[2-9][[:digit:]]*\.)'    \
              err="'automake' 1.10 or above was not found"
 has_or_abort prog=libtool                                                                           \
              ver='\(GNU libtool.*\) (2[[:digit:]]*\.|1\.6[[:digit:]]*\.|1\.5\.[2-9][[:digit:]]+)'   \
diff -r e4bb05790f3f -r ffe807a86288 scripts/crosstool-NG.sh.in
--- a/scripts/crosstool-NG.sh.in	Sun Aug 02 23:33:38 2009 +0200
+++ b/scripts/crosstool-NG.sh.in	Sun Aug 02 23:38:37 2009 +0200
@@ -405,7 +405,7 @@
             else
                 case "${tool}" in
                     # We'll at least need some of them...
-                    ar|as|gcc|ld|nm|objcopy|objdump|ranlib)
+                    ar|as|gcc|g++|ld|nm|objcopy|objdump|ranlib)
                         CT_Abort "Missing: '${t}${tool}${!s}' or '${t}${tool}' or '${tool}' : either needed!"
                         ;;
                     # Some are conditionnally required
diff -r e4bb05790f3f -r ffe807a86288 scripts/wrapper.in
--- a/scripts/wrapper.in	Sun Aug 02 23:33:38 2009 +0200
+++ b/scripts/wrapper.in	Sun Aug 02 23:38:37 2009 +0200
@@ -1,7 +1,8 @@
 #!/bin/sh
 
-dirname="$(dirname "${0}")"
-basename="$(basename "${0}")"
+canonicalizedname=$(readlink -nm "${0}")
+dirname="$(dirname "${canonicalizedname}")"
+basename="$(basename "${canonicalizedname}")"
 
 ld_lib_path="$(dirname "${dirname}")/lib"