[SCM] GNU Libtool branch, master, updated. v2.4.2-337-g9f2b41f

[Gary V. Vaughan]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".

The branch, master has been updated
       via  9f2b41f6d9a74e9d4e3a3d959da0e81a3f5d7a23 (commit)
      from  cdd7f33f06e5864fdf0d13731398f5021e285647 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9f2b41f6d9a74e9d4e3a3d959da0e81a3f5d7a23
Author: Gary V. Vaughan <address@hidden>
Date:   Thu Oct 25 10:03:05 2012 -0500

    bootstrap: use a decent awk if /bin/awk is hopeless.
    
    Bootstrap used to fail without an explicit AWK environment
    setting on machines with both nawk and awk, but where awk is a
    museum piece.
    * gl/build-aux/inline-source (AWK): Remove initial setting.
    (require_awk): Search PATH for a gawk, mawk or nawk before
    settling on awk, just like configure does.
    (func_include): Use it.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 gl/build-aux/inline-source |   45 +++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/gl/build-aux/inline-source b/gl/build-aux/inline-source
index 058354e..a2241f6 100755
--- a/gl/build-aux/inline-source
+++ b/gl/build-aux/inline-source
@@ -31,9 +31,6 @@ scriptversion=2012-10-11.10; # UTC
 # Please report bugs or propose patches to address@hidden
 
 
-: ${AWK="awk"}
-
-
 ## ------ ##
 ## Usage. ##
 ## ------ ##
@@ -69,6 +66,46 @@ func_options ${1+"$@"}
 eval set dummy "$func_options_result"; shift
 
 
+## -------------------- ##
+## Resource management. ##
+## -------------------- ##
+
+# require_AWK
+# -----------
+# Search for a "not hopeless" awk.
+require_AWK=func_require_AWK
+func_require_AWK ()
+{
+    $debug_cmd
+
+    test -n "$AWK" || {
+      # Find the first executable in the list.
+      for _G_prog in gawk mawk nawk awk
+      do
+        require_AWK_IFS=$IFS
+       IFS=${PATH_SEPARATOR-:}
+       for _G_dir in $PATH
+        do
+         IFS=$require_AWK_IFS
+          if test -f "$_G_dir/$_G_prog" && test -x "$_G_dir/$_G_prog"
+         then
+           AWK="$_G_dir/$_G_prog"
+            break 2
+          fi
+        done
+       IFS=$require_AWK_IFS
+      done
+    }
+
+    test -n "$AWK" || func_fatal_error "\
+Please install GNU Awk, or 'export AWK=/path/to/gnu/awk'."
+
+    func_verbose "found '$AWK'."
+
+    require_AWK=:
+}
+
+
 ## --------------- ##
 ## Core functions. ##
 ## --------------- ##
@@ -78,6 +115,8 @@ eval set dummy "$func_options_result"; shift
 # Output the contents of file included by LINE.
 func_include ()
 {
+    $require_AWK
+
     test -f "$1" \
         || func_fatal_error "file '$1' not found"
 


hooks/post-receive
-- 
GNU Libtool