{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf320 {\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset0 Menlo-Regular;} {\colortbl;\red255\green255\blue255;\red108\green108\blue108;\red0\green0\blue0;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \f0\b\fs24 \cf2 From: \b0 \cf3 "Gary V. Vaughan"
\ \b \cf2 Date: \b0 \cf3 31 August 2010 17:08:41 GMT+07:00\ \b \cf2 To: \b0 \cf3 Libtool Patches List \ \b \cf2 Cc: \b0 \cf3 "Gary V. Vaughan" \ \b \cf2 Subject: \cf3 [PATCH v2 4/6] Rewrite bootstrap script for consistency with our other shell code.\ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \b0 \cf3 \ \pard\pardeftab720\ql\qnatural \f1 \cf3 From: Gary V. Vaughan \ \ And then, soon after posting that series, I thought that we shouldn't\ need to maintain 2 copies of the option parse loop support functions,\ especially as we have a perfectly good mechanism in place to generate\ that code already...\ \ ...I've included a diff of `bootstrap' proper, since it will need to\ be committed, although you can mostly ignore it here and look at\ (the MUCH shorter) bootstrap.m4sh file to see what's going on.\ \ This supercedes the previous post.\ \ Okay to push?\ \ \ * libltdl/config/bootstrap.m4sh: Add a proper option parsing loop.\ Reformat header comments to work with `func_help' and\ `func_version'.\ (my_sed_traces): With help from Autoconf quadrigraphs, expand to\ extract all parameters from `configure.ac', without additional\ shell munging.\ * Makefile.maint (bootstrap): New rule to generate the `bootstrap'\ scripts from `ltdl/config/bootstrap.m4sh'.\ * bootstrap: Regenerated.\ \ Signed-off-by: Gary V. Vaughan \ ---\ ChangeLog \'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0| \'a0\'a013 +\ Makefile.maint \'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0| \'a0\'a0\'a07 +\ bootstrap \'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0| 1308 +++++++++++++++++++++++++++++++++++++----\ libltdl/config/bootstrap.m4sh | \'a0276 +++++++++\ 4 files changed, 1490 insertions(+), 114 deletions(-)\ create mode 100755 libltdl/config/bootstrap.m4sh\ \ diff --git a/ChangeLog b/ChangeLog\ index f73d431..74a7972 100644\ --- a/ChangeLog\ +++ b/ChangeLog\ @@ -1,3 +1,16 @@\ +2010-08-30 \'a0Gary V. Vaughan \ +\ + Rewrite bootstrap script for consistency with our other shell code.\ + * libltdl/config/bootstrap.m4sh: Add a proper option parsing loop.\ + Reformat header comments to work with `func_help' and\ + `func_version'.\ + (my_sed_traces): With help from Autoconf quadrigraphs, expand to\ + extract all parameters from `configure.ac', without additional\ + shell munging.\ + * Makefile.maint (bootstrap): New rule to generate the `bootstrap'\ + scripts from `ltdl/config/bootstrap.m4sh'.\ + * bootstrap: Regenerated.\ +\ 2010-08-29 \'a0Gary V. Vaughan \'a0\ \ Support missing detached signatures, like gnulib implementation.\ diff --git a/Makefile.maint b/Makefile.maint\ index e2fa628..90ca0e5 100644\ --- a/Makefile.maint\ +++ b/Makefile.maint\ @@ -75,6 +75,13 @@ $(srcdir)/$(auxdir)/mailnotify: $(auxdir)/mailnotify.m4sh\ mv -f mailnotify.tmp mailnotify; \\\ rm -f mailnotify.in\ \ +$(srcdir)/bootstrap: $(auxdir)/bootstrap.m4sh\ + rm -f $@ address@hidden + $(M4SH) -B $(srcdir)/$(auxdir) $< \\\ + \'a0\'a0\'a0| $(edit) -e "s,@^I@, ,g" > address@hidden + chmod 555 address@hidden + mv -f address@hidden address@hidden +\ .PHONY: git-release\ git-release: version-check prev-tarball check-news fetch git-commit git-dist diffs web-manual\ @tarname="$(PACKAGE)-$(VERSION).tar.gz"; \\\ diff --git a/bootstrap b/bootstrap\ index 7ad0979..5f6e19d 100755\ --- a/bootstrap\ +++ b/bootstrap\ @@ -1,16 +1,17 @@\ #! /bin/sh\ -# bootstrap -- Helps bootstrapping libtool, when checked out from repository.\ -#\ -# \'a0\'a0Copyright (C) 2003, 2004, 2005, 2006, 2009, 2010 Free Software\ -# \'a0\'a0Foundation, Inc,\ -# \'a0\'a0Mritten by Gary V. Vaughan, 2003\ -#\ -# \'a0\'a0This file is part of GNU Libtool.\ -#\ -# GNU Libtool is free software; you can redistribute it and/or\ -# modify it under the terms of the GNU General Public License as\ -# published by the Free Software Foundation; either version 2 of\ -# the License, or (at your option) any later version.\ +# Generated from ../libltdl/config/bootstrap.m4sh by GNU Autoconf 2.67.\ +\ +# bootstrap (GNU Libtool) version 2010-08-30\ +# Written by Gary V. Vaughan, 2010\ +\ +# Copyright (C) 2010 Free Software Foundation, Inc.\ +# This is free software; see the source for copying conditions. \'a0There is NO\ +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\ +\ +# GNU Libtool is free software; you can redistribute it and/or modify\ +# it under the terms of the GNU General Public License as published by\ +# the Free Software Foundation; either version 2 of the License, or\ +# (at your option) any later version.\ #\ # GNU Libtool is distributed in the hope that it will be useful,\ # but WITHOUT ANY WARRANTY; without even the implied warranty of\ @@ -22,10 +23,26 @@\ # can be downloaded from \'a0http://www.gnu.org/licenses/gpl.html,\ # or obtained by writing to the Free Software Foundation, Inc.,\ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\ -####\ \ -# Exit upon failure.\ -set -e\ +# Usage: $progname [OPTION]...\ +\ +# \'a0\'a0\'a0\'a0\'a0\'a0--debug \'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0enable verbose shell tracing\ +# \'a0\'a0-n, --dry-run \'a0\'a0\'a0\'a0\'a0\'a0print commands rather than running them\ +# \'a0\'a0-f, --force \'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0bootstrap even when sources are not from git\ +# \'a0\'a0-r, --reconf-dirs=DIR1,DIR2,...\ +# \'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0limit the directories to be bootstrapped to the\ +# \'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0comma delimited list of DIR1,DIR2,....\ +# \'a0\'a0-v, --verbose \'a0\'a0\'a0\'a0\'a0\'a0verbosely report processing\ +# \'a0\'a0\'a0\'a0\'a0\'a0--version \'a0\'a0\'a0\'a0\'a0\'a0print version information and exit\ +# \'a0\'a0-h, --help \'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0\'a0print short or long help message\ +\ +# You can also set the following variables to help $progname\ +# locate the right tools:\ +# \'a0\'a0AUTORECONF, AUTOCONF, AUTOMAKE, AUTOM4TE, CONFIG_SHELL,\ +# \'a0\'a0EGREP, FGREP, GREP, LN_S, M4, MAKE, MAKEINFO, RM, SED\ +\ +# This script bootstraps a git checkout of GNU Libtool by correctly calling\ +# out to parts of the GNU Build Platform.\ \ # It is okay for the bootstrap process to require unreleased autoconf\ # or automake, as long as any released libtool will work with at least\ @@ -33,137 +50,1190 @@ set -e\ # better features, and configure.ac documents oldest version of each\ # required for bootstrap (AC_PREREQ, and AM_INIT_AUTOMAKE).\ \ -SHELL=$\{CONFIG_SHELL-/bin/sh\}\ -export SHELL\ +# Report bugs to \ +\ : $\{AUTORECONF=autoreconf\}\ : $\{AUTOCONF=autoconf\}\ : $\{AUTOMAKE=automake\}\ : $\{AUTOM4TE=autom4te\}\ : $\{MAKE=make\}\ -: $\{GREP=grep\}\ -: $\{EGREP=egrep\}\ -: $\{FGREP=fgrep\}\ -: $\{SED=sed\}\ -: $\{LN_S='ln -s'\}\ : $\{MAKEINFO=makeinfo\}\ \ -case $1 in\ ---help|-h*)\ - \'a0cat <