# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1240261803 0
# Node ID 3448ac3f1a5da3f78963f32016f2f0a8683069f0
# Parent  7ac43d3747c028d52fe5c428343b5c93571f44b5
There's no longer any reason to require GNU awk:
- the only part that required it (socks proxy settings) is gone,
- all remaining awk scripts are POSIXly correct (or should be).

 -------- diffstat follows --------
 /trunk/configure                     |    5     2     3     0 ++---
 /trunk/Makefile.in                   |    2     0     2     0 --
 /trunk/scripts/build/kernel/linux.sh |    2     1     1     0 +-
 /trunk/scripts/build/internals.sh    |    1     0     1     0 -
 /trunk/scripts/build/mpfr.sh         |    2     1     1     0 +-
 /trunk/scripts/functions             |    4     2     2     0 ++--
 /trunk/scripts/saveSample.sh.in      |    4     2     2     0 ++--
 7 files changed, 8 insertions(+), 12 deletions(-)

diff -r 7ac43d3747c0 -r 3448ac3f1a5d Makefile.in
--- a/Makefile.in	Mon Apr 20 20:14:53 2009 +0000
+++ b/Makefile.in	Mon Apr 20 21:10:03 2009 +0000
@@ -51,7 +51,6 @@
 bash   := @@bash@@
 grep   := @@grep@@
 make   := @@make@@
-awk    := @@awk@@
 sed    := @@sed@@
 
 ###############################################################################
@@ -139,7 +138,6 @@
 	  echo "export bash=$(bash)";       \
 	  echo "export grep=$(grep)";       \
 	  echo "export make=$(make)";       \
-	  echo "export awk=$(awk)";         \
 	  echo "export sed=$(sed)";         \
 	 ) >paths.mk
 
diff -r 7ac43d3747c0 -r 3448ac3f1a5d configure
--- a/configure	Mon Apr 20 20:14:53 2009 +0000
+++ b/configure	Mon Apr 20 21:10:03 2009 +0000
@@ -4,9 +4,8 @@
 DATE=$( date +%Y%m%d )
 
 # All absolutely required tools, one per line to ease diff.
-# See function 'has_or_abort, below, for syntax
+# See function 'has_or_abort', below, for syntax
 #  - Hopefully, if gcc is present, then all associated tools will be
-#  - awk must be GNU awk
 #  - makeinfo for building docs, even if discarded later on
 #  - others obvious... :-/
 #
@@ -44,7 +43,7 @@
 install:install=GNU coreutils
 make:make=^GNU Make
 gcc
-awk:awk=^GNU Awk || gawk=^GNU Awk
+awk
 bison
 flex
 makeinfo
diff -r 7ac43d3747c0 -r 3448ac3f1a5d scripts/build/internals.sh
--- a/scripts/build/internals.sh	Mon Apr 20 20:14:53 2009 +0000
+++ b/scripts/build/internals.sh	Mon Apr 20 21:10:03 2009 +0000
@@ -18,7 +18,6 @@
                -e 's|@@CT_bash@@|'"${bash}"'|g;'        \
                -e 's|@@CT_grep@@|'"${grep}"'|g;'        \
                -e 's|@@CT_make@@|'"${make}"'|g;'        \
-               -e 's|@@CT_awk@@|'"${awk}"'|g;'          \
                -e 's|@@CT_sed@@|'"${sed}"'|g;'          \
                "${CT_LIB_DIR}/scripts/populate.in"      \
                >"${CT_PREFIX_DIR}/bin/${CT_TARGET}-populate"
diff -r 7ac43d3747c0 -r 3448ac3f1a5d scripts/build/kernel/linux.sh
--- a/scripts/build/kernel/linux.sh	Mon Apr 20 20:14:53 2009 +0000
+++ b/scripts/build/kernel/linux.sh	Mon Apr 20 21:10:03 2009 +0000
@@ -47,7 +47,7 @@
 
     # Only starting with 2.6.18 does headers_install is usable. We only
     # have 2.6 version available, so only test for sublevel.
-    k_sublevel=$("${awk}" '/^SUBLEVEL =/ { print $3 }' "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}/Makefile")
+    k_sublevel=$(awk '/^SUBLEVEL =/ { print $3 }' "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}/Makefile")
     [ ${k_sublevel} -ge 18 ] || CT_Abort "Kernel version >= 2.6.18 is needed to install kernel headers."
 
     V_OPT="V=${CT_KERNEL_LINUX_VERBOSE_LEVEL}"
diff -r 7ac43d3747c0 -r 3448ac3f1a5d scripts/build/mpfr.sh
--- a/scripts/build/mpfr.sh	Mon Apr 20 20:14:53 2009 +0000
+++ b/scripts/build/mpfr.sh	Mon Apr 20 21:10:03 2009 +0000
@@ -42,7 +42,7 @@
                 # See: http://sourceware.org/ml/crossgcc/2008-11/msg00046.html
                 # and: http://sourceware.org/ml/crossgcc/2008-11/msg00048.html
                 libtoolize_opt=
-                case "$(libtoolize --version |head -n 1 |"${awk}" '{ print $(NF); }')" in
+                case "$(libtoolize --version |head -n 1 |awk '{ print $(NF); }')" in
                     0.*)    ;;
                     1.*)    ;;
                     *)      libtoolize_opt=-i;;
diff -r 7ac43d3747c0 -r 3448ac3f1a5d scripts/functions
--- a/scripts/functions	Mon Apr 20 20:14:53 2009 +0000
+++ b/scripts/functions	Mon Apr 20 21:10:03 2009 +0000
@@ -743,8 +743,8 @@
     CT_DoLog DEBUG "  Saving environment and aliases"
     # We must omit shell functions, and some specific bash variables
     # that break when restoring the environment, later. We could do
-    # all the processing in the gawk script, but a sed is easier...
-    set |"${awk}" '
+    # all the processing in the awk script, but a sed is easier...
+    set |awk '
               BEGIN { _p = 1; }
               $0~/^[^ ]+ \(\)/ { _p = 0; }
               _p == 1
diff -r 7ac43d3747c0 -r 3448ac3f1a5d scripts/saveSample.sh.in
--- a/scripts/saveSample.sh.in	Mon Apr 20 20:14:53 2009 +0000
+++ b/scripts/saveSample.sh.in	Mon Apr 20 21:10:03 2009 +0000
@@ -78,8 +78,8 @@
 CT_DoAddFileToSample() {
     source="$1"
     dest="$2"
-    inode_s=$(ls -i "${source}" |"${awk}" '{ print $1; }')
-    inode_d=$(ls -i "${dest}" 2>/dev/null |"${awk}" '{ print $1; }' || true)
+    inode_s=$(ls -i "${source}" |awk '{ print $1; }')
+    inode_d=$(ls -i "${dest}" 2>/dev/null |awk '{ print $1; }' || true)
     if [ "${inode_s}" != "${inode_d}" ]; then
         cp "${source}" "${dest}"
     fi