summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary V. Vaughan <gary@gnu.org>2011-11-07 11:34:13 +0700
committerGary V. Vaughan <gary@gnu.org>2011-11-07 11:37:57 +0700
commita0f2576e96bf2d9f2f61820aa41a0e66e33edfde (patch)
tree1680dcadac09c6c68dbc5ec692a4e37962cf729d
parent1cc6d379753f3f07b41d1a1b4f5dae0cdee28b25 (diff)
downloadlibtool-a0f2576e96bf2d9f2f61820aa41a0e66e33edfde.tar.gz
libtoolize: rename `--subproject' option, and make it work.
* libtoolize (M4SH_GETOPTS): Remove `--standalone', which never worked, and add `--subproject' which sets ltdl_mode correctly. Signed-off-by: Gary V. Vaughan <gary@gnu.org>
-rw-r--r--NEWS4
-rw-r--r--libtoolize.m4sh16
2 files changed, 12 insertions, 8 deletions
diff --git a/NEWS b/NEWS
index 3672ff8f..7b583844 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,10 @@ NEWS - list of user-visible changes between releases of GNU Libtool
- Fix a long-standing latent bug in libtoolize which could delete lines
from libltdl/Makefile.am in recursive mode due to underquoting in a
sed script.
+ - The libtoolize subproject mode selector is now named `--subproject'
+ and is equivalent to the implied `--subproject' mode when no other
+ mode is selected; `--standalone' never worked, and is no longer
+ accepted.
New in 2.4.2 2011-10-17: git version 2.4.1a, Libtool team:
diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index 6bd7e4e0..9adf9e5f 100644
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -127,7 +127,7 @@ M4SH_GETOPTS(
[], [--no-warning|--no-warn], [], [],
[], [--nonrecursive|--non-recursive], [], [],
[], [--recursive], [], [],
- [], [--standalone], [], [],
+ [], [--subproject], [], [],
[?], [--ltdl], [false], [
# This is tricky, since we're overloading $opt_ltdl to be the
# optarg for --ltdl during option processing, but then stashing
@@ -144,18 +144,18 @@ M4SH_GETOPTS(
test -n "$env_warning" &&
echo "$env_warning" |while read line; do func_warning "$line"; done
- # validate $opt_nonrecursive, $opt_recursive and $opt_standalone
+ # validate $opt_nonrecursive, $opt_recursive and $ot_subproject
if $opt_nonrecursive; then
- if $opt_recursive || $opt_standalone; then
- func_error "you can have at most one of --non-recursive, --recursive and --standalone"
+ if $opt_recursive || $opt_subproject; then
+ func_error "you can have at most one of --non-recursive, --recursive and --subproject"
fi
ltdl_mode=nonrecursive
elif $opt_recursive; then
- $opt_standalone &&
- func_error "you can have at most one of --non-recursive, --recursive and --standalone"
+ $opt_subproject &&
+ func_error "you can have at most one of --non-recursive, --recursive and --subproject"
ltdl_mode=recursive
- elif $opt_standalone; then
- ltdl_mode=standalone
+ elif $opt_subproject; then
+ ltdl_mode=subproject
fi
# any remaining arguments are an error