[SCM] GNU Libtool branch, master, updated. v2.4.2-128-gaead37d

[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  aead37d19ed17f1391f373c9599477e0e178cf0c (commit)
       via  daf3f3a7d7ed77c9a15ddf41c744d9e509aa3945 (commit)
       via  5229af9cefbce37d9a83f89fac92de22adde57c7 (commit)
       via  44313522fcb32a47d5e61d97b6eaa6052daae516 (commit)
       via  509907a28ecbb385ff144999d72c34d0503ca430 (commit)
      from  11869b9c9eb8bcc8cb6a615141f522a447377324 (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 aead37d19ed17f1391f373c9599477e0e178cf0c
Author: Gary V. Vaughan <address@hidden>
Date:   Thu Dec 8 12:24:00 2011 +0700

    bootstrap: escape quotes properly in generated functions.
    
    * bootstrap: Although not a real bug, for consistency, be sure
    to correctly escape single quotes inside a single quoted
    function generator.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

commit daf3f3a7d7ed77c9a15ddf41c744d9e509aa3945
Author: Gary V. Vaughan <address@hidden>
Date:   Thu Dec 8 12:20:47 2011 +0700

    bootstrap: reorder function definitions to keep func_buildreq_* together.
    
    * bootstrap: Restore asciibetical order, so that all the
    buildreq function definitions are together.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

commit 5229af9cefbce37d9a83f89fac92de22adde57c7
Author: Gary V. Vaughan <address@hidden>
Date:   Thu Dec 8 12:15:11 2011 +0700

    bootstrap: use _buildreq as a prefix for better ordering.
    
    * bootstrap (require_autobuild_buildreq)
    (require_autoconf_buildreq, require_automake_buildreq)
    (require_autopoint_buildreq, require_libtoolize_buildreq)
    (require_patch_buildreq): Rename from these...
    (require_buildreq_autobuild, require_buildreq_autoconf)
    (require_buildreq_automake, require_buildreq_autopoint)
    (require_buildreq_libtoolize, require_buildreq_patch): ...to
    these, respectively.  Adjust all callers.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

commit 44313522fcb32a47d5e61d97b6eaa6052daae516
Author: Gary V. Vaughan <address@hidden>
Date:   Thu Dec 8 12:08:16 2011 +0700

    bootstrap: ensure consistent function header comments.
    
    * bootstrap (require_bootstrap_uptodate)
    (require_buildtools_uptodate): Use `require_...' in header
    comment for these functions to be consistent with the rest,
    rather than `func_require_...'.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

commit 509907a28ecbb385ff144999d72c34d0503ca430
Author: Gary V. Vaughan <address@hidden>
Date:   Thu Dec 8 11:54:40 2011 +0700

    bootstrap: make sure patch is available to bootstrap if necessary.
    
    Make sure we're not lacking any functionality provided by the
    incumbent gnulib bootstrap script, and where it's easy to do so
    (like it is here), provide better functionality!
    * bootstrap (require_patch): Make sure that PATCH expands to the
    best `patch' command available on the system, honouring
    overrides in the users environment.
    (require_patch_buildreq): Automatically add a requirement for a
    patch command to buildreq when there are diff files in
    $local_gl_dir.
    (func_require_buildtools_uptodate): Call require_patch_buildreq
    before testing build tool versions.
    (func_gnulib_tool_copy_file): Make sure PATCH is set before using
    gnulib-tool to copy files.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

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

Summary of changes:
 bootstrap |  271 +++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 163 insertions(+), 108 deletions(-)

diff --git a/bootstrap b/bootstrap
index ae65e37..28f85b0 100755
--- a/bootstrap
+++ b/bootstrap
@@ -556,6 +556,7 @@ func_gnulib_tool_copy_file ()
 
     $require_gnulib_path
     $require_gnulib_tool
+    $require_patch
 
     gnulib_copy_cmd="$gnulib_tool --copy-file"
     $opt_copy || func_append gnulib_copy_cmd " --symlink"
@@ -861,74 +862,6 @@ func_require_aclocal_amflags ()
 }
 
 
-# require_autobuild_buildreq
-# --------------------------
-# Try to find whether the bootstrap requires autobuild.
-require_autobuild_buildreq=func_require_autobuild_buildreq
-func_require_autobuild_buildreq ()
-{
-    $debug_cmd
-
-    $require_macro_dir
-
-    test -f "$macro_dir/autobuild.m4" \
-        || printf '%s\n' "$buildreq" |func_grep_q '^[   ]*autobuild' \
-        || {
-      func_extract_trace AB_INIT
-      test -n "$func_extract_trace_result" && {
-        func_append buildreq 'autobuild - http://josefsson.org/autobuild/
-'
-        func_verbose "auto-adding \`autobuild' to build requirements"
-      }
-    }
-
-    require_autobuild_buildreq=:
-}
-
-
-# require_autoconf_buildreq
-# require_autopoint_buildreq
-# require_libtoolize_buildreq
-# ---------------------------
-# Try to find the minimum compatible version of autoconf/libtool
-# required to bootstrap successfully, and add it to `$buildreq'.
-for tool in autoconf libtoolize autopoint; do
-  b=$tool
-  v=require_${tool}_buildreq
-  f=func_$v
-  case $tool in
-    autoconf) m=AC_PREREQ ;;
-    libtoolize) m=LT_PREREQ; b=libtool ;;
-    autopoint) m=AM_GNU_GETTEXT_VERSION b=gettext ;;
-  esac
-
-  eval $v'='$f'
-  '$f' ()
-  {
-    $debug_cmd
-
-    # The following is ignored if undefined, but might be necessary
-    # in order for `func_find_tool` to run.
-    ${require_'$tool'-:}
-
-    printf '%s\n' "$buildreq" |func_grep_q '\''^[       ]*'$tool\'' || {
-      func_extract_trace '$m'
-      _G_version=$func_extract_trace_result
-      test -n "$_G_version" && {
-        func_append buildreq "\
-            '$tool' $_G_version http://www.gnu.org/s/'$b'
-"
-        func_verbose \
-            "auto-adding \`'$tool'-$_G_version'\'' to build requirements"
-      }
-    }
-
-    '$v'=:
-  }
-'
-done
-
-
 # require_autoheader
 # ------------------
 # Skip autoheader if it's not needed.
@@ -956,37 +889,6 @@ func_require_autoheader ()
 }
 
 
-# require_automake_buildreq
-# -------------------------
-# Try to find the minimum compatible version of automake required to
-# bootstrap successfully, and add it to `$buildreq'.
-require_automake_buildreq=func_require_automake_buildreq
-func_require_automake_buildreq ()
-{
-    $debug_cmd
-
-    # if automake is not already listed in $buildreq...
-    printf '%s\n' "$buildreq" |func_grep_q automake || {
-      func_extract_trace AM_INIT_AUTOMAKE
-
-      # ...and AM_INIT_AUTOMAKE is declared...
-      test -n "$func_extract_trace_result" && {
-        automake_version=`echo "$func_extract_trace_result" \
-           |$SED 's|[^0-9]*||; s| .*$||'`
-        test -n "$automake_version" || automake_version=-
-
-        func_append buildreq "\
-            automake $automake_version http://www.gnu.org/s/automake
-"
-        func_verbose \
-            "auto-adding \`automake-$automake_version' to build requirements"
-      }
-    }
-
-    require_automake_buildreq=:
-}
-
-
 # require_autopoint
 # -----------------
 # Skip autopoint if it's not needed.
@@ -1012,8 +914,8 @@ func_require_autopoint ()
 }
 
 
-# func_require_bootstrap_uptodate
-# -------------------------------
+# require_bootstrap_uptodate
+# --------------------------
 # Complain if the version of bootstrap in the gnulib directory differs
 # from the one we are running.
 require_bootstrap_uptodate=func_require_bootstrap_uptodate
@@ -1066,8 +968,136 @@ func_require_build_aux ()
 }
 
 
-# func_require_buildtools_uptodate
-# --------------------------------
+# require_buildreq_autobuild
+# --------------------------
+# Try to find whether the bootstrap requires autobuild.
+require_buildreq_autobuild=func_require_buildreq_autobuild
+func_require_buildreq_autobuild()
+{
+    $debug_cmd
+
+    $require_macro_dir
+
+    test -f "$macro_dir/autobuild.m4" \
+        || printf '%s\n' "$buildreq" |func_grep_q '^[   ]*autobuild' \
+        || {
+      func_extract_trace AB_INIT
+      test -n "$func_extract_trace_result" && {
+        func_append buildreq 'autobuild - http://josefsson.org/autobuild/
+'
+        func_verbose "auto-adding \`autobuild' to build requirements"
+      }
+    }
+
+    require_buildreq_autobuild=:
+}
+
+
+# require_buildreq_autoconf
+# require_buildreq_autopoint
+# require_buildreq_libtoolize
+# ---------------------------
+# Try to find the minimum compatible version of autoconf/libtool
+# required to bootstrap successfully, and add it to `$buildreq'.
+for tool in autoconf libtoolize autopoint; do
+  b=$tool
+  v=require_buildreq_${tool}
+  f=func_$v
+  case $tool in
+    autoconf) m=AC_PREREQ ;;
+    libtoolize) m=LT_PREREQ; b=libtool ;;
+    autopoint) m=AM_GNU_GETTEXT_VERSION b=gettext ;;
+  esac
+
+  eval $v'='$f'
+  '$f' ()
+  {
+    $debug_cmd
+
+    # The following is ignored if undefined, but might be necessary
+    # in order for `func_find_tool` to run.
+    ${require_'$tool'-:}
+
+    printf '\''%s\n'\'' "$buildreq" |func_grep_q '\''^[         ]*'$tool\'' || 
{
+      func_extract_trace '$m'
+      _G_version=$func_extract_trace_result
+      test -n "$_G_version" && {
+        func_append buildreq "\
+            '$tool' $_G_version http://www.gnu.org/s/'$b'
+"
+        func_verbose \
+            "auto-adding \`'$tool'-$_G_version'\'' to build requirements"
+      }
+    }
+
+    '$v'=:
+  }
+'
+done
+
+
+# require_buildreq_automake
+# -------------------------
+# Try to find the minimum compatible version of automake required to
+# bootstrap successfully, and add it to `$buildreq'.
+require_buildreq_automake=func_require_buildreq_automake
+func_require_buildreq_automake()
+{
+    $debug_cmd
+
+    # if automake is not already listed in $buildreq...
+    printf '%s\n' "$buildreq" |func_grep_q automake || {
+      func_extract_trace AM_INIT_AUTOMAKE
+
+      # ...and AM_INIT_AUTOMAKE is declared...
+      test -n "$func_extract_trace_result" && {
+        automake_version=`echo "$func_extract_trace_result" \
+           |$SED 's|[^0-9]*||; s| .*$||'`
+        test -n "$automake_version" || automake_version=-
+
+        func_append buildreq "\
+            automake $automake_version http://www.gnu.org/s/automake
+"
+        func_verbose \
+            "auto-adding \`automake-$automake_version' to build requirements"
+      }
+    }
+
+    require_buildreq_automake=:
+}
+
+
+# require_buildreq_patch
+# ----------------------
+# Automatically add a patch build-requirement if there are diff files
+# in $local_gl_dir.
+require_buildreq_patch=func_require_buildreq_patch
+func_require_buildreq_patch ()
+{
+    $debug_cmd
+
+    # This ensures PATCH is set appropriately by the time
+    # func_check_versions enforces $buildreq.
+    $require_patch
+
+    # If patch is not already listed in $buildreq...
+    printf '%s\n' "$buildreq" |func_grep_q '^[  ]*patch' || {
+      # The ugly find invocation is necessary to exit with non-zero
+      # status for old find binaries that don't support -exec fully.
+      if test ! -d "$local_gl_dir" \
+          || find "$local_gl_dir" -name *.diff -exec false {} +; then :
+      else
+          func_append buildreq 'patch - http://www.gnu.org/s/patch
+'
+      fi
+    }
+
+    require_buildreq_patch=:
+}
+
+
+# require_buildtools_uptodate
+# ---------------------------
 # Ensure all the packages listed in BUILDREQS are available on the build
 # machine at the minimum versions or better.
 require_buildtools_uptodate=func_require_buildtools_uptodate
@@ -1075,11 +1105,12 @@ func_require_buildtools_uptodate ()
 {
     $debug_cmd
 
-    $require_autobuild_buildreq
-    $require_autoconf_buildreq
-    $require_automake_buildreq
-    $require_libtoolize_buildreq
-    $require_autopoint_buildreq
+    $require_buildreq_autobuild
+    $require_buildreq_autoconf
+    $require_buildreq_automake
+    $require_buildreq_libtoolize
+    $require_buildreq_autopoint
+    $require_buildreq_patch
 
     test -n "$buildreq" && {
       _G_error_hdr=
@@ -1613,6 +1644,30 @@ func_gnulib_tool has installed the \`git-version-gen' 
script."
 }
 
 
+# require_patch
+# -------------
+# Find patch, according to the PATCH environment variable, or else
+# searching the user's PATH.
+require_patch=func_require_patch
+func_require_patch ()
+{
+    $debug_cmd
+
+    test -n "$PATCH" || {
+      # Find a patch program, preferring gpatch which is usually better
+      # than the vendor patch.
+      func_find_tool PATCH gpatch patch
+    }
+
+    func_verbose "export PATCH='$PATCH'"
+
+    # Make sure the search result is visible to subshells
+    export PATCH
+
+    require_patch=:
+}
+
+
 # require_source_base
 # -------------------
 # Ensure that source_base has a sensible value, extracted from


hooks/post-receive
-- 
GNU Libtool