[SCM] GNU Libtool branch, master, updated. v2.2.10-70-g21cffd1

[Ralf Wildenhues]

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  21cffd15fbf2adbf7bd948260be0ac95b12bd510 (commit)
       via  10f650c428d16805132088510b04a853c73b98fa (commit)
      from  06543b43736a9d36c447e7fa04b76d90a6b31967 (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 21cffd15fbf2adbf7bd948260be0ac95b12bd510
Author: Ralf Wildenhues <address@hidden>
Date:   Wed Aug 4 22:30:48 2010 +0200

    Let `libtool' without arguments point to `--help' again.
    
    * libltdl/config/ltmain.m4sh (func_check_version_match):
    Remove duplicate and wrong error check.
    * tests/help.at (standard command line options): Extend test.
    Report by Rainer Tammer.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 10f650c428d16805132088510b04a853c73b98fa
Author: Ralf Wildenhues <address@hidden>
Date:   Wed Aug 4 22:30:01 2010 +0200

    Avoid syntax error due to shift of nonexistent parameter.
    
    * libltdl/config/ltmain.m4sh <command-line handling>: Only shift
    if there is a positional parameter to shift.  Fixes `libtool
    --help' when dash is used.
    Report by Rainer Tammer.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                  |   12 ++++++++++++
 libltdl/config/ltmain.m4sh |    7 ++++---
 tests/help.at              |    6 +++++-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 49efb7b..a435d6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2010-08-04  Ralf Wildenhues  <address@hidden>
 
+       Let `libtool' without arguments point to `--help' again.
+       * libltdl/config/ltmain.m4sh (func_check_version_match):
+       Remove duplicate and wrong error check.
+       * tests/help.at (standard command line options): Extend test.
+       Report by Rainer Tammer.
+
+       Avoid syntax error due to shift of nonexistent parameter.
+       * libltdl/config/ltmain.m4sh <command-line handling>: Only shift
+       if there is a positional parameter to shift.  Fixes `libtool
+       --help' when dash is used.
+       Report by Rainer Tammer.
+
        Fix testsuite errors due to shell quoted parameter expansion issue.
        * tests/getopt-m4sh.at (_LT_AT_GETOPT_M4SH_SETUP): Insert space
        between double-quoted and unquoted shell parameter, as bash
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 193ff1a..32a41c7 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -387,7 +387,10 @@ M4SH_GETOPTS(
        func_enable_tag "$optarg"],
 [
   # save first non-option argument
-  nonopt="$opt"; shift
+  if test "$[]#" -gt 0; then
+    nonopt="$opt"
+    shift
+  fi
 
   # preserve --debug
   $opt_debug && func_append preserve_args " --debug"
@@ -410,8 +413,6 @@ M4SH_GETOPTS(
       func_fatal_configuration "not configured to build any kind of library"
     fi
 
-    test -z "$opt_mode" && func_fatal_error "error: you must specify a MODE."
-
     # Darwin sucks
     eval std_shrext=\"$shrext_cmds\"
 
diff --git a/tests/help.at b/tests/help.at
index 3460a2b..e1bcbf5 100644
--- a/tests/help.at
+++ b/tests/help.at
@@ -1,6 +1,6 @@
 # help.at -- standard command line options          -*- Autotest -*-
 #
-#   Copyright (C) 2009 Free Software Foundation, Inc.
+#   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 #
 #   This file is part of GNU Libtool.
 #
@@ -35,6 +35,10 @@ AT_CHECK([$LIBTOOL --help-all], [], [ignore])
 AT_CHECK([$LIBTOOL --version], [], [stdout])
 AT_CHECK([grep 'Copyright.*Free Software Foundation' stdout], [], [ignore])
 
+AT_CHECK([$LIBTOOL], [1], [ignore], [stderr])
+AT_CHECK([grep 'specify a MODE' stderr], [], [ignore])
+AT_CHECK([grep ' --help' stderr], [], [ignore])
+
 AT_CLEANUP
 
 


hooks/post-receive
-- 
GNU Libtool