]> git.ipfire.org Git - thirdparty/libtool.git/commitdiff
libtoolize: exec automake and autoconf only with --help
authorMike Frysinger <vapier@gentoo.org>
Sat, 13 Feb 2016 08:46:34 +0000 (03:46 -0500)
committerPavel Raiskup <praiskup@redhat.com>
Fri, 19 Feb 2016 08:50:34 +0000 (09:50 +0100)
Same fix as applied to libtool in commit 408cfb9c5fa8a666917
to delay use of automake/autoconf to when the --help option is
actually specified.

* libtoolize.in (func_help): Override func_help() from
gl/build-aux/options-parser to only run automake --version and
autoconf --version when libtool --help is executed on the command
line.
Copyright-paperwork-exempt: Yes

libtoolize.in

index c9e524756a9759e7797032ba86decfa012cabdc0..f7187464e78663f017f09584211d0045c7d478f6 100644 (file)
@@ -94,7 +94,12 @@ usage_message="Options:
 "
 
 # Additional text appended to 'usage_message' in response to '--help'.
-long_help_message=$long_help_message"
+func_help ()
+{
+    $debug_cmd
+
+    func_usage_message
+    $ECHO "$long_help_message
        'environment'   show warnings about LIBTOOLIZE_OPTIONS content
        'file'          show warnings about file copying and linking
 
@@ -120,8 +125,9 @@ include the following information:
 
 Report bugs to <@PACKAGE_BUGREPORT@>.
 GNU @PACKAGE@ home page: <@PACKAGE_URL@>.
-General help using GNU software: <http://www.gnu.org/gethelp/>.
-"
+General help using GNU software: <http://www.gnu.org/gethelp/>."
+    exit 0
+}
 
 warning_categories='environment file'