[SCM] GNU Libtool branch, master, updated. v2.4.2-369-g8d2a63c
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 8d2a63c23a2dfb424e4b2f934c73c1737f979062 (commit)
via ea6773ca6f3b01a35fe7be9313099b57e96113c1 (commit)
via 51496e032d8c431cdb4d750d1e4928ecb3d816ba (commit)
from 05a3f4271916833e0f3639a09b331768451c1dd4 (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 8d2a63c23a2dfb424e4b2f934c73c1737f979062
Author: Gary V. Vaughan g...@gnu.org
Date: Sun Jan 27 19:57:22 2013 +0700
bootstrap: factor out gnulib-tool option calculations.
* gl/build-aux/bootstrap.in (func_gnulib_tool): Factor base option
settings out...
(require_gnulib_tool_base_options): ...to here.
* bootstrap: Regenerate.
Signed-off-by: Gary V. Vaughan g...@gnu.org
commit ea6773ca6f3b01a35fe7be9313099b57e96113c1
Author: Gary V. Vaughan g...@gnu.org
Date: Sun Jan 27 20:13:27 2013 +0700
syntax-check: fix a quoted_test_operand violation.
* gl/build-aux/bootstrap.in (func_insert_if_absent): Make sure
test operands are quoted correctly.
* bootstrap: Regenerate.
Signed-off-by: Gary V. Vaughan g...@gnu.org
commit 51496e032d8c431cdb4d750d1e4928ecb3d816ba
Author: Gary V. Vaughan g...@gnu.org
Date: Sun Jan 27 20:20:30 2013 +0700
syntax-check: fix new SPACE-TAB violations.
* build-aux/ltmain.in (func_dll_def_p): Replace SPACE-TAB by
TAB-SPACE.
* m4/libtool.m4 (_LT_DLL_DEF_P): Likewise.
Signed-off-by: Gary V. Vaughan g...@gnu.org
---
Summary of changes:
bootstrap | 85 +---
build-aux/ltmain.in |4 +-
gl/build-aux/bootstrap.in | 85 +---
m4/libtool.m4 |4 +-
4 files changed, 116 insertions(+), 62 deletions(-)
diff --git a/bootstrap b/bootstrap
index 44bc328..2297205 100755
--- a/bootstrap
+++ b/bootstrap
@@ -2588,60 +2588,50 @@ func_gnulib_tool ()
test true = $gnulib_tool || {
if test -n $gnulib_modules; then
$require_gnulib_cache
-$require_build_aux
-$require_macro_dir
+$require_gnulib_tool_base_options
+
+gnulib_mode=--import
# Try not to pick up any stale values from 'gnulib-cache.m4'.
rm -f $gnulib_cache
-gnulib_mode=--import
-
-# 'gnulib_modules' and others are maintained in 'bootstrap.conf':
-# Use 'gnulib --import' to fetch gnulib modules.
-test -n $build_aux \
- func_append_uniq gnulib_tool_options --aux-dir=$build_aux
-test -n $macro_dir \
- func_append_uniq gnulib_tool_options --m4-base=$macro_dir
-test -n $doc_base \
- func_append_uniq gnulib_tool_options --doc-base=$doc_base
-test -n $gnulib_name \
- func_append_uniq gnulib_tool_options --lib=$gnulib_name
-test -n $local_gl_dir \
- func_append_uniq gnulib_tool_options
--local-dir=$local_gl_dir
-test -n $source_base \
- func_append_uniq gnulib_tool_options
--source-base=$source_base
+gnulib_tool_all_options=$gnulib_tool_options
+test -n $gnulib_tool_base_options \
+ func_append_uniq gnulib_tool_all_options
$gnulib_tool_base_options
test -n $gnulib_mk \
- func_append_uniq gnulib_tool_options
--makefile-name=$gnulib_mk
+ func_append_uniq gnulib_tool_all_options
--makefile-name=$gnulib_mk
test -n $tests_base {
- func_append_uniq gnulib_tool_options --tests-base=$tests_base
- func_append_uniq gnulib_tool_options --with-tests
+ func_append_uniq gnulib_tool_all_options --tests-base=$tests_base
+ func_append_uniq gnulib_tool_all_options --with-tests
}
else
# 'gnulib_modules' and others are cached in 'gnulib-cache.m4':
# Use 'gnulib --update' to fetch gnulib modules.
gnulib_mode=--update
+
+gnulib_tool_all_options=$gnulib_tool_options
fi
# Add a sensible default libtool option to gnulib_tool_options.
# The embedded echo is to squash whitespace before globbing.
- case `echo $gnulib_tool_options ` in
+ case `echo $gnulib_tool_all_options ` in
* --no-libtool *|* --libtool *) ;;
*) if test true = $LIBTOOLIZE; then
- func_append_uniq gnulib_tool_options --no-libtool
+ func_append_uniq gnulib_tool_all_options --no-libtool
else
- func_append_uniq gnulib_tool_options --libtool
+
[SCM] GNU Libtool branch, master, updated. v2.4.2-370-g2e40f72
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 2e40f7209a10b9d814f558784eb5018d5e404be3 (commit)
from 8d2a63c23a2dfb424e4b2f934c73c1737f979062 (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 2e40f7209a10b9d814f558784eb5018d5e404be3
Author: Gary V. Vaughan g...@gnu.org
Date: Sun Jan 27 21:07:27 2013 +0700
bootstrap: fix func_insert_if_absent bugs.
* gl/build-aux/bootstrap.in (func_insert_if_absent): Print verbose
message when there is a new entry to add.
Also, make sure to update the .gitignore file when changed.
* bootstrap: Regenerate.
* THANKS: Add Pádraig Brady.
Reported by Pádraig Brady.
Signed-off-by: Gary V. Vaughan g...@gnu.org
---
Summary of changes:
THANKS|1 +
bootstrap |6 +++---
gl/build-aux/bootstrap.in |6 +++---
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/THANKS b/THANKS
index 92e6dff..7f3eb62 100644
--- a/THANKS
+++ b/THANKS
@@ -150,6 +150,7 @@
Nix n...@esperi.org.uk
Olaf Lenzol...@fias.uni-frankfurt.de
Olly Betts o...@muscat.co.uk
+ Pádraig Brady p...@draigbrady.com
Patrice Fromypatrice.fr...@u-psud.fr
Patrick Welche pr...@newn.cam.ac.uk
Paul Biggar paul.big...@gmail.com
diff --git a/bootstrap b/bootstrap
index 2297205..8232a44 100755
--- a/bootstrap
+++ b/bootstrap
@@ -4380,14 +4380,14 @@ func_insert_if_absent ()
test -n $duplicate_entries \
func_error duplicate entries in $file: $duplicate_entries
- func_grep_q $str $file \
- func_verbose inserting '$str' into '$file'
+ func_grep_q ^$str\$ $file \
+ || func_verbose inserting '$str' into '$file'
linesold=`func_gitignore_entries $file |wc -l`
linesnew=`$bs_echo $str \
|func_gitignore_entries - $file |sort -u |wc -l`
test $linesold -eq $linesnew \
-|| sed 1i\\$nl$str$nl $file \
+|| { sed 1i\\$nl$str$nl $file $fileT mv $fileT $file; } \
|| func_permissions_error $file
done
}
diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in
index bfd4ad6..8af0c89 100755
--- a/gl/build-aux/bootstrap.in
+++ b/gl/build-aux/bootstrap.in
@@ -2190,14 +2190,14 @@ func_insert_if_absent ()
test -n $duplicate_entries \
func_error duplicate entries in $file: $duplicate_entries
- func_grep_q $str $file \
- func_verbose inserting '$str' into '$file'
+ func_grep_q ^$str\$ $file \
+ || func_verbose inserting '$str' into '$file'
linesold=`func_gitignore_entries $file |wc -l`
linesnew=`$bs_echo $str \
|func_gitignore_entries - $file |sort -u |wc -l`
test $linesold -eq $linesnew \
-|| sed 1i\\$nl$str$nl $file \
+|| { sed 1i\\$nl$str$nl $file $fileT mv $fileT $file; } \
|| func_permissions_error $file
done
}
hooks/post-receive
--
GNU Libtool
