[SCM] GNU Libtool branch, master, updated. v2.4.2-394-g96d8763
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 96d876301b0b1423e8192b6e54eba6a88569d14f (commit)
from 5d4a43d8747f71e677a1c8df574dc18036ff569d (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 96d876301b0b1423e8192b6e54eba6a88569d14f
Author: Gary V. Vaughan g...@gnu.org
Date: Sun Sep 15 13:38:11 2013 +0700
bootstrap: fetch defaults from gnulib-cache.m4 for non-imported projects.
Recent changes uncovered some bugs in handling of gnulib-tool
options for projects that check in gnulib-cache.m4 rather than
keep a separate list of modules and options in bootstrap.conf.
* gl/build-aux/bootstrap.in (func_require_doc_base)
(func_require_gnulib_name, func_require_local_gl_dir): New
functions to set defaults from gnulib-cache.m4 in projects that
use gnulib-tool in --update mode.
(func_require_gnulib_tool_base_options): Use them to fetch
defaults.
(func_require_gnulib_copy_cmd): New function to calculate the
options required for gnlib-tool copy command.
(func_gnulib_tool_copy_file): Simplify accordingly.
(scriptversion): Bump.
Signed-off-by: Gary V. Vaughan g...@gnu.org
---
Summary of changes:
bootstrap | 117 ++--
gl/build-aux/bootstrap.in | 117 ++--
2 files changed, 202 insertions(+), 32 deletions(-)
diff --git a/bootstrap b/bootstrap
index fec6f33..e123a8b 100755
--- a/bootstrap
+++ b/bootstrap
@@ -2203,7 +2203,7 @@ test extract-trace = $progname func_main $@
# End:
# Set a version string for *this* script.
-scriptversion=2013-08-29.21; # UTC
+scriptversion=2013-09-15.06; # UTC
# 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
@@ -2766,13 +2766,9 @@ func_gnulib_tool_copy_file ()
{
$debug_cmd
-$require_gnulib_path
$require_gnulib_tool
$require_patch
-gnulib_copy_cmd=$gnulib_tool --copy-file
-$opt_copy || func_append gnulib_copy_cmd --symlink
-
if test true = $gnulib_tool; then
# If gnulib-tool is not available (e.g. bootstrapping in a
# distribution tarball), make sure that at least we have some
@@ -2786,12 +2782,14 @@ or else specify the location of your 'git' binary by
setting 'GIT' in the environment so that a fresh
'gnulib' submodule can be cloned.
else
- test -f $gnulib_path/$1 || {
+ $require_gnulib_copy_cmd
+
+ $gnulib_copy_cmd $1 $2 2/dev/null || {
+$require_gnulib_path
+
func_error '$gnulib_path/$1' does not exist
return 1
}
-
- $gnulib_copy_cmd $1 $2
fi
}
@@ -3325,6 +3323,8 @@ func_require_buildreq_patch ()
{
$debug_cmd
+$require_local_gl_dir
+
# This ensures PATCH is set appropriately by the time
# func_check_versions enforces $buildreq.
$require_patch
@@ -3400,6 +3400,28 @@ defaulting to '$copyright_holder'.
}
+# require_doc_base
+#
+# Ensure doc_base has a sensible value, extracted from 'gnulib-cache.m4'
+# if possible, otherwise letting 'gnulib-tool' pick a default.
+require_doc_base=func_require_doc_base
+func_require_doc_base ()
+{
+$debug_cmd
+
+$require_gnulib_cache
+
+test -f $gnulib_cache test -z $doc_base {
+ func_extract_trace_first gl_DOC_BASE $gnulib_cache
+ doc_base=$func_extract_trace_first_result
+
+ test -n $doc_base func_verbose doc_base='$doc_base'
+}
+
+require_doc_base=:
+}
+
+
# require_dotgitmodules
# -
# Ensure we have a '.gitmodules' file, with appropriate 'gnulib' settings.
@@ -3495,6 +3517,25 @@ func_require_gnulib_cache ()
}
+# require_gnulib_copy_cmd
+# ---
+# Only calculate the options for copying files with gnulib once.
+require_gnulib_copy_cmd=func_require_gnulib_copy_cmd
+func_require_gnulib_copy_cmd ()
+{
+$debug_cmd
+
+$require_gnulib_tool
+$require_gnulib_tool_base_options
+
+gnulib_copy_cmd=$gnulib_tool $gnulib_tool_base_options --copy-file
+$opt_copy || func_append gnulib_copy_cmd --symlink
+$opt_quiet || func_append gnulib_copy_cmd --verbose
+
+require_gnulib_copy_cmd=:
+}
+
+
# require_gnulib_merge_changelog
# --
# See if we can use gnulib's git-merge-changelog merge driver.
@@ -3533,10 +3574,9 @@ func_require_gnulib_mk ()
{
$debug_cmd
-test -f $gnulib_cache test -z $gnulib_mk {
- $require_gnulib_cache
- $require_macro_dir
+
[SCM] GNU Libtool branch, master, updated. v2.4.2-395-g2d744d9
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 2d744d9edab9819e15942d20e2f11fad14d8cbbb (commit)
from 96d876301b0b1423e8192b6e54eba6a88569d14f (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 2d744d9edab9819e15942d20e2f11fad14d8cbbb
Author: Gary V. Vaughan g...@gnu.org
Date: Sun Sep 15 20:35:15 2013 +0700
bootstrap: make ensure_changelog work for update mode projects.
* gl/build-aux/bootstrap.in (func_bootstrap): Move
func_changelog_ensure invocation from here...
(func_reconfigure): ...to here. If gnulib_modules is empty, then
grep gnulib-cache.m4 for gitlog-to-changelog before invoking
func_changelog_ensure.
* bootstrap: Regenerate.
Signed-off-by: Gary V. Vaughan g...@gnu.org
---
Summary of changes:
bootstrap | 17 +
gl/build-aux/bootstrap.in | 17 +
2 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/bootstrap b/bootstrap
index e123a8b..803380a 100755
--- a/bootstrap
+++ b/bootstrap
@@ -2461,10 +2461,6 @@ func_bootstrap ()
# Post-option preparation.
func_prep
-# Ensure ChangeLog presence.
-func_ifcontains $gnulib_modules gitlog-to-changelog \
- func_ensure_changelog
-
# Reconfigure the package.
func_reconfigure
@@ -2545,6 +2541,19 @@ func_reconfigure ()
{
$debug_cmd
+# Ensure ChangeLog presence.
+if test -n $gnulib_modules; then
+ func_ifcontains $gnulib_modules gitlog-to-changelog \
+func_ensure_changelog
+else
+ $require_gnulib_cache
+ if sed -n '/^gl_MODULES(\[/,/^])$/p' $gnulib_cache |
+ func_grep_q gitlog-to-changelog
+ then
+func_ensure_changelog
+ fi
+fi
+
# Released 'autopoint' has the tendency to install macros that have
# been obsoleted in current 'gnulib., so run this before 'gnulib-tool'.
func_autopoint
diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in
index e58cde5..550a642 100755
--- a/gl/build-aux/bootstrap.in
+++ b/gl/build-aux/bootstrap.in
@@ -271,10 +271,6 @@ func_bootstrap ()
# Post-option preparation.
func_prep
-# Ensure ChangeLog presence.
-func_ifcontains $gnulib_modules gitlog-to-changelog \
- func_ensure_changelog
-
# Reconfigure the package.
func_reconfigure
@@ -355,6 +351,19 @@ func_reconfigure ()
{
$debug_cmd
+# Ensure ChangeLog presence.
+if test -n $gnulib_modules; then
+ func_ifcontains $gnulib_modules gitlog-to-changelog \
+func_ensure_changelog
+else
+ $require_gnulib_cache
+ if sed -n '/^gl_MODULES(\[/,/^])$/p' $gnulib_cache |
+ func_grep_q gitlog-to-changelog
+ then
+func_ensure_changelog
+ fi
+fi
+
# Released 'autopoint' has the tendency to install macros that have
# been obsoleted in current 'gnulib., so run this before 'gnulib-tool'.
func_autopoint
hooks/post-receive
--
GNU Libtool
[SCM] GNU Libtool branch, master, updated. v2.4.2-396-g75051fb
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 75051fb536aa3a84324f61253765ab0e58e91fa2 (commit)
from 2d744d9edab9819e15942d20e2f11fad14d8cbbb (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 75051fb536aa3a84324f61253765ab0e58e91fa2
Author: Gary V. Vaughan g...@gnu.org
Date: Mon Sep 16 11:02:23 2013 +0700
bootstrap: clean up spurious 'gnulib-cache.m4 missing' error.
* gl/build-aux/bootstrap.in (func_reconfigure): Don't show an
error when running without gnulib-cache.m4.
* bootstrap: Regenerate.
Signed-off-by: Gary V. Vaughan g...@gnu.org
---
Summary of changes:
bootstrap |4 ++--
gl/build-aux/bootstrap.in |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/bootstrap b/bootstrap
index 803380a..2ad3eb9 100755
--- a/bootstrap
+++ b/bootstrap
@@ -2203,7 +2203,7 @@ test extract-trace = $progname func_main $@
# End:
# Set a version string for *this* script.
-scriptversion=2013-09-15.06; # UTC
+scriptversion=2013-09-16.03; # UTC
# 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
@@ -2547,7 +2547,7 @@ func_reconfigure ()
func_ensure_changelog
else
$require_gnulib_cache
- if sed -n '/^gl_MODULES(\[/,/^])$/p' $gnulib_cache |
+ if sed -n '/^gl_MODULES(\[/,/^])$/p' $gnulib_cache 2/dev/null |
func_grep_q gitlog-to-changelog
then
func_ensure_changelog
diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in
index 550a642..6463a6c 100755
--- a/gl/build-aux/bootstrap.in
+++ b/gl/build-aux/bootstrap.in
@@ -13,7 +13,7 @@
. `echo $0 |${SED-sed} 's|[^/]*$||'`extract-trace
# Set a version string for *this* script.
-scriptversion=2013-09-15.06; # UTC
+scriptversion=2013-09-16.03; # UTC
# 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
@@ -357,7 +357,7 @@ func_reconfigure ()
func_ensure_changelog
else
$require_gnulib_cache
- if sed -n '/^gl_MODULES(\[/,/^])$/p' $gnulib_cache |
+ if sed -n '/^gl_MODULES(\[/,/^])$/p' $gnulib_cache 2/dev/null |
func_grep_q gitlog-to-changelog
then
func_ensure_changelog
hooks/post-receive
--
GNU Libtool
