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>

diff --git a/NEWS b/NEWS
index 3672ff8fcc5f9621a00c673afa7e14cd7ac6f4e8..7b583844abdcc77ca9fdfe76fe7451ee95fd0729 100644 (file)
--- 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 6bd7e4e0409bcedc2d4d04a89fb6c308eed3ab5a..9adf9e5f23fcd8b06c0b06fd79d44df57109f8bc 100644 (file)
--- 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