[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: [PATCH] libtoolize: rename `--subproject' option, and make it work.
From: |
Gary V. Vaughan |
Subject: |
FYI: [PATCH] libtoolize: rename `--subproject' option, and make it work. |
Date: |
Mon, 7 Nov 2011 11:53:02 +0700 |
Pushed as obvious.
* libtoolize (M4SH_GETOPTS): Remove `--standalone', which never
worked, and add `--subproject' which sets ltdl_mode correctly.
Signed-off-by: Gary V. Vaughan <address@hidden>
---
NEWS | 4 ++++
libtoolize.m4sh | 16 ++++++++--------
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/NEWS b/NEWS
index 3672ff8..7b58384 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 6bd7e4e..9adf9e5 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
--
1.7.7.2
Cheers,
--
Gary V. Vaughan (gary AT gnu DOT org)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- FYI: [PATCH] libtoolize: rename `--subproject' option, and make it work.,
Gary V. Vaughan <=