From MAILER-DAEMON Fri Jun 04 14:07:38 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OKbIv-00065D-UQ
	for mharc-libtool-commit@gnu.org; Fri, 04 Jun 2010 14:07:37 -0400
Received: from [140.186.70.92] (port=49157 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OKb2S-0008FR-10
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 13:50:39 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKb2O-000570-Fb
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 13:50:35 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:41612
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKb2O-00056s-8v
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 13:50:32 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKb2N-0005rU-GX
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 17:50:31 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKb2N-0000w6-Cz
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 17:50:31 +0000
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: efa4f5e852320fca3b5eada20d75d92720c0b660
X-Git-Newrev: aa7558299c54421fa5ea751457068b773db38cd1
Message-Id: <E1OKb2N-0000w6-Cz@vcs-noshell.in.savannah.gnu.org>
Date: Fri, 04 Jun 2010 17:50:31 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.7b-4-gaa75582
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Jun 2010 18:07:35 -0000

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  aa7558299c54421fa5ea751457068b773db38cd1 (commit)
      from  efa4f5e852320fca3b5eada20d75d92720c0b660 (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 aa7558299c54421fa5ea751457068b773db38cd1
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Sat Jun 5 00:50:24 2010 +0700

    Provide an m4sh reimplementation of announce-gen.
    
    * libltdl/config/getopt.m4sh (M4SH_GETOPTS): New macro that takes
    a quoted m4 list of command line options to be parsed, and
    generates the shell code to parse those options and collect the
    results into appropriately named 'opt_xxx' shell variables.  Also,
    add some private supporting macros, and improve the comments
    radically.
    * libltdl/config/announce-gen.m4sh: New file, to generate and
    optionally post (an enhancement over the gnulib perl script of the
    same name) a release announcement.
    * Makefile.maint (announce-gen): Build a new announce-gen script
    in the build directory, from the contents of
    libltdl/config/announce-gen.m4sh.
    * HACKING (Release Procedure): Update the instructions to use
    announce-gen.
    (Alpha release note template, Full release note template):
    Removed.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 ChangeLog                        |   20 ++
 HACKING                          |  180 ++------------
 Makefile.maint                   |   14 +
 libltdl/config/announce-gen.m4sh |  456 +++++++++++++++++++++++++++++++++
 libltdl/config/getopt.m4sh       |  521 ++++++++++++++++++++++++++++++++++++--
 5 files changed, 1007 insertions(+), 184 deletions(-)
 create mode 100644 libltdl/config/announce-gen.m4sh

diff --git a/ChangeLog b/ChangeLog
index 0eb77ff..4c01630 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2010-06-05  Gary V. Vaughan  <gary@gnu.org>
+
+	Provide an m4sh reimplementation of announce-gen.
+	* libltdl/config/getopt.m4sh (M4SH_GETOPTS): New macro that takes
+	a quoted m4 list of command line options to be parsed, and
+	generates the shell code to parse those options and collect the
+	results into appropriately named 'opt_xxx' shell variables.  Also,
+	add some private supporting macros, and improve the comments
+	radically.
+	* libltdl/config/announce-gen.m4sh: New file, to generate and
+	optionally post (an enhancement over the gnulib perl script of the
+	same name) a release announcement.
+	* Makefile.maint (announce-gen): Build a new announce-gen script
+	in the build directory, from the contents of
+	libltdl/config/announce-gen.m4sh.
+	* HACKING (Release Procedure): Update the instructions to use
+	announce-gen.
+	(Alpha release note template, Full release note template):
+	Removed.
+
 2010-05-22  Gary V. Vaughan  <gary@gnu.org>
 
 	Support "git log --oneline" in generated commit messages.
diff --git a/HACKING b/HACKING
index bea81fe..fa3e323 100644
--- a/HACKING
+++ b/HACKING
@@ -744,170 +744,38 @@ or obtained by writing to the Free Software Foundation, Inc.,
   <yourusername>@cvs.savannah.gnu.org:/webcvs/libtool
   (generate with `make -f[../]Makefile.maint web-manual').
 
-* Send announcement to libtool@gnu.org and autotools-announce@gnu.org,
-  if not an alpha send to info-gnu@gnu.org as well.
+* In the build directory, run `Make -f[../]Makeflie.maint announce-gen'.
 
-* Post a copy of the release announcement to savannah news:
-  https://savannah.gnu.org/news/submit.php?group=libtool
-  which will automatically propogate to http://planet.gnu.org.
-
-
-13. Alpha release note template
-===============================
-
-To: libtool@gnu.org, autotools-announce@gnu.org
-Reply-To: bug-libtool@gnu.org
-Subject: GNU Libtool @VERSION@ released (alpha release).
-
-The Libtool Team is pleased to announce alpha release @VERSION@ of GNU
-Libtool.
-
-GNU Libtool hides the complexity of using shared libraries behind a
-consistent, portable interface. GNU Libtool ships with GNU libltdl,
-which hides the complexity of loading dynamic runtime libraries
-(modules) behind a consistent, portable interface.
-
-Here are the compressed sources:
-
-  ftp://alpha.gnu.org/gnu/libtool/libtool-@VERSION@.tar.gz
-  ftp://alpha.gnu.org/gnu/libtool/libtool-@VERSION@.tar.bz2
-
-Here are the xdeltas and diffs against libtool-@PREV_RELEASE_VERSION_ON_THIS_BRANCH@:
-
-  ftp://alpha.gnu.org/gnu/libtool/libtool-@PREV_RELEASE_VERSION_ON_THIS_BRANCH@-@VERSION@.diff.gz
-  ftp://alpha.gnu.org/gnu/libtool/libtool-@PREV_RELEASE_VERSION_ON_THIS_BRANCH@-@VERSION@.xdelta
-
-Here are the gpg detached signatures:
-
-  ftp://alpha.gnu.org/gnu/libtool/libtool-@VERSION@.tar.gz.sig
-  ftp://alpha.gnu.org/gnu/libtool/libtool-@VERSION@.tar.bz2.sig
-  ftp://alpha.gnu.org/gnu/libtool/libtool-@PREV_RELEASE_VERSION_ON_THIS_BRANCH@-@VERSION@.diff.gz.sig
-  ftp://alpha.gnu.org/gnu/libtool/libtool-@PREV_RELEASE_VERSION_ON_THIS_BRANCH@-@VERSION@.xdelta.sig
-
-You should download the signature named after any tarball you download,
-and then verify its integrity with, for example:
-
-  gpg --verify libtool-@VERSION@.tar.gz.sig
-
-Here are the MD5 and SHA1 checksums:
-
-  @MD5SUM@ libtool-@VERSION@.tar.gz
-  @MD5SUM@ libtool-@VERSION@.tar.bz2
-  @MD5SUM@ libtool-@PREV_RELEASE_VERSION_ON_THIS_BRANCH@-@VERSION@.diff.gz
-  @MD5SUM@ libtool-@PREV_RELEASE_VERSION_ON_THIS_BRANCH@-@VERSION@.xdelta
-  @SHA1SUM@ libtool-@VERSION@.tar.gz
-  @SHA1SUM@ libtool-@VERSION@.tar.bz2
-  @SHA1SUM@ libtool-@PREV_RELEASE_VERSION_ON_THIS_BRANCH@-@VERSION@.diff.gz
-  @SHA1SUM@ libtool-@PREV_RELEASE_VERSION_ON_THIS_BRANCH@-@VERSION@.xdelta
-
-This release has @SUMMARY_OF_IMPROVEMENTS_SINCE_LAST_RELEASE_ON_THIS_BRANCH@.
-
-This release was bootstrapped with @BOOTSTRAP_TOOLS_WITH_VERSIONS@,
-but is useable with @COMPATIBLE_AUTOTOOL_VERSIONS@ in your own
-projects.
-
-Alternatively, you can fetch the unbootstrapped source code with
-git by using the following command:
-
-  $ git clone git://git.savannah.gnu.org/libtool.git
-  $ cd libtool
-  $ git checkout @GIT_RELEASE_TAG@
-
-You will then need to have recent (possibly as yet unreleased) versions
-of Automake and Autoconf installed to bootstrap the checked out
-sources yourself.
-
-New in @VERSION@: @RELEASE_DATE@
-
-  @EXCERPT_FROM_NEWS_FILE@
+* Make sure the source directory has an appropriate .announcerc, along
+  the lines of:
 
-Please report bugs to <bug-libtool@gnu.org>, along with the verbose
-output of any failed test groups, and the output from `./libtool --config.'
-The README file explains how to capture the verbose test output.
+    --bootstrap-tools='autoconf,automake'
+    --gpg-key-id={the id of the key you signed the tarballs with}
+    --header 'From: {your name} <{your email address}>
+    --header 'To: Libtool List <libtool@gnu.org>'
+    --header 'Cc: Autotools Announce List <autotools-announce@gnu.org>'
+    --header 'Reply-To: Libtool Bugs <bug-libtool@gnu.org>'
+    --message 'GNU Libtool hides the complexity of using shared'
+    --message 'libraries behind a consistent, portable interface.'
+    --message 'GNU Libtool ships with GNU libltdl, which hides the'
+    --message 'complexity of loading dynamic runtime libraries'
+    --message '(modules) behind a consistent, portable interface.'
+    --signature
 
+* Check the release announcement with:
 
+    ./announce-gen -r -o --prev=LASTRELEASE alpha
 
-14. Full release note template
-==============================
+  or for a stable release:
 
-To: info-gnu@gnu.org
-Cc: libtool@gnu.org, autotools-announce@gnu.org
-Reply-To: bug-libtool@gnu.org
-Subject: GNU Libtool @VERSION@ released.
+    ./announce-gen -r -o -h 'Cc: info-gnu@gnu.org' --prev=LASTRELEASE stable
 
-The Libtool Team is pleased to announce the release of GNU Libtool
-@VERSION@.
-
-GNU Libtool hides the complexity of using shared libraries behind a
-consistent, portable interface. GNU Libtool ships with GNU libltdl,
-which hides the complexity of loading dynamic runtime libraries
-(modules) behind a consistent, portable interface.
-
-This release has @SUMMARY_OF_IMPROVEMENTS_SINCE_LAST_RELEASE_ON_THIS_BRANCH@.
-
-New in @VERSION@: @RELEASE_DATE@
-
-  @EXCERPT_FROM_NEWS_FILE@
-
-libtool-@VERSION@ is available now from ftp.gnu.org, along with
-diffs and xdeltas against libtool-@PREV_RELEASE_VERSION_ON_THIS_BRANCH@
-that are also available from ftp.gnu.org.  Please
-use a mirror to reduce stress on the main gnu machine:
-
-  http://www.gnu.org/order/ftp.html
-
-Here are the compressed sources:
-
-  ftp://ftp.gnu.org/gnu/libtool/libtool-@VERSION@.tar.gz
-  ftp://ftp.gnu.org/gnu/libtool/libtool-@VERSION@.tar.bz2
-
-Here are the xdeltas and diffs against libtool-@PREV_RELEASE_VERSION_ON_THIS_BRANCH@:
-
-  ftp://ftp.gnu.org/gnu/libtool/libtool-@PREV_RELEASE_VERSION_ON_THIS_BRANCH@-@VERSION@.diff.gz
-  ftp://ftp.gnu.org/gnu/libtool/libtool-@PREV_RELEASE_VERSION_ON_THIS_BRANCH@-@VERSION@.xdelta
-
-Here are the gpg detached signatures:
-
-  ftp://ftp.gnu.org/gnu/libtool/libtool-@VERSION@.tar.gz.sig
-  ftp://ftp.gnu.org/gnu/libtool/libtool-@VERSION@.tar.bz2.sig
-  ftp://ftp.gnu.org/gnu/libtool/libtool-@PREV_RELEASE_VERSION_ON_THIS_BRANCH@-@VERSION@.diff.gz.sig
-  ftp://ftp.gnu.org/gnu/libtool/libtool-@PREV_RELEASE_VERSION_ON_THIS_BRANCH@-@VERSION@.xdelta.sig
-
-You should download the signature named after any tarball you download,
-and then verify its integrity with, for example:
-
-  gpg --verify libtool-@VERSION@.tar.gz.sig
-
-Here are the MD5 and SHA1 checksums:
-
-  @MD5SUM@ libtool-@VERSION@.tar.gz
-  @MD5SUM@ libtool-@VERSION@.tar.bz2
-  @MD5SUM@ libtool-@PREV_RELEASE_VERSION_ON_THIS_BRANCH@-@VERSION@.diff.gz
-  @MD5SUM@ libtool-@PREV_RELEASE_VERSION_ON_THIS_BRANCH@-@VERSION@.xdelta
-  @SHA1SUM@ libtool-@VERSION@.tar.gz
-  @SHA1SUM@ libtool-@VERSION@.tar.bz2
-  @SHA1SUM@ libtool-@PREV_RELEASE_VERSION_ON_THIS_BRANCH@-@VERSION@.diff.gz
-  @SHA1SUM@ libtool-@PREV_RELEASE_VERSION_ON_THIS_BRANCH@-@VERSION@.xdelta
-
-This release was bootstrapped with @BOOTSTRAP_TOOLS_WITH_VERSIONS@,
-but is useable with @COMPATIBLE_AUTOTOOL_VERSIONS@ in your own
-projects.
-
-Alternatively, you can fetch the unbootstrapped source code with
-git by using the following command:
-
-  $ git clone git://git.savannah.gnu.org/libtool.git
-  $ cd libtool
-  $ git checkout @GIT_RELEASE_TAG@
-
-You will then need to have the latest release versions of Automake
-(@AUTOMAKE_VERSION@) and Autoconf (@AUTOCONF_VERSION@) installed to
-bootstrap the checked out sources yourself.
-
-Please report bugs to <bug-libtool@gnu.org>, along with the verbose
-output of any failed test groups, and the output from `./libtool --config.'
-The README file explains how to capture the verbose test output.
+  When you're happy with the announcement text, post it by rerunning the
+  command with `-p' instead of `-o'.
 
+* Post a copy of the release announcement to savannah news:
+  https://savannah.gnu.org/news/submit.php?group=libtool
+  which will automatically propogate to http://planet.gnu.org.
 
 -- 
   Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation,
diff --git a/Makefile.maint b/Makefile.maint
index b90b31d..70b7405 100644
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -48,6 +48,20 @@ $(srcdir)/commit: $(srcdir)/$(auxdir)/mailnotify clcommit.m4sh
 	mv -f commit.tmp commit; \
 	rm -f commit.in
 
+announce-gen: $(auxdir)/announce-gen.m4sh $(auxdir)/getopt.m4sh
+	$(timestamp); \
+	rm -f announce-gen announce-gen.in announce-gen.tmp; \
+	$(M4SH) -B $(top_srcdir)/$(auxdir) $(top_srcdir)/$(auxdir)/announce-gen.m4sh > announce-gen.in; \
+	input="announce-gen.m4sh"; \
+	$(edit) -e "s,@TIMESTAMP\@,$$TIMESTAMP,g" \
+		-e "s,@LASTRELEASE\@,$(LASTRELEASE),g" \
+		-e "s,@top_srcdir\@,$(top_srcdir),g" \
+		announce-gen.in > announce-gen.tmp; \
+	chmod a+x announce-gen.tmp; \
+	chmod a-w announce-gen.tmp; \
+	mv -f announce-gen.tmp announce-gen; \
+	rm -f announce-gen.in
+
 $(srcdir)/$(auxdir)/mailnotify: $(auxdir)/mailnotify.m4sh
 	$(timestamp); \
 	cd $(srcdir)/$(auxdir); \
diff --git a/libltdl/config/announce-gen.m4sh b/libltdl/config/announce-gen.m4sh
new file mode 100644
index 0000000..6295039
--- /dev/null
+++ b/libltdl/config/announce-gen.m4sh
@@ -0,0 +1,456 @@
+AS_INIT[]m4_divert_push([HEADER-COPYRIGHT])dnl
+# @configure_input@
+
+# announce-gen (GNU @PACKAGE@) version 1.0
+# Written by Gary V. Vaughan 
+# based on a perl script by Jim Meyering
+
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# gen-announce 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.
+#
+# gen-announce is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with clcommit; see the file COPYING.  If not, a copy
+# can be downloaded from http://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.
+
+# Usage: $progname {-o|-p} [OPTIONS]... [--] RELEASE-TYPE [TO-ADDRESS]...
+
+# -b file   --blurb=FILE            read announcement blurb from FILE
+#           --bootstrap-tools=LIST  a comma-separated list of tools, e.g.
+#                                   autoconf,automake,bison,gnulib
+#           --current-version=VER   override current release version number
+#           --debug                 enable verbose shell tracing
+#           --gpg-key-id=ID         gnupg ID of signature key for release files
+# -h STRING --header=STRING         insert mail header into announcement
+# -m STRING --message=STRING        insert into message blurb for announcement
+# -c        --no-print-checksums    do not emit MD5 and SHA1 checksums
+# -o        --output                output to stdout
+#           --package-name=NAME     override default package name
+# -p        --post                  post the announcement directly
+#           --previous-version=VER  previous release version number
+# -r [FILE] --rcfile[=FILE]         read options from FILE [./.announcerc]
+#           --signature[=FILE]      append FILE to post [~/.signature]
+#           --url-directory=URL     download url directory for released files
+#                                   [ftp://ftp.gnu.org/gnu/<package-name>]
+# -v        --verbose               run in verbose mode
+#           --version               print version information
+# -?        --help                  print short or long help message
+
+# In output mode, selected by `-o', a release note is printed on stdout.
+
+# In post mode, the release note is displayed in $PAGER, (giving you the
+# chance to make changes, and add headers) before posting to any every
+# TO-ADDRESS given on the command line, as well as any addresses added
+# to `To:', `Cc:' and `Bcc:' headers during editing.
+
+# The `--rcfile' option points to a file with other option settings, one
+# on each line.  For example:
+#
+#    --bootstrap-tools='autoconf, automake'
+#    --gpg-key-id=2983D606
+#    --header 'From: "Gary V. Vaughan" <gary@gnu.org>'
+#    --header 'To: Libtool List <libtool@gnu.org>'
+#    --header 'Cc: Autotools Announce List <autotools-announce@gnu.org>'
+#    --header 'Reply-To: Libtool Bugs <bug-libtool@gnu.org>'
+#    --message 'GNU Libtool hides the complexity of using shared'
+#    --message 'libraries behind a consistent, portable interface.'
+#    --message 'GNU Libtool ships with GNU libltdl, which hides the'
+#    --message 'complexity of loading dynamic runtime libraries'
+#    --message '(modules) behind a consistent, portable interface.'
+#    --signature
+#
+# This is the .announcerc for GNU Libtool.  Announce-gen is pretty
+# smart about picking defaults for package-name and current-version
+# and often guesses previous-version correctly too.  So, typically a
+# release note can be posted with:
+#
+#    ./$progname -r -p -h 'Cc: info-gnu@gnu.org' --prev=<LASTRELEASE> stable
+#
+# When that's producing a good announcement, it can be posted by using
+# the same arguments again, but for `-p' instead of `-o'
+
+# Report bugs to <gary@gnu.org>
+
+: ${DU="du"}
+: ${MAILNOTIFY="mailnotify"}
+: ${MD5SUM="md5"}
+: ${SHA1SUM="shasum"}
+
+PROGRAM=announce-gen
+
+m4_divert_pop
+m4_include([getopt.m4sh])
+
+M4SH_VERBATIM([[
+top_srcdir=`cd "@top_srcdir@" && pwd`
+test -d "$top_srcdir" || top_srcdir='@top_srcdir@'
+
+# Initialisation:
+mailnotify_flags=
+package_name="@PACKAGE_NAME@"
+sendmail_to=
+valid_release_types='alpha,beta,release-candidate,stable'
+
+# try to find out whether read supports -r
+if echo bt | tr b '\\' | { read -r line; test "X$line" = 'X\t'; } 2>/dev/null
+then
+  read_r='read -r'
+else
+  read_r=read
+fi
+]])
+
+dnl SHORT	LONG			       DEFAULT		      INIT
+dnl ----------------------------------------------------------------------
+M4SH_GETOPTS(
+  [b@],	[--blurb],				[],			[],
+  [h;],	[--header],				[],			[],
+  [m;],	[--message|--msg],			[],			[],
+  [o],	[--output],				[],			[],
+  [p],	[--post],			   	[],			[],
+  [r@?],[--rcfile],				[$top_srcdir/.announcerc], [
+	# The funny quoting allows keeping one option per line in $opt_rcfile:
+	eval set dummy `echo \`cat $opt_rcfile\` \${1+"\[$]@"}`
+	shift],
+  [v],	[--verbose],				[],			[
+	mailnotify_flags="${mailnotify_flags+$mailnotify_flags }$opt"],
+  [!],	[--bootstrap-tools|--bootstrap|--boots], [],			[
+	for tool in `echo "$optarg"|$SED 's|,| |g'`; do
+	    ($tool --version) >/dev/null 2>&1 || {
+	        func_error "$opt \`$optarg' does not respond to --version option."
+	        cmd_exit=exit
+	    }
+	done],
+  [!],	[--current-version|--current|--curr],	[@VERSION@],		[],
+  [!],	[--gpg-key-id|--gpg],			[], 			[],
+  [],	[--no-print-checksums],			[],			[],
+  [!],	[--previous-version|--previous|--prev], [@LASTRELEASE@],	[],
+  [!],	[--release-type],			[],			[],
+  [@?],	[--signature],				[$HOME/.signature],	[],
+  [!],	[--url-directory],			[],			[],
+ [
+  # validate $opt_gpg_key_id
+  test -n "$opt_gpg_key_id" || {
+      func_error "you must specify a key with --gpg-key-id."
+      exit_cmd=exit
+  }
+
+  # validate $opt_bootstrap_tools
+  test -n "$opt_bootstrap_tools" || {
+      func_error "you must specify some tools with --bootstrap-tools."
+      exit_cmd=exit
+  }
+
+  # validate $opt_blurb and $opt_message
+  test -n "$opt_blurb" && test -n "$opt_message" && {
+      func_error "you can specify only one of --blurb and --message."
+      exit_cmd=exit
+  }
+
+  # validate $opt_output and $opt_post
+  $opt_output && $opt_post && {
+      func_error "you can specify only one of --output and --post."
+      exit_cmd=exit
+  }
+  $opt_output || $opt_post || {
+      func_error "you must specify either --output or --post."
+      exit_cmd=exit
+  }
+
+  # validate $opt_release_type
+  test -n "$opt_release_type" || {
+      test [$]# -gt 0 || { func_error "no release type specified."; exit_cmd=exit; }
+      opt_release_type="[$]1"; shift
+  }
+  case ,$valid_release_types, in *,$opt_release_type,*) ;;
+      *) func_error "\`$opt_release_type': invalid release type."; exit_cmd=exit ;;
+  esac
+
+  # validate $url_directory
+  test -n "$url_directory" || {
+      case $opt_release_type in
+	  stable) url_directory="ftp://ftp.gnu.org/gnu/$package_name" ;;
+          *)      url_directory="ftp://alpha.gnu.org/gnu/$package_name" ;;
+      esac
+  }
+
+  # pass trace argument along to mailnotify too
+  $opt_debug &&
+      mailnotify_flags="${mailnotify_flags+$mailnotify_flags }--debug"
+  
+  # validate remaining command line args as destination addresses
+  for address
+  do
+      func_quote_for_eval "$address"
+      sendmail_to="${sendmail_to+$sendmail_to }$func_quote_for_eval_result"
+  done
+])
+
+M4SH_VERBATIM([[
+# Bail out on command errors!
+set -e
+
+# func_print_changelog_deltas
+func_print_changelog_deltas ()
+{
+    # FIXME: Jim's announce-gen does something with ChangeLogs
+    #        and cvs diff.  We don't use CVS, and perl makes
+    #        my eyes bleed... maybe I'll write this function
+    #        one day.
+    :
+}
+
+
+# func_print_checksums title filename...
+func_print_checksums ()
+{
+    my_title="$1"; shift
+
+    test -n "$1" && {
+	echo
+	echo "Here are the $my_title:"
+	echo
+	for my_sum in $MD5SUM $SHA1SUM; do
+	    for my_filename in ${1+"$@"}; do
+		my_line=`$my_sum $my_filename`
+		my_hash=`expr "$my_line" : '.*\([0-9a-f]\{40\}\)' || :`
+		test -n "$my_hash" || my_hash=`expr "$my_line" : '.*\([0-9a-f]\{32\}\)'`"        "
+		echo "  $my_hash  $my_filename"
+	    done
+	done
+    }
+
+    # To stop bash exiting if test fails
+    :
+}
+
+
+# func_print_locations title url files
+func_print_locations ()
+{
+    test -n "$3" && {
+	echo
+	echo "Here are the $1:"
+	echo
+	for my_file in $3; do
+	    my_size=`$DU -h $my_file|sed 's,[bB]*[ 	].*$,,'`
+	    echo "  $2/$my_file (${my_size}B)"
+	done
+    }
+
+    # To stop bash exiting if test fails
+    :
+}
+
+
+# func_print_news_deltas
+func_print_news_deltas ()
+{
+    my_news_file="$top_srcdir/NEWS"
+    my_skipping=:
+
+    # reset the field separator to prevent whitespace removal by 'read'
+    save_IFS="$IFS"
+    IFS=
+
+    echo
+    cat $my_news_file |
+      while read line; do
+	case $line in
+	  "New in $opt_current_version "*:)
+	      my_skipping=false
+	      echo "$line"
+	      ;;
+	  "New in "*:)
+	      my_skipping=:
+	      ;;
+	  *)
+	      $my_skipping || echo "$line"
+	      ;;
+	esac
+      done
+
+    IFS="$save_IFS"
+}
+
+
+# func_tool_versions toolname...
+func_print_tool_versions ()
+{
+    test -n "$1" && {
+	echo
+	echo "This release was bootstrapped with the following tools:"
+	echo
+	for my_tool in ${1+"$@"}; do
+	    my_tool_version=`$my_tool --version|sed 's,^.* ,,g;1q'`
+	    echo "  $my_tool-$my_tool_version"
+	done
+    }
+
+    # To stop bash exiting if test fails
+    :
+}
+
+
+
+## ----- ##
+## main. ##
+## ----- ##
+
+{
+  # Neutralize the locale, so that, for instance, "du" does not
+  # issue "1,2" instead of "1.2", which confuses our regexps.
+  LC_ALL=C
+  export LC_ALL
+
+  # Secure directory for temporary files
+  tmp_dir="`func_mktempdir`"
+  trap '$RM -r "$tmp_dir"; exit $EXIT_FAILURE' 1 2 15
+
+  # Save any header or post blurb for mailnotify
+  header_file="$tmp_dir/headers"
+  blurb_file="$tmp_dir/blurb"
+
+  test -n "$opt_header" && echo "$opt_header" > "$header_file"
+  test -n "$opt_message" && echo "$opt_message" > "$blurb_file"
+  test -n "$opt_blurb" && cat "$opt_blurb" > "$blurb_file"
+
+  archive_suffixes='tar.gz tar.bz2 tar.lzma tar.xz'
+  diff_suffixes='diff.gz diff.bz2 diff.lzma diff.xz xdelta'
+
+  # Ensure there is something to announce!
+  for suffix in $archive_suffixes; do
+      candidate="$package_name-$opt_current_version.$suffix"
+      candidates="${candidates+$candidates, }$candidate"
+      test -r "$candidate" || continue
+      tarballs="${tarballs+$tarballs }$candidate"
+  done
+  for suffix in $diff_suffixes; do
+      candidate="$package_name-$opt_previous_version-$opt_current_version.$suffix"
+      candidates="${candidates+$candidates, }$candidate"
+      test -r "$candidate" || continue
+      compressed_diffs="${compressed_diffs+$compressed_diffs }$candidate"
+  done
+  test -n "$tarballs$compressed_diffs" ||
+      func_fatal_error "none of $candidates were found."
+
+  # Signature files
+  signed_files="$tarballs $compressed_diffs"
+  for signed in $signed_files; do
+      sig_files="${sig_files+$sig_files }$signed.sig"
+  done
+
+  # Displaying or posting the announcement?
+  if $opt_post; then
+      notify_file="$tmp_dir/post"
+      exec 3>$notify_file
+  else
+      exec 3>&1
+  fi
+
+  {
+      echo "Subject: $package_name $opt_current_version released ($opt_release_type)"
+      test -f "$header_file" && cat "$header_file"
+      echo
+      test -f "$blurb_file" && cat "$blurb_file"
+      func_print_locations "compressed sources" "$url_directory" "$tarballs"
+      func_print_locations "diffs against $package_name $opt_previous_version" "$url_directory" "$compressed_diffs"
+      func_print_locations "GPG detached signatures[1]" "$url_directory" "$sig_files"
+
+      $opt_print_checksums && 
+          func_print_checksums "MD5 and SHA1 checksums[2]" $tarballs $compressed_diffs
+
+      case $url_directory in
+	  *"gnu.org"*)
+	      echo
+	      echo 'To reduce load on the main server, please one of the mirrors listed at:'
+	      echo
+	      echo '  http://www.gnu.org/order/ftp.html'
+	      ;;
+      esac
+
+      cat <<EOF
+
+[1] You can use the above signature files to verify that the
+    corresponding file (without the .sig suffix) is the same
+    file that was released by the owner of it's GPG key ID.
+    First be sure to download both the .sig file and the
+    corresponding file. Then run a cammand like this:
+
+      gpg --verify `echo "$tarballs" | sed -e 's, .*$,,g'`.sig
+
+    If that command fails because you don't have the required
+    public key, then run this command to import it:
+
+      gpg --keyserver keys.gnupg.net --recv-keys $opt_gpg_key_id
+
+    and rerun the \`gpg --verify' command.
+EOF
+
+      $opt_print_checksums && cat <<EOF
+
+[2] You can use either of the above checksum files to verify
+    that the corresponding file is complete and correct. To
+    confirm that the file you downloaded has a checksum that
+    matches the release note, compare it against the output
+    one of the following commands:
+
+      md5sum `echo "$tarballs" | sed -e 's, .*$,,g'`
+      shasum `echo "$tarballs" | sed -e 's, .*$,,g'`
+
+    (the name of the command sometimes varies between
+    different operating systems).
+EOF
+
+      func_print_tool_versions $tool_list
+      func_print_news_deltas
+      func_print_changelog_deltas
+
+      echo 'Enjoy!'
+  } >&3
+
+  $opt_post && {
+      test -f "$top_srcdir/libltdl/config/$MAILNOTIFY" &&
+          MAILNOTIFY="$top_srcdir/libltdl/config/$MAILNOTIFY"
+      test -f "$MAILNOTIFY" ||
+          func_fatal_error "$MAILNOTIFY: file not found."
+
+      ${PAGER-more} "$notify_file" || break
+
+      sleep 1 # give the user some time for a ^C
+
+      # Break out the headers
+      header_file="$tmp_dir/headers"
+      $SED -n '/[A-Z][a-zA-Z0-9-]*: /p;/^$/q' "$notify_file" > "$header_file"
+
+      my_mail_body="`$SED '1,/^$/d' $notify_file`"
+      echo "$my_mail_body" > "$notify_file"
+
+      func_verbose "mailing release announcement to \"$sendmail_to\""
+      func_show_eval "$MAILNOTIFY $mailnotify_flags \
+	  --headers='$header_file' \
+          -m 'text/plain' -f '$notify_file' -- $sendmail_to"
+  }
+}
+
+$RM -r "$tmp_dir"
+
+exit $EXIT_SUCCESS
+
+# Local Variables:
+# mode:shell-script
+# sh-indentation:2
+# End:
+]])
diff --git a/libltdl/config/getopt.m4sh b/libltdl/config/getopt.m4sh
index d0f92f6..6e0e2c6 100644
--- a/libltdl/config/getopt.m4sh
+++ b/libltdl/config/getopt.m4sh
@@ -1,37 +1,502 @@
-m4_if([getopt.m4sh -- getopt helper functions		 -*- Autoconf -*-
+m4_include([general.m4sh])m4_divert_push(-1)
+# getopt.m4sh -- getopt helper functions		 -*- Autoconf -*-
+#
+#    Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+#    Written by Gary V. Vaughan, 2004
+#
+#    This 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 you option) any later version.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that contains
+# a configuration script generated by Autoconf, you may include this
+# file under the same distribution terms that you use for the rest
+# of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from  http://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.
 
-   Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-   Foundation, Inc.
-   Written by Gary V. Vaughan, 2004
+# This file provides the M4SH_GETOPTS option processing compiler, and
+# all necessary support at the m4 and shell-script levels.
+#
+# An m4sh script can include this file, and an M4SH_GETOPTS invocation
+# that expands to a shell script option processing loop with similar
+# abilites to a C program the uses getopt_long() to process it's command
+# line options - although, unlike the C API, M4SH_GETOPTS also supplies
+# the loop to step through and process the options.
+#
+# See the comment above M4SH_GETOPTS, below, for details.
 
-   This file is part of GNU Cvs-utils.
 
-GNU Cvs-utils 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 you option) any later version.
+# All internal macros begin with `m4go_'.
+m4_pattern_forbid([^_?m4go_])
 
-As a special exception to the GNU General Public License, if you
-distribute this file as part of a program or library that contains
-a configuration script generated by Autoconf, you may include this
-file under the same distribution terms that you use for the rest
-of that program.
+## --------------------------------- ##
+## 1. Low level string manipulation. ##
+## --------------------------------- ##
 
-GNU Cvs-utils is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.
+# m4go_slice(STRING, BEGIN, END)
+# ------------------------------
+# Just like m4_substr(), except that both the BEGIN and END of the
+# substring are given as offsets from the beginning of STRING, as
+# returned by m4_index().
+m4_define([m4go_slice],
+[m4_substr([$1], [$2], m4_eval([$3-$2]))])
 
-You should have received a copy of the GNU General Public License
-along with GNU Libtool; see the file COPYING.  If not, a copy
-can be downloaded from  http://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.
-])dnl
+# m4go_trimn(STRING)
+# -------------------
+# Trim all leading and trailing newlines from STRING.
+#
+# Inspite of careful quoting, this macro is NOT robust to active
+# symbols:
+#        | m4_define(active, ACTV)
+#        | m4go_trimn([[
+#        |    start active finish
+#        | ]])
+#       => start ACTV fini
+# The interaction between index counting and macro expansion also
+# results in overtrimming in this example by 2 characters (the
+# difference between the lengths of `active' and `ACTV'). Translation
+# into French is just a coincidence.
+#
+# The implementation is surprisingly finicky: We use m4go_slice() to
+# extract the middle section of the string, while using m4_bregexp() to
+# return offset counts for the first and last non-newlines in STRING.
+# But there are a number of corner cases:
+#  1. Double quoted STRING works, (i.e m4go_trimn([[\nthe string\n]]. We
+#     achieve that by transliterating quote characters as well as
+#     newlines to the same character before counting off the offsets.
+#  2. This needs a slightly different transliteration for each
+#     m4_bregexp() invocation, because we need to maintain balanced
+#     quotes in the argument and we don't want to swallow leading ']' or
+#     trailing '[' characters.  So, we turn the quote we don't want to
+#     strip into a harmless ' '.
+#  3. Because we're now effectively stripping the quotation with the
+#     m4_translit() calls, embedded commas can fool m4_bregexp() into
+#     thinking there are more arguments than we intended, so we turn
+#     them into spaces too.
+#  4. Unbalanced parentheses would also confuse m4_bregexp(), so we also
+#     turn them into spaces.  The upshot of that if STRING contains a
+#     macro invocation with arguments, it will be expanded in the result
+#     as if no arguments had been passed.
+#  5. Comments are not ignored after stripping quote marks, so we have
+#     to turn them off for the duration.
+#  6. Finally, we need to requote the result to account for the quotes
+#     we probably stripped.  m4_quote() doesn't handle commas well, so
+#     we use m4_expand() to requote without losing whitespace after any
+#     embedded commas.
+m4_define([m4go_trimn],
+[m4_changecom()m4_expand([m4go_slice([$1], m4_bregexp(m4_translit([$1],[
+[/,()]], [//     ]), [[^/]]), m4_bregexp(m4_translit([$1], [
+[/,()]], [/     /]), [/*$]))])[]m4_changecom([#])])
 
-m4_include([general.m4sh])
+# m4go_untab(STRING)
+# ------------------
+# Trim leading TABs from each line of STRING.
+m4_define([m4go_untab],
+[m4_bpatsubst([$1], [^[	]*], [])])
 
-M4SH_VERBATIM([[
+# m4go_unindent(STRING)
+# ---------------------
+# Completely unindent STRING: Remove the leading TABs from each line of
+# STRING; trim leading newlines and trailing whitespace from STRING as
+# a whole.
+m4_define([m4go_unindent],
+[m4_ifval([$1], [m4go_untab([m4go_trimn([$1])])])])
+
+
+## ------------------------------ ##
+## 2. Option processing compiler. ##
+## ------------------------------ ##
+
+# Shell fragments are piecemeal added to these macros for each
+# invocation of m4go_option; eventually to be expanded into the compiled
+# option parsing shell script by M4SH_GETOPTS:
+
+m4_define([m4go_defaults], [])	# initial shell option variable setings
+m4_define([m4go_branches], [])	# case branches to process options
+
+# The initial entries in m4go_shortnoargs represent the (non-argument)
+# options that are always accepted by the expanded processing loop. We
+# also keep a list of short options that accept an option argument in
+# the macro `m4go_shortargs', but we use `m4_append([m4go_shortargs],
+# OPTION, [|])' to insert the separator pipe symbols - which requires
+# that `m4go_shortargs' be undefined if the first option appended is not
+# prefixed by a leading `|'.
+m4_define([m4go_shortnoargs], [-?*|-h*|-v*])
+
+
+# M4SH_GETOPTS(SHORT-SPEC1, LONG-MATCH1, DEF1, INIT1,
+#              SHORT-SPEC2, LONG-MATCH2, DEF2, INIT2, ... [VALIDATION])
+# ---------------------------------------------------------------------
+# Declare a series of command line options with one letter (`-m') or
+# long form `--message' formats, along with optional default values
+# incase a given option is not provided by the user when the script is
+# invoked, and validation code, for example to prevent specifying
+# mutually exclusive options or omitting required options.
+#
+# After this macro has been called, the value of each option is
+# available in a shell variable named `opt_' followed by the first part
+# (i.e. up to the first '|' symbol) of the LONG-MATCHn argument with the
+# leading `--` removed, and any further `-' converted to `_', or else if
+# no long form option was provided, simple `opt_' followed by the short
+# option letter. For example, the value supplied by the user as an
+# argument to an option `--gpg-key-id' will be available in the shell
+# variable $opt_gpg_key_id, `-c' with no long form option will be
+# available as $opt_c and so on. Where an option doesn't take an
+# argument, then the shell variable will be set to either `:' or `false'
+# depending on whether the user set that option on the script command
+# line - with one important exception: If the long form option name
+# begins with `--no-', and does not require an option argument, then the
+# variable name will be `opt_' followed by the rest of the option name
+# with the leading `no_' removed; and it's value will be `false' if
+# `--no-foo' was given on the command line, and `:' otherwise.
+#
+# Each option is declared by a set of 4 arguments as follows:
+#
+# SHORT-SPECn
+#	The short option letter, if any, for the nth option followed by
+#	any flags to denote special processing for this option. For
+#	example, `f?@'. See below for a list of the supported flags and
+#	their meaning. If you specify `h', `v' or `x', then the
+#	automatic processing of those short options for `--help',
+#	`--version' and `--debug' (resp.) will be overridden.
+# LONG-MATCHn
+#	The long option list, including leading dashes for the nth
+#	option. The value for this option is used directly as a shell
+#	`case' branch to match the option, so you can specify multiple
+#	matches. For example, `--message|--mes*|--msg'.  If you specify
+#	neither this argument nor a short option letter with
+#	SHORT-SPECn, then invalid shell code will be generated.
+# DEFn	If there is a default value for the nth option to take when it
+#	is not given on the command line when the script is executed,
+#	specify it here. Double quotes are added in the expanded shell
+#	script, so it is safe to use shell variables. For example,
+#	`$HOME/.foorc'.
+# INITn	Any option specific initialisation for the nth option should be
+#	specified in this argument. The shell code it contains is added
+#	directly to the case branch that matches the nth option, after
+#	the `opt_NAME' variable has been set, with the option argument
+#	(if any) still left in `$1'.  This allows neat tricks such as
+#	injecting new arguments into the command line before the
+#	processing loop terminates.  For example:
+#
+#		`eval set -- `cat $rcfile` ${1+"$@"}'
+#
+#	Note that, because we look inside the content of INITn to
+#	determine whether there are newlines to be stripped, double
+#	quoting the whele thing doesn't work.  Instead, you'll need to
+#	quote active symbols yourself.  Generally, you'll only need to
+#	worry about $n and $@, although if you use symbols that can be
+#	expanded by m4 you'll need to quote those too.
+# VALIDATION
+#	The final argument, if any, should contain shell code to
+#	validate correctness of the processed options.  This code is
+#	expanded after the option processing loop has exited, and before
+#	the conditional script exit if errors have been found.  Try to
+#	show as many errors as possible before exiting the shell rather
+#	than bailing out on the first error discovered so that the user
+#	can correct all of them at once rather than just one between
+#	each reinvocation of the script.
+#
+# In addition to an option short form letter (e.g. `m'), each
+# SHORT-SPECn argument can also list one or more of the following flags
+# to place additional constraints on that option (only one of `?', `+'
+# and `@' can be given in any SHORT-SPECn):
+#
+# =STRING
+#	The option does not take an argument, but when specified on the
+#	command line the `opt_' variable is set to STRING.
+# ?	The option takes an optional argument. Unless the next command
+#	line argument begins with a `-' it will be the value stored in
+#	this option's `opt_' shell variable. Otherwise the `opt_'
+#	variable will contain the INITn value.
+# !	The option requires an argument. The next command line argument
+#	will be stored in this option's `opt_' shell variable, or else
+#	the INITn value, if any, will be stored if this option is not
+#	given on the command line.
+# ;	The same as `!', except that when the argument is given multiple
+#	times on the command line, each argument is appended to the
+#	`opt_' shell variable, along with a new-line to separate it from
+#	the previous argument.
+# +	The same as `!', except that each time the argument is supplied
+#	on the command line, it's value is stored in an `opt_' variable
+#	with `_n' appended to the variable name - where `n' is `1' for
+#	the first argument, `2, for the second and so on.
+# @	The option argument must point to an existing file. The
+#	processing loop will automatically contain an additional check
+#	to ensure that the named file exists. `@' can be added to a
+#	SHORT-SPECn argument in addition to any other flags.
+# ^	The value stored in the `opt_' variable is quoted by passing it
+#	through the shell function `func_quote_for_eval'.
+#
+# The M4SH_GETOPTS macro is implemented by first delegating to
+# `_M4SH_GETOPTS', a shift4-loop that repeatedly calls `m4go_options',
+# shifts away the 4 processed arguments, checks the number of remaining
+# args and loops again until only 1 argument (VALIDATION) or 0 arguments
+# (no VALIDATION code) remain. When all the processing is complete, we
+# expand 'm4go_printopts' to write out the complete command line
+# processing shell loop.
+#
+# Generally, you can combine the SHORT-SPECn flags in sensible ways,
+# but no error checking is done. If you choose a combination that makes
+# no sense, you'll probably end up with broken shell code.
+m4_define([M4SH_GETOPTS],
+[_$0($@)[]m4go_printopts])
+m4_define([_M4SH_GETOPTS],
+[m4_if([$#], 0, [],
+       [$#], 1, [m4_define([m4go_validation],[$1])],
+       [$#], 2, [m4_fatal([$0: too few arguments: $#: $2])],
+       [$#], 3, [m4_fatal([$0: too few arguments: $#: $3])],
+       [m4go_option($@)[]$0(m4_shiftn(4, $@))])])
+
+
+# m4go_option(SHORT-SPEC, LONG-MATCH, DEFAULT, INIT)
+# --------------------------------------------------
+# This macro is a wrapper for `_m4go_option', which first extracts the
+# short option letter (if any) from SHORT-SPEC, and then calculates the
+# full `opt_' shell variable name for this option before delegating
+# those results along with all of its own arguments to `_m4go_option'.
+#
+# Note that when the LONG-MATCH begins with `--no-', we add `~' to the
+# list of SHORT-SPEC flags before calling `_m4go_option' to denote that
+# the name of the `opt_' variable is reversed in the sense of the option
+# name itself.That is, we want to start with the option being true, and
+# set it to false if `--no-foo' is given on the command line.
+#
+# `m4_do' is used here to separate out the pushdef and popdef of the
+# temporary `_short' macro used to held the extracted short option
+# letter, if any.
+m4_define([m4go_option],
+[m4_do(
+    [m4_pushdef([_short],
+        m4_bmatch([$1],
+            [[?!;+@^]], m4_bpatsubst([$1], [[?!;+@^]*], []),
+            [^=],       [],
+            [.],        [[$1]],
+                        []))],
+    [_$0(opt_[]m4_ifnblank([$2],
+            m4_translit(m4_bpatsubst([$2], [^--\(no-\)?\([^|]+\).*$],
+                                     [\2]), -, _),
+                _short),
+         _short,
+         [$1]m4_bmatch([$2], [^--no-], [~]),
+         [$2],
+         [$3],
+         [$4])],
+    [m4_popdef([_short])])])
+
+
+# _m4go_option(OPTION-NAME, SHORT-OPTION, SHORT-SPEC, LONG-MATCH,
+#                  DEFAULT, INIT)
+#----------------------------------------------------------------
+# For this option, append the appropriate shell code fragments to:
+# `m4go_defaults'
+#	A shell script fragment containing `opt_' variable
+#	initialisation according to DEFAULT, if necessary;
+# `m4go_branches'
+#	The case branch to match any SHORT-OPTION or LONG-MATCH command
+#	line option, along with any automatic processing implied by
+#	SHORT-SPEC flags, and additional code from INIT;
+# `m4go_shortargs'
+#	This match string accumulates all of the short options that
+#	accept option arguments, so that we can generate some additional
+#	code to split apart compacted option strings (`-xfoo' will be
+#	treated as if `-x foo' had been passed) in `m4go_printopts'.
+# `m4go_shortnoargs'
+#	Similarly, accumulate short options that do not take option
+#	arguments, so that we can generate the code to split apart
+#	compacted options strings in `m4go_printopts' (`-xfoo' will be
+#	treated as if `-x -f -o -o' had been passed).
+#
+# The core of this macro switches the `m4go_branches' processing to an
+# appropriate macro depending on what flags are present in SHORT-SPEC.
+
+m4_define([_m4go_option],
+[m4_do(
+    [m4_append([m4go_defaults],
+        m4_bmatch([$3],
+            [[?!;+@^]], [m4_ifnblank([$5], [m4_n([$1="$5"])])],
+            [~],        [m4_n([$1=:])],
+                        [m4_n([$1=false])]))],
+    [m4_append([m4go_branches], [[]dnl (
+      m4_join([|], [$4], m4_ifnblank([$2], [-$2])))
+])],
+    [m4_append([m4go_branches],
+        [m4_bmatch([$3], [[!+@]],
+[			test [$]# = 0 && func_missing_arg $opt && break
+])m4_n(m4_bmatch([$3],
+    [\^],      [			func_quote_for_eval "[$]1"
+			optarg="$func_quote_for_eval_result"],
+    [[?!;+@]], [			optarg="[$]1"]))[]dnl
+m4_n(m4_bmatch([$3],
+    [+],       [			$1_num=`expr 1 + ${$1_num-0}`
+			eval $1_${$1_num}=\"$optarg\"],
+    [?],       [m4_bmatch([$3],
+                    [@], [m4_expand([m4go_optional_file_arg([$1])])],
+                         [m4_expand([m4go_optional_arg([$1])])])],
+    [[!@]],    [			$1="$optarg"],
+    [;],       [			$1="${$1+[$]$1
+}$optarg"],
+    [~],       [			$1=false],
+    [=.],      [			$1="m4_bpatsubst([$3], [^.*=], [])"],
+               [			$1=:]))[]dnl
+dnl only write the file_arg fragment when we didn't already write opt_file_arg:
+m4_bmatch([$3], [@], [m4_bmatch([$3], [?], [],
+                   [m4_expand([m4go_file_arg([$1])])
+])])m4_n(m4go_unindent([$6]))[]dnl
+m4_bmatch([$3], [[!+]], [			shift
+])			;;
+])],
+    [m4_ifnblank([$2],
+        [m4_bmatch([$3],
+            [[?!;+@^~]], [m4_append([m4go_shortargs],   [-$2*], [|])],
+                       [m4_append([m4go_shortnoargs], [-$2*],
+                                  [|])])])])])
+
+
+# m4go_optional_arg(OPTION-NAME)
+# ------------------------------
+# Expand to the case branch core code for processing a flag that takes
+# an optional argument, and sets the `opt_' variable named by
+# OPTION-NAME appropriately.
+m4_define([m4go_optional_arg],
+[			if test [$]# -gt 0; then
+			    case $optarg in # ((
+			        -*) ;;
+			        *) $1="$optarg"; shift ;;
+			    esac
+			fi])
+
+# m4go_file_arg(OPTION-NAME)
+# --------------------------
+# As above, but for flags that require the name of an existing file as
+# an argument.
+m4_define([m4go_file_arg],
+[			test -r "$optarg" || {
+			    func_error "$opt: cannot read file \`$optarg'."
+			    exit_cmd=exit
+			}])
+
+# m4go_optional_file_arg(OPTION-NAME)
+# -----------------------------------
+# As above, but for options that optionally takes the name of an
+# existing file as its argument.
+m4_define([m4go_optional_file_arg],
+[			if test [$]# -gt 0; then
+			    case $optarg in # ((
+			        -*) ;;
+			        *)  $1="$optarg"
+			            test -r "$optarg" || {
+			                func_error "$opt: cannot read file \`$optarg'."
+			                exit_cmd=exit
+			            }
+			            shift ;;
+			    esac
+			fi])
+
+
+# m4go_printopts
+# --------------
+# This macro expands to the complete command line option processing
+# loop, providing for user declared options from `M4SH_GETOPTS' as well
+# as support for `-x|--debug', `-\?|-h|--help' and `--version'.  The
+# latter two extract their output from a stylized comment at the start
+# of the script, and will not work correctly if the format is not
+# followed precisely.
+m4_define([m4go_printopts],
+[
+# Option defaults:
+opt_debug=false
+m4go_defaults
+
+# Parse options once, thoroughly.  This comes as soon as possible in the
+# script to make things like `--version' happen as quickly as we can.
+{M4SH_VERBATIM([[
+  # sed scripts
+  my_sed_single_opt='1s/^\(..\).*$/\1/;q'
+  my_sed_single_rest='1s/^..\(.*\)$/\1/;q'
+  my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
+  my_sed_long_arg='1s/^--[^=]*=//'
+]])
+  # this just eases exit handling
+  while test [$]# -gt 0; do
+    opt="[$]1"
+    shift
+    case $opt in
+      --debug|-x)	opt_debug=:
+			func_echo "enabling shell trace mode"
+			set -x
+			;;
+m4go_branches
+      -\?|-h)		func_usage				;;
+      --help)		func_help				;;
+      --version)	func_version				;;
+
+      # Separate optargs to long options:
+      --*=*)
+			arg=`echo "$opt" | $SED "$my_sed_long_arg"`
+			opt=`echo "$opt" | $SED "$my_sed_long_opt"`
+			set dummy "$opt" "$arg" ${1+"[$]@"}
+			shift
+			;;
+
+m4_ifset([m4go_shortargs], dnl (
+[      # Separate optargs to short options:
+      ]m4go_shortargs[)
+			arg=`echo "$opt" |$SED "$my_sed_single_rest"`
+			opt=`echo "$opt" |$SED "$my_sed_single_opt"`
+			set dummy "$opt" "$arg" ${1+"[$]@"}
+			shift
+			;;
+
+])m4_ifset([m4go_shortnoargs], dnl (
+[      # Separate non-argument short options:
+      ]m4go_shortnoargs[)
+			rest=`echo "$opt" |$SED "$my_sed_single_rest"`
+			opt=`echo "$opt" |$SED "$my_sed_single_opt"`
+			set dummy "$opt" "-$rest" ${1+"[$]@"}
+			shift
+			;;
+
+])      --)		break					;;
+      -*)		func_fatal_help "unrecognized option \`$opt'" ;;
+      *)		set dummy "$opt" ${1+"[$]@"};	shift; break  ;;
+    esac
+  done
+m4_ifset([m4go_validation],
+[
+  # Validate options:
+m4go_validation
+])
+  # Bail if the options were screwed
+  $exit_cmd $EXIT_FAILURE
+}
+])
+
+
+## ------------------------- ##
+## 3. Supporting Shell Code. ##
+## ------------------------- ##
+
+# The shell functions below are expanded verbatim into the shell script
+# at `m4_include([getopt.m4sh]', which are necessary for the correct
+# operation of the automatic `--version' and `--help' options, among
+# others.
+
+m4_divert_pop(-1)M4SH_VERBATIM([[
 # func_version
 # Echo version message to standard output and exit.
 func_version ()
@@ -57,7 +522,7 @@ func_version ()
 # Echo short help message to standard output and exit.
 func_usage ()
 {
-    $SED -n '/^# Usage:/,/^#  *-h/ {
+    $SED -n '/^# Usage:/,/^#  *.*--help/ {
         s/^# //
 	s/^# *$//
 	s/\$progname/'$progname'/
@@ -98,7 +563,7 @@ func_help ()
 # exit_cmd.
 func_missing_arg ()
 {
-    func_error "missing argument for $1"
+    func_error "missing argument for $1."
     exit_cmd=exit
 }
 


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Fri Jun 04 14:44:17 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OKbsP-00068X-4g
	for mharc-libtool-commit@gnu.org; Fri, 04 Jun 2010 14:44:17 -0400
Received: from [140.186.70.92] (port=43605 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OKbsJ-000637-UV
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 14:44:14 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKbsD-0005f8-UX
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 14:44:10 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:45931
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKbsD-0005ey-T0
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 14:44:05 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKbsD-0006UO-BC
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 18:44:05 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKbsC-0005Xh-Te
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 18:44:05 +0000
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: aa7558299c54421fa5ea751457068b773db38cd1
X-Git-Newrev: 2f666f77692f52e02d4b856f5764440c5a80cc35
Message-Id: <E1OKbsC-0005Xh-Te@vcs-noshell.in.savannah.gnu.org>
Date: Fri, 04 Jun 2010 18:44:04 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.7b-5-g2f666f7
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Jun 2010 18:44:15 -0000

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  2f666f77692f52e02d4b856f5764440c5a80cc35 (commit)
      from  aa7558299c54421fa5ea751457068b773db38cd1 (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 2f666f77692f52e02d4b856f5764440c5a80cc35
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Sat Jun 5 01:43:56 2010 +0700

    Prepare for next release.
    
    * configure.ac, libltdl/configure.ac (AC_INIT): Bump version
    number to 2.2.8.
    * NEWS: Update version number.
    * INSTALL, libltdl/config/install-sh, libltdl/config/config.guess,
    libltdl/config/config.sub, libltdl/config/texinfo.tex: Updated
    from canonical source.

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

Summary of changes:
 ChangeLog            |    8 ++++++++
 NEWS                 |    7 ++++---
 configure.ac         |    2 +-
 libltdl/configure.ac |    2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4c01630..6673df5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2010-06-05  Gary V. Vaughan  <gary@gnu.org>
 
+	Prepare for next release.
+	* configure.ac, libltdl/configure.ac (AC_INIT): Bump version
+	number to 2.2.8.
+	* NEWS: Update version number.
+	* INSTALL, libltdl/config/install-sh, libltdl/config/config.guess,
+	libltdl/config/config.sub, libltdl/config/texinfo.tex: Updated
+	from canonical source.
+
 	Provide an m4sh reimplementation of announce-gen.
 	* libltdl/config/getopt.m4sh (M4SH_GETOPTS): New macro that takes
 	a quoted m4 list of command line options to be parsed, and
diff --git a/NEWS b/NEWS
index d031af4..0e949b2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,11 @@
 NEWS - list of user-visible changes between releases of GNU Libtool
 
-New in 2.2.8 2010-05-??: git version 2.2.7c, Libtool team:
+New in 2.2.8 2010-06-05: git version 2.2.7c, Libtool team:
 
-* New features:
+* No new features:
 
-  - None.
+  - Bumped version number and romoted 2.2.7b release candidate to a full
+    stable release.
 
 New in 2.2.7b 2010-05-20: git version 2.2.7a, Libtool team:
 
diff --git a/configure.ac b/configure.ac
index 93fe17e..4aeadbc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ dnl Oldest automake required for bootstrap is below in AM_INIT_AUTOMAKE.
 ## ------------------------ ##
 ## Autoconf initialisation. ##
 ## ------------------------ ##
-AC_INIT([libtool], [2.2.7c], [bug-libtool@gnu.org])
+AC_INIT([libtool], [2.2.8], [bug-libtool@gnu.org])
 AC_CONFIG_HEADERS([config.h:config-h.in])
 AC_CONFIG_SRCDIR([libtoolize.in])
 LT_CONFIG_LTDL_DIR([libltdl], [nonrecursive])
diff --git a/libltdl/configure.ac b/libltdl/configure.ac
index 407fcac..d0a7761 100644
--- a/libltdl/configure.ac
+++ b/libltdl/configure.ac
@@ -40,7 +40,7 @@ AC_PREREQ(2.59)dnl We use AS_HELP_STRING
 ## ------------------------ ##
 ## Autoconf initialisation. ##
 ## ------------------------ ##
-AC_INIT([libltdl], [2.2.7c], [bug-libtool@gnu.org])
+AC_INIT([libltdl], [2.2.8], [bug-libtool@gnu.org])
 AC_CONFIG_HEADERS([config.h:config-h.in])
 AC_CONFIG_SRCDIR([ltdl.c])
 AC_CONFIG_AUX_DIR([config])


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Fri Jun 04 15:30:14 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OKcar-00063B-Kl
	for mharc-libtool-commit@gnu.org; Fri, 04 Jun 2010 15:30:13 -0400
Received: from [140.186.70.92] (port=37035 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OKcan-00061Q-D4
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 15:30:10 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKcal-0004za-Sj
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 15:30:09 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:38735
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKcal-0004zS-Qc
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 15:30:07 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKcaj-00073w-8A
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 19:30:05 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKcaj-0000ny-4M
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 19:30:05 +0000
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 2f666f77692f52e02d4b856f5764440c5a80cc35
X-Git-Newrev: 8524eb8f5cc197caebc0f5bb6f704dab47d42773
Message-Id: <E1OKcaj-0000ny-4M@vcs-noshell.in.savannah.gnu.org>
Date: Fri, 04 Jun 2010 19:30:05 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.7b-6-g8524eb8
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Jun 2010 19:30:11 -0000

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  8524eb8f5cc197caebc0f5bb6f704dab47d42773 (commit)
      from  2f666f77692f52e02d4b856f5764440c5a80cc35 (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 8524eb8f5cc197caebc0f5bb6f704dab47d42773
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Sat Jun 5 02:29:56 2010 +0700

    Set SCM version number to 2.2.9a.
    
    * configure.ac, libltdl/configure.ac (AC_INIT): Bump version
    number to 2.2.9a.
    * NEWS: Updated.

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

Summary of changes:
 ChangeLog            |    7 +++++++
 NEWS                 |    6 ++++++
 configure.ac         |    2 +-
 libltdl/configure.ac |    2 +-
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6673df5..584590b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2010-06-05  Gary V. Vaughan  <gary@gnu.org>
 
+	Set SCM version number to 2.2.9a.
+	* configure.ac, libltdl/configure.ac (AC_INIT): Bump version
+	number to 2.2.9a.
+	* NEWS: Updated.
+
+	GNU Libtool 2.2.8 was released.
+
 	Prepare for next release.
 	* configure.ac, libltdl/configure.ac (AC_INIT): Bump version
 	number to 2.2.8.
diff --git a/NEWS b/NEWS
index 0e949b2..24e654f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 NEWS - list of user-visible changes between releases of GNU Libtool
 
+New in 2.2.9b 2010-??-??: git version 2.2.9a, Libtool team:
+
+* New features:
+
+  - None.
+
 New in 2.2.8 2010-06-05: git version 2.2.7c, Libtool team:
 
 * No new features:
diff --git a/configure.ac b/configure.ac
index 4aeadbc..c595192 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ dnl Oldest automake required for bootstrap is below in AM_INIT_AUTOMAKE.
 ## ------------------------ ##
 ## Autoconf initialisation. ##
 ## ------------------------ ##
-AC_INIT([libtool], [2.2.8], [bug-libtool@gnu.org])
+AC_INIT([libtool], [2.2.9a], [bug-libtool@gnu.org])
 AC_CONFIG_HEADERS([config.h:config-h.in])
 AC_CONFIG_SRCDIR([libtoolize.in])
 LT_CONFIG_LTDL_DIR([libltdl], [nonrecursive])
diff --git a/libltdl/configure.ac b/libltdl/configure.ac
index d0a7761..969865f 100644
--- a/libltdl/configure.ac
+++ b/libltdl/configure.ac
@@ -40,7 +40,7 @@ AC_PREREQ(2.59)dnl We use AS_HELP_STRING
 ## ------------------------ ##
 ## Autoconf initialisation. ##
 ## ------------------------ ##
-AC_INIT([libltdl], [2.2.8], [bug-libtool@gnu.org])
+AC_INIT([libltdl], [2.2.9a], [bug-libtool@gnu.org])
 AC_CONFIG_HEADERS([config.h:config-h.in])
 AC_CONFIG_SRCDIR([ltdl.c])
 AC_CONFIG_AUX_DIR([config])


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Fri Jun 04 15:30:25 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OKcb3-00068g-58
	for mharc-libtool-commit@gnu.org; Fri, 04 Jun 2010 15:30:25 -0400
Received: from [140.186.70.92] (port=37093 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OKcaz-00066x-Nd
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 15:30:22 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKcay-00051u-HI
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 15:30:21 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:38749
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKcay-00051q-G0
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 15:30:20 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKcay-000750-BK
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 19:30:20 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKcas-0000pm-Q7
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 19:30:17 +0000
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
X-Git-Refname: refs/tags/v2.2.8
X-Git-Reftype: annotated tag
X-Git-Oldrev: 0000000000000000000000000000000000000000
X-Git-Newrev: 2f7631018aefc396375b3c1ce1c2bea9ec675873
Message-Id: <E1OKcas-0000pm-Q7@vcs-noshell.in.savannah.gnu.org>
Date: Fri, 04 Jun 2010 19:30:14 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool annotated tag, v2.2.8, created. v2.2.8
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Jun 2010 19:30:23 -0000

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 annotated tag, v2.2.8 has been created
        at  2f7631018aefc396375b3c1ce1c2bea9ec675873 (tag)
   tagging  2f666f77692f52e02d4b856f5764440c5a80cc35 (commit)
  replaces  v2.2.7b
 tagged by  Gary V. Vaughan
        on  Sat Jun 5 02:18:32 2010 +0700

- Log -----------------------------------------------------------------
release 2.2.8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (Darwin)

iEYEABECAAYFAkwJUgAACgkQFRMICSmD1gaRQACfSuHzQF7hvHGvcftfC/VN3cdT
suoAniqFikFuqLVL+YeMYenQa+Q5RxUI
=QZw9
-----END PGP SIGNATURE-----

Gary V. Vaughan (4):
      Set SCM version number to 2.2.7c.
      Support "git log --oneline" in generated commit messages.
      Provide an m4sh reimplementation of announce-gen.
      Prepare for next release.

Ralf Wildenhues (1):
      * HACKING: Set Reply-To: in announcement emails.

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


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Fri Jun 04 16:53:05 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OKdt3-00025U-Ht
	for mharc-libtool-commit@gnu.org; Fri, 04 Jun 2010 16:53:05 -0400
Received: from [140.186.70.92] (port=39473 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OKdt0-00024o-Kv
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 16:53:04 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKdsu-0004cU-8S
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 16:53:02 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:46607
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKdsu-0004cP-5r
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 16:52:56 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKdst-000833-Mt
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 20:52:55 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKdst-0007QF-J3
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 20:52:55 +0000
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 8524eb8f5cc197caebc0f5bb6f704dab47d42773
X-Git-Newrev: 4a649e5c369e3aa28887bb3f50dc6256811c99e6
Message-Id: <E1OKdst-0007QF-J3@vcs-noshell.in.savannah.gnu.org>
Date: Fri, 04 Jun 2010 20:52:55 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.8-2-g4a649e5
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Jun 2010 20:53:04 -0000

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  4a649e5c369e3aa28887bb3f50dc6256811c99e6 (commit)
      from  8524eb8f5cc197caebc0f5bb6f704dab47d42773 (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 4a649e5c369e3aa28887bb3f50dc6256811c99e6
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Sat Jun 5 03:52:43 2010 +0700

    Fix web manual generation details in release instructions.
    
    * HACKING (Release Procedure): Move the instruction for generating
    web manuals for a new release to before the instruction that bumps
    the version numbers to the post release values.

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

Summary of changes:
 ChangeLog |    5 +++++
 HACKING   |    7 +++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 584590b..ad9eb40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-06-05  Gary V. Vaughan  <gary@gnu.org>
 
+	Fix web manual generation details in release instructions.
+	* HACKING (Release Procedure): Move the instruction for generating
+	web manuals for a new release to before the instruction that bumps
+	the version numbers to the post release values.
+
 	Set SCM version number to 2.2.9a.
 	* configure.ac, libltdl/configure.ac (AC_INIT): Bump version
 	number to 2.2.9a.
diff --git a/HACKING b/HACKING
index fa3e323..5e045ac 100644
--- a/HACKING
+++ b/HACKING
@@ -722,6 +722,9 @@ or obtained by writing to the Free Software Foundation, Inc.,
   between the previous release tarball and the new with detached gpg
   signature files and clear signed directive files.
 
+* If not an alpha, generate with `make -f[../]Makefile.maint
+  web-manual'.
+
 * Upload release tarballs and diff files, plus their associated
   detached gpg signature files and clear signed directive files to
   ftp-upload.gnu.org.  If the upload is destined for ftp.gnu.org, then the
@@ -740,9 +743,9 @@ or obtained by writing to the Free Software Foundation, Inc.,
 * Update the webpages, libtool.html will need to indicate the latest
   release number.
 
-* If not an alpha, upload new manual pages with cvs to:
+* If not an alpha, upload new manual pages you created earlier in
+  doc/manual using cvs to here:
   <yourusername>@cvs.savannah.gnu.org:/webcvs/libtool
-  (generate with `make -f[../]Makefile.maint web-manual').
 
 * In the build directory, run `Make -f[../]Makeflie.maint announce-gen'.
 


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Fri Jun 04 16:56:58 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OKdwo-0003MO-OM
	for mharc-libtool-commit@gnu.org; Fri, 04 Jun 2010 16:56:58 -0400
Received: from [140.186.70.92] (port=40858 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OKdwl-0003Lq-Pu
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 16:56:57 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKdwk-00056l-8S
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 16:56:55 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:47086
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKdwk-00056h-6u
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 16:56:54 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKdwj-00086N-GG
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 20:56:53 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKdwj-0007mG-Ci
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 20:56:53 +0000
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4a649e5c369e3aa28887bb3f50dc6256811c99e6
X-Git-Newrev: 695c5ee50d2ee6c8943f14c2bd252a6f269abf11
Message-Id: <E1OKdwj-0007mG-Ci@vcs-noshell.in.savannah.gnu.org>
Date: Fri, 04 Jun 2010 20:56:53 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.8-3-g695c5ee
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Jun 2010 20:56:57 -0000

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  695c5ee50d2ee6c8943f14c2bd252a6f269abf11 (commit)
      from  4a649e5c369e3aa28887bb3f50dc6256811c99e6 (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 695c5ee50d2ee6c8943f14c2bd252a6f269abf11
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Sat Jun 5 03:56:43 2010 +0700

    Update generated upload directive file format to v1.1.
    
    * Makefile.maint (git-dist, diffs): Update to generate v1.1 format
    directive files for ftp://ftp-upload.gnu.org/incoming/ftp.

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

Summary of changes:
 ChangeLog      |    4 ++++
 Makefile.maint |    8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ad9eb40..7a0472c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-06-05  Gary V. Vaughan  <gary@gnu.org>
 
+	Update generated upload directive file format to v1.1.
+	* Makefile.maint (git-dist, diffs): Update to generate v1.1 format
+	directive files for ftp://ftp-upload.gnu.org/incoming/ftp.
+
 	Fix web manual generation details in release instructions.
 	* HACKING (Release Procedure): Move the instruction for generating
 	web manuals for a new release to before the instruction that bumps
diff --git a/Makefile.maint b/Makefile.maint
index 70b7405..70d8810 100644
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -177,7 +177,9 @@ git-dist: check-news check-commit
 	for suffix in gz lzma; do \
 	  ofile="$(PACKAGE)-$(VERSION).tar.$$suffix"; \
 	  $(GPG) --detach-sign $$ofile \
-	  && echo "directory: libtool" > $$ofile.directive \
+	  && echo "version: 1.1" > $$ofile.directive \
+	  && echo "directory: libtool" >> $$ofile.directive \
+	  && echo "filename: $$ofile" >> $$ofile.directive \
 	  && $(GPG) --clearsign $$ofile.directive \
 	  && rm -f $$ofile.directive; \
 	done
@@ -225,7 +227,9 @@ diffs: prev-tarball new-tarball
 		$(PACKAGE)-$(LASTRELEASE) $(PACKAGE)-$(VERSION) \
 		| GZIP=$(GZIP_ENV) gzip -c > $$ofile \
 	&& $(GPG) --detach-sign $$ofile \
-	&& echo "directory: libtool" > $$ofile.directive \
+	&& echo "version: 1.1" > $$ofile.directive \
+	&& echo "directory: libtool" >> $$ofile.directive \
+	&& echo "filename: $$ofile" |sed 's,: \.\./,: ,' >> $$ofile.directive \
 	&& $(GPG) --clearsign $$ofile.directive \
 	&& rm -f $$ofile.directive
 


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Fri Jun 04 17:17:00 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OKeGA-00067F-NE
	for mharc-libtool-commit@gnu.org; Fri, 04 Jun 2010 17:16:58 -0400
Received: from [140.186.70.92] (port=57749 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OKeG7-0004tH-R9
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 17:16:57 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKe5r-00067t-4f
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 17:06:20 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:37403
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKe5r-00067n-26
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 17:06:19 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKe5q-0008Ez-BA
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 21:06:18 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKe5q-0000GW-7L
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 21:06:18 +0000
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 695c5ee50d2ee6c8943f14c2bd252a6f269abf11
X-Git-Newrev: f369e079744be44675513bd5283bd99503bc88b3
Message-Id: <E1OKe5q-0000GW-7L@vcs-noshell.in.savannah.gnu.org>
Date: Fri, 04 Jun 2010 21:06:18 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.8-4-gf369e07
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Jun 2010 21:16:57 -0000

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  f369e079744be44675513bd5283bd99503bc88b3 (commit)
      from  695c5ee50d2ee6c8943f14c2bd252a6f269abf11 (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 f369e079744be44675513bd5283bd99503bc88b3
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Sat Jun 5 04:06:10 2010 +0700

    Fetch from new upstream host for config.guess and config.sub.
    
    * Makefile.maint (WGET_CGIT): Location of newest config.guess and
    config.sub upstream.
    (fetch): Fetch config.guess and config.sub from WGET_CGIT, rather
    than no-longer-updating WGET_SGO location.

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

Summary of changes:
 ChangeLog      |    6 ++++++
 Makefile.maint |    5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7a0472c..89be093 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-06-05  Gary V. Vaughan  <gary@gnu.org>
 
+	Fetch from new upstream host for config.guess and config.sub.
+	* Makefile.maint (WGET_CGIT): Location of newest config.guess and
+	config.sub upstream.
+	(fetch): Fetch config.guess and config.sub from WGET_CGIT, rather
+	than no-longer-updating WGET_SGO location.
+
 	Update generated upload directive file format to v1.1.
 	* Makefile.maint (git-dist, diffs): Update to generate v1.1 format
 	directive files for ftp://ftp-upload.gnu.org/incoming/ftp.
diff --git a/Makefile.maint b/Makefile.maint
index 70d8810..e2fa628 100644
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -121,6 +121,7 @@ check-news:
 WGET = wget
 WGETSGO = $(WGET) 'http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~'
 WGET_GIT = $(WGET) 'http://git.savannah.gnu.org/gitweb/?a=blob_plain;hb=HEAD;p='
+WGET_CGIT = $(WGET) 'http://git.savannah.gnu.org/cgit/config.git/plain'
 
 ## Files that we fetch and which we compare against.
 ## FIXME should be a lot more here
@@ -140,8 +141,8 @@ fetch:
 	(cd Fetchdir && \
 	$(WGET_GIT)'gnulib.git;f=doc/INSTALL' -O INSTALL && \
 	$(WGET_GIT)'automake.git;f=lib/install-sh' -O install-sh && \
-	$(WGETSGO)/config/config/config.guess -O config.guess && \
-	$(WGETSGO)/config/config/config.sub -O config.sub && \
+	$(WGET_CGIT)/config.guess -O config.guess && \
+	$(WGET_CGIT)/config.sub -O config.sub && \
 	$(WGETSGO)/texinfo/texinfo/doc/texinfo.tex -O texinfo.tex )
 ## Don't exit after test because we want to give as many errors as
 ## possible.


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Fri Jun 04 17:19:24 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OKeIW-0000Ag-8m
	for mharc-libtool-commit@gnu.org; Fri, 04 Jun 2010 17:19:24 -0400
Received: from [140.186.70.92] (port=34388 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OKeIT-00007B-GZ
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 17:19:22 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKeIS-0003IN-GZ
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 17:19:21 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:33904
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKeIS-0003IH-FB
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 17:19:20 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKeIS-0008M1-3K
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 21:19:20 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKeIS-0001N0-1h
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 21:19:20 +0000
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: f369e079744be44675513bd5283bd99503bc88b3
X-Git-Newrev: fd9aeebfe95b73aa7f1b5539806eee8b4b23f0c6
Message-Id: <E1OKeIS-0001N0-1h@vcs-noshell.in.savannah.gnu.org>
Date: Fri, 04 Jun 2010 21:19:20 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.8-5-gfd9aeeb
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Jun 2010 21:19:22 -0000

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  fd9aeebfe95b73aa7f1b5539806eee8b4b23f0c6 (commit)
      from  f369e079744be44675513bd5283bd99503bc88b3 (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 fd9aeebfe95b73aa7f1b5539806eee8b4b23f0c6
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Sat Jun 5 04:19:11 2010 +0700

    Shift correctly in numbered option argument collection.
    
    * libltdl/config/getopt.m4sh (_m4go_option): Argument list also
    needs to be `shift'ed in the shell option loop after processing a
    numbered argument collection.

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

Summary of changes:
 ChangeLog                  |    5 +++++
 libltdl/config/getopt.m4sh |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 89be093..7567527 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-06-05  Gary V. Vaughan  <gary@gnu.org>
 
+	Shift correctly in numbered option argument collection.
+	* libltdl/config/getopt.m4sh (_m4go_option): Argument list also
+	needs to be `shift'ed in the shell option loop after processing a
+	numbered argument collection.
+
 	Fetch from new upstream host for config.guess and config.sub.
 	* Makefile.maint (WGET_CGIT): Location of newest config.guess and
 	config.sub upstream.
diff --git a/libltdl/config/getopt.m4sh b/libltdl/config/getopt.m4sh
index 6e0e2c6..74491d0 100644
--- a/libltdl/config/getopt.m4sh
+++ b/libltdl/config/getopt.m4sh
@@ -357,7 +357,7 @@ dnl only write the file_arg fragment when we didn't already write opt_file_arg:
 m4_bmatch([$3], [@], [m4_bmatch([$3], [?], [],
                    [m4_expand([m4go_file_arg([$1])])
 ])])m4_n(m4go_unindent([$6]))[]dnl
-m4_bmatch([$3], [[!+]], [			shift
+m4_bmatch([$3], [[!+;]], [			shift
 ])			;;
 ])],
     [m4_ifnblank([$2],


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Fri Jun 04 17:22:14 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OKeLG-00061e-Md
	for mharc-libtool-commit@gnu.org; Fri, 04 Jun 2010 17:22:14 -0400
Received: from [140.186.70.92] (port=45899 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OKeLE-0005vq-DP
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 17:22:13 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKeLC-00040i-N9
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 17:22:12 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:55298
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKeLC-00040d-Le
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 17:22:10 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKeLC-0008PU-KI
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 21:22:10 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKeLC-0001br-GP
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 21:22:10 +0000
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: fd9aeebfe95b73aa7f1b5539806eee8b4b23f0c6
X-Git-Newrev: 7a1821bead2aa2fefaf3a31a26e2cbf6e4ecfc0f
Message-Id: <E1OKeLC-0001br-GP@vcs-noshell.in.savannah.gnu.org>
Date: Fri, 04 Jun 2010 21:22:10 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.8-6-g7a1821b
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Jun 2010 21:22:13 -0000

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  7a1821bead2aa2fefaf3a31a26e2cbf6e4ecfc0f (commit)
      from  fd9aeebfe95b73aa7f1b5539806eee8b4b23f0c6 (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 7a1821bead2aa2fefaf3a31a26e2cbf6e4ecfc0f
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Sat Jun 5 04:22:01 2010 +0700

    Quote command line arguments after --rcfile properly.
    
    * libltdl/config/announce-gen.m4sh (--rcfile): Quote remaining
    arguments shell variable expression correctly for eval.

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

Summary of changes:
 ChangeLog                        |    4 ++++
 libltdl/config/announce-gen.m4sh |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7567527..09e6981 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-06-05  Gary V. Vaughan  <gary@gnu.org>
 
+	Quote command line arguments after --rcfile properly.
+	* libltdl/config/announce-gen.m4sh (--rcfile): Quote remaining
+	arguments shell variable expression correctly for eval.
+	
 	Shift correctly in numbered option argument collection.
 	* libltdl/config/getopt.m4sh (_m4go_option): Argument list also
 	needs to be `shift'ed in the shell option loop after processing a
diff --git a/libltdl/config/announce-gen.m4sh b/libltdl/config/announce-gen.m4sh
index 6295039..2eb021c 100644
--- a/libltdl/config/announce-gen.m4sh
+++ b/libltdl/config/announce-gen.m4sh
@@ -122,7 +122,7 @@ M4SH_GETOPTS(
   [p],	[--post],			   	[],			[],
   [r@?],[--rcfile],				[$top_srcdir/.announcerc], [
 	# The funny quoting allows keeping one option per line in $opt_rcfile:
-	eval set dummy `echo \`cat $opt_rcfile\` \${1+"\[$]@"}`
+	eval set dummy `echo \`cat $opt_rcfile\` '${1+"[$]@"}'`
 	shift],
   [v],	[--verbose],				[],			[
 	mailnotify_flags="${mailnotify_flags+$mailnotify_flags }$opt"],


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Fri Jun 04 18:06:59 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OKf2Y-0002qy-T0
	for mharc-libtool-commit@gnu.org; Fri, 04 Jun 2010 18:06:58 -0400
Received: from [140.186.70.92] (port=59492 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OKf2W-0002mK-Q6
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 18:06:57 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKf2V-0004qM-6T
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 18:06:56 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:40607
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKf2V-0004qF-58
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 18:06:55 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKf2U-0000Wq-O4
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 22:06:54 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OKf2U-0004wR-LA
	for libtool-commit@gnu.org; Fri, 04 Jun 2010 22:06:54 +0000
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 7a1821bead2aa2fefaf3a31a26e2cbf6e4ecfc0f
X-Git-Newrev: 540fbe5b3215ffd3ea0bcb03240ad67d8a2f0336
Message-Id: <E1OKf2U-0004wR-LA@vcs-noshell.in.savannah.gnu.org>
Date: Fri, 04 Jun 2010 22:06:54 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.8-7-g540fbe5
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Jun 2010 22:06:58 -0000

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  540fbe5b3215ffd3ea0bcb03240ad67d8a2f0336 (commit)
      from  7a1821bead2aa2fefaf3a31a26e2cbf6e4ecfc0f (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 540fbe5b3215ffd3ea0bcb03240ad67d8a2f0336
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Sat Jun 5 05:06:45 2010 +0700

    Add missing quote for literal ? in a shell case statement.
    
    * libltdl/config/getopt.m4sh (m4go_shortnoargs): Quote initial ?
    correctly for use in a shell case statement.

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

Summary of changes:
 ChangeLog                  |    4 ++++
 libltdl/config/getopt.m4sh |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 09e6981..c511b59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-06-05  Gary V. Vaughan  <gary@gnu.org>
 
+	Add missing quote for literal ? in a shell case statement.
+	* libltdl/config/getopt.m4sh (m4go_shortnoargs): Quote initial ?
+	correctly for use in a shell case statement.
+
 	Quote command line arguments after --rcfile properly.
 	* libltdl/config/announce-gen.m4sh (--rcfile): Quote remaining
 	arguments shell variable expression correctly for eval.
diff --git a/libltdl/config/getopt.m4sh b/libltdl/config/getopt.m4sh
index 74491d0..a81a905 100644
--- a/libltdl/config/getopt.m4sh
+++ b/libltdl/config/getopt.m4sh
@@ -135,7 +135,7 @@ m4_define([m4go_branches], [])	# case branches to process options
 # OPTION, [|])' to insert the separator pipe symbols - which requires
 # that `m4go_shortargs' be undefined if the first option appended is not
 # prefixed by a leading `|'.
-m4_define([m4go_shortnoargs], [-?*|-h*|-v*])
+m4_define([m4go_shortnoargs], [-\?*|-h*|-v*])
 
 
 # M4SH_GETOPTS(SHORT-SPEC1, LONG-MATCH1, DEF1, INIT1,


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Sun Jun 06 06:53:41 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OLDU5-0004s9-6E
	for mharc-libtool-commit@gnu.org; Sun, 06 Jun 2010 06:53:41 -0400
Received: from [140.186.70.92] (port=33427 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OLDTn-0004dn-Ct
	for libtool-commit@gnu.org; Sun, 06 Jun 2010 06:53:39 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OLDTj-0007qt-PR
	for libtool-commit@gnu.org; Sun, 06 Jun 2010 06:53:22 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:52167
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OLDTj-0007qp-M6
	for libtool-commit@gnu.org; Sun, 06 Jun 2010 06:53:19 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OLDTj-0001ie-Gv
	for libtool-commit@gnu.org; Sun, 06 Jun 2010 10:53:19 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OLDTj-0007gs-E8
	for libtool-commit@gnu.org; Sun, 06 Jun 2010 10:53:19 +0000
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 540fbe5b3215ffd3ea0bcb03240ad67d8a2f0336
X-Git-Newrev: b33d82439af7213436aa02188d475fcf24b130d0
Message-Id: <E1OLDTj-0007gs-E8@vcs-noshell.in.savannah.gnu.org>
Date: Sun, 06 Jun 2010 10:53:19 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.8-8-gb33d824
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Jun 2010 10:53:40 -0000

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  b33d82439af7213436aa02188d475fcf24b130d0 (commit)
      from  540fbe5b3215ffd3ea0bcb03240ad67d8a2f0336 (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 b33d82439af7213436aa02188d475fcf24b130d0
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Sat Jun 5 05:40:40 2010 +0700

    Update and simplify all m4sh scripts to use latest getopt.m4sh.
    
    * clcommit.m4sh, libltdl/config/mailnotify.m4sh: Rewrite option
    parsing loop over M4SH_GETOPTS macro, and adjust all clients of
    option variables to use generated option names.

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

Summary of changes:
 ChangeLog                      |    5 +
 clcommit.m4sh                  |  318 ++++++++++----------------------
 libltdl/config/mailnotify.m4sh |  394 ++++++++++++++++++++--------------------
 3 files changed, 306 insertions(+), 411 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c511b59..6c397c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-06-05  Gary V. Vaughan  <gary@gnu.org>
 
+	Update and simplify all m4sh scripts to use latest getopt.m4sh.
+	* clcommit.m4sh, libltdl/config/mailnotify.m4sh: Rewrite option
+	parsing loop over M4SH_GETOPTS macro, and adjust all clients of
+	option variables to use generated option names.
+
 	Add missing quote for literal ? in a shell case statement.
 	* libltdl/config/getopt.m4sh (m4go_shortnoargs): Quote initial ?
 	correctly for use in a shell case statement.
diff --git a/clcommit.m4sh b/clcommit.m4sh
index 8c14be2..ff27f9d 100644
--- a/clcommit.m4sh
+++ b/clcommit.m4sh
@@ -1,7 +1,7 @@
 AS_INIT[]m4_divert_push([HEADER-COPYRIGHT])dnl
 # @configure_input@
 
-# clcommit (GNU @PACKAGE@) version 2.0.1
+# clcommit (GNU @PACKAGE@) version 2.1
 # Written by Gary V. Vaughan <gary@gnu.org>
 # and Alexandre Oliva <aoliva@redhat.com>
 
@@ -32,16 +32,16 @@ AS_INIT[]m4_divert_push([HEADER-COPYRIGHT])dnl
 #           --debug            enable verbose shell tracing
 # -n        --dry-run          don't commit anything
 #           --fast             same as --force --first
-# -F file   --file=FILE        read commit message from FILE
+# -F FILE   --file=FILE        read commit message from FILE
 # -1        --first            extract first entry from ChangeLog, no git diff
 # -f        --force            don't check (unless *followed* by -n), and just
 #                              display commit message instead of running $PAGER
 #           --from=ADDRESS     override default from ADDRESS in commit email
-# -m msg    --message=STRING   set commit message to STRING
+# -m STRING --message=STRING   set commit message to STRING
 #           --msg=STRING          same as -m
 # -p        --push             push the changes back to origin
 # -r [FILE] --rcfile[=FILE]    read default option from FILE [./.clcommitrc]
-# -s addr   --sendmail=ADDRESS send commit email of the differences to ADDRESS
+# -s ADDR   --sendmail=ADDR    send commit email of the differences to ADDRESS
 #           --signature[=FILE] add FILE to the end of the email [~/.signature]
 #           --signoff          add a Signed-off-by attribution at the end
 # -S TEXT   --summary=TEXT     specify a TEXT subject line for the commit email
@@ -83,19 +83,12 @@ m4_divert_pop
 m4_include([getopt.m4sh])
 
 M4SH_VERBATIM([[
-# Global variables:
-opt_commit=:
-opt_first=false
-opt_push=false
-opt_tags=false
-opt_update=:
-opt_verbose=false
-
-git_flags=
-mailnotify_flags=
-sendmail_to=
+# Locations for important files:
+log_dir="`func_mktempdir`"
+log_file="$log_dir/log"
+push_conflicts="$log_dir/git_push.log"
 
-exit_cmd=:
+trap '$RM -r "$log_dir"; exit $EXIT_FAILURE' 1 2 15
 
 # try to find out whether read supports -r
 if echo bt | tr b '\\' | { read -r line; test "X$line" = 'X\t'; } 2>/dev/null
@@ -104,196 +97,81 @@ then
 else
   read_r=read
 fi
+]])
 
-# Locations for important files:
-signature_file=
-log_dir="`func_mktempdir`"
-log_file="$log_dir/log"
-push_conflicts="$log_dir/git_push.log"
-
-trap '$RM -r "$log_dir"; exit $EXIT_FAILURE' 1 2 15
-
-set -e
-
-# Parse options once, thoroughly.  This comes as soon as possible in
-# the script to make things like `clcommit --version' happen quickly.
-{
-  # sed scripts:
-  my_sed_single_opt='1s/^\(..\).*$/\1/;q'
-  my_sed_single_rest='1s/^..\(.*\)$/\1/;q'
-  my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
-  my_sed_long_arg='1s/^--[^=]*=//'
-
-  # this just eases exit handling
-  while test $# -gt 0; do
-    opt="$1"
-    shift
-    case $opt in
-
-      --author|-a)	test $# = 0 && func_missing_arg $opt && break
-      			func_quote_for_eval "$1"
-			git_flags="$git_flags --author=$func_quote_for_eval_result"
-			shift
-			;;
-
-      --[cC]hange[lL]og|-C)
-			test $# = 0 && func_missing_arg $opt && break
-			if test -f "$1"; then :; else
-			  func_error "ChangeLog file \`$1' does not exist"
-			  break
-			fi
-			ChangeLog="$1"
-			shift
-			;;
-
-      --debug)		func_echo "enabling shell trace mode"
-	    		mailnotify_flags="$mailnotify_flags --debug"
-			set -x
-			;;
-
-      --dry-run|-n)	opt_commit=false; opt_update=:		;;
-
-      --fast)		set dummy --force --first ${1+"$@"}; shift	;;
-
-      --file|-F)	test $# = 0 && func_missing_arg $opt && break
-			if $opt_first || test -f "$log_file"; then
-			  func_error "you can have at most one of -m, -F and -1"
-			  break
-			fi
-			if cat < "$1" > "$log_file"; then :; else
-			  break
-			fi
-			shift
-			;;
-
-      --first|-1)	if test -f "$log_File"; then
-	    		  func_error "you can have at most one of -m, -F and -1"
-			  break
-			fi
-			opt_first=:
-			;;
-
-      --force|-f)	opt_update=false; PAGER=cat		;;
-
-      --from)		test $# = 0 && func_missing_arg $opt && break
-      			func_quote_for_eval "$1"
-			mailnotify_flags="$mailnotify_flags --from=$func_quote_for_eval_result"
-			shift
-			;;
-
-      --message|--msg|-m)
-			test $# = 0 && func_missing_arg $opt && break
-			if $opt_first || test -f "$log_file"; then
-			  func_error "you can have at most one of -m, -F and -1"
-			  break
-			fi
-			echo "$1" > "$log_file"
-			shift
-			;;
-
-      --push|-p)	opt_push=:				;;
-
-      --rcfile|-r)	rc_file="./.clcommitrc"
-			if test $# -gt 0; then
-			  case $1 in
-			    -*)				;;
-			    *)  rc_file="$1"; shift	;;
-			  esac
-			fi
-			if test -f "$rc_file"; then :; else
-			  func_error "rcfile \`$rc_file' does not exist"
-			  exit_cmd=exit
-			  break
-			fi
-			# The funny quoting allows keeping one option per
-			# line in $rc_file:
-			eval set dummy `echo \`cat $rc_file\` \${1+"\$@"}`
-			shift
-			;;
-
-      --sendmail|-s)	test $# = 0 && func_missing_arg $opt && break
-      			func_quote_for_eval "$1"
-      			sendmail_to="$func_quote_for_eval_result"
-			shift
-			;;
-
-      --signature)	test $# = 0 && func_missing_arg $opt && break
-    			signature_file="$HOME/.signature"
-			case $1 in
-			  -*) ;;
-			  *)  signature_file="$1"; shift ;;
-			esac
-			if test -f "$signature_file"; then :; else
-			  func_error "\`$signature_file': file not found"
-			  break
-			fi
-			;;
-
-      --signoff)	git_flags="$git_flags --signoff"	;;
-
-      --summary|-S)	test $# = 0 && func_missing_arg $opt && break
-			summary="$1"
-			shift
-			;;
-
-      --tags)		opt_tags=:				;;
-
-      --verbose|-v)	opt_verbose=:				;;
-
-      # Separate optargs to long options:
-      --*=*)
-			arg=`echo "$opt" | $SED "$my_sed_long_arg"`
-			opt=`echo "$opt" | $SED "$my_sed_long_opt"`
-			set dummy "$opt" "$arg" ${1+"$@"}
-			shift
-			;;
-
-      # Separate optargs to short options:
-      -a*|-m*|-F*|-C*|-S*|-s*)
-			arg=`echo "$opt" |$SED "$my_sed_single_rest"`
-			opt=`echo "$opt" |$SED "$my_sed_single_opt"`
-			set dummy "$opt" "$arg" ${1+"$@"}
-			shift
-			;;
-
-      # Separate non-argument short options:
-      -1*|-f*|-p*|-n*|-q*)
-			rest=`echo "$opt" |$SED "$my_sed_single_rest"`
-			opt=`echo "$opt" |$SED "$my_sed_single_opt"`
-			set dummy "$opt" "-$rest" ${1+"$@"}
-			shift
-			;;
-
-      -\?|-h)		func_usage					;;
-      --help)		func_help					;;
-      --version)	func_version					;;
-      --)		break						;;
-      -*)		func_fatal_help "unrecognized option \`$opt'"	;;
-      *)		set dummy "$opt" ${1+"$@"};	shift; break		;;
-    esac
-  done
-
-  if test -z "$sendmail_to"; then
+dnl SHORT	LONG			       DEFAULT		      INIT
+dnl ----------------------------------------------------------------------
+M4SH_GETOPTS(
+  [1],		[--first],			[],			[],
+  [a^!],	[--author],			[],			[
+	git_flags="${git_flags+$git_flags }--author=$opt_author"],
+  [C@],		[--changelog|--Change[Ll]og],	[],			[],
+  [F!],		[--file],			[],			[
+	cat "[$]1" > "$log_file" || break],
+  [f],		[--force],			[],			[
+	PAGER=cat],
+  [m!],		[--message|--msg],		[],			[
+	echo "[$]1" > "$log_file"],
+  [n],		[--dry-run|--dryrun],		[],			[
+	mailnotify_flags="${mailnotify_flags+$mailnotify_flags }--dry-run"],
+  [p],		[--push],			[],			[],
+  [r@?],	[--rcfile],			[./.clcommitrc],	[
+	# The funny quoting allows keeping one option per line in $opt_rcfile:
+	eval set dummy `echo \`cat $opt_rcfile\` '${1+"[$]@"}'`
+	shift],
+  [S!],		[--summary],			[],			[],
+  [s^!],	[--sendmail],			[],			[],
+  [v],		[--verbose],			[],			[
+	mailnotify_flags="${mailnotify_flags+$mailnotify_flags }--verbose"],
+  [],		[--fast],			[],			[
+	set dummy --force --first ${1+"[$]@"}; shift],
+  [^!],		[--from],			[],			[
+	mailnotify_flags="${mailnotify_flags+$mailnotify_flags }--from=$opt_from"],
+  [@?],		[--signature],			[],			[
+	test -n "$opt_signature" || opt_signature="$HOME/.signature"],
+  [],		[--signoff],			[],			[
+	git_flags="${git_flags+$git_flags }$opt"],
+  [],		[--tags],			[],			[],
+ [
+  # pass debug flag along to mailnotify
+  $opt_debug &&
+      mailnotify_flags="${mailnotify_flags+$mailnotify_flags }--debug"
+
+  # validate $opt_first, $opt_file and $opt_message
+  if $opt_first; then
+      test -n "$opt_file$opt_message" &&
+          func_error "you can have at most one of -m, -F and -1"
+  else
+      test -n "$opt_file" && test -n "$opt_message" &&
+          func_error "you can have at most one of -m, -F and -1"
+  fi
 
+  # validate $opt_from and $opt_signature
+  test -n "$opt_sendmail" || {
     # can't have a from address without a destination address
-    test -n "$sendmail_from" &&
+    test -n "$opt_from" &&
       func_error "can't use --from without --sendmail." && exit_cmd=exit
 
     # can't use a signature file without a destination address
-    test -n "$signature_file" &&
+    test -n "$opt_signature" &&
       func_error "can't use --signature without --sendmail." && exit_cmd=exit
-  fi
+  }
 
-  $opt_tags && test x"$opt_push" = xfalse &&
-    func_error "can't use --tags without --push." && exit_cmd=exit
+  # validate $opt_tags
+  $opt_push || {
+      $opt_tags &&
+          func_error "can't use --tags without --push." && exit_cmd=exit
+  }
+])
 
-  # Bail if the options were screwed
-  $exit_cmd $EXIT_FAILURE
-}
+M4SH_VERBATIM([[
+# Bail out on command errors!
+set -e
 
 # func_check_conflicts
 func_check_conflicts ()
 {
+    func_verbose "checking for commit conflicts..."
     if $GIT push --dry-run > "$push_conflicts" 2>&1; then :; else
       cat "$push_conflicts" >&2
       func_fatal_error "some conflicts were found with upstream repository, aborting..."
@@ -304,25 +182,25 @@ func_check_conflicts ()
 # func_check_commit_msg
 func_check_commit_msg ()
 {
-    if test -z "$ChangeLog"; then
+    if test -z "$opt_changelog"; then
       for f in ${1+"$@"}; do
         case "$f" in
           ChangeLog* | */ChangeLog*)
-            if test -z "$ChangeLog"; then
-	      ChangeLog="$f"
+            if test -z "$opt_changelog"; then
+	      opt_changelog="$f"
 	    else
-	      func_fatal_error "multiple ChangeLog files: $ChangeLog and $f"
+	      func_fatal_error "multiple ChangeLog files: $opt_changelog and $f"
 	    fi
 	  ;;
         esac
       done
     fi
 
-    func_verbose "$progname: checking commit message..."
+    func_verbose "checking commit message..."
     separate_summary=:		# whether to separate summary lines for git
     if $opt_first; then
       skipping=:
-      $SED 's,^,+,' < ${ChangeLog-ChangeLog} |
+      $SED 's,^,+,' < ${opt_changelog-ChangeLog} |
         while $read_r line; do
           case "$line" in
             "+") if $skipping; then skipping=false; else break; fi;;
@@ -345,7 +223,7 @@ func_check_commit_msg ()
         done |
           $SED 's,^\+	,,' > "$log_file" || exit $EXIT_FAILURE
     else
-      $GIT diff ${ChangeLog-ChangeLog} |
+      $GIT diff ${opt_changelog-ChangeLog} |
         while $read_r line; do
           case $line in
             "--- "*) :;;
@@ -387,13 +265,19 @@ func_commit ()
     test $# -gt 0 && subject="$@"
 
     test $# -gt 0 || { set dummy -a; shift; }
-    func_verbose "$GIT commit$git_flags -F $log_file ${1+$@}"
-    $GIT commit$git_flags -F $log_file ${1+"$@"} || exit $EXIT_FAILURE
+    func_verbose "$GIT commit $git_flags -F $log_file ${1+$@}"
+    $opt_dry_run ||
+        $GIT commit $git_flags -F $log_file ${1+"$@"} || exit $EXIT_FAILURE
 
-    if $opt_push; then
-      $GIT push
-      $opt_tags && $GIT push --tags
-    fi
+    $opt_push && {
+      func_verbose "$GIT push"
+      $opt_dry_run || $GIT push
+
+      $opt_tags && {
+	  func_verbose "$GIT push --tags"
+	  $opt_dry_run || $GIT push --tags
+      }
+    }
 
     :
 }
@@ -403,7 +287,7 @@ func_commit ()
 func_mailnotify ()
 {
     notify_file="${log_dir}/notify"
-    func_verbose "Mailing commit notification to $sendmail_to"
+    func_verbose "Mailing commit notification to \"$opt_sendmail\""
 
     {
       echo Subject: $subject
@@ -417,9 +301,9 @@ func_mailnotify ()
       echo ""
       echo "Log Message:"
       $SED -e 's,^,	,' "$log_file"
-      test -f "$signature_file" && {
+      test -f "$opt_signature" && {
         echo '-- '
-	cat "$signature_file"
+	cat "$opt_signature"
       }
     } > "$notify_file"
 
@@ -434,11 +318,10 @@ func_mailnotify ()
     my_mail_body=`$SED -e '2,$p;d' "$notify_file"`
     echo "$my_mail_body" > "$notify_file"
 
-    func_verbose "mailing commit notification to \"$sendmail_to\""
     func_quote_for_eval "$my_mail_subject"
     func_show_eval "$MAILNOTIFY $mailnotify_flags \
         -s $func_quote_for_eval_result -m 'text/plain' -f '$notify_file' \
-	-- $sendmail_to"
+	-- $opt_sendmail"
 }
 
 
@@ -458,17 +341,18 @@ func_mailnotify ()
     func_error "*** They should be used to separate distinct commits."
   fi
 
-  $opt_update && $opt_push && func_check_conflicts
+  # $opt_force says to force the changes through without checking for conflicts
+  $opt_push && {
+      $opt_force || func_check_conflicts
+  }
 
   # Do not check for empty $log_file again, even though the user might have
   # zeroed it out.  If s/he did, it was probably intentional.
-  if $opt_commit; then
-    func_commit ${1+"$@"}
-  fi
+  func_commit ${1+"$@"}
 
-  # Send a copy of the log_file if sendmail_to was set:
+  # Send a copy of the log_file if opt_sendmail was set:
   subject=`sed -n '1p' "$log_file"`
-  if test -n "$sendmail_to"; then
+  if test -n "$opt_sendmail"; then
     if ! $opt_push; then
       func_warning "Mail notification NOT sent for commit to local repository."
     else
diff --git a/libltdl/config/mailnotify.m4sh b/libltdl/config/mailnotify.m4sh
index a95f201..d8a24e3 100644
--- a/libltdl/config/mailnotify.m4sh
+++ b/libltdl/config/mailnotify.m4sh
@@ -1,10 +1,10 @@
 AS_INIT[]m4_divert_push([HEADER-COPYRIGHT])dnl
 # @configure_input@
 
-# mailnotify (GNU @PACKAGE@) version 0.6
+# mailnotify (GNU @PACKAGE@) version 1.0
 # Written by Gary V. Vaughan <gary@gnu.org>
 
-# Copyright (C) 2004, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2006, 2010 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -24,19 +24,17 @@ AS_INIT[]m4_divert_push([HEADER-COPYRIGHT])dnl
 # or obtained by writing to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-# Usage: $progname [OPTION]... [--] to-address...
+# Usage: $progname [OPTIONS]...
 #
-#           --debug             enable verbose shell tracing
-# -C ADDR   --carbon-copy=ADDR  send a carbon-copy to ADDR
-# -F ADDR   --from=ADDR         override default from address with ADDR
+# -x        --debug             enable verbose shell tracing
+#           --dry-run           don't actually post the mime message
 # -f FILE   --filename=FILE     content of this part
+# -h FILE   --headers=FILE      read additional headers from FILE
 # -m TYPE   --mime-type=TYPE    mime-type of this part
-# -n                            another mime part (-f, -m) to follow
 # -o FILE   --output-file=FILE  output to FILE instead of sending
-# -s TEXT   --subject=TEXT      set subject header
 # -v        --verbose           run in verbose mode
 #           --version           print version information
-# -h,-?     --help              print short or long help message
+# -?        --help              print short or long help message
 
 # Assemble a (possibly multi-part) mime message and hand it to the local
 # sendmail for onward delivery.  MUAs tend to mangle patch attachments in
@@ -48,12 +46,19 @@ AS_INIT[]m4_divert_push([HEADER-COPYRIGHT])dnl
 # For example to send a patch as an attachment, assuming the patch itself
 # is in PATCHFILE:
 #
-#    echo 'Applied to HEAD' > body
-#    $progname -f body -m text/plain -n -f PATCHFILE -m text/x-patch \
-#        -s 'FYI: PATCHFILE' patch-list@foo.org
+#    echo 'From: me@example.org' > headers
+#    echo 'To: patch-list@foo.org' >> headers
+#    echo 'Subject: FYI: PATCHFILE' >> headers
+#    echo 'Cc: someone@example.org' >> headers
+#    echo 'Applied this patch to HEAD' > body
+#    $progname -h headers -f body -m text/plain -f PATCHFILE -m text/x-patch
+#
+# There is no set order or requirement for mail headers in the headers
+# file, though you will obviously need someone's address in 'To:', and
+# it's not polite to omit the 'Subject:' header...
 
 # You will probably find using this script in conjunction with clcommit
-# or cvsapply will save you an awful lot of typing.
+# saves you a lot of typing.
 
 # Report bugs to <gary@gnu.org>
 
@@ -66,134 +71,78 @@ m4_divert_pop
 m4_include([getopt.m4sh])
 
 M4SH_VERBATIM([[
-# Global variables:
-multipart=1
-outputfile=""
-
 sed_mail_address='s,^.*<\(.*\)>.*$,\1,'
+]])
 
-# Parse options once, thoroughly.  This comes as soon as possible in
-# the script to make things like `mailnotify --version' happen quickly.
-{
-  # sed scripts:
-  my_sed_single_opt='1s/^\(..\).*$/\1/;q'
-  my_sed_single_rest='1s/^..\(.*\)$/\1/;q'
-  my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
-  my_sed_long_arg='1s/^--[^=]*=//'
-
-  while test $# -gt 0; do
-    opt="$1"
-    shift
-    case $opt in
-      --debug)		func_echo "enabling shell trace mode"
-			set -x
-			;;
-
-      -C|--carbon-copy) test $# -eq 0 && func_missing_arg "$opt" && break
-	    		func_quote_for_eval "$1"
-			cc="$func_quote_for_eval_result"
-			shift
-			;;
-
-      -F|--from)	test $# -eq 0 && func_missing_arg "$opt" && break
-	    		func_quote_for_eval "$1"
-			from="$func_quote_for_eval_result"
-			shift
-			;;
-
-      -f|--filename)	test $# -eq 0 && func_missing_arg "$opt" && break
-			if test -f "$1"; then :; else
-			  func_error "\`$1' does not exist"
-			  exit_cmd=exit
-			  break
-			fi
-			eval datafile$multipart=\"$1\"
-			shift
-			;;
-
-      -m|--mime-type)	test $# -eq 0 && func_missing_arg "$opt" && break
-			case $1 in
-			  text/*) ;;
-			  */*) func_error "only text/* mime-types supported"
-			       ;;
-			  *)   func_error "invalid mime-type, \`$1'"
-			       exit_cmd=exit
-			       ;;
-			esac
-			eval ctype$multipart=\"$1\"
-			shift
-			;;
-
-      -n)		if eval test -z \"\$ctype$multipart\" ||
-			   eval test -z \"\$datafile$multipart\"; then
-			  func_fatal_error "One part is incomplete -- each part needs a filename and a mime-type"
-			fi
-			multipart=`expr 1 + $multipart`
-			;;
-
-      -o|--output-file)	test $# -eq 0 && func_missing_arg "$opt" && break
-	    		func_quote_for_eval "$1"
-			outputfile="$func_quote_for_eval_result"
-			shift
-			;;
-
-      -s|--subject)	test $# -eq 0 && func_missing_arg "$opt" && break
-	    		func_quote_for_eval "$1"
-			subject="$func_quote_for_eval_result"
-			shift
-			;;
-
-      -v|--verbose)	opt_verbose=:			;;
-
-      # Separate optargs to long options:
-      --carbon-copy=*|--from=*|--filename=*|--mime-type=*|--output-file=*|--subject=*)
-			arg=`echo "$opt" | $SED "$my_sed_long_arg"`
-			opt=`echo "$opt" | $SED "$my_sed_long_opt"`
-			set -- "$opt" "$arg" ${1+"$@"}
-			;;
-
-      # Separate optargs to short options:
-      -C*|-F*|-f*|-m*|-o*|-s*)
-			arg=`echo "$opt" |$SED "$my_sed_single_rest"`
-			opt=`echo "$opt" |$SED "$my_sed_single_opt"`
-			set -- "$opt" "$arg" ${1+"$@"}
-			;;
-
-      # Separate non-argument short options:
-      -n*|-v*)
-			rest=`echo "$opt" |$SED "$my_sed_single_rest"`
-			opt=`echo "$opt" |$SED "$my_sed_single_opt"`
-			set -- "$opt" "-$rest" ${1+"$@"}
-			;;
-
-      -\?|-h)		func_usage					;;
-      --help)		func_help					;;
-      --version)	func_version					;;
-      --)		break						;;
-      -*)		func_fatal_help "unrecognized option \`$opt'"	;;
-      *)		set -- "$opt" ${1+"$@"};      break		;;
-    esac
-  done
-
-  test $# -gt 0 ||
-    func_fatal_help "no destination address"
-
-  if test -z "$outputfile"; then
-    if test -z "$subject" ||
-       eval test -z \"\$ctype$multipart\" ||
-       eval test -z \"\$datafile$multipart\"; then
+dnl SHORT	LONG			       DEFAULT		      INIT
+dnl ----------------------------------------------------------------------
+dnl There are several options supported below for backwards compatibility,
+dnl but which are not mentioned in the help.
+M4SH_GETOPTS(
+  [C^!],	[--carbon-copy],		[],			[],
+  [F^!],	[--from],			[],			[],
+  [f@+],	[--filename],			[],			[],
+  [h@!],	[--headers],			[],			[],
+  [m+!],	[--mime-type],			[],			[
+	case [$]1 in
+	  text/*) ;;
+	  */*) func_error "\`[$]1': only text/* mime-types supported"
+	       ;;
+	  *)   func_error "invalid mime-type, \`[$]1'"
+	       exit_cmd=exit
+	       ;;
+	esac],
+  [n],		[],				[],			[],
+  [o!],		[--output-file],		[],			[],
+  [s^!],	[--subject],			[],			[],
+  [v],		[--verbose],			[],			[],
+  [],		[--dry-run|--dryrun],		[],			[],
+ [
+  # ensure destination address(es) available
+  test [$]# -gt 0 ||
+    grep '^\(To\|Cc\|Bcc\): ' "${opt_headers-nosuchfile}" >/dev/null 2>&1 ||
+      func_fatal_help "no destination address"
+
+  # validate headers
+  test "$opt_headers" && {
+    test -n "$opt_carbon_copy" && grep "^Cc: *" "$opt_headers" >/dev/null 2>&1 && {
+      func_error "specify \`Cc:' in either \`$opt_headers' or with \`--carbon-copy'."
+      exit_cmd=exit
+    }
+    test -n "$opt_from" && grep "^From: *" "$opt_headers" >/dev/null 2>&1 && {
+      func_error "specify \`From:' in either \`$opt_headers' or with \`--from'."
+      exit_cmd=exit
+    }
+    test -n "$opt_subject" && grep "^Subject: *" "$opt_headers" >/dev/null 2>&1 && {
+      func_error "specify \`Subject:' in either \`$opt_headers' or with \`--subject'."
+      exit_cmd=exit
+    }
+  }
+
+  # validate mime parts
+  if test "${opt_mime_type_num-0}" -ne "${opt_filename_num-0}"; then
+    func_fatal_error "One part is incomplete -- each part needs a filename and a mime-type"
+  fi
+  if test -z "$opt_output_file"; then
+    test -f "$opt_headers" || if test -z "$opt_subject" ||
+       eval test -z \"\$opt_mime_type_$opt_mime_type_num\" ||
+       eval test -z \"\$opt_filename_$opt_filename_num\"; then
       func_fatal_error "if output is not directed to a file -s, -f, and -m are all required"
     fi
   else
-    eval test -n \"\$datafile$multipart\" ||
+    eval test -n \"\$opt_filename_$opt_filename_num\" ||
         func_fatal_error "-f is required."
-    eval test -n \"\$ctype$multipart\" ||
+    eval test -n \"\$opt_mime_type_$opt_mime_type_num\" ||
         func_fatal_error "with output directed to a file, -m is required"
   fi
-  eval test -f \"\$datafile$multipart\" ||
-    eval func_fatal_error \"\$datafile$multipart: file not found\"
-}
 
+  # validate $opt_dry_run
+  $opt_dry_run && SENDMAIL="echo $SENDMAIL"
+])
+
+M4SH_VERBATIM([[
+# Bail out on command errors!
+set -e
 
 # func_headers outfile destination
 # Generate common headers to OUTFILE, where DESTINATION is a comma
@@ -209,14 +158,26 @@ func_headers ()
 	}
 	d'
 
-    {
+    $opt_dry_run || {
 	echo "User-Agent: $PROGRAM/`$SED \"$my_sed_version_no\" < $progpath`"
 	echo "MIME-Version: 1.0"
-	test -n "$from" && eval echo From: $from
-	eval echo To: $my_destination
-	test -n "$cc" && eval echo CC: $cc
-	test -n "$subject" && eval echo Subject: $subject
+
+	# Deprecated command line options take precedence at the moment
+	my_elide="Bcc"
+	test -n "$opt_from" &&
+	    my_elide="${my_elide+$my_elide\|}From" && eval echo From: $opt_from
+	test -n "$my_destination" &&
+	    my_elide="${my_elide+$my_elide\|}To" && eval echo To: $my_destination
+	test -n "$opt_carbon_copy" &&
+	    my_elide="${my_elide+$my_elide\|}Cc" && eval echo CC: $opt_carbon_copy
+	test -n "$opt_subject" &&
+	    my_elide="${my_elide+$my_elide\|}Subject" && eval echo Subject: $opt_subject
+
+	# Plus any additional headers
+	test -n "$opt_headers" && $SED "/^\($my_elide\): */d" "$opt_headers"
     } > "$my_outfile"
+
+    :
 }
 
 
@@ -226,11 +187,11 @@ func_single_content ()
 {
     my_outfile="$1"
 
-    cat >> "$my_outfile" <<EOF
-Content-Type: $ctype1;
+    $opt_dry_run || cat >> "$my_outfile" <<EOF
+Content-Type: $opt_mime_type_1;
 Content-Transfer-Encoding: 7bit
 
-`cat $datafile1`
+`cat $opt_filename_1`
 EOF
 }
 
@@ -241,7 +202,8 @@ func_multipart_content ()
 {
     my_outfile="$1"
     boundary="boundary-${HOST}-$$-`date | tr ' :' -`"
-    cat <<EOF >> "$my_outfile"
+    $opt_dry_run || {
+	cat <<EOF >> "$my_outfile"
 Content-Type: multipart/mixed;
 	boundary="$boundary"
 
@@ -249,31 +211,34 @@ This is a multimedia message in MIME format.  If you are reading
 this prefix, your mail reader does not understand MIME.  You may
 wish to look into upgrading to a mime-aware mail reader.
 EOF
-    i=0
-    while test $i -lt $multipart
-    do
-      i=`expr 1 + $i`
-      eval file=\"\$datafile$i\"
-      name=`echo "$file" | $SED $basename`
-      {
-	echo ""
-	echo "--$boundary"
-	if test $i -gt 1; then
-	    eval echo \"Content-Type: \$ctype$i\;\"
-	    echo "        name=\"$name\""
-	else
-	    eval echo \"Content-Type: \$ctype$i\"
-	fi
-	echo "Content-Transfer-Encoding: 7bit"
-	echo ""
-	cat "$file"
-      } >> "$my_outfile"
-    done
-    {
-      echo ""
-      echo "--${boundary}--"
-      echo ""
-    } >> "$my_outfile"
+	i=0
+	while test $i -lt $opt_filename_num
+	do
+	    i=`expr 1 + $i`
+	    eval file=\"\$opt_filename_$i\"
+	    name=`echo "$file" | $SED $basename`
+	    {
+		echo ""
+		echo "--$boundary"
+		if test $i -gt 1; then
+		    eval echo \"Content-Type: \$opt_mime_type_$i\;\"
+		    echo "        name=\"$name\""
+		else
+		    eval echo \"Content-Type: \$opt_mime_type_$i\"
+		fi
+		echo "Content-Transfer-Encoding: 7bit"
+		echo ""
+		cat "$file"
+	    } >> "$my_outfile"
+	done
+	{
+	    echo ""
+	    echo "--${boundary}--"
+	    echo ""
+	} >> "$my_outfile"
+    }
+
+    :
 }
 
 
@@ -289,25 +254,29 @@ func_sendmail ()
     my_destination="$2"
     my_from="$3"
 
+    $opt_dry_run && my_infile=/dev/null
+
     from_name=`eval echo "X$my_from" | $Xsed -e 's, *<.*> *$,,'`
     from_addr=`eval echo "X$my_from" | $Xsed -e "$sed_mail_address"`
 
     save_PATH="$PATH"
     PATH="/usr/lib:/usr/sbin:$PATH"
 
-    save_IFS="$IFS"
-    IFS=':'
-    for try_sendmail_dir in $PATH; do
+    $opt_dry_run || {
+        save_IFS="$IFS"
+        IFS=':'
+        for try_sendmail_dir in $PATH; do
+            IFS="$save_IFS"
+	    PATH="$save_PATH"
+	    if test -x "$try_sendmail_dir/$SENDMAIL"; then
+	        SENDMAIL="$try_sendmail_dir/$SENDMAIL"
+	        break
+	    fi
+        done
         IFS="$save_IFS"
-	PATH="$save_PATH"
-	if test -x "$try_sendmail_dir/$SENDMAIL"; then
-	    SENDMAIL="$try_sendmail_dir/$SENDMAIL"
-	    break
-	fi
-    done
-    IFS="$save_IFS"
-    PATH="$save_PATH"
-    test -x "$SENDMAIL" || func_fatal_error "sendmail executable not found"
+        PATH="$save_PATH"
+        test -x "$SENDMAIL" || func_fatal_error "sendmail executable not found"
+    }
 
     func_verbose "Delivering mail, please wait..."
     if test -n "$from_name"; then
@@ -319,13 +288,40 @@ func_sendmail ()
     fi
     if test $? -eq 0; then
         func_verbose "...succeeded."
-        $RM $my_infile
+        $opt_dry_run || $RM $my_infile
     else
         func_fatal_error "Mail delivery failed, draft mail is in $my_infile"
     fi
 }
 
 
+# func_extract_email_from_header re_header headerfile
+func_extract_email ()
+{
+    my_re_header="$1"
+    my_headerfile="$2"
+    $as_unset func_extract_email_result
+
+    save_IFS="$IFS"
+    IFS='
+'
+    for to in : `grep "$my_re_header" "$my_headerfile" 2>/dev/null`; do
+	IFS="$save_IFS"
+	test "X$to" = X: && continue
+
+	line=`echo "$to" | $SED "s,$my_re_header,,"`
+
+	IFS=,
+	for addr in $line; do
+	    IFS="$save_IFS"
+	    func_quote_for_eval "$addr"
+	    to_addr=`echo "$func_quote_for_eval_result" | $SED "$sed_mail_address"`
+	    test -n "$to_addr" || to_addr="$func_quote_for_eval_result"
+	    func_extract_email_result="${func_extract_email_result+$func_extract_email_result }$to_addr"
+	done
+    done
+    IFS="$save_IFS"
+}
 
 ## ----- ##
 ## main. ##
@@ -333,47 +329,57 @@ func_sendmail ()
 
 {
   tmp_dir="`func_mktempdir`"
+  headers="$tmp_dir/headers"
   fname="$tmp_dir/mail"
+
   trap '$RM -r "$tmp_dir"; exit $EXIT_FAILURE' 1 2 15
 
   # Generate a comma separated list of destination addresses for the
   # mail headers:
-  destination=""
+  $as_unset destination
   for to in : ${1+"$@"}
   do
       test "X$to" = X: && continue
 
       func_quote_for_eval "$to"
-
-      case $destination in
-	  "") destination="$func_quote_for_eval_result" ;;
-          *)  destination="$destination, $func_quote_for_eval_result" ;;
-      esac
+      destination="${destination+$destination, }$func_quote_for_eval_result"
   done
-
   func_headers "$fname" "$destination"
-  if test $multipart -gt 1; then
+
+  if test $opt_filename_num -gt 1; then
       func_multipart_content "$fname"
   else
       func_single_content "$fname"
   fi
 
-  # Generate a space delimited list of destination addresses for sendmail:
-  if test -z "$outputfile"; then
-      destination=""
+  # Generate a list of destination addresses for sendmail:
+  if test -z "$opt_output_file"; then
+      $as_unset destination
       for to in : ${1+"$@"}
       do
           test "X$to" = X: && continue
 
 	  func_quote_for_eval "$to"
 
-          to_addr=`echo "$func_quote_for_eval_result" | sed "$sed_mail_address"`
+          to_addr=`echo "$func_quote_for_eval_result" | $SED "$sed_mail_address"`
 	  test -n "$to_addr" || to_addr="$func_quote_for_eval_result"
-	  destination="$destination $to_addr"
+	  destination="${destination+$destination }$to_addr"
       done
-      func_sendmail "$fname" "$destination" "$from"
+      func_extract_email '^To: *' "$opt_headers"
+      destination="${destination+$destination }$func_extract_email_result"
+      func_extract_email '^Cc: *' "$opt_headers"
+      destination="${destination+$destination }$func_extract_email_result"
+      func_extract_email '^Bcc: *' "$opt_headers"
+      destination="${destination+$destination }$func_extract_email_result"
+
+      test -n "$opt_from" || {
+	  func_extract_email '^From: *' "$opt_headers"
+	  opt_from="$func_extract_email_result"
+      }
+
+      func_sendmail "$fname" "$destination" "$opt_from"
   else
-      mv $fname $outputfile || exit $EXIT_FAILURE
+      mv $fname $opt_output_file || exit $EXIT_FAILURE
   fi
 
   $RM -r "$tmp_dir"


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Sun Jun 06 09:25:27 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OLFqx-00065D-KS
	for mharc-libtool-commit@gnu.org; Sun, 06 Jun 2010 09:25:27 -0400
Received: from [140.186.70.92] (port=48179 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OLFqu-00062n-HM
	for libtool-commit@gnu.org; Sun, 06 Jun 2010 09:25:25 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OLFqt-0007S2-4Q
	for libtool-commit@gnu.org; Sun, 06 Jun 2010 09:25:24 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:34742
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OLFqt-0007Rv-07
	for libtool-commit@gnu.org; Sun, 06 Jun 2010 09:25:23 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OLFqs-0003Zd-F1
	for libtool-commit@gnu.org; Sun, 06 Jun 2010 13:25:22 +0000
Received: from rwild by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OLFqs-0006Wm-9z
	for libtool-commit@gnu.org; Sun, 06 Jun 2010 13:25:22 +0000
From: "Ralf Wildenhues" <Ralf.Wildenhues@gmx.de>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b33d82439af7213436aa02188d475fcf24b130d0
X-Git-Newrev: b188543381ff1b0815e7e301d2f40170868abe82
Message-Id: <E1OLFqs-0006Wm-9z@vcs-noshell.in.savannah.gnu.org>
Date: Sun, 06 Jun 2010 13:25:22 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.8-9-gb188543
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Jun 2010 13:25:26 -0000

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  b188543381ff1b0815e7e301d2f40170868abe82 (commit)
      from  b33d82439af7213436aa02188d475fcf24b130d0 (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 b188543381ff1b0815e7e301d2f40170868abe82
Author: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date:   Sun Jun 6 13:21:39 2010 +0200

    Rewrite manual intro to be gender-neutral.
    
    * doc/libtool.texi (Introduction): Use gender-neutral
    formulation when addressing developers.
    
    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

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

Summary of changes:
 ChangeLog        |    6 ++++++
 doc/libtool.texi |   12 ++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6c397c9..b79b004 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Rewrite manual intro to be gender-neutral.
+	* doc/libtool.texi (Introduction): Use gender-neutral
+	formulation when addressing developers.
+
 2010-06-05  Gary V. Vaughan  <gary@gnu.org>
 
 	Update and simplify all m4sh scripts to use latest getopt.m4sh.
diff --git a/doc/libtool.texi b/doc/libtool.texi
index bbc22f4..051aec3 100644
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -230,13 +230,13 @@ Platform quirks
 @node Introduction
 @chapter Introduction
 
-In the past, if a source code package developer wanted to take advantage
-of the power of shared libraries, he needed to write custom support code
-for each platform on which his package ran.  He also had to design a
-configuration interface so that the package installer could choose what
-sort of libraries were built.
+In the past, if you were a source code package developer and wanted to
+take advantage of the power of shared libraries, you needed to write
+custom support code for each platform on which your package ran.  You
+also had to design a configuration interface so that the package
+installer could choose what sort of libraries were built.
 
-GNU Libtool simplifies the developer's job by encapsulating both the
+GNU Libtool simplifies your job by encapsulating both the
 platform-specific dependencies, and the user interface, in a single
 script.  GNU Libtool is designed so that the complete functionality of
 each host type is available via a generic interface, but nasty quirks


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Mon Jun 07 16:45:57 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OLjCn-00017K-T5
	for mharc-libtool-commit@gnu.org; Mon, 07 Jun 2010 16:45:57 -0400
Received: from [140.186.70.92] (port=45564 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OLjCl-000173-Fr
	for libtool-commit@gnu.org; Mon, 07 Jun 2010 16:45:56 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OLjCg-0005zs-2v
	for libtool-commit@gnu.org; Mon, 07 Jun 2010 16:45:55 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:47673
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OLjCf-0005zn-VJ
	for libtool-commit@gnu.org; Mon, 07 Jun 2010 16:45:50 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OLjCf-0001WG-Fa
	for libtool-commit@gnu.org; Mon, 07 Jun 2010 20:45:49 +0000
Received: from rwild by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OLjCf-00012t-C1
	for libtool-commit@gnu.org; Mon, 07 Jun 2010 20:45:49 +0000
From: "Ralf Wildenhues" <Ralf.Wildenhues@gmx.de>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b188543381ff1b0815e7e301d2f40170868abe82
X-Git-Newrev: 0e3d88b8399b610522ddb59625f3f9cc021fdd14
Message-Id: <E1OLjCf-00012t-C1@vcs-noshell.in.savannah.gnu.org>
Date: Mon, 07 Jun 2010 20:45:49 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.8-11-g0e3d88b
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 07 Jun 2010 20:45:56 -0000

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  0e3d88b8399b610522ddb59625f3f9cc021fdd14 (commit)
       via  9a801684f6e1a665dc7126091662b34d042adf68 (commit)
      from  b188543381ff1b0815e7e301d2f40170868abe82 (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 0e3d88b8399b610522ddb59625f3f9cc021fdd14
Author: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date:   Mon Jun 7 22:32:26 2010 +0200

    Make versioning test stricter for w32, enable shared libs.
    
    * tests/versioning.at (versioning): Add -no-undefined to
    LDFLAGS.
    (test_uninstalled): Also move $bindir out of the way
    temporarily.
    
    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

commit 9a801684f6e1a665dc7126091662b34d042adf68
Author: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date:   Mon Jun 7 22:30:44 2010 +0200

    Fix versioning test for LDFLAGS=-Wl,--as-needed.
    
    * tests/versioning.at (versioning): For the library update
    hypotheses, ensure the unchanged library libb isn't accidentally
    relinked against the new liba, by not reinstalling libb.
    Fixes testsuite failure for the incompatible update case with
    LDFLAGS=-Wl,--as-needed.
    * THANKS: Update.
    Report by Ryan Hill.
    
    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

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

Summary of changes:
 ChangeLog           |   17 +++++++++++++++++
 THANKS              |    1 +
 tests/versioning.at |   26 ++++++++++++++------------
 3 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b79b004..9a03c01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2010-06-07  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Make versioning test stricter for w32, enable shared libs.
+	* tests/versioning.at (versioning): Add -no-undefined to
+	LDFLAGS.
+	(test_uninstalled): Also move $bindir out of the way
+	temporarily.
+
+	Fix versioning test for LDFLAGS=-Wl,--as-needed.
+	* tests/versioning.at (versioning): For the library update
+	hypotheses, ensure the unchanged library libb isn't accidentally
+	relinked against the new liba, by not reinstalling libb.
+	Fixes testsuite failure for the incompatible update case with
+	LDFLAGS=-Wl,--as-needed.
+	* THANKS: Update.
+	Report by Ryan Hill.
+
 2010-06-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	Rewrite manual intro to be gender-neutral.
diff --git a/THANKS b/THANKS
index 529a699..14ab56b 100644
--- a/THANKS
+++ b/THANKS
@@ -158,6 +158,7 @@
   Roland Mainz			roland.mainz@nrubsig.org
   Roumen Petrov			bugtrack@roumenpetrov.info
   Rudolf Leitgeb		r.leitgeb@x-pin.com
+  Ryan Hill			dirtyepic@gentoo.org
   Sam Thursfield		ssssam@gmail.com
   Scott McCreary		scottmc2@gmail.com
   Sebastian Wilhelmi		wilhelmi@ira.uka.de
diff --git a/tests/versioning.at b/tests/versioning.at
index 136a549..69bf731 100644
--- a/tests/versioning.at
+++ b/tests/versioning.at
@@ -1,6 +1,6 @@
 # versioning.at -- test libtool versioning           -*- Autotest -*-
 #
-#   Copyright (C) 2009 Free Software Foundation, Inc.
+#   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 #
 #   This file is part of GNU Libtool.
 #
@@ -103,6 +103,7 @@ int main (void)
 inst=`pwd`/inst
 libdir=$inst/lib
 bindir=$inst/bin
+LDFLAGS="$LDFLAGS -no-undefined"
 mkdir $inst $libdir $bindir
 
 for file in liba1.c liba2.c liba3.c liba4.c libb.c; do
@@ -155,10 +156,12 @@ test_uninstalled ()
 {
   # temporarily move installed libraries out of the way in order to avoid
   # skewing test results:
-  mv $libdir temp
+  mv $libdir temp-lib
+  mv $bindir temp-bin
   LT_AT_EXEC_CHECK([./prog1])
   LT_AT_EXEC_CHECK([./prog2])
-  mv temp $libdir
+  mv temp-lib $libdir
+  mv temp-bin $bindir
 }
 
 test_installed ()
@@ -190,18 +193,17 @@ AT_CHECK([$LIBTOOL --mode=uninstall rm -f $libdir/liba.la], [], [ignore], [ignor
 
 
 # Hypothesis: library revision updates do not require (uninstalled
-# nor installed) programs to be relinked.
+# nor installed) programs or libraries to be relinked.
 AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la liba2.lo ]dnl
 	 [-version-info 0:1:0 -rpath $libdir], [], [ignore], [ignore])
 test_uninstalled
-AT_CHECK([$LIBTOOL --mode=install cp liba.la libb.la $libdir],
-	 [], [ignore], [ignore])
+AT_CHECK([$LIBTOOL --mode=install cp liba.la $libdir], [], [ignore], [ignore])
 AT_CHECK([$LIBTOOL --mode=clean rm -f liba.la], [], [ignore], [ignore])
 test_installed
 # do not uninstall here: the library may be reused in the next test.
 
 # Hypothesis: backward compatible library updates do not require
-# (uninstalled nor installed) programs to be relinked.
+# (uninstalled nor installed) programs or libraries to be relinked.
 # This can have one of several reasons:
 # - the soname is the difference between $current and $age, thus
 #   unchanged; in this case, the newly installed library will be used,
@@ -212,26 +214,26 @@ test_installed
 AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la liba3.lo ]dnl
 	 [-version-info 1:0:1 -rpath $libdir], [], [ignore], [ignore])
 # Do not test the uninstalled program, it may be broken (in the second case).
-AT_CHECK([$LIBTOOL --mode=install cp liba.la libb.la $libdir],
-	 [], [ignore], [ignore])
+AT_CHECK([$LIBTOOL --mode=install cp liba.la $libdir], [], [ignore], [ignore])
 AT_CHECK([$LIBTOOL --mode=clean rm -f liba.la], [], [ignore], [ignore])
 test_installed
 # do not uninstall here: the library may be reused in the next test.
 
 
 # Hypothesis: with shared libraries, incompatible library updates
-# will not cause old installed programs (linked against the old
+# will not cause old installed programs or libraries (linked against the old
 # library version) to break.
 # This can have one of several reasons:
 # - the soname has changed, so the old installed library will still be
 #   available,
 # - we are linking statically, so the old library code will still be used.
+# In order to be sure we are still linking against the old library version,
+# we must ensure that libb is not relinked, so we must not reinstall libb here.
 AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la liba4.lo ]dnl
 	 [-version-info 2:0:0 -rpath $libdir], [], [ignore], [ignore])
 # We do not guarantee that old versions of an uninstalled library are still
 # available, so test_uninstalled will not necessarily work here any more.
-AT_CHECK([$LIBTOOL --mode=install cp liba.la libb.la $libdir],
-	 [], [ignore], [ignore])
+AT_CHECK([$LIBTOOL --mode=install cp liba.la $libdir], [], [ignore], [ignore])
 AT_CHECK([$LIBTOOL --mode=clean rm -f liba.la], [], [ignore], [ignore])
 test_installed
 


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Tue Jun 08 00:46:26 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OLqhm-0002VL-7n
	for mharc-libtool-commit@gnu.org; Tue, 08 Jun 2010 00:46:26 -0400
Received: from [140.186.70.92] (port=44532 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OLqhg-0002VF-8I
	for libtool-commit@gnu.org; Tue, 08 Jun 2010 00:46:25 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OLqhe-0004O4-SF
	for libtool-commit@gnu.org; Tue, 08 Jun 2010 00:46:20 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:48951
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OLqhe-0004O0-O0
	for libtool-commit@gnu.org; Tue, 08 Jun 2010 00:46:18 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OLqhe-0007PF-98
	for libtool-commit@gnu.org; Tue, 08 Jun 2010 04:46:18 +0000
Received: from rwild by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OLqhe-0002Zn-5S
	for libtool-commit@gnu.org; Tue, 08 Jun 2010 04:46:18 +0000
From: "Ralf Wildenhues" <Ralf.Wildenhues@gmx.de>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0e3d88b8399b610522ddb59625f3f9cc021fdd14
X-Git-Newrev: eb399e6a03d7a536079eb90ff55dcc4043c949e4
Message-Id: <E1OLqhe-0002Zn-5S@vcs-noshell.in.savannah.gnu.org>
Date: Tue, 08 Jun 2010 04:46:18 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.8-12-geb399e6
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Jun 2010 04:46:25 -0000

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  eb399e6a03d7a536079eb90ff55dcc4043c949e4 (commit)
      from  0e3d88b8399b610522ddb59625f3f9cc021fdd14 (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 eb399e6a03d7a536079eb90ff55dcc4043c949e4
Author: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date:   Tue Jun 8 06:44:26 2010 +0200

    Avoid autom4te warning about unnamed diversion.
    
    * libltdl/config/getopt.m4sh: Use diversion name KILL not -1.
    
    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

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

Summary of changes:
 ChangeLog                  |    5 +++++
 libltdl/config/getopt.m4sh |    4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9a03c01..f1a58fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-08  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Avoid autom4te warning about unnamed diversion.
+	* libltdl/config/getopt.m4sh: Use diversion name KILL not -1.
+
 2010-06-07  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	Make versioning test stricter for w32, enable shared libs.
diff --git a/libltdl/config/getopt.m4sh b/libltdl/config/getopt.m4sh
index a81a905..70f40e6 100644
--- a/libltdl/config/getopt.m4sh
+++ b/libltdl/config/getopt.m4sh
@@ -1,4 +1,4 @@
-m4_include([general.m4sh])m4_divert_push(-1)
+m4_include([general.m4sh])m4_divert_push([KILL])
 # getopt.m4sh -- getopt helper functions		 -*- Autoconf -*-
 #
 #    Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
@@ -496,7 +496,7 @@ m4go_validation
 # operation of the automatic `--version' and `--help' options, among
 # others.
 
-m4_divert_pop(-1)M4SH_VERBATIM([[
+m4_divert_pop([KILL])M4SH_VERBATIM([[
 # func_version
 # Echo version message to standard output and exit.
 func_version ()


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Tue Jun 08 15:23:44 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OM4Om-0004Sb-9l
	for mharc-libtool-commit@gnu.org; Tue, 08 Jun 2010 15:23:44 -0400
Received: from [140.186.70.92] (port=48472 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OM4Ok-0004Qr-2D
	for libtool-commit@gnu.org; Tue, 08 Jun 2010 15:23:43 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OM4Oi-0007h1-LR
	for libtool-commit@gnu.org; Tue, 08 Jun 2010 15:23:41 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:44560
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OM4Oi-0007gw-I4
	for libtool-commit@gnu.org; Tue, 08 Jun 2010 15:23:40 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OM4Oi-0001BP-AJ
	for libtool-commit@gnu.org; Tue, 08 Jun 2010 19:23:40 +0000
Received: from rwild by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OM4Oi-0002Gi-5c
	for libtool-commit@gnu.org; Tue, 08 Jun 2010 19:23:40 +0000
From: "Ralf Wildenhues" <Ralf.Wildenhues@gmx.de>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: eb399e6a03d7a536079eb90ff55dcc4043c949e4
X-Git-Newrev: e0c89b9a0768516b8f67a33af15838679821ee3b
Message-Id: <E1OM4Oi-0002Gi-5c@vcs-noshell.in.savannah.gnu.org>
Date: Tue, 08 Jun 2010 19:23:40 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.8-13-ge0c89b9
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Jun 2010 19:23:43 -0000

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  e0c89b9a0768516b8f67a33af15838679821ee3b (commit)
      from  eb399e6a03d7a536079eb90ff55dcc4043c949e4 (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 e0c89b9a0768516b8f67a33af15838679821ee3b
Author: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date:   Tue Jun 8 21:23:08 2010 +0200

    Fix testsuite helper macros to not hide failure.
    
    * tests/testsuite.at (LT_AT_CONFIGURE, LT_AT_MAKE):
    Do not wrap AT_CHECK in a subshell, so that failures are
    properly propagated; instead, move environment changes inside
    the AT_CHECK code.
    Report and analysis by Peter Rosin.
    
    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

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

Summary of changes:
 ChangeLog          |    7 +++++++
 tests/testsuite.at |   16 +++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f1a58fa..0ce3ca0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2010-06-08  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	Fix testsuite helper macros to not hide failure.
+	* tests/testsuite.at (LT_AT_CONFIGURE, LT_AT_MAKE):
+	Do not wrap AT_CHECK in a subshell, so that failures are
+	properly propagated; instead, move environment changes inside
+	the AT_CHECK code.
+	Report and analysis by Peter Rosin.
+
 	Avoid autom4te warning about unnamed diversion.
 	* libltdl/config/getopt.m4sh: Use diversion name KILL not -1.
 
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 7f9afe9..71b9dc4 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -151,21 +151,19 @@ AT_KEYWORDS([autoconf automake])
 # LT_AT_CONFIGURE([OPTIONS])
 # --------------------------
 m4_define([LT_AT_CONFIGURE],
-[( SHELL=${CONFIG_SHELL-/bin/sh}
-   AT_CHECK([CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options $1],
-	 [0], [ignore], [ignore])
- )
+[AT_CHECK([: ${CONFIG_SHELL=/bin/sh}; export CONFIG_SHELL; ]dnl
+	  [$CONFIG_SHELL ./configure $configure_options $1],
+	  [0], [ignore], [ignore])
 ])
 
 
 # LT_AT_MAKE([TGTS], [VARS])
 # --------------------------
 m4_define([LT_AT_MAKE],
-[( $unset LIBTOOL LIBTOOLIZE
-  for target in m4_default([$1], [all])
-  do
-    AT_CHECK([$MAKE $target $2], [0], [ignore], [ignore])
-  done )
+[for target in m4_default([$1], [all])
+do
+  AT_CHECK([$unset LIBTOOL LIBTOOLIZE; $MAKE $target $2], [0], [ignore], [ignore])
+done
 ])
 
 


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Wed Jun 09 05:25:23 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OMHXH-0000OI-GN
	for mharc-libtool-commit@gnu.org; Wed, 09 Jun 2010 05:25:23 -0400
Received: from [140.186.70.92] (port=57265 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OMHX8-0000Nm-HY
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 05:25:21 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMHX2-0005JU-S5
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 05:25:14 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:38925
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMHX2-0005JQ-Qo
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 05:25:08 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMHX2-0002xc-MZ
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 09:25:08 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMHX2-0006A2-Bh
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 09:25:08 +0000
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e0c89b9a0768516b8f67a33af15838679821ee3b
X-Git-Newrev: c0aed9ccd030563897155ec3013086d213fcf8b8
Message-Id: <E1OMHX2-0006A2-Bh@vcs-noshell.in.savannah.gnu.org>
Date: Wed, 09 Jun 2010 09:25:08 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.8-14-gc0aed9c
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Jun 2010 09:25:22 -0000

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  c0aed9ccd030563897155ec3013086d213fcf8b8 (commit)
      from  e0c89b9a0768516b8f67a33af15838679821ee3b (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 c0aed9ccd030563897155ec3013086d213fcf8b8
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Wed Jun 9 16:24:59 2010 +0700

    * NEWS (2.2.8): BlueGene compiler tests were performed on BG/P
    systems, not BG/L.
    Reported by Christian RÃ¶ssel <christian.roessel@gmx.de>

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

Summary of changes:
 ChangeLog |    6 ++++++
 NEWS      |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0ce3ca0..906daab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-09  Gary V. Vaughan  <gary@gnu.org>
+
+	* NEWS (2.2.8): BlueGene compiler tests were performed on BG/P
+	systems, not BG/L.
+	Reported by Christian RÃ¶ssel <christian.roessel@gmx.de>
+
 2010-06-08  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	Fix testsuite helper macros to not hide failure.
diff --git a/NEWS b/NEWS
index 24e654f..70a02a9 100644
--- a/NEWS
+++ b/NEWS
@@ -46,7 +46,7 @@ New in 2.2.7b 2010-05-20: git version 2.2.7a, Libtool team:
   - Improved support for 64bit Windows (mingw64).
   - Improved support for cegcc (Windows CE/PocketPC).
   - Support for GNU/kOpenSolaris (kopensolaris*-gnu).
-  - Initial support for compilers on BlueGene BG/L.
+  - Initial support for compilers on BlueGene BG/P.
   - Improved support for Atari FreeMiNT.
   - With binutils 2.19.50+, shared libraries can be built on AIX.
   - Initial support for the Cuda Compiler Driver on GNU/Linux.


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Wed Jun 09 05:54:10 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OMHz8-0006wb-3O
	for mharc-libtool-commit@gnu.org; Wed, 09 Jun 2010 05:54:10 -0400
Received: from [140.186.70.92] (port=35369 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OMHz5-0006tY-G4
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 05:54:08 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMHz3-0001Zb-Um
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 05:54:07 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:44187
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMHz3-0001ZX-S5
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 05:54:05 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMHz3-0003HG-IC
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 09:54:05 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMHz3-00081Q-AY
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 09:54:05 +0000
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c0aed9ccd030563897155ec3013086d213fcf8b8
X-Git-Newrev: a50e0106eac68939708e1b6bb69d2da61556c426
Message-Id: <E1OMHz3-00081Q-AY@vcs-noshell.in.savannah.gnu.org>
Date: Wed, 09 Jun 2010 09:54:05 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.8-15-ga50e010
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Jun 2010 09:54:08 -0000

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  a50e0106eac68939708e1b6bb69d2da61556c426 (commit)
      from  c0aed9ccd030563897155ec3013086d213fcf8b8 (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 a50e0106eac68939708e1b6bb69d2da61556c426
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Wed Jun 9 16:53:56 2010 +0700

    Enable correct extraction of multiline copyright from --version.
    
    * libltdl/config/getopt.m4sh: Wrap copyright notice at 76
    columns.
    (func_version): Don't omit spaces when merging multiline copyright
    notices.
    * clcommit.m4sh, libtoolize.m4sh: Wrap copyright notice at 76
    columns.

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

Summary of changes:
 ChangeLog                  |    8 ++++++++
 clcommit.m4sh              |    3 ++-
 libltdl/config/getopt.m4sh |    5 +++--
 libtoolize.m4sh            |    3 ++-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 906daab..a7776be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2010-06-09  Gary V. Vaughan  <gary@gnu.org>
 
+	Enable correct extraction of multiline copyright from --version.
+	* libltdl/config/getopt.m4sh: Wrap copyright notice at 76
+	columns.
+	(func_version): Don't omit spaces when merging multiline copyright
+	notices.
+	* clcommit.m4sh, libtoolize.m4sh: Wrap copyright notice at 76
+	columns.
+
 	* NEWS (2.2.8): BlueGene compiler tests were performed on BG/P
 	systems, not BG/L.
 	Reported by Christian RÃ¶ssel <christian.roessel@gmx.de>
diff --git a/clcommit.m4sh b/clcommit.m4sh
index ff27f9d..c79e6b9 100644
--- a/clcommit.m4sh
+++ b/clcommit.m4sh
@@ -5,7 +5,8 @@ AS_INIT[]m4_divert_push([HEADER-COPYRIGHT])dnl
 # Written by Gary V. Vaughan <gary@gnu.org>
 # and Alexandre Oliva <aoliva@redhat.com>
 
-# Copyright (C) 1999, 2000, 2004, 2006, 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2004, 2006, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
diff --git a/libltdl/config/getopt.m4sh b/libltdl/config/getopt.m4sh
index 70f40e6..a8d4e7e 100644
--- a/libltdl/config/getopt.m4sh
+++ b/libltdl/config/getopt.m4sh
@@ -1,7 +1,8 @@
 m4_include([general.m4sh])m4_divert_push([KILL])
 # getopt.m4sh -- getopt helper functions		 -*- Autoconf -*-
 #
-#    Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+#    Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+#    Foundation, Inc.
 #    Written by Gary V. Vaughan, 2004
 #
 #    This file is part of GNU Libtool.
@@ -505,7 +506,7 @@ func_version ()
 	:more
 	/\./!{
 	  N
-	  s/\n# //
+	  s/\n# / /
 	  b more
 	}
 	:go
diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index 8cbc6a6..cfe4aaa 100644
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -5,7 +5,8 @@ AS_INIT[]m4_divert_push([HEADER-COPYRIGHT])dnl
 # libtoolize (GNU @PACKAGE@@TIMESTAMP@) @VERSION@
 # Written by Gary V. Vaughan <gary@gnu.org>, 2003
 
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Wed Jun 09 06:03:41 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OMI8K-0002M0-Tg
	for mharc-libtool-commit@gnu.org; Wed, 09 Jun 2010 06:03:41 -0400
Received: from [140.186.70.92] (port=47223 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OMI8I-0002Jx-6y
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 06:03:39 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMI8B-0006Zu-VC
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 06:03:37 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:55940
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMI8B-0006ZW-S7
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 06:03:31 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMI8B-0003Oh-Eo
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 10:03:31 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMI8B-0000BC-BZ
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 10:03:31 +0000
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a50e0106eac68939708e1b6bb69d2da61556c426
X-Git-Newrev: 6897067b692fc9a5001087a3abaae6b478b068f7
Message-Id: <E1OMI8B-0000BC-BZ@vcs-noshell.in.savannah.gnu.org>
Date: Wed, 09 Jun 2010 10:03:31 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.8-16-g6897067
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Jun 2010 10:03:39 -0000

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  6897067b692fc9a5001087a3abaae6b478b068f7 (commit)
      from  a50e0106eac68939708e1b6bb69d2da61556c426 (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 6897067b692fc9a5001087a3abaae6b478b068f7
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Wed Jun 9 17:03:22 2010 +0700

    Don't warn about the blank line inserted into git commit message.
    
    * clcommit.m4sh: When searching for accidental commits of mutliple
    changes, ignore the second line of the message, which we inserted
    earlier to support "git log --oneline".

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

Summary of changes:
 ChangeLog     |    5 +++++
 clcommit.m4sh |    4 +++-
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a7776be..275575b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-06-09  Gary V. Vaughan  <gary@gnu.org>
 
+	Don't warn about the blank line inserted into git commit message.
+	* clcommit.m4sh: When searching for accidental commits of mutliple
+	changes, ignore the second line of the message, which we inserted
+	earlier to support "git log --oneline".
+
 	Enable correct extraction of multiline copyright from --version.
 	* libltdl/config/getopt.m4sh: Wrap copyright notice at 76
 	columns.
diff --git a/clcommit.m4sh b/clcommit.m4sh
index c79e6b9..93d5f99 100644
--- a/clcommit.m4sh
+++ b/clcommit.m4sh
@@ -337,7 +337,9 @@ func_mailnotify ()
   grep '[^ 	]' < "$log_file" > /dev/null ||
     func_fatal_error "empty commit message, aborting"
 
-  if grep '^$' < "$log_file" > /dev/null; then
+  # We expect line 2 to be blank, since it separates the git summary line from
+  # the commit message body, but any others are probably an error:
+  if sed 2d "$log_file" | grep '^$' > /dev/null; then
     func_error "*** Warning: blank lines should not appear within commit messages."
     func_error "*** They should be used to separate distinct commits."
   fi


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Wed Jun 09 06:08:48 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OMIDI-0006ZO-1U
	for mharc-libtool-commit@gnu.org; Wed, 09 Jun 2010 06:08:48 -0400
Received: from [140.186.70.92] (port=46785 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OMIDB-0006X2-FB
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 06:08:46 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMID6-0005Bh-Mm
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 06:08:41 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:46859
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMID6-0005BQ-KB
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 06:08:36 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMID6-0003Tf-21
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 10:08:36 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMID5-0000Vj-Pv
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 10:08:35 +0000
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 6897067b692fc9a5001087a3abaae6b478b068f7
X-Git-Newrev: 03c999cb719207fc1679c37714084334b3c633ab
Message-Id: <E1OMID5-0000Vj-Pv@vcs-noshell.in.savannah.gnu.org>
Date: Wed, 09 Jun 2010 10:08:35 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.8-17-g03c999c
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Jun 2010 10:08:46 -0000

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  03c999cb719207fc1679c37714084334b3c633ab (commit)
      from  6897067b692fc9a5001087a3abaae6b478b068f7 (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 03c999cb719207fc1679c37714084334b3c633ab
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Wed Jun 9 17:08:27 2010 +0700

    Fix a type in the 2.2.8 release notes.
    
    * NEWS: s/ romoted/ promoted/ in the 2.2.8 release notes.

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

Summary of changes:
 ChangeLog |    3 +++
 NEWS      |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 275575b..d4d8eea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-06-09  Gary V. Vaughan  <gary@gnu.org>
 
+	Fix a type in the 2.2.8 release notes.
+	* NEWS: s/ romoted/ promoted/ in the 2.2.8 release notes.
+
 	Don't warn about the blank line inserted into git commit message.
 	* clcommit.m4sh: When searching for accidental commits of mutliple
 	changes, ignore the second line of the message, which we inserted
diff --git a/NEWS b/NEWS
index 70a02a9..fc984a3 100644
--- a/NEWS
+++ b/NEWS
@@ -10,7 +10,7 @@ New in 2.2.8 2010-06-05: git version 2.2.7c, Libtool team:
 
 * No new features:
 
-  - Bumped version number and romoted 2.2.7b release candidate to a full
+  - Bumped version number and promoted 2.2.7b release candidate to a full
     stable release.
 
 New in 2.2.7b 2010-05-20: git version 2.2.7a, Libtool team:


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Wed Jun 09 08:01:29 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OMJyL-0006hB-6V
	for mharc-libtool-commit@gnu.org; Wed, 09 Jun 2010 08:01:29 -0400
Received: from [140.186.70.92] (port=54196 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OMJyE-0006dF-K2
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 08:01:26 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMJy5-00071i-3j
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 08:01:22 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:56579
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMJy5-00071d-1g
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 08:01:13 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMJy4-0004rH-6j
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 12:01:12 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMJxr-0006I7-2V
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 12:01:05 +0000
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 03c999cb719207fc1679c37714084334b3c633ab
X-Git-Newrev: 9bf1ccc71a7f2990881db64d59b0039bf412a27e
Message-Id: <E1OMJxr-0006I7-2V@vcs-noshell.in.savannah.gnu.org>
Date: Wed, 09 Jun 2010 12:01:00 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.8-18-g9bf1ccc
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Jun 2010 12:01:27 -0000

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  9bf1ccc71a7f2990881db64d59b0039bf412a27e (commit)
      from  03c999cb719207fc1679c37714084334b3c633ab (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 9bf1ccc71a7f2990881db64d59b0039bf412a27e
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Wed Jun 9 19:00:19 2010 +0700

    Simplify license variations, and add missing license texts.
    
    * ChangeLog, ChangeLog.1996, ChangeLog.1997, ChangeLog.1998,
    ChangeLog.1999, ChangeLog.2000, ChangeLog.2001, ChangeLog.2002,
    ChangeLog.2003, ChangeLog.2004, ChangeLog.2005, ChangeLog.2006,
    ChangeLog.2007, ChangeLog.2008, ChangeLog.2009, NEWS: Add
    all-permissive license.
    * HACKING, README, README.alpha, TODO: Relax license to RMS
    encouraged all-permissive terms.
    * libltdl/README: Ditto. I added the original license text in
    2007, and there's no need for it to be so long for such a trivial
    file.
    * libltdl/config/getopt.m4sh, libltdl/general.m4sh: Cvs-utils is
    dead, and I am the author of these files, so consolidated license
    terms to match regular Libtool licensing.
    * HACKING (Licensing Rules): Update wording, and list of files for
    the all permissive license.
    (GPL with CVS-Utils exception clause): Removed.  No files have these
    license any more.
    (GPL with Libtool exception clause): Ditto, only libltdl/README
    used to be distributed with this variation.
    * AUTHORS: Add GPL license text.

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

Summary of changes:
 AUTHORS                     |   21 +++++++
 ChangeLog                   |   32 +++++++++++
 ChangeLog.1996              |   10 ++++
 ChangeLog.1997              |   10 ++++
 ChangeLog.1998              |   10 ++++
 ChangeLog.1999              |   10 ++++
 ChangeLog.2000              |   10 ++++
 ChangeLog.2001              |   10 ++++
 ChangeLog.2002              |   10 ++++
 ChangeLog.2003              |   10 ++++
 ChangeLog.2004              |   10 ++++
 ChangeLog.2005              |   10 ++++
 ChangeLog.2006              |   10 ++++
 ChangeLog.2007              |   10 ++++
 ChangeLog.2008              |   10 ++++
 ChangeLog.2009              |   10 ++++
 HACKING                     |  126 +++++++++----------------------------------
 NEWS                        |   10 ++++
 README                      |   19 ++-----
 README.alpha                |   19 ++-----
 TODO                        |   19 ++-----
 libltdl/README              |   25 ++-------
 libltdl/config/general.m4sh |   64 +++++++++++-----------
 libltdl/config/getopt.m4sh  |    6 +-
 24 files changed, 278 insertions(+), 203 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index ccd280a..b810761 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -28,3 +28,24 @@
     Peter Rosin			peda@lysator.liu.se
     Noah Misch			noah@cs.caltech.edu
     Charles Wilson		libtool@cwilson.fastmail.fm
+-- 
+  Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+  This 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.
+
+GNU Libtool is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Libtool; see the file COPYING.  If not, a copy
+can be downloaded from  http://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.
diff --git a/ChangeLog b/ChangeLog
index d4d8eea..216e6ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,27 @@
 2010-06-09  Gary V. Vaughan  <gary@gnu.org>
 
+	Simplify license variations, and add missing license texts.
+	* ChangeLog, ChangeLog.1996, ChangeLog.1997, ChangeLog.1998,
+	ChangeLog.1999, ChangeLog.2000, ChangeLog.2001, ChangeLog.2002,
+	ChangeLog.2003, ChangeLog.2004, ChangeLog.2005, ChangeLog.2006,
+	ChangeLog.2007, ChangeLog.2008, ChangeLog.2009, NEWS: Add
+	all-permissive license.
+	* HACKING, README, README.alpha, TODO: Relax license to RMS
+	encouraged all-permissive terms.
+	* libltdl/README: Ditto. I added the original license text in
+	2007, and there's no need for it to be so long for such a trivial
+	file.
+	* libltdl/config/getopt.m4sh, libltdl/general.m4sh: Cvs-utils is
+	dead, and I am the author of these files, so consolidated license
+	terms to match regular Libtool licensing.
+	* HACKING (Licensing Rules): Update wording, and list of files for
+	the all permissive license.
+	(GPL with CVS-Utils exception clause): Removed.  No files have these 
+	license any more.
+	(GPL with Libtool exception clause): Ditto, only libltdl/README
+	used to be distributed with this variation.
+	* AUTHORS: Add GPL license text.
+	
 	Fix a type in the 2.2.8 release notes.
 	* NEWS: s/ romoted/ promoted/ in the 2.2.8 release notes.
 
@@ -451,5 +473,15 @@
 	* libtoolize.m4sh: Likewise.
 
 Continued in ChangeLog.2009
+-- 
+  Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+  This file is part of GNU Libtool.
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
 
 vim:tw=72
diff --git a/ChangeLog.1996 b/ChangeLog.1996
index 7b5391c..ae9bee8 100644
--- a/ChangeLog.1996
+++ b/ChangeLog.1996
@@ -166,3 +166,13 @@
 1996-03-15  Gordon Matzigkeit  <gord@gnu.ai.mit.edu>
 
 	* For historical reasons: this is when I started writing libtool.
+-- 
+  Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+  This file is part of GNU Libtool.
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
diff --git a/ChangeLog.1997 b/ChangeLog.1997
index b4e735f..992b1ba 100644
--- a/ChangeLog.1997
+++ b/ChangeLog.1997
@@ -1312,3 +1312,13 @@
 	recognizes valid source file suffices.
 
 Continued in ChangeLog.1996
+-- 
+  Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+  This file is part of GNU Libtool.
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
diff --git a/ChangeLog.1998 b/ChangeLog.1998
index 6eff175..ca65524 100644
--- a/ChangeLog.1998
+++ b/ChangeLog.1998
@@ -1332,3 +1332,13 @@ Thu May 28 18:59:08 1998  Ian Lance Taylor  <ian@cygnus.com>
 	warnings.  Reported by François Pinard.
 
 Continued in ChangeLog.1997
+-- 
+  Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+  This file is part of GNU Libtool.
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
diff --git a/ChangeLog.1999 b/ChangeLog.1999
index 27674ac..ccabba9 100644
--- a/ChangeLog.1999
+++ b/ChangeLog.1999
@@ -3493,3 +3493,13 @@
 	* libltdl/ltdl.h: use dllimport/export on Win32
 
 Continued in ChangeLog.1998
+-- 
+  Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+  This file is part of GNU Libtool.
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
diff --git a/ChangeLog.2000 b/ChangeLog.2000
index 99fd69b..364716b 100644
--- a/ChangeLog.2000
+++ b/ChangeLog.2000
@@ -1315,3 +1315,13 @@
 	Reported by Jon Leichter <jon@symas.com>
 
 Continued in ChangeLog.1999
+-- 
+  Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+  This file is part of GNU Libtool.
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
diff --git a/ChangeLog.2001 b/ChangeLog.2001
index 16f6362..25d1133 100644
--- a/ChangeLog.2001
+++ b/ChangeLog.2001
@@ -1563,3 +1563,13 @@
 	* libltdl/ltdl.h:  formatting change.
 
 Continued in ChangeLog.2000
+-- 
+  Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+  This file is part of GNU Libtool.
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
diff --git a/ChangeLog.2002 b/ChangeLog.2002
index 610419c..d2c1fdd 100644
--- a/ChangeLog.2002
+++ b/ChangeLog.2002
@@ -724,3 +724,13 @@
 	ftp.gnu.org.
 
 Continued in ChangeLog.2001
+-- 
+  Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+  This file is part of GNU Libtool.
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
diff --git a/ChangeLog.2003 b/ChangeLog.2003
index 2a1172a..edf2386 100644
--- a/ChangeLog.2003
+++ b/ChangeLog.2003
@@ -1294,3 +1294,13 @@
 	so that it can be conditional on the value of $module.
 
 Continued in ChangeLog.2002
+-- 
+  Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+  This file is part of GNU Libtool.
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
diff --git a/ChangeLog.2004 b/ChangeLog.2004
index 1c3e6db..62e52c3 100644
--- a/ChangeLog.2004
+++ b/ChangeLog.2004
@@ -3566,3 +3566,13 @@
 	* NEWS: Next release will be in 2004.
 
 Continued in ChangeLog.2003
+-- 
+  Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+  This file is part of GNU Libtool.
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
diff --git a/ChangeLog.2005 b/ChangeLog.2005
index 7995db8..55c30a1 100644
--- a/ChangeLog.2005
+++ b/ChangeLog.2005
@@ -2791,3 +2791,13 @@
 	...and make use of new names.
 
 Continued in ChangeLog.2004
+-- 
+  Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+  This file is part of GNU Libtool.
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
diff --git a/ChangeLog.2006 b/ChangeLog.2006
index c9a7ec0..a223ba2 100644
--- a/ChangeLog.2006
+++ b/ChangeLog.2006
@@ -811,3 +811,13 @@
 	* ChangeLog: ..here.
 
 Continued in ChangeLog.2005
+-- 
+  Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+  This file is part of GNU Libtool.
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
diff --git a/ChangeLog.2007 b/ChangeLog.2007
index 23e3107..0b2778b 100644
--- a/ChangeLog.2007
+++ b/ChangeLog.2007
@@ -1365,3 +1365,13 @@
 	* TODO: Likewise.
 
 Continued in ChangeLog.2006
+-- 
+  Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+  This file is part of GNU Libtool.
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
diff --git a/ChangeLog.2008 b/ChangeLog.2008
index 28ce0a9..5fa2699 100644
--- a/ChangeLog.2008
+++ b/ChangeLog.2008
@@ -1901,3 +1901,13 @@
 	libltdl/m4/libtool.m4: Bump copyright years.
 
 Continued in ChangeLog.2007
+-- 
+  Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+  This file is part of GNU Libtool.
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
diff --git a/ChangeLog.2009 b/ChangeLog.2009
index 6c07b7f..0a43ab4 100644
--- a/ChangeLog.2009
+++ b/ChangeLog.2009
@@ -877,3 +877,13 @@
 Continued in ChangeLog.2008
 
 vim:tw=72
+-- 
+  Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+  This file is part of GNU Libtool.
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
diff --git a/HACKING b/HACKING
index 5e045ac..468f54b 100644
--- a/HACKING
+++ b/HACKING
@@ -417,21 +417,26 @@ yyyy-mm-dd  Name of Author  <email@address>  (tiny change)
 ===================
 
 GNU Libtool uses 3 different licenses for various of the files distributed
-herein, with 7 variations on license text.  It is important that you use
-the correct license text in each new file added.  Here are the texts
-along with some notes on when each is appropriate.  Appropriate commenting
-(shell, C etc) and decoration (m4sh etc) assumed throughout.
+herein, with several variations on license text.  It is important that
+you use the correct license text in each new file added.  Here are the
+texts along with some notes on when each is appropriate.  Appropriate
+commenting (shell, C etc) and decoration (m4sh etc) assumed throughout.
+
+
 
 11.1. Notice preservation
 
-Autoconf macros and files used to generate them need this license:
+Autoconf macros and files used to generate them need this license, along
+with files such as HACKING, NEWS, README, README.alpha, TODO and
+ChangeLogs:
 
    Copyright (C) <year list> Free Software Foundation, Inc.
    Written by <author>, <year>
 
-This file is free software; the Free Software Foundation gives
-unlimited permission to copy and/or distribute it, with or without
-modifications, as long as this notice is preserved.
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
 
 
 
@@ -444,36 +449,6 @@ below:
    Copyright (C) <year list> Free Software Foundation, Inc.
    Written by <author>, <year>
 
-  This 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.
-
-GNU Libtool is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Libtool; see the file COPYING.  If not, a copy
-can be downloaded from  http://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.
-
-
-
-11.3. GPL with Libtool exception clause
-
-At the moment only `libltdl/README' needs the exception clause to
-allow projects that distribute a copy of the libltdl sources to also
-redistribute the README:
-
-
-   Copyright (C) <year list> Free Software Foundation, Inc.
-   Written by <author>, <year>
-
    This file is part of GNU Libtool.
 
 GNU Libtool is free software; you can redistribute it and/or
@@ -481,11 +456,6 @@ 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.
 
-As a special exception to the GNU General Public License,
-if you distribute this file as part of a program or library that
-is built using GNU Libtool, you may include this file under the
-same distribution terms that you use for the rest of that program.
-
 GNU Libtool is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -499,47 +469,12 @@ or obtained by writing to the Free Software Foundation, Inc.,
 
 
 
-11.4. GPL with Cvs-utils exception clause
+11.3. GPL with self extracting version
 
-GNU Libtool imports some m4sh infrastructure from the GNU Cvs-utils
-project, namely `getopt.m4sh' and `general.m4sh'.  Those files use
-the GPL with their own exception clause as follows:
-
-   Copyright (C) <year list> Free Software Foundation, Inc.
-   Written by <author>, <year>
-
-   This file is part of GNU Cvs-utils.
-
-GNU Cvs-utils 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 you option) any later version.
-
-As a special exception to the GNU General Public License, if you
-distribute this file as part of a program or library that contains
-a configuration script generated by Autoconf, you may include this
-file under the same distribution terms that you use for the rest
-of that program.
-
-GNU Cvs-utils is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Libtool; see the file COPYING.  If not, a copy
-can be downloaded from  http://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.
-
-
-
-11.5. GPL with self extracting version
-
-Some of the sources built atop Cvs-utils' m4sh framework use
-getopt.m4sh:func_version() to extract their --version output from
-the copyright block.  Those files also need the --version copyright
-text paragraph as follows:
+Some of the sources built atop the getopt.m4sh framework use
+func_version() to extract their --version output from the copyright
+block.  Those files also need the --version copyright text paragraph as
+follows:
 
    <program name> (GNU @PACKAGE@) <version number>
    Written by <author> <email address>.
@@ -568,7 +503,7 @@ or obtained by writing to the Free Software Foundation, Inc.,
 
 
 
-11.6. GPL with self extracting version and Libtool exception clause
+11.4. GPL with self extracting version and Libtool exception clause
 
 Although the libtool script is generated from `ltmain.m4sh' according
 to the rules in the preceding subsection, it also needs the Libtool
@@ -607,7 +542,7 @@ or obtained by writing to the Free Software Foundation, Inc.,
 
 
 
-11.7. LGPL with Libtool exception clause
+11.5. LGPL with Libtool exception clause
 
 Finally, not only is Libltdl is LGPLed, but it is routinely
 redistributed inside projects that use it, so its sources need to use
@@ -785,23 +720,12 @@ or obtained by writing to the Free Software Foundation, Inc.,
   Inc.
   Written by Gary V. Vaughan, 2004
 
-  This file is part of GNU Libtool.  Report bugs to bug-libtool@gnu.org.
-
-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
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+  This file is part of GNU Libtool.
 
-You should have received a copy of the GNU General Public License
-along with GNU Libtool; see the file COPYING.  If not, a copyi
-can be downloaded from http://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.
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
 
 Local Variables:
 mode: text
diff --git a/NEWS b/NEWS
index fc984a3..5fd98ec 100644
--- a/NEWS
+++ b/NEWS
@@ -883,3 +883,13 @@ New in 0.2:
 New in 0.1:
 * First release of libtool
 * Support for: *-*-freebsd*, *-*-netbsd*, *-*-sunos4*, *-*-ultrix4*
+-- 
+  Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+  This file is part of GNU Libtool.
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
diff --git a/README b/README
index 612699e..0a9317f 100644
--- a/README
+++ b/README
@@ -180,21 +180,10 @@ For more details about version numbers, see:
 
   This 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.
-
-GNU Libtool is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Libtool; see the file COPYING.  If not, a copy
-can be downloaded from http://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
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
 
 
 Local Variables:
diff --git a/README.alpha b/README.alpha
index 903fafb..a785a7b 100644
--- a/README.alpha
+++ b/README.alpha
@@ -120,21 +120,10 @@ send the file `tests/testsuite.log' to the bug report mailing list,
 
   This 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.
-
-GNU Libtool is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Libtool; see the file COPYING.  If not, a copy
-can be downloaded from http://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
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
 
 
 Local Variables:
diff --git a/TODO b/TODO
index 8a9ed7e..fda5764 100644
--- a/TODO
+++ b/TODO
@@ -285,21 +285,10 @@ GNU Libtool
 
   This 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.
-
-GNU Libtool is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Libtool; see the file COPYING.  If not, a copy
-can be downloaded from  http://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.
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
 
 Local Variables:
 mode: text
diff --git a/libltdl/README b/libltdl/README
index e533467..54b1aea 100644
--- a/libltdl/README
+++ b/libltdl/README
@@ -14,24 +14,7 @@ It supports the following dlopen interfaces:
 
    This 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.
-
-As a special exception to the GNU General Public License,
-if you distribute this file as part of a program or library that
-is built using GNU Libtool, you may include this file under the
-same distribution terms that you use for the rest of that program.
-
-GNU Libtool is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Libtool; see the file COPYING.  If not, a copy
-can be downloaded from  http://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.
-
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
diff --git a/libltdl/config/general.m4sh b/libltdl/config/general.m4sh
index 90722bc..bb254cc 100644
--- a/libltdl/config/general.m4sh
+++ b/libltdl/config/general.m4sh
@@ -1,40 +1,39 @@
-m4_if([general.m4sh -- general shell script boiler plate -*- Autoconf -*-
-
-   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-   Written by Gary V. Vaughan, 2004
-
-   This file is part of GNU Cvs-utils.
-
-GNU Cvs-utils 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 you option) any later version.
-
-As a special exception to the GNU General Public License, if you
-distribute this file as part of a program or library that contains
-a configuration script generated by Autoconf, you may include this
-file under the same distribution terms that you use for the rest
-of that program.
-
-GNU Cvs-utils is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Libtool; see the file COPYING.  If not, a copy
-can be downloaded from  http://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.
-])dnl
-
-m4_define([M4SH_VERBATIM], [$1])dnl
+m4_divert_push([KILL])					-*- Autoconf -*-
+# general.m4sh -- general shell script boiler plate
+#
+#   Copyright (C) 2004, 2005, 2007, 2008, 2010 Free Software Foundation, Inc.
+#   Written by Gary V. Vaughan, 2004
+#
+#   This 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.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from  http://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.
+
+m4_define([M4SH_VERBATIM], [$1])
 
 m4_ifndef([M4SH_IN_HEADER],
 [m4_define([M4SH_IN_HEADER],
 [m4_divert_text([HEADER-COPYRIGHT], [$1])])])
 
-M4SH_IN_HEADER([dnl
+m4_divert_pop([KILL])M4SH_IN_HEADER([dnl
 # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
 # is ksh but when the shell is invoked as "sh" and the current value of
 # the _XPG environment variable is not equal to 1 (one), the special
@@ -561,4 +560,3 @@ func_show_eval_locale ()
     fi
 }
 ]])
-
diff --git a/libltdl/config/getopt.m4sh b/libltdl/config/getopt.m4sh
index a8d4e7e..2899539 100644
--- a/libltdl/config/getopt.m4sh
+++ b/libltdl/config/getopt.m4sh
@@ -1,5 +1,5 @@
-m4_include([general.m4sh])m4_divert_push([KILL])
-# getopt.m4sh -- getopt helper functions		 -*- Autoconf -*-
+m4_include([general.m4sh])m4_divert_push([KILL])	-*- Autoconf -*-
+# getopt.m4sh -- getopt helper functions
 #
 #    Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
 #    Foundation, Inc.
@@ -10,7 +10,7 @@ m4_include([general.m4sh])m4_divert_push([KILL])
 # 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 you option) any later version.
+# the License, or (at your option) any later version.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program or library that contains


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Wed Jun 09 08:26:14 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OMKMI-0001Yj-GA
	for mharc-libtool-commit@gnu.org; Wed, 09 Jun 2010 08:26:14 -0400
Received: from [140.186.70.92] (port=47899 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OMKMG-0001U7-4V
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 08:26:13 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMKMD-0004En-21
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 08:26:11 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:58166
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMKMD-0004Ed-0h
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 08:26:09 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMKMC-0005AO-GG
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 12:26:08 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMKMC-0007aX-6E
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 12:26:08 +0000
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 9bf1ccc71a7f2990881db64d59b0039bf412a27e
X-Git-Newrev: 1a3cd365c08196584165a6dea16bd874e4a1004d
Message-Id: <E1OMKMC-0007aX-6E@vcs-noshell.in.savannah.gnu.org>
Date: Wed, 09 Jun 2010 12:26:08 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.8-19-g1a3cd36
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Jun 2010 12:26:13 -0000

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  1a3cd365c08196584165a6dea16bd874e4a1004d (commit)
      from  9bf1ccc71a7f2990881db64d59b0039bf412a27e (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 1a3cd365c08196584165a6dea16bd874e4a1004d
Author: Peter Rosin <peda@lysator.liu.se>
Date:   Wed Jun 9 19:26:00 2010 +0700

    Don't try the MSYS libdir path on MinGW.
    
    * libltdl/ltdl.c (parse_dotla_file) [mingw]: The absolute
    libdir path in the .la file is recorded as an MSYS (POSIX
    style) path. Make sure it isn't tried when locating the
    shared library.
    * NEWS: Updated.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 ChangeLog      |    9 +++++++++
 NEWS           |    4 +++-
 libltdl/ltdl.c |    5 +++++
 3 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 216e6ce..0543999 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-09-15  Peter Rosin  <peda@lysator.liu.se>
+
+	Don't try the MSYS libdir path on MinGW.
+	* libltdl/ltdl.c (parse_dotla_file) [mingw]: The absolute
+	libdir path in the .la file is recorded as an MSYS (POSIX
+	style) path. Make sure it isn't tried when locating the
+	shared library.
+	* NEWS: Updated.
+
 2010-06-09  Gary V. Vaughan  <gary@gnu.org>
 
 	Simplify license variations, and add missing license texts.
diff --git a/NEWS b/NEWS
index 5fd98ec..654208f 100644
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,9 @@ New in 2.2.9b 2010-??-??: git version 2.2.9a, Libtool team:
 
 * New features:
 
-  - None.
+  - On non-cygwin Windows systems, we no longer try to lookup the POSIX
+    format path recorded in $libdir of a pseudo-library when looking up
+    the location of the library with the native tools.
 
 New in 2.2.8 2010-06-05: git version 2.2.7c, Libtool team:
 
diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index 4e1a402..e1b4e2f 100644
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -1076,12 +1076,17 @@ parse_dotla_file(FILE *file, char **dlname, char **libdir, char **deplibs,
 	{
 	  errors += trim (old_name, &line[sizeof (STR_OLD_LIBRARY) - 1]);
 	}
+
+      /* Windows native tools do not understand the POSIX paths we store
+	 in libdir. */
+#ifndef __WINDOWS__
 #undef  STR_LIBDIR
 #define STR_LIBDIR	"libdir="
       else if (strncmp (line, STR_LIBDIR, sizeof (STR_LIBDIR) - 1) == 0)
 	{
 	  errors += trim (libdir, &line[sizeof(STR_LIBDIR) - 1]);
 	}
+#endif
 
 #undef  STR_DL_DEPLIBS
 #define STR_DL_DEPLIBS	"dependency_libs="


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Wed Jun 09 08:34:58 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OMKUk-0000oP-6l
	for mharc-libtool-commit@gnu.org; Wed, 09 Jun 2010 08:34:58 -0400
Received: from [140.186.70.92] (port=52276 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OMKUf-0006l8-Lq
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 08:34:56 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMKUW-000677-Iy
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 08:34:53 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:46612
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMKUW-000672-HY
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 08:34:44 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMKUV-0005Dt-T2
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 12:34:44 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMKUV-0008E1-I1
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 12:34:43 +0000
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 1a3cd365c08196584165a6dea16bd874e4a1004d
X-Git-Newrev: c39115a3f83ceceb31d7ebba4af9b65bde6de737
Message-Id: <E1OMKUV-0008E1-I1@vcs-noshell.in.savannah.gnu.org>
Date: Wed, 09 Jun 2010 12:34:43 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.8-20-gc39115a
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Jun 2010 12:34:56 -0000

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  c39115a3f83ceceb31d7ebba4af9b65bde6de737 (commit)
      from  1a3cd365c08196584165a6dea16bd874e4a1004d (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 c39115a3f83ceceb31d7ebba4af9b65bde6de737
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Wed Jun 9 19:34:34 2010 +0700

    Fix a quoting bug with ./commit -a 'A U Thor'.
    
    * clcommit.m4sh (func_commit): Use func_show_eval when calling
    git, so that the previously func_quote_for_eval()ed $git_flags is
    expanded properly.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 ChangeLog     |    7 +++++++
 clcommit.m4sh |   13 +++----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0543999..a1bc465 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-09  Gary V. Vaughan  <gary@gnu.org>
+
+	Fix a quoting bug with ./commit -a 'A U Thor'.
+	* clcommit.m4sh (func_commit): Use func_show_eval when calling
+	git, so that the previously func_quote_for_eval()ed $git_flags is
+	expanded properly.
+
 2009-09-15  Peter Rosin  <peda@lysator.liu.se>
 
 	Don't try the MSYS libdir path on MinGW.
diff --git a/clcommit.m4sh b/clcommit.m4sh
index 93d5f99..6157cd2 100644
--- a/clcommit.m4sh
+++ b/clcommit.m4sh
@@ -266,18 +266,11 @@ func_commit ()
     test $# -gt 0 && subject="$@"
 
     test $# -gt 0 || { set dummy -a; shift; }
-    func_verbose "$GIT commit $git_flags -F $log_file ${1+$@}"
-    $opt_dry_run ||
-        $GIT commit $git_flags -F $log_file ${1+"$@"} || exit $EXIT_FAILURE
+    func_show_eval "$GIT commit $git_flags -F $log_file ${1+$@}" "exit $EXIT_FAILURE"
 
     $opt_push && {
-      func_verbose "$GIT push"
-      $opt_dry_run || $GIT push
-
-      $opt_tags && {
-	  func_verbose "$GIT push --tags"
-	  $opt_dry_run || $GIT push --tags
-      }
+      func_show_eval "$GIT push"
+      $opt_tags && func_show_eval "$GIT push --tags"
     }
 
     :


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Wed Jun 09 10:10:05 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OMLyn-0007zH-Es
	for mharc-libtool-commit@gnu.org; Wed, 09 Jun 2010 10:10:05 -0400
Received: from [140.186.70.92] (port=46840 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OMLsE-0006Md-Qb
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 10:03:20 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMLsC-0008Dw-QH
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 10:03:18 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:36054
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMLsC-0008Ds-Nk
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 10:03:16 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMLsC-0006KE-JS
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 14:03:16 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMLsC-00030O-Ae
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 14:03:16 +0000
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c39115a3f83ceceb31d7ebba4af9b65bde6de737
X-Git-Newrev: c6b266a56fd2a9711d31e44f065701b8e78b3455
Message-Id: <E1OMLsC-00030O-Ae@vcs-noshell.in.savannah.gnu.org>
Date: Wed, 09 Jun 2010 14:03:16 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.8-21-gc6b266a
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Jun 2010 14:10:04 -0000

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  c6b266a56fd2a9711d31e44f065701b8e78b3455 (commit)
      from  c39115a3f83ceceb31d7ebba4af9b65bde6de737 (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 c6b266a56fd2a9711d31e44f065701b8e78b3455
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Wed Jun 9 21:03:07 2010 +0700

    Prepare for next release.
    
    * configure.ac, libltdl/configure.ac (AC_INIT): Bump version number
    to 2.2.10.
    * NEWS: Update version number.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 ChangeLog            |    5 +++++
 NEWS                 |    2 +-
 configure.ac         |    2 +-
 libltdl/configure.ac |    2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a1bc465..2132b7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-06-09  Gary V. Vaughan  <gary@gnu.org>
 
+	Prepare for next release.
+	* configure.ac, libltdl/configure.ac (AC_INIT): Bump version number
+	to 2.2.10.
+	* NEWS: Update version number.
+
 	Fix a quoting bug with ./commit -a 'A U Thor'.
 	* clcommit.m4sh (func_commit): Use func_show_eval when calling
 	git, so that the previously func_quote_for_eval()ed $git_flags is
diff --git a/NEWS b/NEWS
index 654208f..6f23f91 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 NEWS - list of user-visible changes between releases of GNU Libtool
 
-New in 2.2.9b 2010-??-??: git version 2.2.9a, Libtool team:
+New in 2.2.10 2010-06-10: git version 2.2.9a, Libtool team:
 
 * New features:
 
diff --git a/configure.ac b/configure.ac
index c595192..f6931a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ dnl Oldest automake required for bootstrap is below in AM_INIT_AUTOMAKE.
 ## ------------------------ ##
 ## Autoconf initialisation. ##
 ## ------------------------ ##
-AC_INIT([libtool], [2.2.9a], [bug-libtool@gnu.org])
+AC_INIT([libtool], [2.2.10], [bug-libtool@gnu.org])
 AC_CONFIG_HEADERS([config.h:config-h.in])
 AC_CONFIG_SRCDIR([libtoolize.in])
 LT_CONFIG_LTDL_DIR([libltdl], [nonrecursive])
diff --git a/libltdl/configure.ac b/libltdl/configure.ac
index 969865f..cec7768 100644
--- a/libltdl/configure.ac
+++ b/libltdl/configure.ac
@@ -40,7 +40,7 @@ AC_PREREQ(2.59)dnl We use AS_HELP_STRING
 ## ------------------------ ##
 ## Autoconf initialisation. ##
 ## ------------------------ ##
-AC_INIT([libltdl], [2.2.9a], [bug-libtool@gnu.org])
+AC_INIT([libltdl], [2.2.10], [bug-libtool@gnu.org])
 AC_CONFIG_HEADERS([config.h:config-h.in])
 AC_CONFIG_SRCDIR([ltdl.c])
 AC_CONFIG_AUX_DIR([config])


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Wed Jun 09 10:17:03 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OMM5X-0004QP-Kh
	for mharc-libtool-commit@gnu.org; Wed, 09 Jun 2010 10:17:03 -0400
Received: from [140.186.70.92] (port=58174 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OMM5V-0004O0-2U
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 10:17:02 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <peter@pogma.com>) id 1OMM5S-0002PM-Ni
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 10:17:00 -0400
Received: from pogma.xen.prgmr.com ([68.68.97.8]:40068)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <peter@pogma.com>)
	id 1OMM5M-0002MR-Hm; Wed, 09 Jun 2010 10:16:52 -0400
Received: from tw.local (wnpgmb1316w-ds01-50-57.dynamic.mts.net [206.45.50.57])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pogma.xen.prgmr.com (Postfix) with ESMTP id 9A516BF5D6;
	Wed,  9 Jun 2010 14:16:50 +0000 (UTC)
Message-ID: <4C0FA250.9060006@pogma.com>
Date: Wed, 09 Jun 2010 09:16:48 -0500
From: Peter O'Gorman <peter@pogma.com>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US;
	rv:1.9.1.9) Gecko/20100430 Fedora/3.0.4-3.fc13 Thunderbird/3.0.4
MIME-Version: 1.0
To: "Gary V. Vaughan" <gary@gnu.org>
References: <E1OMLsC-00030O-Ae@vcs-noshell.in.savannah.gnu.org>
In-Reply-To: <E1OMLsC-00030O-Ae@vcs-noshell.in.savannah.gnu.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
Cc: libtool-commit@gnu.org
Subject: Re: [SCM] GNU Libtool branch, master, updated. v2.2.8-21-gc6b266a
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Jun 2010 14:17:02 -0000

On 06/09/2010 09:03 AM, Gary V. Vaughan wrote:

>      Prepare for next release.
>
>      * configure.ac, libltdl/configure.ac (AC_INIT): Bump version number
>      to 2.2.10.

Really? Why?

Peter


From MAILER-DAEMON Wed Jun 09 11:18:04 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OMN2Z-0003ro-O5
	for mharc-libtool-commit@gnu.org; Wed, 09 Jun 2010 11:18:03 -0400
Received: from [140.186.70.92] (port=56837 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OMN2V-0003nY-JA
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 11:18:01 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMN2U-0006md-6Q
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 11:17:59 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:46848
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMN2U-0006mY-57
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 11:17:58 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMN2U-0007FU-39
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 15:17:58 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMN2T-0007pg-Vr
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 15:17:58 +0000
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c6b266a56fd2a9711d31e44f065701b8e78b3455
X-Git-Newrev: d18372c98ae0440183f1f207c19947f874ec35c0
Message-Id: <E1OMN2T-0007pg-Vr@vcs-noshell.in.savannah.gnu.org>
Date: Wed, 09 Jun 2010 15:17:58 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.8-22-gd18372c
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Jun 2010 15:18:01 -0000

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  d18372c98ae0440183f1f207c19947f874ec35c0 (commit)
      from  c6b266a56fd2a9711d31e44f065701b8e78b3455 (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 d18372c98ae0440183f1f207c19947f874ec35c0
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Wed Jun 9 22:17:47 2010 +0700

    Set SCM version number to 2.2.11a.
    
    * configure.ac, libltdl/configure.ac (AC_INIT): Bump version
    number to 2.2.11a.
    * NEWS: Updated.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 ChangeLog            |    7 +++++++
 NEWS                 |    6 ++++++
 configure.ac         |    2 +-
 libltdl/configure.ac |    2 +-
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2132b7f..a7967b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2010-06-09  Gary V. Vaughan  <gary@gnu.org>
 
+	Set SCM version number to 2.2.11a.
+	* configure.ac, libltdl/configure.ac (AC_INIT): Bump version
+	number to 2.2.11a.
+	* NEWS: Updated.
+
+	GNU Libtool 2.2.10 was released.
+
 	Prepare for next release.
 	* configure.ac, libltdl/configure.ac (AC_INIT): Bump version number
 	to 2.2.10.
diff --git a/NEWS b/NEWS
index 6f23f91..7e65da6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 NEWS - list of user-visible changes between releases of GNU Libtool
 
+New in 2.2.12 2010-08-??: git version 2.2.11a, Libtool team:
+
+* New features:
+
+  - None!
+
 New in 2.2.10 2010-06-10: git version 2.2.9a, Libtool team:
 
 * New features:
diff --git a/configure.ac b/configure.ac
index f6931a4..f47eb44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ dnl Oldest automake required for bootstrap is below in AM_INIT_AUTOMAKE.
 ## ------------------------ ##
 ## Autoconf initialisation. ##
 ## ------------------------ ##
-AC_INIT([libtool], [2.2.10], [bug-libtool@gnu.org])
+AC_INIT([libtool], [2.2.11a], [bug-libtool@gnu.org])
 AC_CONFIG_HEADERS([config.h:config-h.in])
 AC_CONFIG_SRCDIR([libtoolize.in])
 LT_CONFIG_LTDL_DIR([libltdl], [nonrecursive])
diff --git a/libltdl/configure.ac b/libltdl/configure.ac
index cec7768..4f71221 100644
--- a/libltdl/configure.ac
+++ b/libltdl/configure.ac
@@ -40,7 +40,7 @@ AC_PREREQ(2.59)dnl We use AS_HELP_STRING
 ## ------------------------ ##
 ## Autoconf initialisation. ##
 ## ------------------------ ##
-AC_INIT([libltdl], [2.2.10], [bug-libtool@gnu.org])
+AC_INIT([libltdl], [2.2.11a], [bug-libtool@gnu.org])
 AC_CONFIG_HEADERS([config.h:config-h.in])
 AC_CONFIG_SRCDIR([ltdl.c])
 AC_CONFIG_AUX_DIR([config])


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Wed Jun 09 11:18:11 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OMN2h-000403-6J
	for mharc-libtool-commit@gnu.org; Wed, 09 Jun 2010 11:18:11 -0400
Received: from [140.186.70.92] (port=56901 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OMN2e-0003xc-PY
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 11:18:10 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMN2d-0006op-Kj
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 11:18:08 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:46849
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMN2d-0006ol-I5
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 11:18:07 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMN2d-0007FX-Fr
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 15:18:07 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMN2d-0007qk-6a
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 15:18:07 +0000
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
X-Git-Refname: refs/tags/v2.2.10
X-Git-Reftype: annotated tag
X-Git-Oldrev: 0000000000000000000000000000000000000000
X-Git-Newrev: 44511fce19c1adc26ab608f518ad6ae447c870ad
Message-Id: <E1OMN2d-0007qk-6a@vcs-noshell.in.savannah.gnu.org>
Date: Wed, 09 Jun 2010 15:18:07 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool annotated tag, v2.2.10, created. v2.2.10
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Jun 2010 15:18:10 -0000

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 annotated tag, v2.2.10 has been created
        at  44511fce19c1adc26ab608f518ad6ae447c870ad (tag)
   tagging  c6b266a56fd2a9711d31e44f065701b8e78b3455 (commit)
  replaces  v2.2.8
 tagged by  Gary V. Vaughan
        on  Wed Jun 9 21:33:20 2010 +0700

- Log -----------------------------------------------------------------
release 2.2.10
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (Darwin)

iEYEABECAAYFAkwPqoUACgkQFRMICSmD1gZzfgCdHAezMY4onzqJzlbbUtaujr4A
HwIAn0D4Pm4KXG7O53n0supTHNgwswrs
=EkSO
-----END PGP SIGNATURE-----

Gary V. Vaughan (15):
      Set SCM version number to 2.2.9a.
      Fix web manual generation details in release instructions.
      Update generated upload directive file format to v1.1.
      Fetch from new upstream host for config.guess and config.sub.
      Shift correctly in numbered option argument collection.
      Quote command line arguments after --rcfile properly.
      Add missing quote for literal ? in a shell case statement.
      Update and simplify all m4sh scripts to use latest getopt.m4sh.
      * NEWS (2.2.8): BlueGene compiler tests were performed on BG/P
      Enable correct extraction of multiline copyright from --version.
      Don't warn about the blank line inserted into git commit message.
      Fix a type in the 2.2.8 release notes.
      Simplify license variations, and add missing license texts.
      Fix a quoting bug with ./commit -a 'A U Thor'.
      Prepare for next release.

Peter Rosin (1):
      Don't try the MSYS libdir path on MinGW.

Ralf Wildenhues (5):
      Rewrite manual intro to be gender-neutral.
      Fix versioning test for LDFLAGS=-Wl,--as-needed.
      Make versioning test stricter for w32, enable shared libs.
      Avoid autom4te warning about unnamed diversion.
      Fix testsuite helper macros to not hide failure.

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


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Wed Jun 09 12:46:34 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OMOQE-0001jM-DH
	for mharc-libtool-commit@gnu.org; Wed, 09 Jun 2010 12:46:34 -0400
Received: from [140.186.70.92] (port=43068 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OMOQC-0001i9-Fr
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 12:46:33 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMOQB-0007d5-Cs
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 12:46:32 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:54286
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMOQB-0007cx-BY
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 12:46:31 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMOQA-0008Kg-Jq
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 16:46:30 +0000
Received: from pogma by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMOQA-0004b6-Hd
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 16:46:30 +0000
From: "Peter O'Gorman" <peter@pogma.com>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d18372c98ae0440183f1f207c19947f874ec35c0
X-Git-Newrev: 15017972c5e7001f3acfee96f74507474f95cdb5
Message-Id: <E1OMOQA-0004b6-Hd@vcs-noshell.in.savannah.gnu.org>
Date: Wed, 09 Jun 2010 16:46:30 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-2-g1501797
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Jun 2010 16:46:33 -0000

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  15017972c5e7001f3acfee96f74507474f95cdb5 (commit)
      from  d18372c98ae0440183f1f207c19947f874ec35c0 (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 15017972c5e7001f3acfee96f74507474f95cdb5
Author: Peter O'Gorman <peter@pogma.com>
Date:   Wed Jun 9 11:45:51 2010 -0500

    Skip demo-nopic tests if SELinux policy will cause failure.
    
    * tests/demo-nopic.test: Check SELinux policy and skip if
    necessary.

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

Summary of changes:
 ChangeLog             |    6 ++++++
 tests/demo-nopic.test |   16 +++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a7967b3..78b5d7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-09  Peter O'Gorman  <peter@pogma.com>
+
+	Skip demo-nopic tests if SELinux policy will cause failure.
+	* tests/demo-nopic.test: Check SELinux policy and skip if
+	necessary.
+
 2010-06-09  Gary V. Vaughan  <gary@gnu.org>
 
 	Set SCM version number to 2.2.11a.
diff --git a/tests/demo-nopic.test b/tests/demo-nopic.test
index 11e5c16..acceca6 100755
--- a/tests/demo-nopic.test
+++ b/tests/demo-nopic.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # demo-nopic.test - try configuring the ../demo subdirectory
 #
-#   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+#   Copyright (C) 2003, 2004, 2010 Free Software Foundation, Inc.
 #   Written by Gary V. Vaughan, 2003
 #
 #   This file is part of GNU Libtool.
@@ -34,6 +34,20 @@ hppa*|x86_64*|s390*)
 	;;
 esac
 
+if test "$build" = "$host" && test -d "/etc/selinux"; then
+	_selinux=`getenforce 2>/dev/null || echo "Disabled"`
+	case "${_selinux}" in
+	*Enforcing)
+		_sebool_allow_execmod=`getsebool allow_execmod 2>/dev/null`
+		case "${_sebool_allow_execmod}" in
+			*off)
+				func_skip "SELinux policy disallows"
+				;;
+		esac
+		;;
+	esac
+fi
+
 func_rmprefixdir
 func_cd "tests/demo"
 func_make_distclean


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Wed Jun 09 14:07:45 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OMPgn-00084C-7W
	for mharc-libtool-commit@gnu.org; Wed, 09 Jun 2010 14:07:45 -0400
Received: from [140.186.70.92] (port=54653 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OMPgj-000842-4Y
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 14:07:44 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMPge-0005UH-Gh
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 14:07:40 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:60720
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMPge-0005U5-FC
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 14:07:36 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMPgd-0000rX-T2
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 18:07:35 +0000
Received: from rwild by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMPgd-0001Nn-Lh
	for libtool-commit@gnu.org; Wed, 09 Jun 2010 18:07:35 +0000
From: "Ralf Wildenhues" <Ralf.Wildenhues@gmx.de>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 15017972c5e7001f3acfee96f74507474f95cdb5
X-Git-Newrev: 8f241f6eaa8acbbe3f4b766a40a1bef7b45f56c2
Message-Id: <E1OMPgd-0001Nn-Lh@vcs-noshell.in.savannah.gnu.org>
Date: Wed, 09 Jun 2010 18:07:35 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-3-g8f241f6
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Jun 2010 18:07:44 -0000

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  8f241f6eaa8acbbe3f4b766a40a1bef7b45f56c2 (commit)
      from  15017972c5e7001f3acfee96f74507474f95cdb5 (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 8f241f6eaa8acbbe3f4b766a40a1bef7b45f56c2
Author: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date:   Tue Jun 8 22:41:41 2010 +0200

    Factorize testing gcj installation in the testsuite.
    
    * tests/testsuite.at (LT_AT_TAG): For the GCJ tag, actually
    try to compile a .java file when deciding whether to skip.
    (LT_AT_EXEC_TAG): New macro, to also ensure runnability.
    * tests/convenience.at (Java convenience archives): Use
    LT_AT_EXEC_TAG, simplify accordingly.
    * tests/flags.at (passing lt_tag flags through libtool): Use
    m4_defn for tag so LT_AT_TAG works.
    * tests/infer-tag.at (GCJ inferred tag): Simplify.
    * THANKS: Update.
    Report by Warren Dodge.
    
    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

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

Summary of changes:
 ChangeLog            |   14 ++++++++++++++
 THANKS               |    1 +
 tests/convenience.at |   14 +++-----------
 tests/flags.at       |    4 ++--
 tests/infer-tag.at   |    6 +-----
 tests/testsuite.at   |   31 +++++++++++++++++++++++++++++--
 6 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 78b5d7d..24de21d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2010-06-09  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Factorize testing gcj installation in the testsuite.
+	* tests/testsuite.at (LT_AT_TAG): For the GCJ tag, actually
+	try to compile a .java file when deciding whether to skip.
+	(LT_AT_EXEC_TAG): New macro, to also ensure runnability.
+	* tests/convenience.at (Java convenience archives): Use
+	LT_AT_EXEC_TAG, simplify accordingly.
+	* tests/flags.at (passing lt_tag flags through libtool): Use
+	m4_defn for tag so LT_AT_TAG works.
+	* tests/infer-tag.at (GCJ inferred tag): Simplify.
+	* THANKS: Update.
+	Report by Warren Dodge.
+
 2010-06-09  Peter O'Gorman  <peter@pogma.com>
 
 	Skip demo-nopic tests if SELinux policy will cause failure.
diff --git a/THANKS b/THANKS
index 14ab56b..dc61c43 100644
--- a/THANKS
+++ b/THANKS
@@ -173,6 +173,7 @@
   Tom Tromey			tromey@cygnus.com
   Tor Lillqvist			tml@iki.fi
   Ulrich Drepper		drepper@ipd.info.uni-karlsruhe.de
+  Warren Dodge			warren.l.dodge@Tektronix.com
   Vadim Zeitlin			vz-libtool@zeitlins.org
   Vincent Lefevre		vincent@vinc17.org
   Vincent Torri			vtorri@univ-evry.fr
diff --git a/tests/convenience.at b/tests/convenience.at
index 339c59a..f076e61 100644
--- a/tests/convenience.at
+++ b/tests/convenience.at
@@ -1,6 +1,7 @@
 # convenience.at -- testing C convenience archives            -*- Autotest -*-
 
-#   Copyright (C) 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
+#   Copyright (C) 2005, 2007, 2008, 2009, 2010 Free Software Foundation,
+#   Inc.
 #   Written by Ralf Wildenhues, 2005
 #
 #   This file is part of GNU Libtool.
@@ -227,7 +228,7 @@ AT_CLEANUP
 
 
 AT_SETUP([Java convenience archives])
-LT_AT_TAG([GCJ])
+LT_AT_EXEC_TAG([GCJ])
 AT_KEYWORDS([libtool])
 
 cat >foo1.java <<EOF
@@ -259,15 +260,6 @@ public class A$i {
 };
 EOF
 
-  # There are just too many broken gcj installations out there, either missing
-  # libgcj.spec or unable to find it.  Skip this test for them.
-  if test $i -eq 1; then
-    AT_CHECK([$GCJ $GCJFLAGS -c foo1.java || exit 77], [], [ignore], [ignore])
-    AT_CHECK([$GCJ $GCJFLAGS --main=foo1 -o foo1$EXEEXT foo1.java A1.java || exit 77],[],[ignore],[ignore])
-    AT_CHECK([./foo1$EXEEXT || exit 77],[],[ignore],[ignore])
-    rm -f foo1.o foo1.obj foo1$EXEEXT
-  fi
-
   $LIBTOOL --tag=GCJ --mode=compile $GCJ $GCJFLAGS -c foo$i.java
   $LIBTOOL --tag=GCJ --mode=compile $GCJ $GCJFLAGS -c A$i.java
   $LIBTOOL --tag=GCJ --mode=link $GCJ $GCJFLAGS $LDFLAGS -o liba$i.la A$i.lo
diff --git a/tests/flags.at b/tests/flags.at
index eceda74..7f600be 100644
--- a/tests/flags.at
+++ b/tests/flags.at
@@ -1,6 +1,6 @@
 # flags.at -- libtool passing of flags             -*- Autotest -*-
 #
-#   Copyright (C) 2009 Free Software Foundation, Inc.
+#   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 #
 #   This file is part of GNU Libtool.
 #
@@ -24,7 +24,7 @@
 m4_foreach([lt_tag], [CC, CXX, F77, FC, GCJ],
 [AT_SETUP([passing lt_tag flags through libtool])
 AT_KEYWORDS([libtool])
-LT_AT_TAG([lt_tag])
+LT_AT_TAG(m4_defn([lt_tag]))
 
 LDFLAGS="$LDFLAGS -no-undefined"
 eval "`$LIBTOOL --config | $EGREP '^(FGREP)='`"
diff --git a/tests/infer-tag.at b/tests/infer-tag.at
index ebc7581..57dd728 100644
--- a/tests/infer-tag.at
+++ b/tests/infer-tag.at
@@ -1,6 +1,6 @@
 # infer-tag.at -- libtool without --tag             -*- Autotest -*-
 #
-#   Copyright (C) 2008 Free Software Foundation, Inc.
+#   Copyright (C) 2008, 2010 Free Software Foundation, Inc.
 #
 #   This file is part of GNU Libtool.
 #
@@ -91,10 +91,6 @@ AT_DATA([A.java],
 };
 ]])
 
-# There are just too many broken gcj installations out there, either missing
-# libgcj.spec or unable to find it.  Skip this test for them.
-AT_CHECK([$GCJ $GCJFLAGS -c A.java || exit 77], [], [ignore], [ignore])
-
 AT_CHECK([$LIBTOOL --mode=compile $GCJ $GCJCFLAGS -c A.java],
 	 [], [ignore], [ignore])
 
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 71b9dc4..423e544 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -275,11 +275,38 @@ AT_CHECK([if $LIBTOOL --mode=execute $2 "$lt_exe" $6; then :; else lt_status=$?;
 
 # LT_AT_TAG(TAG)
 # --------------
+# Declare that the language TAG will be used in this test.
+# Skips the test if the compiler is apparently not functional.
 m4_define([LT_AT_TAG],
 [AT_KEYWORDS([$1])
 AT_CHECK([{ test -n "[$]$1" && test "X[$]$1" != Xno; } || (exit 77)])
-m4_if([$1], [CXX],
-  [AT_CHECK([test "X$CXX" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77)])])
+m4_case([$1],
+  [CXX],
+  [AT_CHECK([test "X$CXX" != Xg++ || (g++ -v >/dev/null 2>&1) || (exit 77)])],
+  [GCJ],
+  [# There are just too many broken gcj installations out there, either missing
+   # libgcj.spec or unable to find it.  Skip the test for them.
+   AT_DATA([gcj_test.java],
+[[public class gcj_test {
+    public static void main(String[] argv) { }
+  }
+]])
+   AT_CHECK([$GCJ $GCJFLAGS -c gcj_test.java || exit 77],
+	    [], [ignore], [ignore])])
+])
+
+
+# LT_AT_EXEC_TAG([TAG])
+# ---------------------
+# Declare that the language TAG will be used and compiled programs may be run.
+# Skips the test if the compiler is apparently not functional.
+m4_define([LT_AT_EXEC_TAG],
+[LT_AT_TAG([$1])
+m4_case([$1],
+  [GCJ],
+  [AT_CHECK([$GCJ $GCJFLAGS --main=gcj_test -o gcj_test$EXEEXT gcj_test.java ]dnl
+	    [|| exit 77], [], [ignore], [ignore])
+   AT_CHECK([./gcj_test$EXEEXT || exit 77], [], [ignore], [ignore])])
 ])
 
 


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Thu Jun 10 03:22:58 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OMc6L-00029I-Fg
	for mharc-libtool-commit@gnu.org; Thu, 10 Jun 2010 03:22:57 -0400
Received: from [140.186.70.92] (port=47515 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OMc6G-00028l-W2
	for libtool-commit@gnu.org; Thu, 10 Jun 2010 03:22:53 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMc6F-0000L9-GE
	for libtool-commit@gnu.org; Thu, 10 Jun 2010 03:22:52 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:56448
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMc6F-0000L5-D9
	for libtool-commit@gnu.org; Thu, 10 Jun 2010 03:22:51 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMc6E-00023N-UE
	for libtool-commit@gnu.org; Thu, 10 Jun 2010 07:22:50 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMc6E-0006C2-Cl
	for libtool-commit@gnu.org; Thu, 10 Jun 2010 07:22:50 +0000
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 8f241f6eaa8acbbe3f4b766a40a1bef7b45f56c2
X-Git-Newrev: 90231d3e97cc87fd19872832f57f879e68163380
Message-Id: <E1OMc6E-0006C2-Cl@vcs-noshell.in.savannah.gnu.org>
Date: Thu, 10 Jun 2010 07:22:50 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-4-g90231d3
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Jun 2010 07:22:55 -0000

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  90231d3e97cc87fd19872832f57f879e68163380 (commit)
      from  8f241f6eaa8acbbe3f4b766a40a1bef7b45f56c2 (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 90231d3e97cc87fd19872832f57f879e68163380
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Thu Jun 10 14:22:40 2010 +0700

    Fix a typu in HACKING.
    
    * HACKING (Release Procedure): s/Makeflie/Makefile/.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 ChangeLog |    5 +++++
 HACKING   |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 24de21d..170e9d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-10  Gary V. Vaughan  <gary@gnu.org>
+
+	Fix a typu in HACKING.
+	* HACKING (Release Procedure): s/Makeflie/Makefile/.
+
 2010-06-09  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	Factorize testing gcj installation in the testsuite.
diff --git a/HACKING b/HACKING
index 468f54b..19ac2cd 100644
--- a/HACKING
+++ b/HACKING
@@ -682,7 +682,7 @@ or obtained by writing to the Free Software Foundation, Inc.,
   doc/manual using cvs to here:
   <yourusername>@cvs.savannah.gnu.org:/webcvs/libtool
 
-* In the build directory, run `Make -f[../]Makeflie.maint announce-gen'.
+* In the build directory, run `Make -f[../]Makefile.maint announce-gen'.
 
 * Make sure the source directory has an appropriate .announcerc, along
   the lines of:


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Thu Jun 10 10:03:10 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OMiLd-0001ru-S6
	for mharc-libtool-commit@gnu.org; Thu, 10 Jun 2010 10:03:10 -0400
Received: from [140.186.70.92] (port=33567 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OMiLb-0001qI-2F
	for libtool-commit@gnu.org; Thu, 10 Jun 2010 10:03:08 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMiLZ-0002J1-IR
	for libtool-commit@gnu.org; Thu, 10 Jun 2010 10:03:06 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:45194
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMiLZ-0002Iu-Fd
	for libtool-commit@gnu.org; Thu, 10 Jun 2010 10:03:05 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMiLY-0006wF-IW
	for libtool-commit@gnu.org; Thu, 10 Jun 2010 14:03:04 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMiLU-0003Is-Db
	for libtool-commit@gnu.org; Thu, 10 Jun 2010 14:03:03 +0000
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 90231d3e97cc87fd19872832f57f879e68163380
X-Git-Newrev: cd0b95778b73f5101d4e10bda30a24191d8e1eae
Message-Id: <E1OMiLU-0003Is-Db@vcs-noshell.in.savannah.gnu.org>
Date: Thu, 10 Jun 2010 14:03:00 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-5-gcd0b957
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Jun 2010 14:03:08 -0000

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  cd0b95778b73f5101d4e10bda30a24191d8e1eae (commit)
      from  90231d3e97cc87fd19872832f57f879e68163380 (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 cd0b95778b73f5101d4e10bda30a24191d8e1eae
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Thu Jun 10 21:02:48 2010 +0700

    Support shell tracing inside functions even with ksh.
    
    * libltdl/config/getopt.m4sh: Set $opt_debug to be either `:'
    or `set -x' depending on whether --debug was parsed to match
    usage in libtoolize.m4sh and ltmain.m4sh.
    * clcommit.m4sh, libltdl/config/announce-gen.sh: Instead of
    `$opt_debug && ...', use `test "$opt_debug" != ":" && ...'.
    * clcommit.m4sh, libltdl/config/announce-gen.m4sh,
    libltdl/config/getopt.m4sh, libltdl/connfig/mailnotify.m4sh:
    Execute at the start of functions to cater to ksh, which
    resets `-x' inside shell functions.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 ChangeLog                        |   11 +++++++++++
 clcommit.m4sh                    |   10 +++++++++-
 libltdl/config/announce-gen.m4sh |   12 +++++++++++-
 libltdl/config/getopt.m4sh       |   14 +++++++++++---
 libltdl/config/mailnotify.m4sh   |   10 ++++++++++
 5 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 170e9d5..ce76dcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2010-06-10  Gary V. Vaughan  <gary@gnu.org>
 
+	Support shell tracing inside functions even with ksh.
+	* libltdl/config/getopt.m4sh: Set $opt_debug to be either `:'
+	or `set -x' depending on whether --debug was parsed to match
+	usage in libtoolize.m4sh and ltmain.m4sh.
+	* clcommit.m4sh, libltdl/config/announce-gen.sh: Instead of
+	`$opt_debug && ...', use `test "$opt_debug" != ":" && ...'.
+	* clcommit.m4sh, libltdl/config/announce-gen.m4sh,
+	libltdl/config/getopt.m4sh, libltdl/connfig/mailnotify.m4sh:
+	Execute at the start of functions to cater to ksh, which
+	resets `-x' inside shell functions.
+
 	Fix a typu in HACKING.
 	* HACKING (Release Procedure): s/Makeflie/Makefile/.
 
diff --git a/clcommit.m4sh b/clcommit.m4sh
index 6157cd2..8292d6a 100644
--- a/clcommit.m4sh
+++ b/clcommit.m4sh
@@ -135,7 +135,7 @@ M4SH_GETOPTS(
   [],		[--tags],			[],			[],
  [
   # pass debug flag along to mailnotify
-  $opt_debug &&
+  test "$opt_debug" != ":" &&
       mailnotify_flags="${mailnotify_flags+$mailnotify_flags }--debug"
 
   # validate $opt_first, $opt_file and $opt_message
@@ -172,6 +172,8 @@ set -e
 # func_check_conflicts
 func_check_conflicts ()
 {
+    $opt_debug
+
     func_verbose "checking for commit conflicts..."
     if $GIT push --dry-run > "$push_conflicts" 2>&1; then :; else
       cat "$push_conflicts" >&2
@@ -183,6 +185,8 @@ func_check_conflicts ()
 # func_check_commit_msg
 func_check_commit_msg ()
 {
+    $opt_debug
+
     if test -z "$opt_changelog"; then
       for f in ${1+"$@"}; do
         case "$f" in
@@ -258,6 +262,8 @@ func_check_commit_msg ()
 # func_commit
 func_commit ()
 {
+    $opt_debug
+
     ${PAGER-more} "$log_file" || exit $EXIT_FAILURE
 
     sleep 1 # give the user some time for a ^C
@@ -280,6 +286,8 @@ func_commit ()
 # func_mailnotify
 func_mailnotify ()
 {
+    $opt_debug
+
     notify_file="${log_dir}/notify"
     func_verbose "Mailing commit notification to \"$opt_sendmail\""
 
diff --git a/libltdl/config/announce-gen.m4sh b/libltdl/config/announce-gen.m4sh
index 2eb021c..a528fef 100644
--- a/libltdl/config/announce-gen.m4sh
+++ b/libltdl/config/announce-gen.m4sh
@@ -187,7 +187,7 @@ M4SH_GETOPTS(
   }
 
   # pass trace argument along to mailnotify too
-  $opt_debug &&
+  test "$opt_debug" != ":" &&
       mailnotify_flags="${mailnotify_flags+$mailnotify_flags }--debug"
   
   # validate remaining command line args as destination addresses
@@ -205,6 +205,8 @@ set -e
 # func_print_changelog_deltas
 func_print_changelog_deltas ()
 {
+    $opt_debug
+
     # FIXME: Jim's announce-gen does something with ChangeLogs
     #        and cvs diff.  We don't use CVS, and perl makes
     #        my eyes bleed... maybe I'll write this function
@@ -216,6 +218,8 @@ func_print_changelog_deltas ()
 # func_print_checksums title filename...
 func_print_checksums ()
 {
+    $opt_debug
+
     my_title="$1"; shift
 
     test -n "$1" && {
@@ -240,6 +244,8 @@ func_print_checksums ()
 # func_print_locations title url files
 func_print_locations ()
 {
+    $opt_debug
+
     test -n "$3" && {
 	echo
 	echo "Here are the $1:"
@@ -258,6 +264,8 @@ func_print_locations ()
 # func_print_news_deltas
 func_print_news_deltas ()
 {
+    $opt_debug
+
     my_news_file="$top_srcdir/NEWS"
     my_skipping=:
 
@@ -289,6 +297,8 @@ func_print_news_deltas ()
 # func_tool_versions toolname...
 func_print_tool_versions ()
 {
+    $opt_debug
+
     test -n "$1" && {
 	echo
 	echo "This release was bootstrapped with the following tools:"
diff --git a/libltdl/config/getopt.m4sh b/libltdl/config/getopt.m4sh
index 2899539..c378640 100644
--- a/libltdl/config/getopt.m4sh
+++ b/libltdl/config/getopt.m4sh
@@ -420,7 +420,7 @@ m4_define([m4go_optional_file_arg],
 m4_define([m4go_printopts],
 [
 # Option defaults:
-opt_debug=false
+opt_debug=:
 m4go_defaults
 
 # Parse options once, thoroughly.  This comes as soon as possible in the
@@ -437,9 +437,9 @@ m4go_defaults
     opt="[$]1"
     shift
     case $opt in
-      --debug|-x)	opt_debug=:
+      --debug|-x)	opt_debug='set -x'
 			func_echo "enabling shell trace mode"
-			set -x
+			$opt_debug
 			;;
 m4go_branches
       -\?|-h)		func_usage				;;
@@ -502,6 +502,8 @@ m4_divert_pop([KILL])M4SH_VERBATIM([[
 # Echo version message to standard output and exit.
 func_version ()
 {
+    $opt_debug
+
     $SED -n '/(C)/!b go
 	:more
 	/\./!{
@@ -523,6 +525,8 @@ func_version ()
 # Echo short help message to standard output and exit.
 func_usage ()
 {
+    $opt_debug
+
     $SED -n '/^# Usage:/,/^#  *.*--help/ {
         s/^# //
 	s/^# *$//
@@ -539,6 +543,8 @@ func_usage ()
 # unless 'noexit' is passed as argument.
 func_help ()
 {
+    $opt_debug
+
     $SED -n '/^# Usage:/,/# Report bugs to/ {
         s/^# //
 	s/^# *$//
@@ -564,6 +570,8 @@ func_help ()
 # exit_cmd.
 func_missing_arg ()
 {
+    $opt_debug
+
     func_error "missing argument for $1."
     exit_cmd=exit
 }
diff --git a/libltdl/config/mailnotify.m4sh b/libltdl/config/mailnotify.m4sh
index d8a24e3..af60de5 100644
--- a/libltdl/config/mailnotify.m4sh
+++ b/libltdl/config/mailnotify.m4sh
@@ -149,6 +149,8 @@ set -e
 # separated list of fully qualified destination addresses.
 func_headers ()
 {
+    $opt_debug
+
     my_outfile="$1"
     my_destination="$2"
     my_sed_version_no='
@@ -185,6 +187,8 @@ func_headers ()
 # Send the only message part as a single mime mail part.
 func_single_content ()
 {
+    $opt_debug
+
     my_outfile="$1"
 
     $opt_dry_run || cat >> "$my_outfile" <<EOF
@@ -200,6 +204,8 @@ EOF
 # Send the various message parts to OUTFILE as a multipart mime mail.
 func_multipart_content ()
 {
+    $opt_debug
+
     my_outfile="$1"
     boundary="boundary-${HOST}-$$-`date | tr ' :' -`"
     $opt_dry_run || {
@@ -250,6 +256,8 @@ EOF
 #         sending domain.
 func_sendmail ()
 {
+    $opt_debug
+
     my_infile="$1"
     my_destination="$2"
     my_from="$3"
@@ -298,6 +306,8 @@ func_sendmail ()
 # func_extract_email_from_header re_header headerfile
 func_extract_email ()
 {
+    $opt_debug
+
     my_re_header="$1"
     my_headerfile="$2"
     $as_unset func_extract_email_result


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Thu Jun 10 13:46:07 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OMlpP-0002rc-N1
	for mharc-libtool-commit@gnu.org; Thu, 10 Jun 2010 13:46:07 -0400
Received: from [140.186.70.92] (port=49070 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OMlpM-0002kM-As
	for libtool-commit@gnu.org; Thu, 10 Jun 2010 13:46:05 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMlpK-00039o-Ez
	for libtool-commit@gnu.org; Thu, 10 Jun 2010 13:46:04 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:33694
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMlpK-00039g-BD
	for libtool-commit@gnu.org; Thu, 10 Jun 2010 13:46:02 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMlpJ-0001Gf-Nz
	for libtool-commit@gnu.org; Thu, 10 Jun 2010 17:46:01 +0000
Received: from rwild by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMlpJ-0007jT-LX
	for libtool-commit@gnu.org; Thu, 10 Jun 2010 17:46:01 +0000
From: "Ralf Wildenhues" <Ralf.Wildenhues@gmx.de>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: cd0b95778b73f5101d4e10bda30a24191d8e1eae
X-Git-Newrev: 8e31ea01adea39d3dccf4f7752c20caa72cbb386
Message-Id: <E1OMlpJ-0007jT-LX@vcs-noshell.in.savannah.gnu.org>
Date: Thu, 10 Jun 2010 17:46:01 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-6-g8e31ea0
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Jun 2010 17:46:06 -0000

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  8e31ea01adea39d3dccf4f7752c20caa72cbb386 (commit)
      from  cd0b95778b73f5101d4e10bda30a24191d8e1eae (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 8e31ea01adea39d3dccf4f7752c20caa72cbb386
Author: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date:   Thu Jun 10 19:44:23 2010 +0200

    Ensure libltdl is up to date for check-local.
    
    * Makefile.am (LTDL_BOOTSTRAP_DEPS): New variable.
    (all-local): Use it to simplify dependencies.
    (testsuite_deps_uninstalled): Add $(LTDL_BOOTSTRAP_DEPS).
    Report by Peter Rosin.
    
    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

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

Summary of changes:
 ChangeLog   |    8 ++++++++
 Makefile.am |    7 +++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ce76dcf..c94b0c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-06-10  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Ensure libltdl is up to date for check-local.
+	* Makefile.am (LTDL_BOOTSTRAP_DEPS): New variable.
+	(all-local): Use it to simplify dependencies.
+	(testsuite_deps_uninstalled): Add $(LTDL_BOOTSTRAP_DEPS).
+	Report by Peter Rosin.
+
 2010-06-10  Gary V. Vaughan  <gary@gnu.org>
 
 	Support shell tracing inside functions even with ksh.
diff --git a/Makefile.am b/Makefile.am
index a7de46d..7c7f571 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -256,11 +256,13 @@ $(srcdir)/libltdl/Makefile.am: $(srcdir)/libltdl/Makefile.inc
 
 ## Unfortunately, all this bogeyness means that we have to manually
 ## keep the generated files in libltdl up to date.
-all-local: $(srcdir)/libltdl/aclocal.m4 \
+LTDL_BOOTSTRAP_DEPS = $(srcdir)/libltdl/aclocal.m4 \
 	$(srcdir)/libltdl/stamp-mk \
 	$(srcdir)/libltdl/configure \
 	$(srcdir)/libltdl/config-h.in
 
+all-local: $(LTDL_BOOTSTRAP_DEPS)
+
 EXTRA_DIST += $(srcdir)/libltdl/stamp-mk $(m4dir)/lt~obsolete.m4
 
 $(srcdir)/libltdl/Makefile.in: $(srcdir)/libltdl/Makefile.am \
@@ -558,7 +560,8 @@ DISTCLEANFILES += tests/atconfig
 CD_TESTDIR	= abs_srcdir=`$(lt__cd) $(srcdir) && pwd`; cd tests
 
 testsuite_deps = tests/atconfig $(srcdir)/$(TESTSUITE)
-testsuite_deps_uninstalled = $(testsuite_deps) libltdl/libltdlc.la $(bin_SCRIPTS)
+testsuite_deps_uninstalled = $(testsuite_deps) libltdl/libltdlc.la \
+			     $(bin_SCRIPTS) $(LTDL_BOOTSTRAP_DEPS)
 
 # Hook the test suite into the check rule
 check-local: $(testsuite_deps_uninstalled)


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Fri Jun 11 00:01:16 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OMvQh-00052l-Ug
	for mharc-libtool-commit@gnu.org; Fri, 11 Jun 2010 00:01:15 -0400
Received: from [140.186.70.92] (port=48789 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OMvQf-00051r-BE
	for libtool-commit@gnu.org; Fri, 11 Jun 2010 00:01:14 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMvQd-00035w-KS
	for libtool-commit@gnu.org; Fri, 11 Jun 2010 00:01:13 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:57982
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMvQd-00035s-Ic
	for libtool-commit@gnu.org; Fri, 11 Jun 2010 00:01:11 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMvQd-0000EI-5q
	for libtool-commit@gnu.org; Fri, 11 Jun 2010 04:01:11 +0000
Received: from pogma by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMvQZ-0000Q5-QI
	for libtool-commit@gnu.org; Fri, 11 Jun 2010 04:01:10 +0000
From: "Peter O'Gorman" <peter@pogma.com>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 8e31ea01adea39d3dccf4f7752c20caa72cbb386
X-Git-Newrev: f5e292a4eeb886859fdb41f9eb417a097ac6fff7
Message-Id: <E1OMvQZ-0000Q5-QI@vcs-noshell.in.savannah.gnu.org>
Date: Fri, 11 Jun 2010 04:01:08 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-7-gf5e292a
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Jun 2010 04:01:14 -0000

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  f5e292a4eeb886859fdb41f9eb417a097ac6fff7 (commit)
      from  8e31ea01adea39d3dccf4f7752c20caa72cbb386 (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 f5e292a4eeb886859fdb41f9eb417a097ac6fff7
Author: Peter O'Gorman <peter@pogma.com>
Date:   Thu Jun 10 22:00:47 2010 -0500

    Create reloadable object files with non-pic objects too.
    
    * libltdl/config/ltmain.m4sh: When not building a shared
    library, use the non-pic objects to create a reloadable
    object, because pic objects do not exist.

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

Summary of changes:
 ChangeLog                  |    7 +++++++
 libltdl/config/ltmain.m4sh |    3 +++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c94b0c7..92ef0ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-10  Peter O'Gorman  <peter@pogma.com>
+
+	Create reloadable object files with non-pic objects too.
+	* libltdl/config/ltmain.m4sh: When not building a shared
+	library, use the non-pic objects to create a reloadable
+	object, because pic objects do not exist.
+
 2010-06-10  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	Ensure libltdl is up to date for check-local.
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 9e6646f..5906552 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -7180,6 +7180,9 @@ EOF
 	fi
       fi
 
+      # If we're not building shared, we need to use non_pic_objs
+      test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
+
       # Create the old-style object.
       reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
 


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Fri Jun 11 02:02:06 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OMxJe-0004Pj-9l
	for mharc-libtool-commit@gnu.org; Fri, 11 Jun 2010 02:02:06 -0400
Received: from [140.186.70.92] (port=54603 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OMxJa-0004PE-2P
	for libtool-commit@gnu.org; Fri, 11 Jun 2010 02:02:03 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMxJY-0007Za-6G
	for libtool-commit@gnu.org; Fri, 11 Jun 2010 02:02:01 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:60751
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMxJY-0007ZU-4X
	for libtool-commit@gnu.org; Fri, 11 Jun 2010 02:02:00 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMxJX-0001g2-KO
	for libtool-commit@gnu.org; Fri, 11 Jun 2010 06:01:59 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OMxJX-0006Cq-GN
	for libtool-commit@gnu.org; Fri, 11 Jun 2010 06:01:59 +0000
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: f5e292a4eeb886859fdb41f9eb417a097ac6fff7
X-Git-Newrev: cc051734a33855b2aeca4be96610feb4f4a8d49a
Message-Id: <E1OMxJX-0006Cq-GN@vcs-noshell.in.savannah.gnu.org>
Date: Fri, 11 Jun 2010 06:01:59 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-8-gcc05173
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Jun 2010 06:02:04 -0000

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  cc051734a33855b2aeca4be96610feb4f4a8d49a (commit)
      from  f5e292a4eeb886859fdb41f9eb417a097ac6fff7 (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 cc051734a33855b2aeca4be96610feb4f4a8d49a
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Fri Jun 11 13:01:48 2010 +0700

    Use getopt.m4sh to generate libtoolize option parser.
    
    * libtoolize.m4sh: Replace hand written shell code with a
    call to M4SH_GETOPTS.  Move some premature initialization
    from the preamble to the main part of the script.  Exit with
    an error on spurious additional non-option arguments.
    (envopts): Integrate LIBTOOLIZE_OPTIONS pre-parsing into the
    main option parsing loop.
    (opt_copy): Use in place of and in the reverse sense of the
    old opt_link variable.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 ChangeLog       |   12 +++
 libtoolize.m4sh |  260 +++++++++++++++++++++++--------------------------------
 2 files changed, 121 insertions(+), 151 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 92ef0ce..48b26f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-06-11  Gary V. Vaughan  <gary@gnu.org>
+
+	Use getopt.m4sh to generate libtoolize option parser.
+	* libtoolize.m4sh: Replace hand written shell code with a
+	call to M4SH_GETOPTS.  Move some premature initialization
+	from the preamble to the main part of the script.  Exit with
+	an error on spurious additional non-option arguments.
+	(envopts): Integrate LIBTOOLIZE_OPTIONS pre-parsing into the
+	main option parsing loop.
+	(opt_copy): Use in place of and in the reverse sense of the
+	old opt_link variable.
+
 2010-06-10  Peter O'Gorman  <peter@pogma.com>
 
 	Create reloadable object files with non-pic objects too.
diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index cfe4aaa..2aa82d4 100644
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -75,55 +75,13 @@ m4_divert_pop
 m4_include([getopt.m4sh])
 
 M4SH_VERBATIM([[
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  SP2NL='tr \040 \012'
-  NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  SP2NL='tr \100 \n'
-  NL2SP='tr \r\n \100\100'
-  ;;
-esac
-
-
-# Command line options:
-opt_debug=:
-opt_force=false
-opt_install=false
-opt_link=:
-opt_ltdl=false
-
-seen_autoconf=false
-seen_libtool=false
-seen_ltdl=false
-
 # ltdl can be installed to be self-contained (subproject, the default);
 # or to be configured by a parent project, either with a recursive or
 # nonrecursive automake driven make:
 ltdl_mode=
 
 # Locations for important files:
-prefix=@prefix@
-datadir=@datadir@
-pkgdatadir=@pkgdatadir@
-pkgltdldir=@pkgdatadir@
-aclocaldir=@aclocaldir@
-auxdir=
-macrodir=
 ltdldir=
-configure_ac=configure.in
-
-# Lists of all files libtoolize has ever installed.  These are removed
-# before installing the latest files when --force was passed to help
-# ensure a clean upgrade.
-# Do not remove config.guess nor config.sub, we don't install them
-# without --install, and the project may not be using Automake.
-all_pkgconfig_files="ltmain.sh"
-all_pkgmacro_files="argz.m4 libtool.m4 ltdl.m4 ltoptions.m4 ltsugar.m4 ltversion.in ltversion.m4 lt~obsolete.m4"
-all_pkgltdl_files="COPYING.LIB Makefile Makefile.in Makefile.inc Makefile.am README acinclude.m4 aclocal.m4 argz_.h argz.c config.h.in config-h.in configure configure.ac configure.in libltdl/lt__alloc.h libltdl/lt__dirent.h libltdl/lt__glibc.h libltdl/lt__private.h libltdl/lt__strl.h libltdl/lt_dlloader.h libltdl/lt_error.h libltdl/lt_system.h libltdl/slist.h loaders/dld_link.c loaders/dlopen.c loaders/dyld.c loaders/load_add_on.c loaders/loadlibrary.c loaders/preopen.c loaders/shl_load.c lt__alloc.c lt__dirent.c lt__strl.c lt_dlloader.c lt_error.c ltdl.c ltdl.h slist.c"
 
 # Parse environment options
 {
@@ -135,114 +93,78 @@ all_pkgltdl_files="COPYING.LIB Makefile Makefile.in Makefile.inc Makefile.am REA
     LIBTOOLIZE_OPTIONS=`echo "$LIBTOOLIZE_OPTIONS" | sed "$my_sed_env_rest"`
 
     case $opt in
-      --debug)		opt_debug=:		;;
-      --no-warn)	opt_warning=false	;;
-      --quiet)		opt_quiet=:		;;
-      --verbose)	opt_verbose=:		;;
-
-      --*)	func_warning "unrecognized environment option \`$opt'"    ;;
+      --debug|--no-warn|--quiet|--verbose)
+		envopts="${envopts+$envopts }$opt"			  ;;
+      --*)	env_warning="${env_warning+$env_warning
+}unrecognized environment option \`$opt'" 				  ;;
       *)	func_fatal_help "garbled LIBTOOLIZE_OPTIONS near \`$opt'" ;;
     esac
   done
-}
-
 
-# Parse options once, thoroughly.  This comes as soon as possible in
-# the script to make things like `libtoolize --version' happen quickly.
-{
-  # sed scripts:
-  my_sed_single_opt='1s/^\(..\).*$/\1/;q'
-  my_sed_single_rest='1s/^..\(.*\)$/\1/;q'
-  my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
-  my_sed_long_arg='1s/^--[^=]*=//'
-
-  while test "$#" -gt 0; do
-    opt="$1"
+  test -n "$envopts" && {
+    func_quote_for_eval "$envopts"
+    eval set dummy "$func_quote_for_eval_result" ${1+"$@"}
     shift
-    case $opt in
-      --copy|-c)	opt_link=false ;;
-
-      --debug)		func_echo "enabling shell trace mode"
-			opt_debug='set -x'
-			$opt_debug
-			;;
-
-      --dry-run|-n)	if $opt_dry_run; then :; else
-			  opt_dry_run=:
-			  RM="func_echo_all $RM"
-			  test -n "$LN_S" && LN_S="func_echo_all $LN_S"
-			  CP="func_echo_all $CP"
-			  MKDIR="func_echo_all $MKDIR"
-			  TAR="func_echo_all $TAR"
-			fi
-			;;
-
-      --force|-f)	opt_force=: ;;
-
-      --install|-i)	opt_install=: ;;
-
-      --ltdl)		opt_ltdl=:
-			if test "$#" -gt 0; then
-			  case $1 in
-			    -*)	;;
-			    *)	ltdldir=`$ECHO "$1" | $SED 's,/*$,,'`
-				shift
-				;;
-			  esac
-			fi
-			;;
-
-      --no-warn)	opt_warning=false ;;
-
-      --nonrecursive|--non-recursive)
-			ltdl_mode=nonrecursive
-			;;
-
-      --quiet|--automake|-q) # --automake is for 1.5 compatibility
-			opt_quiet=:
-			;;
-
-      --recursive)	ltdl_mode=recursive ;;
-
-      --subproject)	ltdl_mode=subproject ;;
-
-      --verbose|-v)	opt_verbose=: ;;
-
-      # Separate optargs to long options:
-      --*=*)
-			arg=`$ECHO "$opt" | $SED "$my_sed_long_arg"`
-			opt=`$ECHO "$opt" | $SED "$my_sed_long_opt"`
-			set dummy "$opt" "$arg" ${1+"$@"}
-			shift
-			;;
-
-      # Separate optargs to short options:
-      #-X*)
-      #			arg=`$ECHO "$opt" | $SED "$my_sed_single_rest"`
-      #			opt=`$ECHO "$opt" | $SED "$my_sed_single_opt"`
-      #			set dummy "$opt" "$arg" ${1+"$@"}
-      #			shift
-      #			;;
-
-      # Separate non-argument short options:
-      -c*|-f*|-i*|-n*|-q*|-v*)
-			rest=`$ECHO "$opt" | $SED "$my_sed_single_rest"`
-			opt=`$ECHO "$opt" | $SED "$my_sed_single_opt"`
-			set dummy "$opt" "-$rest" ${1+"$@"}
-			shift
-			;;
-
-      -\?|-h)		func_usage					;;
-      --help)		func_help					;;
-      --version)	func_version					;;
-      --)		break						;;
-      -*)		func_fatal_help "unrecognized option \`$opt'"	;;
-      *)		func_fatal_help "too many arguments"		;;
-    esac
-  done
+  }
 }
+]])
+
+dnl SHORT	LONG			       DEFAULT		      INIT
+dnl ----------------------------------------------------------------------
+dnl   --automake, below, is for compatibility with automake 1.5
+M4SH_GETOPTS(
+  [c],		[--copy],			[],			[],
+  [f],		[--force],			[],			[],
+  [i],		[--install],			[],			[],
+  [n],		[--dry-run|--dryrun],		[],			[
+	CP="func_echo_all $CP"
+	test -n "$LN_S" && LN_S="func_echo_all $LN_S"
+	MKDIR="func_echo_all $MKDIR"
+	RM="func_echo_all $RM"
+	TAR="func_echo_all $TAR"],
+  [q],		[--quiet|--automake],		[],			[],
+  [v],		[--verbose],			[],			[],
+  [],		[--no-warning|--no-warn],	[],			[],
+  [],		[--nonrecursive|--non-recursive], [],			[],
+  [],		[--recursive],			[],			[],
+  [],		[--standalone],			[],			[],
+  [?],		[--ltdl],			[false],		[
+	# This is tricky, since we're overloading $opt_ltdl to be the
+	# optarg for --ltdl during option processing, but then stashing
+	# the (optional) optarg in $ltdldir and reusing $opt_ltdl to
+	# indicate that --ltdl was seen during option processing.  Also,
+	# be careful that --ltdl=foo --ltdl=bar results in ltdldir=bar:
+	case $opt_ltdl in
+          false|:) ;;  # a bare '--ltdl' followed by another option
+	  *)       ltdldir=`$ECHO "$optarg" | $SED 's,/*$,,'` ;;
+	esac
+	opt_ltdl=:],
+[
+  # show any warnings saved by LIBTOOLIZE_OPTIONS parsing
+  test -n "$env_warning" &&
+    echo "$env_warning" |while read line; do func_warning "$line"; done
+
+  # validate $opt_nonrecursive, $opt_recursive and $opt_standalone
+  if $opt_nonrecursive; then
+    if $opt_recursive || $opt_standalone; then
+      func_error "you can have at most one of --non-recursive, --recursive and --standalone"
+    fi
+    ltdl_mode=nonrecursive
+  elif $opt_recursive; then
+    $opt_standalone &&
+      func_error "you can have at most one of --non-recursive, --recursive and --standalone"
+    ltdl_mode=recursive
+  elif $opt_standalone; then
+    ltdl_mode=standalone
+  fi
 
+  # any remaining arguments are an error
+  test [$]# -gt 0 &&
+    func_fatal_help "unknown additional arguments: \`${1+$@}'"
+])
 
+
+M4SH_VERBATIM([[
 # func_echo_once msg_var
 # Calls func_echo with the value of MSG_VAR, and then sets MSG_VAR="" so
 # that subsequent calls have no effect.
@@ -321,7 +243,15 @@ func_copy_cb ()
     func_mkdir_p `$ECHO "$my_destdir/$my_file" | $SED "$dirname"`
 
     $RM "$my_destdir/$my_file"
-    if $opt_link; then
+    if $opt_copy; then
+      if { ( cd "$my_srcdir" && $TAR chf - "$my_file" ) 2>/dev/null \
+           | ( umask 0 && cd "$my_destdir" && $TAR xf - ) >/dev/null 2>&1; } \
+	 && touch "$my_destdir/$my_file"; then
+	$opt_quiet || func_echo_once "$my_msg_var"
+	$opt_quiet || func_echo "copying $my_copy_msg"
+	copy_return_status=0
+      fi
+    else
       if test "$my_file" = "aclocal.m4"; then
 	if { ( cd "$my_srcdir" && $TAR chf - "$my_file" ) 2>/dev/null \
 	     | ( umask 0 && cd "$my_destdir" && $TAR xf - ) >/dev/null 2>&1 ; }
@@ -337,14 +267,6 @@ func_copy_cb ()
 	  copy_return_status=0
 	fi
       fi
-    else
-      if { ( cd "$my_srcdir" && $TAR chf - "$my_file" ) 2>/dev/null \
-           | ( umask 0 && cd "$my_destdir" && $TAR xf - ) >/dev/null 2>&1; } \
-	 && touch "$my_destdir/$my_file"; then
-	$opt_quiet || func_echo_once "$my_msg_var"
-	$opt_quiet || func_echo "copying $my_copy_msg"
-	copy_return_status=0
-      fi
     fi
     if test "$copy_return_status" != 0; then
       $opt_quiet || func_echo_once "$my_msg_var"
@@ -1517,6 +1439,42 @@ func_check_macros ()
 ## ----------- ##
 
 {
+  # Lists of all files libtoolize has ever installed.  These are removed
+  # before installing the latest files when --force was passed to help
+  # ensure a clean upgrade.
+  # Do not remove config.guess nor config.sub, we don't install them
+  # without --install, and the project may not be using Automake.
+  all_pkgconfig_files="ltmain.sh"
+  all_pkgmacro_files="argz.m4 libtool.m4 ltdl.m4 ltoptions.m4 ltsugar.m4 ltversion.in ltversion.m4 lt~obsolete.m4"
+  all_pkgltdl_files="COPYING.LIB Makefile Makefile.in Makefile.inc Makefile.am README acinclude.m4 aclocal.m4 argz_.h argz.c config.h.in config-h.in configure configure.ac configure.in libltdl/lt__alloc.h libltdl/lt__dirent.h libltdl/lt__glibc.h libltdl/lt__private.h libltdl/lt__strl.h libltdl/lt_dlloader.h libltdl/lt_error.h libltdl/lt_system.h libltdl/slist.h loaders/dld_link.c loaders/dlopen.c loaders/dyld.c loaders/load_add_on.c loaders/loadlibrary.c loaders/preopen.c loaders/shl_load.c lt__alloc.c lt__dirent.c lt__strl.c lt_dlloader.c lt_error.c ltdl.c ltdl.h slist.c"
+
+  # Locations for important files:
+  prefix=@prefix@
+  datadir=@datadir@
+  pkgdatadir=@pkgdatadir@
+  pkgltdldir=@pkgdatadir@
+  aclocaldir=@aclocaldir@
+  auxdir=
+  macrodir=
+  configure_ac=configure.in
+
+  seen_autoconf=false
+  seen_libtool=false
+  seen_ltdl=false
+
+  # test EBCDIC or ASCII
+  case `echo X|tr X '\101'` in
+   A) # ASCII based system
+      # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+    SP2NL='tr \040 \012'
+    NL2SP='tr \015\012 \040\040'
+    ;;
+   *) # EBCDIC based system
+    SP2NL='tr \100 \n'
+    NL2SP='tr \r\n \100\100'
+    ;;
+  esac
+
   # Allow the user to override the master libtoolize repository:
   if test -n "$_lt_pkgdatadir"; then
     pkgltdldir="$_lt_pkgdatadir"


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Fri Jun 11 15:40:48 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ONA5w-0002X3-EP
	for mharc-libtool-commit@gnu.org; Fri, 11 Jun 2010 15:40:48 -0400
Received: from [140.186.70.92] (port=37952 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ONA5r-0002Wt-Dc
	for libtool-commit@gnu.org; Fri, 11 Jun 2010 15:40:46 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1ONA5l-0001l6-FT
	for libtool-commit@gnu.org; Fri, 11 Jun 2010 15:40:41 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:36883
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1ONA5l-0001l0-Cv
	for libtool-commit@gnu.org; Fri, 11 Jun 2010 15:40:37 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1ONA5k-0003Vd-RZ
	for libtool-commit@gnu.org; Fri, 11 Jun 2010 19:40:36 +0000
Received: from pogma by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1ONA5k-0005sW-Au
	for libtool-commit@gnu.org; Fri, 11 Jun 2010 19:40:36 +0000
From: "Peter O'Gorman" <peter@pogma.com>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: cc051734a33855b2aeca4be96610feb4f4a8d49a
X-Git-Newrev: d4558ac9bee7bde487ea982c28771d43a610d4fc
Message-Id: <E1ONA5k-0005sW-Au@vcs-noshell.in.savannah.gnu.org>
Date: Fri, 11 Jun 2010 19:40:36 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-9-gd4558ac
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Jun 2010 19:40:47 -0000

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  d4558ac9bee7bde487ea982c28771d43a610d4fc (commit)
      from  cc051734a33855b2aeca4be96610feb4f4a8d49a (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 d4558ac9bee7bde487ea982c28771d43a610d4fc
Author: Peter O'Gorman <peter@pogma.com>
Date:   Fri Jun 11 14:22:55 2010 -0500

    Skip bindir install test if we're not building shared.
    
    * tests/bindir.at: Skip install test if necessary.
    * THANKS: Update.
    Report by Michael E Faenza.

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

Summary of changes:
 ChangeLog       |    7 +++++++
 THANKS          |    1 +
 tests/bindir.at |    3 +++
 3 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 48b26f8..823c6d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-11  Peter O'Gorman  <peter@pogma.com>
+
+	Skip bindir install test if we're not building shared.
+	* tests/bindir.at: Skip install test if necessary.
+	* THANKS: Update.
+	Report by Michael E Faenza.
+
 2010-06-11  Gary V. Vaughan  <gary@gnu.org>
 
 	Use getopt.m4sh to generate libtoolize option parser.
diff --git a/THANKS b/THANKS
index dc61c43..08445f1 100644
--- a/THANKS
+++ b/THANKS
@@ -130,6 +130,7 @@
   Marcel Loose			loose@astron.nl
   Mark Kettenis			kettenis@phys.uva.nl
   Matthijs Kooijman		matthijs@stdin.nl
+  Micheal E. Faenza		mfaenza@mitre.org
   Michael Haubenwallner		michael.haubenwallner@salomon.at
   Mike Gorchak			mike@malva.ua
   Mike Frysinger		vapier@gentoo.org
diff --git a/tests/bindir.at b/tests/bindir.at
index e49853d..40e67cc 100644
--- a/tests/bindir.at
+++ b/tests/bindir.at
@@ -198,6 +198,9 @@ case "$host_os" in
     ;;
 esac
 
+eval "`$LIBTOOL --config | grep '^build_libtool_libs='`"
+AT_CHECK([test "$build_libtool_libs" = yes || (exit 77)])
+
 ####
 # These routines save the PATH before a test and restore it after,
 # prepending a chosen directory to the path on the platforms where


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Sat Jun 12 04:10:02 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ONLn0-000447-3V
	for mharc-libtool-commit@gnu.org; Sat, 12 Jun 2010 04:10:02 -0400
Received: from [140.186.70.92] (port=44794 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ONLmx-00042O-8Z
	for libtool-commit@gnu.org; Sat, 12 Jun 2010 04:10:00 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1ONLmv-0007cE-KA
	for libtool-commit@gnu.org; Sat, 12 Jun 2010 04:09:59 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:47056
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1ONLmv-0007cA-FQ
	for libtool-commit@gnu.org; Sat, 12 Jun 2010 04:09:57 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1ONLmv-0004J4-82
	for libtool-commit@gnu.org; Sat, 12 Jun 2010 08:09:57 +0000
Received: from rwild by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1ONLmu-0003Uc-OI
	for libtool-commit@gnu.org; Sat, 12 Jun 2010 08:09:57 +0000
From: "Ralf Wildenhues" <Ralf.Wildenhues@gmx.de>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d4558ac9bee7bde487ea982c28771d43a610d4fc
X-Git-Newrev: 2a4278537315a9b073f2669e56753b41d5ab493d
Message-Id: <E1ONLmu-0003Uc-OI@vcs-noshell.in.savannah.gnu.org>
Date: Sat, 12 Jun 2010 08:09:56 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-10-g2a42785
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Jun 2010 08:10:00 -0000

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  2a4278537315a9b073f2669e56753b41d5ab493d (commit)
      from  d4558ac9bee7bde487ea982c28771d43a610d4fc (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 2a4278537315a9b073f2669e56753b41d5ab493d
Author: Peter Rosin <peda@lysator.liu.se>
Date:   Thu Jun 10 19:53:39 2010 +0200

    Improve libdir usage from within ltdl on MinGW.
    
    * libltdl/ltdl.c (parse_dotla_file) [__WINDOWS__]: Read the
    libdir entry in the .la file, but accept it only if it is not
    a unix-style absolute name.
    * tests/ltdl-libdir.at: New test that checks if ltdl finds an
    installed module via the libdir variable in the .la file.  On
    MinGW, use a Windows-style libdir name including drive spec.
    * Makefile.am: Add above.
    
    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

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

Summary of changes:
 ChangeLog            |   12 +++++
 Makefile.am          |    1 +
 libltdl/ltdl.c       |    7 ++-
 tests/ltdl-libdir.at |  119 ++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 137 insertions(+), 2 deletions(-)
 create mode 100644 tests/ltdl-libdir.at

diff --git a/ChangeLog b/ChangeLog
index 823c6d3..ba5aa6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-06-12  Peter Rosin  <peda@lysator.liu.se>
+	    Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Improve libdir usage from within ltdl on MinGW.
+	* libltdl/ltdl.c (parse_dotla_file) [__WINDOWS__]: Read the
+	libdir entry in the .la file, but accept it only if it is not
+	a unix-style absolute name.
+	* tests/ltdl-libdir.at: New test that checks if ltdl finds an
+	installed module via the libdir variable in the .la file.  On
+	MinGW, use a Windows-style libdir name including drive spec.
+	* Makefile.am: Add above.
+
 2010-06-11  Peter O'Gorman  <peter@pogma.com>
 
 	Skip bindir install test if we're not building shared.
diff --git a/Makefile.am b/Makefile.am
index 7c7f571..c3f74e0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -486,6 +486,7 @@ TESTSUITE_AT	= tests/testsuite.at \
 		  tests/lt_dlopen.at \
 		  tests/lt_dlopen_a.at \
 		  tests/lt_dlopenext.at \
+		  tests/ltdl-libdir.at \
 		  tests/ltdl-api.at \
 		  tests/dlloader-api.at \
 		  tests/loadlibrary.at \
diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index e1b4e2f..1213f0d 100644
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -1079,14 +1079,17 @@ parse_dotla_file(FILE *file, char **dlname, char **libdir, char **deplibs,
 
       /* Windows native tools do not understand the POSIX paths we store
 	 in libdir. */
-#ifndef __WINDOWS__
 #undef  STR_LIBDIR
 #define STR_LIBDIR	"libdir="
       else if (strncmp (line, STR_LIBDIR, sizeof (STR_LIBDIR) - 1) == 0)
 	{
 	  errors += trim (libdir, &line[sizeof(STR_LIBDIR) - 1]);
-	}
+#ifdef __WINDOWS__
+	  /* Disallow following unix-style paths on MinGW.  */
+	  if (*libdir && (**libdir == '/' || **libdir == '\\'))
+	    **libdir = '\0';
 #endif
+	}
 
 #undef  STR_DL_DEPLIBS
 #define STR_DL_DEPLIBS	"dependency_libs="
diff --git a/tests/ltdl-libdir.at b/tests/ltdl-libdir.at
new file mode 100644
index 0000000..432d18e
--- /dev/null
+++ b/tests/ltdl-libdir.at
@@ -0,0 +1,119 @@
+# ltdl-libdir.at -- test libltdl functionality             -*- Autotest -*-
+#
+#   Copyright (C) 2010 Free Software Foundation, Inc.
+#   This 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.
+#
+# GNU Libtool is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from  http://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.
+####
+
+AT_SETUP([libdir of installed modules])
+AT_KEYWORDS([libltdl])
+
+# This test requires shared library support.
+AT_CHECK([$LIBTOOL --features | grep 'enable shared libraries' || exit 77],
+	 [], [ignore])
+
+# With MinGW, try Windows-style paths only.
+if pwd -W >/dev/null 2>&1; then
+  prefix=`pwd -W`/inst
+else
+  prefix=`pwd`/inst
+fi
+libdir=$prefix/lib
+bindir=$prefix/bin
+mkdir $prefix $libdir $bindir
+
+AT_DATA([a.c],
+[[
+int f (void)
+{
+  return 42;
+}
+]])
+
+AT_DATA([m.c],
+[[
+#include <stdio.h>
+#include <ltdl.h>
+
+typedef int func_f(void);
+
+int
+main (int argc, const char *argv[])
+{
+  lt_dlhandle module = NULL;
+  func_f *f = NULL;
+
+  if (lt_dlinit()) {
+    fprintf(stderr, "lt_dlinit failed '%s'\n", lt_dlerror());
+    return 1;
+  }
+
+  module = lt_dlopen("./a.la");
+
+  if (!module) {
+    fprintf(stderr, "lt_dlopen failed '%s'\n", lt_dlerror());
+    return 1;
+  }
+
+  f = (func_f *)lt_dlsym(module, "f");
+
+  if (!f) {
+    fprintf(stderr, "lt_dlsym failed '%s'\n", lt_dlerror());
+    return 1;
+  }
+
+  if (f() != 42) {
+    fprintf(stderr, "f did not return 42\n");
+    return 1;
+  }
+
+  lt_dlclose(module);
+  lt_dlexit();
+  return 0;
+}
+]])
+
+: ${LTDLINCL="-I$abs_top_srcdir/libltdl"}
+: ${LIBLTDL="$abs_builddir/../libltdl/libltdlc.la"}
+
+CPPFLAGS="$LTDLINCL $CPPFLAGS"
+LDFLAGS="$LDFLAGS -no-undefined"
+
+AT_CHECK([$LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c a.c],
+	 [], [ignore], [ignore])
+AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o a.la ]dnl
+	 [a.lo -rpath $libdir -module -shared -avoid-version],
+	 [], [ignore], [ignore])
+AT_CHECK([$LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c m.c],
+	 [], [ignore], [ignore])
+AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m$EXEEXT ]dnl
+	 [m.$OBJEXT $LIBLTDL],
+	 [], [ignore], [ignore])
+AT_CHECK([$LIBTOOL --mode=install cp a.la $libdir/a.la],
+	 [], [ignore], [ignore])
+AT_CHECK([$LIBTOOL --mode=install cp m$EXEEXT $bindir/m$EXEEXT],
+	 [], [ignore], [ignore])
+
+# Try finding the module via the libdir entry in a misplaced .la file.
+
+mv $libdir/a.la $bindir/a.la
+cd $bindir
+LT_AT_EXEC_CHECK([./m],
+		 [], [ignore], [ignore])
+
+AT_CLEANUP


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Sun Jun 13 13:15:55 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ONqmp-0001Jx-At
	for mharc-libtool-commit@gnu.org; Sun, 13 Jun 2010 13:15:55 -0400
Received: from [140.186.70.92] (port=59506 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ONqmm-0001Js-09
	for libtool-commit@gnu.org; Sun, 13 Jun 2010 13:15:53 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1ONqmk-0001wk-Lf
	for libtool-commit@gnu.org; Sun, 13 Jun 2010 13:15:51 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:50932
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1ONqmk-0001wg-Iv
	for libtool-commit@gnu.org; Sun, 13 Jun 2010 13:15:50 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1ONqmk-0002wI-5F
	for libtool-commit@gnu.org; Sun, 13 Jun 2010 17:15:50 +0000
Received: from rwild by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1ONqmj-0003Pp-SU
	for libtool-commit@gnu.org; Sun, 13 Jun 2010 17:15:50 +0000
From: "Ralf Wildenhues" <Ralf.Wildenhues@gmx.de>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 2a4278537315a9b073f2669e56753b41d5ab493d
X-Git-Newrev: 6558f036e358528fa5d849d4ce56ebd057474d72
Message-Id: <E1ONqmj-0003Pp-SU@vcs-noshell.in.savannah.gnu.org>
Date: Sun, 13 Jun 2010 17:15:49 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-11-g6558f03
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Jun 2010 17:15:53 -0000

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  6558f036e358528fa5d849d4ce56ebd057474d72 (commit)
      from  2a4278537315a9b073f2669e56753b41d5ab493d (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 6558f036e358528fa5d849d4ce56ebd057474d72
Author: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date:   Sun Jun 13 12:28:58 2010 +0200

    Print Libtool project URL in program --help output.
    
    * configure.ac (AC_INIT): Set PACKAGE argument to `GNU Libtool',
    so Autoconf knows this is GNU software.  For Autoconf < 2.64,
    if AC_PACKAGE_URL is not defined, substitute PACKAGE_URL.
    * Makefile.am (edit): Substitute PACKAGE_URL.
    ($(srcdir)/tests/package.m4): Also depend on Makefile.am.
    Define AT_PACKAGE_URL, for `tests/testsuite --help' output.
    * libltdl/config/getopt.m4sh (func_help): Also extract comment
    lines that mention a home page and general GNU help.
    * libltdl/config/ltmain.m4sh: Use @PACKAGE_BUGREPORT@ instead of
    hard-coded list address.  Also mention Libtool home page and
    general GNU help web page.
    * libtoolize.m4sh: Likewise.
    
    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

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

Summary of changes:
 ChangeLog                  |   16 ++++++++++++++++
 Makefile.am                |    4 +++-
 configure.ac               |    7 +++++--
 libltdl/config/getopt.m4sh |    7 ++++++-
 libltdl/config/ltmain.m4sh |    4 +++-
 libtoolize.m4sh            |    4 +++-
 6 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ba5aa6b..5ce2ca2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2010-06-13  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Print Libtool project URL in program --help output.
+	* configure.ac (AC_INIT): Set PACKAGE argument to `GNU Libtool',
+	so Autoconf knows this is GNU software.  For Autoconf < 2.64,
+	if AC_PACKAGE_URL is not defined, substitute PACKAGE_URL.
+	* Makefile.am (edit): Substitute PACKAGE_URL.
+	($(srcdir)/tests/package.m4): Also depend on Makefile.am.
+	Define AT_PACKAGE_URL, for `tests/testsuite --help' output.
+	* libltdl/config/getopt.m4sh (func_help): Also extract comment
+	lines that mention a home page and general GNU help.
+	* libltdl/config/ltmain.m4sh: Use @PACKAGE_BUGREPORT@ instead of
+	hard-coded list address.  Also mention Libtool home page and
+	general GNU help web page.
+	* libtoolize.m4sh: Likewise.
+
 2010-06-12  Peter Rosin  <peda@lysator.liu.se>
 	    Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
diff --git a/Makefile.am b/Makefile.am
index c3f74e0..8e00b3e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -126,6 +126,7 @@ edit = sed \
 	-e 's,@MACRO_VERSION\@,$(VERSION),g' \
 	-e 's,@PACKAGE\@,$(PACKAGE),g' \
 	-e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \
+	-e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \
 	-e 's,@PACKAGE_NAME\@,$(PACKAGE),g' \
 	-e 's,@PACKAGE_STRING\@,$(PACKAGE) $(VERSION),g' \
 	-e 's,@PACKAGE_TARNAME\@,$(PACKAGE),g' \
@@ -543,7 +544,7 @@ $(srcdir)/$(TESTSUITE): $(srcdir)/tests/package.m4 $(TESTSUITE_AT) Makefile.am
 	$(AUTOTEST) `echo $(TESTSUITE_AT) | sed 's,tests/,,g'` -o testsuite.tmp && \
 	mv -f testsuite.tmp testsuite
 
-$(srcdir)/tests/package.m4: $(srcdir)/configure.ac
+$(srcdir)/tests/package.m4: $(srcdir)/configure.ac Makefile.am
 	{ \
 	  echo '# Signature of the current package.'; \
 	  echo 'm4_define([AT_PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
@@ -551,6 +552,7 @@ $(srcdir)/tests/package.m4: $(srcdir)/configure.ac
 	  echo 'm4_define([AT_PACKAGE_VERSION],   [@PACKAGE_VERSION@])'; \
 	  echo 'm4_define([AT_PACKAGE_STRING],    [@PACKAGE_STRING@])'; \
 	  echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
+	  echo 'm4_define([AT_PACKAGE_URL],       [@PACKAGE_URL@])'; \
 	} | $(edit) > $(srcdir)/tests/package.m4
 
 tests/atconfig: $(top_builddir)/config.status
diff --git a/configure.ac b/configure.ac
index f47eb44..35c79f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
 # Process this file with autoconf to create configure. -*- autoconf -*-
 
-#   Copyright (C) 2001, 2004, 2005, 2008 Free Software Foundation, Inc.
+#   Copyright (C) 2001, 2004, 2005, 2008, 2010 Free Software Foundation,
+#   Inc.
 #   Written by Gary V. Vaughan, 2001
 #
 #   This file is part of GNU Libtool.
@@ -30,7 +31,9 @@ dnl Oldest automake required for bootstrap is below in AM_INIT_AUTOMAKE.
 ## ------------------------ ##
 ## Autoconf initialisation. ##
 ## ------------------------ ##
-AC_INIT([libtool], [2.2.11a], [bug-libtool@gnu.org])
+AC_INIT([GNU Libtool], [2.2.11a], [bug-libtool@gnu.org])
+m4_ifndef([AC_PACKAGE_URL],
+	  [AC_SUBST([PACKAGE_URL], [http://www.gnu.org/software/libtool/])])
 AC_CONFIG_HEADERS([config.h:config-h.in])
 AC_CONFIG_SRCDIR([libtoolize.in])
 LT_CONFIG_LTDL_DIR([libltdl], [nonrecursive])
diff --git a/libltdl/config/getopt.m4sh b/libltdl/config/getopt.m4sh
index c378640..44cf727 100644
--- a/libltdl/config/getopt.m4sh
+++ b/libltdl/config/getopt.m4sh
@@ -546,6 +546,7 @@ func_help ()
     $opt_debug
 
     $SED -n '/^# Usage:/,/# Report bugs to/ {
+	:print
         s/^# //
 	s/^# *$//
 	s*\$progname*'$progname'*
@@ -558,7 +559,11 @@ func_help ()
 	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
 	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
 	p
-     }' < "$progpath"
+	d
+     }
+     /^# .* home page:/b print
+     /^# General help using/b print
+     ' < "$progpath"
     ret=$?
     if test -z "$1"; then
       exit $ret
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 5906552..dd883a6 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -75,7 +75,9 @@ m4_divert_push([SCRIPT])# @configure_input@
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
-# Report bugs to <bug-libtool@gnu.org>.
+# Report bugs to <@PACKAGE_BUGREPORT@>.
+# GNU @PACKAGE@ home page: <@PACKAGE_URL@>.
+# General help using GNU software: <http://www.gnu.org/gethelp/>.
 
 PROGRAM=libtool
 PACKAGE=@PACKAGE@
diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index 2aa82d4..04db82f 100644
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -65,7 +65,9 @@ AS_INIT[]m4_divert_push([HEADER-COPYRIGHT])dnl
 #       automake:		$automake_version
 #       autoconf:		$autoconf_version
 #
-# Report bugs to <bug-libtool@gnu.org>.
+# Report bugs to <@PACKAGE_BUGREPORT@>.
+# GNU @PACKAGE@ home page: <@PACKAGE_URL@>.
+# General help using GNU software: <http://www.gnu.org/gethelp/>.
 
 : ${TAR=tar}
 


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Mon Jun 14 00:31:44 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OO1Kq-0005eJ-Mh
	for mharc-libtool-commit@gnu.org; Mon, 14 Jun 2010 00:31:44 -0400
Received: from [140.186.70.92] (port=44496 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OO1Km-0005e9-UP
	for libtool-commit@gnu.org; Mon, 14 Jun 2010 00:31:42 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OO1Ki-00008x-IU
	for libtool-commit@gnu.org; Mon, 14 Jun 2010 00:31:38 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:33225
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OO1Ki-00008o-H7
	for libtool-commit@gnu.org; Mon, 14 Jun 2010 00:31:36 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OO1Kh-0002Zp-Qc
	for libtool-commit@gnu.org; Mon, 14 Jun 2010 04:31:35 +0000
Received: from pogma by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OO1Kh-0005Sb-MP
	for libtool-commit@gnu.org; Mon, 14 Jun 2010 04:31:35 +0000
From: "Peter O'Gorman" <peter@pogma.com>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 6558f036e358528fa5d849d4ce56ebd057474d72
X-Git-Newrev: 23c144c1bcc5c71e05b27e7233a8bbef331cf410
Message-Id: <E1OO1Kh-0005Sb-MP@vcs-noshell.in.savannah.gnu.org>
Date: Mon, 14 Jun 2010 04:31:35 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-14-g23c144c
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Jun 2010 04:31:43 -0000

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  23c144c1bcc5c71e05b27e7233a8bbef331cf410 (commit)
       via  7b9d7e4af33bbd07f0836fa5a04b6eaac80f9bdd (commit)
       via  83b2c36410a7b0b1b75227ef287ca6112fe7fdcb (commit)
      from  6558f036e358528fa5d849d4ce56ebd057474d72 (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 23c144c1bcc5c71e05b27e7233a8bbef331cf410
Author: Peter O'Gorman <peter@pogma.com>
Date:   Sun Jun 13 22:27:31 2010 -0500

    Test with --disable-shared at release time too.
    
    * HACKING: Note it.

commit 7b9d7e4af33bbd07f0836fa5a04b6eaac80f9bdd
Author: Peter O'Gorman <peter@pogma.com>
Date:   Sun Jun 13 22:26:48 2010 -0500

    Avoid failure for --disable-shared.
    
    * tests/lt_dladvise.at: Hack.

commit 83b2c36410a7b0b1b75227ef287ca6112fe7fdcb
Author: Peter O'Gorman <peter@pogma.com>
Date:   Sun Jun 13 22:21:54 2010 -0500

    Use LTDL_SET_PRELOADED_SYMBOLS to avoid failure.
    
    * tests/exceptions.at: Use it.

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

Summary of changes:
 ChangeLog            |   11 +++++++++++
 HACKING              |    1 +
 tests/exceptions.at  |    3 +++
 tests/lt_dladvise.at |   12 ++++++++++++
 4 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5ce2ca2..a313b4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-06-13  Peter O'Gorman  <peter@pogma.com>
+
+	Test with --disable-shared at release time too.
+	* HACKING: Note it.
+
+	Avoid failure for --disable-shared.
+	* tests/lt_dladvise.at: Hack.
+
+	Use LTDL_SET_PRELOADED_SYMBOLS to avoid failure.
+	* tests/exceptions.at: Use it.
+
 2010-06-13  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	Print Libtool project URL in program --help output.
diff --git a/HACKING b/HACKING
index 19ac2cd..7ea1818 100644
--- a/HACKING
+++ b/HACKING
@@ -641,6 +641,7 @@ or obtained by writing to the Free Software Foundation, Inc.,
 * Run `make distcheck'
   and `make distcheck DISTCHECK_CONFIGURE_FLAGS=--disable-ltdl-install'
   and `make distcheck DISTCHECK_CONFIGURE_FLAGS=--program-prefix=g'
+  and `make distcheck DISTCHECK_CONFIGURE_FLAGS=--disable-shared'
   and `make distcheck CC=g++'
   If there are any problems, fix them and start again.
 
diff --git a/tests/exceptions.at b/tests/exceptions.at
index 6fe9f9a..293723c 100644
--- a/tests/exceptions.at
+++ b/tests/exceptions.at
@@ -224,6 +224,9 @@ int exceptions_in_module (void)
 
 int main (void)
 {
+
+  LTDL_SET_PRELOADED_SYMBOLS();
+
   if (exceptions_in_prog ())
     return 1;
   if (exceptions_in_lib ())
diff --git a/tests/lt_dladvise.at b/tests/lt_dladvise.at
index cdbe91d..18c2104 100644
--- a/tests/lt_dladvise.at
+++ b/tests/lt_dladvise.at
@@ -223,7 +223,17 @@ main (void)
 
   hint_resident ();
   hint_local ();
+#ifdef HAVE_SHARED
   hint_global ();
+#else
+  /* This ugly hack is because we have symbols with the same name in both the
+     global module and the local one, we can't lt_dlopen the local module
+     locally and then later load the global module globally because of this.
+     Instead of skipping the test entirely, we test what we can and
+     have this hack. */
+  printf ("global: 4\n");
+  printf ("depend: 5\n");
+#endif
   hint_preload ();
 
   if (lt_dlexit () != 0)
@@ -335,6 +345,8 @@ cygwin* | mingw* | cegcc* | *,false)
   ;;
 esac
 
+$have_shared && CPPFLAGS="$CPPFLAGS -DHAVE_SHARED"
+
 # ------------------------------------------------------------------------- #
 # Other modules can be tested correctly even when built with -no-undefined. #
 # ------------------------------------------------------------------------- #


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Mon Jun 14 12:38:46 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OOCgP-0004Wq-VG
	for mharc-libtool-commit@gnu.org; Mon, 14 Jun 2010 12:38:46 -0400
Received: from [140.186.70.92] (port=56082 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OOCgM-0004UN-Rm
	for libtool-commit@gnu.org; Mon, 14 Jun 2010 12:38:44 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OOCgH-0004bO-ER
	for libtool-commit@gnu.org; Mon, 14 Jun 2010 12:38:42 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:34133
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OOCgH-0004bK-Bm
	for libtool-commit@gnu.org; Mon, 14 Jun 2010 12:38:37 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OOCgH-0002uE-8h
	for libtool-commit@gnu.org; Mon, 14 Jun 2010 16:38:37 +0000
Received: from pogma by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OOCgH-0000SB-5a
	for libtool-commit@gnu.org; Mon, 14 Jun 2010 16:38:37 +0000
From: "Peter O'Gorman" <peter@pogma.com>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 23c144c1bcc5c71e05b27e7233a8bbef331cf410
X-Git-Newrev: 0263ff229bbf6f02a61d4ccad3bd4ab3a5601e1d
Message-Id: <E1OOCgH-0000SB-5a@vcs-noshell.in.savannah.gnu.org>
Date: Mon, 14 Jun 2010 16:38:37 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-15-g0263ff2
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Jun 2010 16:38:44 -0000

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  0263ff229bbf6f02a61d4ccad3bd4ab3a5601e1d (commit)
      from  23c144c1bcc5c71e05b27e7233a8bbef331cf410 (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 0263ff229bbf6f02a61d4ccad3bd4ab3a5601e1d
Author: Peter O'Gorman <peter@pogma.com>
Date:   Mon Jun 14 11:04:17 2010 -0500

    Pass resident test with --disable-shared too.
    
    * tests/resident.at: use LTDL_SET_PRELOADED_SYMBOLS.

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

Summary of changes:
 ChangeLog         |    5 +++++
 tests/resident.at |    2 ++
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a313b4b..2ffbcee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-14  Peter O'Gorman  <peter@pogma.com>
+
+	Pass resident test with --disable-shared too.
+	* tests/resident.at: use LTDL_SET_PRELOADED_SYMBOLS.
+
 2010-06-13  Peter O'Gorman  <peter@pogma.com>
 
 	Test with --disable-shared at release time too.
diff --git a/tests/resident.at b/tests/resident.at
index 2a85204..cf00688 100644
--- a/tests/resident.at
+++ b/tests/resident.at
@@ -38,6 +38,8 @@ main (int argc, char* argv[])
   lt_dlhandle plugin_handle;
   lt_dladvise advise;
 
+  LTDL_SET_PRELOADED_SYMBOLS();
+
   if (argc < 2)
     {
       fprintf (stderr, "usage: %s plugin\n", argv[0]);


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Mon Jun 14 14:44:39 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OOEeF-0005ZX-E5
	for mharc-libtool-commit@gnu.org; Mon, 14 Jun 2010 14:44:39 -0400
Received: from [140.186.70.92] (port=40789 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OOEeB-0005Qk-UZ
	for libtool-commit@gnu.org; Mon, 14 Jun 2010 14:44:37 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OOEeA-0003Gk-Kr
	for libtool-commit@gnu.org; Mon, 14 Jun 2010 14:44:35 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:33266
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OOEeA-0003Gf-JX
	for libtool-commit@gnu.org; Mon, 14 Jun 2010 14:44:34 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OOEeA-0004Rn-9E
	for libtool-commit@gnu.org; Mon, 14 Jun 2010 18:44:34 +0000
Received: from rwild by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OOEeA-0002mS-7B
	for libtool-commit@gnu.org; Mon, 14 Jun 2010 18:44:34 +0000
From: "Ralf Wildenhues" <Ralf.Wildenhues@gmx.de>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0263ff229bbf6f02a61d4ccad3bd4ab3a5601e1d
X-Git-Newrev: d640a3f4fca82e18b16eed3d6cc2f91e5cc8d74e
Message-Id: <E1OOEeA-0002mS-7B@vcs-noshell.in.savannah.gnu.org>
Date: Mon, 14 Jun 2010 18:44:34 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-16-gd640a3f
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Jun 2010 18:44:37 -0000

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  d640a3f4fca82e18b16eed3d6cc2f91e5cc8d74e (commit)
      from  0263ff229bbf6f02a61d4ccad3bd4ab3a5601e1d (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 d640a3f4fca82e18b16eed3d6cc2f91e5cc8d74e
Author: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date:   Sun Jun 13 11:46:16 2010 +0200

    Enable colored Autotest testsuite output if available.
    
    * tests/testsuite.at: Move AT_INIT call down to late in the
    file, all prior code can go beforehand.
    Call AT_COLOR_TESTS if defined.
    
    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

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

Summary of changes:
 ChangeLog          |    7 +++++++
 tests/testsuite.at |    9 ++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2ffbcee..8629a74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-14  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Enable colored Autotest testsuite output if available.
+	* tests/testsuite.at: Move AT_INIT call down to late in the
+	file, all prior code can go beforehand.
+	Call AT_COLOR_TESTS if defined.
+
 2010-06-14  Peter O'Gorman  <peter@pogma.com>
 
 	Pass resident test with --disable-shared too.
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 423e544..3935962 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -1,6 +1,6 @@
 # Process with autom4te to create an -*- Autotest -*- test suite.
 #
-#   Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+#   Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
 #   Foundation, Inc.
 #   Written by Gary V. Vaughan, 2004
 #
@@ -23,8 +23,6 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 ####
 
-AT_INIT
-
 m4_divert_push([PREPARE_TESTS])dnl
 : ${tst_dist=dist}
 : ${ACLOCAL=aclocal}
@@ -441,6 +439,11 @@ m4_pattern_allow([^dnl$])
 # We exercise these tools.
 dnl AT_TESTED([grep autoreconf autom4te automake])
 
+# Enable colored output if available.
+m4_ifdef([AT_COLOR_TESTS], [AT_COLOR_TESTS])
+
+AT_INIT
+
 ## ----------- ##
 ## The suite.  ##
 ## ----------- ##


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Tue Jun 15 13:17:46 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OOZli-0000Ma-Df
	for mharc-libtool-commit@gnu.org; Tue, 15 Jun 2010 13:17:46 -0400
Received: from [140.186.70.92] (port=41217 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OOZla-0000JV-Gu
	for libtool-commit@gnu.org; Tue, 15 Jun 2010 13:17:44 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OOZlY-00008s-1K
	for libtool-commit@gnu.org; Tue, 15 Jun 2010 13:17:37 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:47903
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OOZlX-00008m-V2
	for libtool-commit@gnu.org; Tue, 15 Jun 2010 13:17:35 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OOZlX-0003vI-JN
	for libtool-commit@gnu.org; Tue, 15 Jun 2010 17:17:35 +0000
Received: from rwild by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OOZlX-0006Q1-B5
	for libtool-commit@gnu.org; Tue, 15 Jun 2010 17:17:35 +0000
From: "Ralf Wildenhues" <Ralf.Wildenhues@gmx.de>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d640a3f4fca82e18b16eed3d6cc2f91e5cc8d74e
X-Git-Newrev: 66c97302adc03fc1aa507ccccd8ecd6ddb86392e
Message-Id: <E1OOZlX-0006Q1-B5@vcs-noshell.in.savannah.gnu.org>
Date: Tue, 15 Jun 2010 17:17:35 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-17-g66c9730
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Jun 2010 17:17:45 -0000

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  66c97302adc03fc1aa507ccccd8ecd6ddb86392e (commit)
      from  d640a3f4fca82e18b16eed3d6cc2f91e5cc8d74e (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 66c97302adc03fc1aa507ccccd8ecd6ddb86392e
Author: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date:   Tue Jun 15 05:19:45 2010 +0200

    Fix cleaning of uninstalled w32 shell wrapper in subdirs.
    
    * libltdl/config/ltmain.m4sh (func_mode_uninstall): Do not
    override global objdir variable, instead use odir for the
    directory of to-be-removed files.  Drop unneeded origobjdir.
    Report by Charles Wilson.
    
    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

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

Summary of changes:
 ChangeLog                  |    8 ++++++++
 libltdl/config/ltmain.m4sh |   28 +++++++++++++---------------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8629a74..a17d9aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-06-15  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Fix cleaning of uninstalled w32 shell wrapper in subdirs.
+	* libltdl/config/ltmain.m4sh (func_mode_uninstall): Do not
+	override global objdir variable, instead use odir for the
+	directory of to-be-removed files.  Drop unneeded origobjdir.
+	Report by Charles Wilson.
+
 2010-06-14  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	Enable colored Autotest testsuite output if available.
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index dd883a6..74c7114 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -7961,24 +7961,23 @@ func_mode_uninstall ()
 
     rmdirs=
 
-    origobjdir="$objdir"
     for file in $files; do
       func_dirname "$file" "" "."
       dir="$func_dirname_result"
       if test "X$dir" = X.; then
-	objdir="$origobjdir"
+	odir="$objdir"
       else
-	objdir="$dir/$origobjdir"
+	odir="$dir/$objdir"
       fi
       func_basename "$file"
       name="$func_basename_result"
-      test "$mode" = uninstall && objdir="$dir"
+      test "$mode" = uninstall && odir="$dir"
 
-      # Remember objdir for removal later, being careful to avoid duplicates
+      # Remember odir for removal later, being careful to avoid duplicates
       if test "$mode" = clean; then
 	case " $rmdirs " in
-	  *" $objdir "*) ;;
-	  *) rmdirs="$rmdirs $objdir" ;;
+	  *" $odir "*) ;;
+	  *) rmdirs="$rmdirs $odir" ;;
 	esac
       fi
 
@@ -8004,18 +8003,18 @@ func_mode_uninstall ()
 
 	  # Delete the libtool libraries and symlinks.
 	  for n in $library_names; do
-	    rmfiles="$rmfiles $objdir/$n"
+	    rmfiles="$rmfiles $odir/$n"
 	  done
-	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+	  test -n "$old_library" && rmfiles="$rmfiles $odir/$old_library"
 
 	  case "$mode" in
 	  clean)
 	    case "  $library_names " in
 	    # "  " in the beginning catches empty $dlname
 	    *" $dlname "*) ;;
-	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
+	    *) rmfiles="$rmfiles $odir/$dlname" ;;
 	    esac
-	    test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+	    test -n "$libdir" && rmfiles="$rmfiles $odir/$name $odir/${name}i"
 	    ;;
 	  uninstall)
 	    if test -n "$library_names"; then
@@ -8082,12 +8081,12 @@ func_mode_uninstall ()
 
 	    # note $name still contains .exe if it was in $file originally
 	    # as does the version of $file that was added into $rmfiles
-	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
+	    rmfiles="$rmfiles $odir/$name $odir/${name}S.${objext}"
 	    if test "$fast_install" = yes && test -n "$relink_command"; then
-	      rmfiles="$rmfiles $objdir/lt-$name"
+	      rmfiles="$rmfiles $odir/lt-$name"
 	    fi
 	    if test "X$noexename" != "X$name" ; then
-	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
+	      rmfiles="$rmfiles $odir/lt-${noexename}.c"
 	    fi
 	  fi
 	fi
@@ -8095,7 +8094,6 @@ func_mode_uninstall ()
       esac
       func_show_eval "$RM $rmfiles" 'exit_status=1'
     done
-    objdir="$origobjdir"
 
     # Try to remove the ${objdir}s in the directories where we deleted files
     for dir in $rmdirs; do


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Tue Jun 15 14:13:23 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OOadW-0007Ot-Iu
	for mharc-libtool-commit@gnu.org; Tue, 15 Jun 2010 14:13:22 -0400
Received: from [140.186.70.92] (port=48970 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OOadT-0007NA-Pw
	for libtool-commit@gnu.org; Tue, 15 Jun 2010 14:13:21 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OOadS-0001nc-3x
	for libtool-commit@gnu.org; Tue, 15 Jun 2010 14:13:19 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:42751
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OOadS-0001nY-2f
	for libtool-commit@gnu.org; Tue, 15 Jun 2010 14:13:18 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OOadS-0004ax-5t
	for libtool-commit@gnu.org; Tue, 15 Jun 2010 18:13:18 +0000
Received: from rwild by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OOadR-0001Og-Ar
	for libtool-commit@gnu.org; Tue, 15 Jun 2010 18:13:18 +0000
From: "Ralf Wildenhues" <Ralf.Wildenhues@gmx.de>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 66c97302adc03fc1aa507ccccd8ecd6ddb86392e
X-Git-Newrev: e0c817e5108fd6d1ac19defac06d8d16fd22426b
Message-Id: <E1OOadR-0001Og-Ar@vcs-noshell.in.savannah.gnu.org>
Date: Tue, 15 Jun 2010 18:13:17 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-18-ge0c817e
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Jun 2010 18:13:21 -0000

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  e0c817e5108fd6d1ac19defac06d8d16fd22426b (commit)
      from  66c97302adc03fc1aa507ccccd8ecd6ddb86392e (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 e0c817e5108fd6d1ac19defac06d8d16fd22426b
Author: Philip Allison <philip.allison@smoothwall.net>
Date:   Tue Jun 15 20:09:48 2010 +0200

    Avoid GCC -Wall compiler warning in dlopen self test.
    
    * libltdl/m4/libtool.m4 (_LT_TRY_DLOPEN_SELF): Fix unused
    variable warning in test program.
    * THANKS: Update.
    
    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

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

Summary of changes:
 ChangeLog             |    7 +++++++
 THANKS                |    1 +
 libltdl/m4/libtool.m4 |    4 ++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a17d9aa..bfa340c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-15  Philip Allison  <philip.allison@smoothwall.net>  (tiny change)
+
+	Avoid GCC -Wall compiler warning in dlopen self test.
+	* libltdl/m4/libtool.m4 (_LT_TRY_DLOPEN_SELF): Fix unused
+	variable warning in test program.
+	* THANKS: Update.
+
 2010-06-15  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	Fix cleaning of uninstalled w32 shell wrapper in subdirs.
diff --git a/THANKS b/THANKS
index 08445f1..8a866a4 100644
--- a/THANKS
+++ b/THANKS
@@ -145,6 +145,7 @@
   Peter Fritzsche		peter.fritzsche@gmx.de
   Peter Jeremy			peterjeremy@optushome.com.au
   Peter Kjellerstedt		peter.kjellerstedt@axis.com
+  Philip Allison		philip.allison@smoothwall.net
   Rainer Emrich			r.emrich@de.tecosim.com
   Rainer Orth			ro@TechFak.Uni-Bielefeld.DE
   Rainer Tammer			tammer@tammer.net
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 22924a8..d35aab0 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -1658,10 +1658,10 @@ else
 /* When -fvisbility=hidden is used, assume the code has been annotated
    correspondingly for the symbols needed.  */
 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-void fnord () __attribute__((visibility("default")));
+int fnord () __attribute__((visibility("default")));
 #endif
 
-void fnord () { int i=42; }
+int fnord () { return 42; }
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Tue Jun 15 16:53:28 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OOd8R-0004EP-P2
	for mharc-libtool-commit@gnu.org; Tue, 15 Jun 2010 16:53:27 -0400
Received: from [140.186.70.92] (port=46773 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OOd8L-00048g-U6
	for libtool-commit@gnu.org; Tue, 15 Jun 2010 16:53:25 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OOd8J-0004Tt-TD
	for libtool-commit@gnu.org; Tue, 15 Jun 2010 16:53:21 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:47393
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OOd8J-0004Tp-PK
	for libtool-commit@gnu.org; Tue, 15 Jun 2010 16:53:19 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OOd8J-0006Xe-JI
	for libtool-commit@gnu.org; Tue, 15 Jun 2010 20:53:19 +0000
Received: from pekberg by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <INVALID.NOREPLY@gnu.org>) id 1OOd8I-0004xw-Ka
	for libtool-commit@gnu.org; Tue, 15 Jun 2010 20:53:19 +0000
From: "Peter Rosin" <peda@lysator.liu.se>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e0c817e5108fd6d1ac19defac06d8d16fd22426b
X-Git-Newrev: 8cc72b48f67a6869584f0c73b0bbad1415ef9eff
Message-Id: <E1OOd8I-0004xw-Ka@vcs-noshell.in.savannah.gnu.org>
Date: Tue, 15 Jun 2010 20:53:18 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-19-g8cc72b4
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Jun 2010 20:53:25 -0000

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  8cc72b48f67a6869584f0c73b0bbad1415ef9eff (commit)
      from  e0c817e5108fd6d1ac19defac06d8d16fd22426b (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 8cc72b48f67a6869584f0c73b0bbad1415ef9eff
Author: Peter Rosin <peda@lysator.liu.se>
Date:   Tue Jun 15 22:52:33 2010 +0200

    On Windows, find potential libs regardless of file name case.
    
    * libltdl/m4/libtool.m4 (_LT_CHECK_MAGIC_METHOD),
    libltdl/config/ltmain.m4sh (func_mode_link): On Windows,
    find potential libs regardless of file name case.
    * tests/nocase.at: New test, to check for regressions
    of the above.
    * Makefile.am: Add above new test.
    * doc/libtool.texi (libtool script contents): Document
    new variables.
    * NEWS: Updated.
    
    Signed-off-by: Peter Rosin <peda@lysator.liu.se>
    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

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

Summary of changes:
 ChangeLog                  |   13 +++++++
 Makefile.am                |    1 +
 NEWS                       |    3 +-
 doc/libtool.texi           |   18 +++++++++
 libltdl/config/ltmain.m4sh |   14 +++++++-
 libltdl/m4/libtool.m4      |   21 ++++++++++-
 tests/nocase.at            |   85 ++++++++++++++++++++++++++++++++++++++++++++
 7 files changed, 152 insertions(+), 3 deletions(-)
 create mode 100644 tests/nocase.at

diff --git a/ChangeLog b/ChangeLog
index bfa340c..958cca9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-06-15  Peter Rosin  <peda@lysator.liu.se>
+
+	On Windows, find potential libs regardless of file name case.
+	* libltdl/m4/libtool.m4 (_LT_CHECK_MAGIC_METHOD),
+	libltdl/config/ltmain.m4sh (func_mode_link): On Windows,
+	find potential libs regardless of file name case.
+	* tests/nocase.at: New test, to check for regressions
+	of the above.
+	* Makefile.am: Add above new test.
+	* doc/libtool.texi (libtool script contents): Document
+	new variables.
+	* NEWS: Updated.
+
 2010-06-15  Philip Allison  <philip.allison@smoothwall.net>  (tiny change)
 
 	Avoid GCC -Wall compiler warning in dlopen self test.
diff --git a/Makefile.am b/Makefile.am
index 8e00b3e..1114e67 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -477,6 +477,7 @@ TESTSUITE_AT	= tests/testsuite.at \
 		  tests/deplib-in-subdir.at \
 		  tests/infer-tag.at \
 		  tests/localization.at \
+		  tests/nocase.at \
 		  tests/install.at \
 		  tests/versioning.at \
 		  tests/destdir.at \
diff --git a/NEWS b/NEWS
index 7e65da6..33531dc 100644
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,8 @@ New in 2.2.12 2010-08-??: git version 2.2.11a, Libtool team:
 
 * New features:
 
-  - None!
+  - On non-cygwin Windows systems, we now lookup potential library
+    file names without regard to file name case.
 
 New in 2.2.10 2010-06-10: git version 2.2.9a, Libtool team:
 
diff --git a/doc/libtool.texi b/doc/libtool.texi
index 051aec3..bf8534a 100644
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -5981,6 +5981,16 @@ and relinking at install time is triggered.  This also means that @var{DESTDIR}
 installation does not work as expected.
 @end defvar
 
+@defvar file_magic_glob
+How to find potential files when @code{deplibs_check_method} is
+@samp{file_magic}. @code{file_magic_glob} is a @code{sed} expression,
+and the @code{sed} instance is fed potential file names that are
+transformed by the @code{file_magic_glob} expression. Useful when the
+shell does not support the shell option @code{nocaseglob}, making
+@code{want_nocaseglob} inappropriate. Normally disabled (i.e.
+@code{file_magic_glob} is empty).
+@end defvar
+
 @defvar finish_cmds
 Commands to tell the dynamic linker how to find shared libraries in a
 specific directory.
@@ -6252,6 +6262,14 @@ The library version numbering type.  One of @samp{libtool},
 @samp{osf}, @samp{sunos}, @samp{windows}, or @samp{none}.
 @end defvar
 
+@defvar want_nocaseglob
+Find potential files using the shell option @code{nocaseglob}, when
+@code{deplibs_check_method} is @samp{file_magic}. Normally set to
+@samp{no}. Set to @samp{yes} to enable the @code{nocaseglob} shell
+option when looking for potential file names in a case-insensitive
+manner.
+@end defvar
+
 @defvar whole_archive_flag_spec
 Compiler flag to generate shared objects from convenience archives.
 @end defvar
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 74c7114..99784b4 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -6381,8 +6381,20 @@ EOF
 	      fi
 	      if test -n "$a_deplib" ; then
 		libname=`eval "\\$ECHO \"$libname_spec\""`
+		if test -n "$file_magic_glob"; then
+		  libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
+		else
+		  libnameglob=$libname
+		fi
+		test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
 		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		  if test "$want_nocaseglob" = yes; then
+		    shopt -s nocaseglob
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		    $nocaseglob
+		  else
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		  fi
 		  for potent_lib in $potential_libs; do
 		      # Follow soft links.
 		      if ls -lLd "$potent_lib" 2>/dev/null |
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index d35aab0..a91bd61 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -3163,6 +3163,21 @@ tpf*)
   ;;
 esac
 ])
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -3170,7 +3185,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
 _LT_DECL([], [deplibs_check_method], [1],
     [Method to check whether dependent libraries are shared objects])
 _LT_DECL([], [file_magic_cmd], [1],
-    [Command to use when deplibs_check_method == "file_magic"])
+    [Command to use when deplibs_check_method = "file_magic"])
+_LT_DECL([], [file_magic_glob], [1],
+    [How to find potential files when deplibs_check_method = "file_magic"])
+_LT_DECL([], [want_nocaseglob], [1],
+    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
 ])# _LT_CHECK_MAGIC_METHOD
 
 
diff --git a/tests/nocase.at b/tests/nocase.at
new file mode 100644
index 0000000..faacc0d
--- /dev/null
+++ b/tests/nocase.at
@@ -0,0 +1,85 @@
+# nocase.at --  test for nocase lib search  -*- Autotest -*-
+#
+#   Copyright (C) 2010 Free Software Foundation, Inc.
+#   Written by Peter Rosin, 2007
+#
+#   This 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.
+#
+# GNU Libtool is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from  http://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.
+####
+
+
+AT_SETUP([nocase library search])
+AT_KEYWORDS([libtool])
+
+eval `$LIBTOOL --config | $EGREP '^(want_nocaseglob|file_magic_glob)='`
+
+AT_CHECK([test "$want_nocaseglob" != yes && ]dnl
+         [test -z "$file_magic_glob" && exit 77],
+	  [1], [ignore], [ignore])
+
+mkdir foo
+AT_DATA([foo/Foo.c],
+[
+int Foo (void) { return 1; }
+])
+
+mkdir bar
+AT_DATA([bar/bar.c],
+[
+extern int Foo (void);
+int bar (void) { return Foo (); }
+])
+
+AT_DATA([main.c],
+[
+extern int bar (void);
+int main (void) { return bar (); }
+])
+
+libdir=`pwd`/inst/lib
+mkdir inst inst/bin inst/lib
+
+$LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c -o foo/Foo.lo foo/Foo.c
+AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o foo/libFoo.la foo/Foo.lo ]dnl
+	 [-no-undefined -version-info 1:0:0 -rpath $libdir],
+	 [], [ignore], [ignore])
+AT_CHECK([$LIBTOOL --mode=install cp foo/libFoo.la $libdir],
+	 [], [ignore], [ignore])
+AT_CHECK([$LIBTOOL --mode=clean rm -f foo/libFoo.la],
+	 [], [ignore], [ignore])
+
+rm -f $libdir/libFoo.la
+
+$LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c -o bar/bar.lo bar/bar.c
+AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o bar/libbar.la bar/bar.lo ]dnl
+	 [-L$libdir -lfoo -no-undefined -version-info 1:0:0 -rpath $libdir],
+	 [], [ignore], [ignore])
+AT_CHECK([$LIBTOOL --mode=install cp bar/libbar.la $libdir],
+	 [], [ignore], [ignore])
+
+str=`$EGREP '^(old_library)=' < $libdir/libbar.la`
+eval "$str"
+libbar=$old_library
+rm -f $libdir/$libbar
+
+$LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c -o main.$OBJEXT main.c
+
+AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main$EXEEXT main.$OBJEXT -L$libdir -lbar],
+	 [], [ignore], [ignore])
+
+AT_CLEANUP


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Wed Jun 16 00:05:01 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OOjs5-0005bh-LR
	for mharc-libtool-commit@gnu.org; Wed, 16 Jun 2010 00:05:01 -0400
Received: from [140.186.70.92] (port=58643 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OOjs1-0005bJ-1I
	for libtool-commit@gnu.org; Wed, 16 Jun 2010 00:04:59 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OOjrz-0002Hc-Hj
	for libtool-commit@gnu.org; Wed, 16 Jun 2010 00:04:56 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:56957
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OOjrz-0002HY-DJ
	for libtool-commit@gnu.org; Wed, 16 Jun 2010 00:04:55 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OOjrz-0003EP-AK
	for libtool-commit@gnu.org; Wed, 16 Jun 2010 04:04:55 +0000
Received: from rwild by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OOjrz-000178-4v
	for libtool-commit@gnu.org; Wed, 16 Jun 2010 04:04:55 +0000
From: "Ralf Wildenhues" <Ralf.Wildenhues@gmx.de>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 8cc72b48f67a6869584f0c73b0bbad1415ef9eff
X-Git-Newrev: 4d3ac408c863b1110ce7782d44c80b24f24111f1
Message-Id: <E1OOjrz-000178-4v@vcs-noshell.in.savannah.gnu.org>
Date: Wed, 16 Jun 2010 04:04:55 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-21-g4d3ac40
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Jun 2010 04:04:59 -0000

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  4d3ac408c863b1110ce7782d44c80b24f24111f1 (commit)
       via  47e4d7da64e121ebf26b66d1bab16d8ca4608c5d (commit)
      from  8cc72b48f67a6869584f0c73b0bbad1415ef9eff (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 4d3ac408c863b1110ce7782d44c80b24f24111f1
Author: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date:   Wed Jun 16 06:03:27 2010 +0200

    Optimize func_ltwrapper_scriptname to assume a cwrapper.
    
    * libltdl/config/ltmain.m4sh (func_ltwrapper_scriptname): Do not
    call func_ltwrapper_executable_p again here, this function is
    documented to allow being called with wrapper executables.
    
    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

commit 47e4d7da64e121ebf26b66d1bab16d8ca4608c5d
Author: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date:   Tue Jun 15 19:23:16 2010 +0200

    Fix bootstrap script to cope with changed AC_INIT arguments.
    
    * bootstrap: When extracting PACKAGE and VERSION from AC_INIT
    arguments, be sure to remove a 'GNU ' prefix and lowercase the
    package name for PACKAGE.  Also set PACKAGE_NAME and PACKAGE_URL
    appropriately for GNU software.  Pass these variables to the
    make commands creating tests/package.m4 and other files.
    * Makefile.am (edit): Fix substitution of PACKAGE_NAME and
    PACKAGE_STRING.
    * libltdl/config/announce-gen.m4sh: Use @PACKAGE@ not
    @PACKAGE_STRING@.
    
    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

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

Summary of changes:
 ChangeLog                        |   18 ++++++++++++++++++
 Makefile.am                      |    4 ++--
 bootstrap                        |   20 ++++++++++++++++----
 libltdl/config/announce-gen.m4sh |    2 +-
 libltdl/config/ltmain.m4sh       |    9 +++------
 5 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 958cca9..a5676ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2010-06-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Optimize func_ltwrapper_scriptname to assume a cwrapper.
+	* libltdl/config/ltmain.m4sh (func_ltwrapper_scriptname): Do not
+	call func_ltwrapper_executable_p again here, this function is
+	documented to allow being called with wrapper executables.
+
+	Fix bootstrap script to cope with changed AC_INIT arguments.
+	* bootstrap: When extracting PACKAGE and VERSION from AC_INIT
+	arguments, be sure to remove a 'GNU ' prefix and lowercase the
+	package name for PACKAGE.  Also set PACKAGE_NAME and PACKAGE_URL
+	appropriately for GNU software.  Pass these variables to the
+	make commands creating tests/package.m4 and other files.
+	* Makefile.am (edit): Fix substitution of PACKAGE_NAME and
+	PACKAGE_STRING.
+	* libltdl/config/announce-gen.m4sh: Use @PACKAGE@ not
+	@PACKAGE_STRING@.
+
 2010-06-15  Peter Rosin  <peda@lysator.liu.se>
 
 	On Windows, find potential libs regardless of file name case.
diff --git a/Makefile.am b/Makefile.am
index 1114e67..d0688ee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -127,8 +127,8 @@ edit = sed \
 	-e 's,@PACKAGE\@,$(PACKAGE),g' \
 	-e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \
 	-e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \
-	-e 's,@PACKAGE_NAME\@,$(PACKAGE),g' \
-	-e 's,@PACKAGE_STRING\@,$(PACKAGE) $(VERSION),g' \
+	-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
+	-e 's,@PACKAGE_STRING\@,$(PACKAGE_NAME) $(VERSION),g' \
 	-e 's,@PACKAGE_TARNAME\@,$(PACKAGE),g' \
 	-e 's,@PACKAGE_VERSION\@,$(VERSION),g' \
 	-e 's,@SED\@,$(SED),g' \
diff --git a/bootstrap b/bootstrap
index d505c36..81ed4b0 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,8 @@
 #! /bin/sh
 # bootstrap -- Helps bootstrapping libtool, when checked out from repository.
 #
-#   Copyright (C) 2003, 2004, 2005, 2006, 2009 Free Software Foundation, Inc,
+#   Copyright (C) 2003, 2004, 2005, 2006, 2009, 2010 Free Software
+#   Foundation, Inc,
 #   Mritten by Gary V. Vaughan, 2003
 #
 #   This file is part of GNU Libtool.
@@ -116,9 +117,18 @@ fi
 set dummy `$SED -n '
     /AC_INIT/{
 	s/[][,()]/ /g
+	s/ GNU / /
 	p
     }' configure.ac`
 shift
+PACKAGE=`echo "$2" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+PACKAGE_NAME=$2
+PACKAGE_URL=
+if grep 'AC_INIT.*GNU' configure.ac >/dev/null; then
+  PACKAGE_NAME="GNU $PACKAGE_NAME"
+  PACKAGE_URL="http://www.gnu.org/software/$PACKAGE/"
+fi
+VERSION=$3
 
 # Whip up a dirty Makefile:
 makes='Makefile.am libltdl/Makefile.inc'
@@ -135,13 +145,15 @@ rm -f $auxdir/ltmain.sh $m4dir/ltversion.m4
 $MAKE ./$auxdir/ltmain.sh ./$m4dir/ltversion.m4 \
     ./libtoolize.in ./tests/defs.in ./tests/package.m4 \
     ./tests/testsuite ./libltdl/Makefile.am ./doc/notes.txt \
-    srcdir=. top_srcdir=. PACKAGE="$2" VERSION="$3" \
-    PACKAGE_BUGREPORT="bug-$2@gnu.org" M4SH="$AUTOM4TE --language=m4sh" \
+    srcdir=. top_srcdir=. PACKAGE="$PACKAGE" VERSION="$VERSION" \
+    PACKAGE_NAME="$PACKAGE_NAME" PACKAGE_URL="$PACKAGE_URL" \
+    PACKAGE_BUGREPORT="bug-$PACKAGE@gnu.org" M4SH="$AUTOM4TE --language=m4sh" \
     AUTOTEST="$AUTOM4TE --language=autotest" SED="$SED" MAKEINFO="$MAKEINFO" \
     GREP="$GREP" FGREP="$FGREP" EGREP="$EGREP" LN_S="$LN_S"
 
 test -f clcommit.m4sh && $MAKE -f Makefile.maint ./commit \
-    srcdir=. top_srcdir=. PACKAGE="$2" VERSION="$3" M4SH="$AUTOM4TE -l m4sh" \
+    srcdir=. top_srcdir=. PACKAGE="$PACKAGE" VERSION="$VERSION" \
+    M4SH="$AUTOM4TE -l m4sh" \
     SED="$SED" GREP="$GREP" FGREP="$FGREP" EGREP="$EGREP" LN_S="$LN_S"
 
 rm -f Makefile
diff --git a/libltdl/config/announce-gen.m4sh b/libltdl/config/announce-gen.m4sh
index a528fef..38e6232 100644
--- a/libltdl/config/announce-gen.m4sh
+++ b/libltdl/config/announce-gen.m4sh
@@ -99,7 +99,7 @@ test -d "$top_srcdir" || top_srcdir='@top_srcdir@'
 
 # Initialisation:
 mailnotify_flags=
-package_name="@PACKAGE_NAME@"
+package_name="@PACKAGE@"
 sendmail_to=
 valid_release_types='alpha,beta,release-candidate,stable'
 
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 99784b4..acb6e25 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -516,12 +516,9 @@ func_ltwrapper_executable_p ()
 # temporary ltwrapper_script.
 func_ltwrapper_scriptname ()
 {
-    func_ltwrapper_scriptname_result=""
-    if func_ltwrapper_executable_p "$1"; then
-	func_dirname_and_basename "$1" "" "."
-	func_stripname '' '.exe' "$func_basename_result"
-	func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
-    fi
+    func_dirname_and_basename "$1" "" "."
+    func_stripname '' '.exe' "$func_basename_result"
+    func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
 }
 
 # func_ltwrapper_p file


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Sat Jun 19 04:40:53 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OPtbh-0006KY-AE
	for mharc-libtool-commit@gnu.org; Sat, 19 Jun 2010 04:40:53 -0400
Received: from [140.186.70.92] (port=38028 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OPtbd-0006J3-R8
	for libtool-commit@gnu.org; Sat, 19 Jun 2010 04:40:51 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OPtbZ-0008Cw-Jw
	for libtool-commit@gnu.org; Sat, 19 Jun 2010 04:40:49 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:53027
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OPtbZ-0008Cr-HG
	for libtool-commit@gnu.org; Sat, 19 Jun 2010 04:40:45 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OPtbZ-00086s-2E
	for libtool-commit@gnu.org; Sat, 19 Jun 2010 08:40:45 +0000
Received: from rwild by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OPtbP-00034N-W5
	for libtool-commit@gnu.org; Sat, 19 Jun 2010 08:40:44 +0000
From: "Ralf Wildenhues" <Ralf.Wildenhues@gmx.de>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4d3ac408c863b1110ce7782d44c80b24f24111f1
X-Git-Newrev: fdc9248662c9473ac68b6d4c430b26298215e7d6
Message-Id: <E1OPtbP-00034N-W5@vcs-noshell.in.savannah.gnu.org>
Date: Sat, 19 Jun 2010 08:40:36 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-23-gfdc9248
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Jun 2010 08:40:51 -0000

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  fdc9248662c9473ac68b6d4c430b26298215e7d6 (commit)
       via  64377ca9da7e0efec71e73d58b047de24fd27dd1 (commit)
      from  4d3ac408c863b1110ce7782d44c80b24f24111f1 (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 fdc9248662c9473ac68b6d4c430b26298215e7d6
Author: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date:   Wed Jun 9 20:09:37 2010 +0200

    Fix execute mode test for OSF/1 5.1.
    
    * tests/execute-mode.at (execute mode): Do not use grep -F
    with an empty pattern.
    * THANKS: Update.
    Report by Jay K.
    
    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

commit 64377ca9da7e0efec71e73d58b047de24fd27dd1
Author: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date:   Sat Jun 19 06:47:42 2010 +0200

    Use config.cache variable for PIC flag, to allow override.
    
    * libltdl/m4/libtool.m4 (_LT_COMPILER_PIC) <lt_prog_compiler_pic>:
    Save result, and allow override, through cache variable
    lt_cv_prog_compiler_pic{,_CXX,_F77,_FC}.  The cache variable
    needs to contain an eventual -DPIC.
    * doc/libtool.texi (): Document it.
    * tests/pic_flag.at (override pic_flag at configure time):
    New file, new test.
    * Makefile.am (TESTSUITE_AT): Update.
    * NEWS, THANKS: Update.
    Suggestion by Joakim Tjernlund and Paolo Bonzini.
    
    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

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

Summary of changes:
 ChangeLog             |   20 +++++++++++++++++++
 Makefile.am           |    1 +
 THANKS                |    2 +
 libltdl/m4/libtool.m4 |   11 ++++++---
 tests/execute-mode.at |   10 ++++----
 tests/pic_flag.at     |   51 +++++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 86 insertions(+), 9 deletions(-)
 create mode 100644 tests/pic_flag.at

diff --git a/ChangeLog b/ChangeLog
index a5676ef..d9ae546 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2010-06-19  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Fix execute mode test for OSF/1 5.1.
+	* tests/execute-mode.at (execute mode): Do not use grep -F
+	with an empty pattern.
+	* THANKS: Update.
+	Report by Jay K.
+
+	Use config.cache variable for PIC flag, to allow override.
+	* libltdl/m4/libtool.m4 (_LT_COMPILER_PIC) <lt_prog_compiler_pic>:
+	Save result, and allow override, through cache variable
+	lt_cv_prog_compiler_pic{,_CXX,_F77,_FC}.  The cache variable
+	needs to contain an eventual -DPIC.
+	* doc/libtool.texi (): Document it.
+	* tests/pic_flag.at (override pic_flag at configure time):
+	New file, new test.
+	* Makefile.am (TESTSUITE_AT): Update.
+	* NEWS, THANKS: Update.
+	Suggestion by Joakim Tjernlund and Paolo Bonzini.
+
 2010-06-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	Optimize func_ltwrapper_scriptname to assume a cwrapper.
diff --git a/Makefile.am b/Makefile.am
index d0688ee..5822428 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -509,6 +509,7 @@ TESTSUITE_AT	= tests/testsuite.at \
 		  tests/configure-iface.at \
 		  tests/stresstest.at \
 		  tests/cmdline_wrap.at \
+		  tests/pic_flag.at \
 		  tests/darwin.at \
 		  tests/deplibs-mingw.at
 
diff --git a/THANKS b/THANKS
index 8a866a4..405a4f7 100644
--- a/THANKS
+++ b/THANKS
@@ -106,9 +106,11 @@
   Jakub Bogusz			qboosh@pld-linux.org
   Jacob Meuser			jakemsr@jakemsr.com
   James Su			james.su@gmail.com
+  Jay K				jay.krell@cornell.edu
   Jeff Squyres			jsquyres@lam-mpi.org
   Jeremy C. Reed		reed@reedmedia.net
   Jim Meyering			jim@meyering.net
+  Joakim Tjernlund		joakim.tjernlund@transmode.se
   Joel N. Weber II		devnull@gnu.org
   Joerg Sonnenberger		joerg@netbsd.org
   John Bowler			jbowler@acm.org
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index a91bd61..b93dd0c 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -3587,7 +3587,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)=
 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 _LT_TAGVAR(lt_prog_compiler_static, $1)=
 
-AC_MSG_CHECKING([for $compiler option to produce PIC])
 m4_if([$1], [CXX], [
   # C++ specific cases for pic, static, wl, etc.
   if test "$GXX" = yes; then
@@ -4185,9 +4184,11 @@ case $host_os in
     _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
     ;;
 esac
-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
-	[How to pass a linker flag through the compiler])
+
+AC_CACHE_CHECK([for $compiler option to produce PIC],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
 
 #
 # Check to make sure the PIC flag actually works.
@@ -4206,6 +4207,8 @@ fi
 _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
 	[Additional compiler flags for building library objects])
 
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+	[How to pass a linker flag through the compiler])
 #
 # Check to make sure the static flag actually works.
 #
diff --git a/tests/execute-mode.at b/tests/execute-mode.at
index a1a1ee2..55f776c 100644
--- a/tests/execute-mode.at
+++ b/tests/execute-mode.at
@@ -1,6 +1,6 @@
 # execute-mode.at -- libtool --mode=execute             -*- Autotest -*-
 #
-#   Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+#   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 #   Written by Ralf Wildenhues, 2008
 #
 #   This file is part of GNU Libtool.
@@ -193,19 +193,19 @@ do
   fi
   AT_CHECK([$LIBTOOL --mode=execute ./foo abc "$arg1" "$arg2" xyz], [], [stdout], [ignore])
   AT_CHECK([$FGREP "$arg1" stdout], [], [ignore])
-  AT_CHECK([$FGREP "$arg2" stdout], [], [ignore])
+  AT_CHECK([test -z "$arg2" || $FGREP "$arg2" stdout], [], [ignore])
   AT_CHECK([test `sed -n '/^abc$/,/^xyz$/p' stdout | wc -l` -eq 4])
   AT_CHECK([$LIBTOOL --mode=execute ./lt-wrapper abc "$arg1" "$arg2" xyz </dev/null], [], [stdout])
   AT_CHECK([$FGREP "$arg1" stdout], [], [ignore])
-  AT_CHECK([$FGREP "$arg2" stdout], [], [ignore])
+  AT_CHECK([test -z "$arg2" || $FGREP "$arg2" stdout], [], [ignore])
   AT_CHECK([test `sed -n '/^abc$/,/^xyz$/p' stdout | wc -l` -eq 4])
   AT_CHECK([$LIBTOOL --mode=execute ./foo lt-wrapper abc "$arg1" "$arg2" xyz], [], [stdout])
   AT_CHECK([$FGREP "$arg1" stdout], [], [ignore])
-  AT_CHECK([$FGREP "$arg2" stdout], [], [ignore])
+  AT_CHECK([test -z "$arg2" || $FGREP "$arg2" stdout], [], [ignore])
   AT_CHECK([test `sed -n '/^abc$/,/^xyz$/p' stdout | wc -l` -eq 4])
   AT_CHECK([$LIBTOOL --mode=execute ./main$EXEEXT abc "$arg1" "$arg2" xyz], [], [stdout])
   AT_CHECK([$FGREP "$arg1" stdout], [], [ignore])
-  AT_CHECK([$FGREP "$arg2" stdout], [], [ignore])
+  AT_CHECK([test -z "$arg2" || $FGREP "$arg2" stdout], [], [ignore])
   # Do not match EOL here, cross setups may have an extra \r here.
   AT_CHECK([test `sed -n '/^abc/,/^xyz/p' stdout | wc -l` -eq 4])
   arg1=
diff --git a/tests/pic_flag.at b/tests/pic_flag.at
new file mode 100644
index 0000000..a729d16
--- /dev/null
+++ b/tests/pic_flag.at
@@ -0,0 +1,51 @@
+# pic_flag.at -- override the pic_flag at configure time   -*- Autotest -*-
+
+#   Copyright (C) 2010 Free Software Foundation, Inc.
+#
+#   This 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.
+#
+# GNU Libtool is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from  http://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.
+####
+
+AT_SETUP([override pic_flag at configure time])
+
+# Just try to configure the Libtool package with -fpic if we can compile
+# with it, for C and C++.
+
+AT_DATA([foo.c],
+[[int data = 42;
+int func(void) { return data; }
+]])
+
+cp foo.c foo.cpp
+C_pic_flag='-fpic -DPIC'
+AT_CHECK([$CC $CPPFLAGS $CFLAGS $C_pic_flag -c foo.c || exit 77],
+	 [], [ignore], [ignore])
+
+CXX_pic_flag='-fpic -DPIC'
+if $CXX $CPPFLAGS $CXXFLAGS $CXX_pic_flag -c foo.cpp; then :; else
+  CXX_pic_flag=
+fi
+
+AT_CHECK(["$abs_top_srcdir"/configure lt_cv_prog_compiler_pic="$C_pic_flag" ]dnl
+	 [lt_cv_prog_compiler_pic_CXX="$CXX_pic_flag"], [], [ignore], [ignore])
+: ${MAKE=make}
+AT_CHECK([$MAKE], [], [stdout], [ignore])
+AT_CHECK([if ./libtool --features | grep 'enable shared libraries'; then ]dnl
+	 [  grep -e -fpic stdout; else exit 77; fi], [], [ignore], [ignore])
+
+AT_CLEANUP


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Sat Jun 19 05:12:49 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OPu6a-0008Ta-Lu
	for mharc-libtool-commit@gnu.org; Sat, 19 Jun 2010 05:12:48 -0400
Received: from [140.186.70.92] (port=41429 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OPu6Y-0008SY-8F
	for libtool-commit@gnu.org; Sat, 19 Jun 2010 05:12:47 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OPu6W-0003l2-T4
	for libtool-commit@gnu.org; Sat, 19 Jun 2010 05:12:46 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:58860
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OPu6W-0003ku-QV
	for libtool-commit@gnu.org; Sat, 19 Jun 2010 05:12:44 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OPu6W-0008Th-5C
	for libtool-commit@gnu.org; Sat, 19 Jun 2010 09:12:44 +0000
Received: from rwild by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OPu6W-0005R1-3W
	for libtool-commit@gnu.org; Sat, 19 Jun 2010 09:12:44 +0000
From: "Ralf Wildenhues" <Ralf.Wildenhues@gmx.de>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: fdc9248662c9473ac68b6d4c430b26298215e7d6
X-Git-Newrev: c70a1b4593662c29f408dc63b324378d4cb250ba
Message-Id: <E1OPu6W-0005R1-3W@vcs-noshell.in.savannah.gnu.org>
Date: Sat, 19 Jun 2010 09:12:44 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-24-gc70a1b4
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Jun 2010 09:12:47 -0000

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  c70a1b4593662c29f408dc63b324378d4cb250ba (commit)
      from  fdc9248662c9473ac68b6d4c430b26298215e7d6 (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 c70a1b4593662c29f408dc63b324378d4cb250ba
Author: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date:   Sat Jun 19 10:54:35 2010 +0200

    Fixup botched ChangeLog entry, fix name added to THANKS.

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

Summary of changes:
 ChangeLog |    1 -
 THANKS    |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d9ae546..aa6a005 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,7 +11,6 @@
 	Save result, and allow override, through cache variable
 	lt_cv_prog_compiler_pic{,_CXX,_F77,_FC}.  The cache variable
 	needs to contain an eventual -DPIC.
-	* doc/libtool.texi (): Document it.
 	* tests/pic_flag.at (override pic_flag at configure time):
 	New file, new test.
 	* Makefile.am (TESTSUITE_AT): Update.
diff --git a/THANKS b/THANKS
index 405a4f7..ff3ab7d 100644
--- a/THANKS
+++ b/THANKS
@@ -106,7 +106,7 @@
   Jakub Bogusz			qboosh@pld-linux.org
   Jacob Meuser			jakemsr@jakemsr.com
   James Su			james.su@gmail.com
-  Jay K				jay.krell@cornell.edu
+  Jay Krell			jay.krell@cornell.edu
   Jeff Squyres			jsquyres@lam-mpi.org
   Jeremy C. Reed		reed@reedmedia.net
   Jim Meyering			jim@meyering.net


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Sat Jun 19 05:23:27 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OPuGt-0003Gb-B7
	for mharc-libtool-commit@gnu.org; Sat, 19 Jun 2010 05:23:27 -0400
Received: from [140.186.70.92] (port=48923 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OPuGq-0003Et-3B
	for libtool-commit@gnu.org; Sat, 19 Jun 2010 05:23:25 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OPuGo-0005Hf-Kg
	for libtool-commit@gnu.org; Sat, 19 Jun 2010 05:23:24 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:51196
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OPuGo-0005HY-JO
	for libtool-commit@gnu.org; Sat, 19 Jun 2010 05:23:22 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OPuGo-00008z-4U
	for libtool-commit@gnu.org; Sat, 19 Jun 2010 09:23:22 +0000
Received: from rwild by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OPuGo-0006Fo-2p
	for libtool-commit@gnu.org; Sat, 19 Jun 2010 09:23:22 +0000
From: "Ralf Wildenhues" <Ralf.Wildenhues@gmx.de>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c70a1b4593662c29f408dc63b324378d4cb250ba
X-Git-Newrev: 50ebc59ab27be1a836c7ebefec53ad2396351ea0
Message-Id: <E1OPuGo-0006Fo-2p@vcs-noshell.in.savannah.gnu.org>
Date: Sat, 19 Jun 2010 09:23:22 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-25-g50ebc59
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Jun 2010 09:23:25 -0000

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  50ebc59ab27be1a836c7ebefec53ad2396351ea0 (commit)
      from  c70a1b4593662c29f408dc63b324378d4cb250ba (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 50ebc59ab27be1a836c7ebefec53ad2396351ea0
Author: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date:   Sat Jun 19 11:22:18 2010 +0200

    Let the bootstrap script fail upon errors.
    
    * bootstrap: Enable errexit.
    
    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

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

Summary of changes:
 ChangeLog |    3 +++
 bootstrap |    3 +++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index aa6a005..324aa09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-06-19  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	Let the bootstrap script fail upon errors.
+	* bootstrap: Enable errexit.
+
 	Fix execute mode test for OSF/1 5.1.
 	* tests/execute-mode.at (execute mode): Do not use grep -F
 	with an empty pattern.
diff --git a/bootstrap b/bootstrap
index 81ed4b0..410c983 100755
--- a/bootstrap
+++ b/bootstrap
@@ -24,6 +24,9 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 ####
 
+# Exit upon failure.
+set -e
+
 # It is okay for the bootstrap process to require unreleased autoconf
 # or automake, as long as any released libtool will work with at least
 # the newest stable versions of each.  Generally, newer versions offer


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Sat Jun 19 10:41:30 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OPzEg-0002sd-Lu
	for mharc-libtool-commit@gnu.org; Sat, 19 Jun 2010 10:41:30 -0400
Received: from [140.186.70.92] (port=52398 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OPzEb-0002pQ-Ue
	for libtool-commit@gnu.org; Sat, 19 Jun 2010 10:41:28 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OPzEZ-00052J-NN
	for libtool-commit@gnu.org; Sat, 19 Jun 2010 10:41:25 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:60967
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OPzEZ-00052E-KQ
	for libtool-commit@gnu.org; Sat, 19 Jun 2010 10:41:23 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OPzEZ-0003zx-Bf
	for libtool-commit@gnu.org; Sat, 19 Jun 2010 14:41:23 +0000
Received: from rwild by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OPzEZ-0006pS-5s
	for libtool-commit@gnu.org; Sat, 19 Jun 2010 14:41:23 +0000
From: "Ralf Wildenhues" <Ralf.Wildenhues@gmx.de>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 50ebc59ab27be1a836c7ebefec53ad2396351ea0
X-Git-Newrev: 1f6f90797f1c461faecaae1928c5e728b71c35b5
Message-Id: <E1OPzEZ-0006pS-5s@vcs-noshell.in.savannah.gnu.org>
Date: Sat, 19 Jun 2010 14:41:23 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-26-g1f6f907
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Jun 2010 14:41:28 -0000

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  1f6f90797f1c461faecaae1928c5e728b71c35b5 (commit)
      from  50ebc59ab27be1a836c7ebefec53ad2396351ea0 (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 1f6f90797f1c461faecaae1928c5e728b71c35b5
Author: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date:   Sat Jun 19 16:40:51 2010 +0200

    Clean up @var handling in the manual.
    
    * doc/libtool.texi: Throughout the manual, replace @var with
    @samp or @code as appropriate, ensure the argument of remaining
    @var uses are lower-case.
    
    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

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

Summary of changes:
 ChangeLog        |    5 ++
 doc/libtool.texi |  144 +++++++++++++++++++++++++++---------------------------
 2 files changed, 77 insertions(+), 72 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 324aa09..a647279 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-06-19  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	Clean up @var handling in the manual.
+	* doc/libtool.texi: Throughout the manual, replace @var with
+	@samp or @code as appropriate, ensure the argument of remaining
+	@var uses are lower-case.
+
 	Let the bootstrap script fail upon errors.
 	* bootstrap: Enable errexit.
 
diff --git a/doc/libtool.texi b/doc/libtool.texi
index bf8534a..7ae2c66 100644
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -1609,7 +1609,7 @@ passes through commas unchanged.
 Pass a linker-specific flag directly to the linker.
 
 @item -XCClinker @var{flag}
-Pass a link-specific flag to the compiler driver (@var{CC}) during linking.
+Pass a link-specific flag to the compiler driver (@code{CC}) during linking.
 @end table
 
 If the @var{output-file} ends in @samp{.la}, then a libtool library is
@@ -1668,13 +1668,13 @@ The following components of @var{mode-args} are treated specially:
 @table @option
 @item -inst-prefix-dir @var{inst-prefix-dir}
 When installing into a temporary staging area, rather than the
-final @var{prefix}, this argument is used to reflect the
+final @code{prefix}, this argument is used to reflect the
 temporary path, in much the same way @command{automake} uses
-@var{DESTDIR}.  For instance, if @var{prefix} is @file{/usr/local},
+@env{DESTDIR}.  For instance, if @code{prefix} is @file{/usr/local},
 but @var{inst-prefix-dir} is @file{/tmp}, then the object will be
 installed under @file{/tmp/usr/local/}.  If the installed object
 is a libtool library, then the internal fields of that library
-will reflect only @var{prefix}, not @var{inst-prefix-dir}:
+will reflect only @code{prefix}, not @var{inst-prefix-dir}:
 
 @example
 # Directory that this library needs to be installed in:
@@ -1690,8 +1690,8 @@ libdir='/tmp/usr/local/lib'
 
 @code{inst-prefix} is also used to insure that if the installed
 object must be relinked upon installation, that it is relinked
-against the libraries in @var{inst-prefix-dir}/@var{prefix},
-not @var{prefix}.
+against the libraries in @var{inst-prefix-dir}/@code{prefix},
+not @code{prefix}.
 
 In truth, this option is not really intended for use when calling
 libtool directly; it is automatically used when @code{libtool --mode=install}
@@ -1923,10 +1923,10 @@ First, to link a program against a libtool library, just use the
 @c
 Since GNU Automake 1.5, the flags @option{-dlopen}
 or @option{-dlpreopen} (@pxref{Link mode}) can be employed with the
-@var{program_LDADD} variable.  Unfortunately, older releases didn't
+@samp{program_LDADD} variable.  Unfortunately, older releases didn't
 accept these flags, so if you are stuck with an ancient Automake, we
 recommend quoting the flag itself, and setting
-@var{program_DEPENDENCIES} too:
+@samp{program_DEPENDENCIES} too:
 
 @example
 program_LDADD = "-dlopen" libfoo.la
@@ -2007,7 +2007,7 @@ adds many new tests to the @code{configure} script so that the generated
 libtool script will understand the characteristics of the host.  It's the
 most important of a number of macros defined by Libtool:
 
-@defmac LT_PREREQ (@var{VERSION})
+@defmac LT_PREREQ (@var{version})
 Ensure that a recent enough version of Libtool is being used.  If the
 version of Libtool used for @code{LT_INIT} is earlier than
 @var{version}, print an error message to the standard
@@ -2018,7 +2018,7 @@ LT_PREREQ([@value{VERSION}])
 @end example
 @end defmac
 
-@defmac LT_INIT (@var{OPTIONS})
+@defmac LT_INIT (@var{options})
 @defmacx AC_PROG_LIBTOOL
 @defmacx AM_PROG_LIBTOOL
 Add support for the @option{--enable-shared} and @option{--disable-shared}
@@ -2065,8 +2065,8 @@ behaves similarly, but it uses @option{--enable-static} and
 The package name @samp{default} matches any packages that have not set
 their name in the @code{PACKAGE} environment variable.
 
-This macro also sets the shell variable @var{LIBTOOL_DEPS}, that you can
-use to automatically update the libtool script if it becomes
+This macro also sets the shell variable @code{LIBTOOL_DEPS}, that you
+can use to automatically update the libtool script if it becomes
 out-of-date.  In order to do that, add to your @file{configure.ac}:
 
 @example
@@ -2156,7 +2156,7 @@ specifying @option{--with-pic} to @command{configure}.
 
 @end defmac
 
-@defmac LT_LANG (@var{LANGUAGE})
+@defmac LT_LANG (@var{language})
 Enable @command{libtool} support for the language given if it
 has not yet already been enabled.  Languages accepted are ``C++'',
 ``Fortran 77'', ``Java'' and ``Windows Resource''.
@@ -2260,7 +2260,7 @@ runs tests, not the produced @code{libtool}.
 @defvar LD
 The system linker to use (if the generated @code{libtool} requires one).
 If this is not set, @code{LT_INIT} will try to find out what is
-the linker used by @var{CC}.
+the linker used by @code{CC}.
 @end defvar
 
 @defvar LDFLAGS
@@ -2456,8 +2456,8 @@ overwrite existing files.
 @item --help
 Display a help message and exit.
 
-@item --ltdl [@var{TARGET-DIRECTORY-NAME}]
-Install libltdl in the @var{TARGET-DIRECTORY-NAME} subdirectory of
+@item --ltdl [@var{target-directory-name}]
+Install libltdl in the @var{target-directory-name} subdirectory of
 your package.  Normally, the directory is extracted from the argument
 to @code{LT_CONFIG_LTDL_DIR} in @file{configure.ac}, though you can
 also specify a subdirectory name here if you are not using Autoconf
@@ -3396,7 +3396,7 @@ generic pointer to the appropriate object, such as @code{&fprintf}.
 @end deftp
 
 @deftypevar {const lt_dlsymlist } lt_preloaded_symbols[]
-An array of @var{lt_dlsymlist} structures, representing all the preloaded
+An array of @code{lt_dlsymlist} structures, representing all the preloaded
 symbols linked into the program proper.  For each module
 @option{-dlpreopen}ed by the Libtool linked program
 there is an element with the @var{name} of the module and an @var{address}
@@ -3414,7 +3414,7 @@ Some compilers may allow identifiers that are not valid in ANSI C, such
 as dollar signs.  Libtool only recognizes valid ANSI C symbols (an
 initial ASCII letter or underscore, followed by zero or more ASCII
 letters, digits, and underscores), so non-ANSI symbols will not appear
-in @var{lt_preloaded_symbols}.
+in @code{lt_preloaded_symbols}.
 
 @deftypefun int lt_dlpreload (const lt_dlsymlist *@var{preloaded})
 Register the list of preloaded modules @var{preloaded}.
@@ -3840,11 +3840,11 @@ functions @code{lt_dlsetsearchpath}, @code{lt_dladdsearchdir} and
 
 @item libltdl's search path:
 This search path is the value of the environment variable
-@var{LTDL_LIBRARY_PATH}.
+@env{LTDL_LIBRARY_PATH}.
 
 @item system library search path:
 The system dependent library search path
-(e.g.@: on Linux it is @var{LD_LIBRARY_PATH}).
+(e.g.@: on Linux it is @env{LD_LIBRARY_PATH}).
 @end enumerate
 
 Each search path must be a list of absolute directories separated by
@@ -4516,14 +4516,14 @@ if (lt_dlloader_add (lt_dlloader_find ("dlopen"), myloader) != 0)
 @end deftypefun
 
 @deftypefun {const char *}lt_dlloader_name (@w{lt_dlloader *@var{place}})
-Return the identifying name of @var{PLACE}, as obtained from
+Return the identifying name of @var{place}, as obtained from
 @code{lt_dlloader_next} or @code{lt_dlloader_find}.  If this function fails,
 it will return @code{NULL} and set an error for retrieval with
 @code{lt_dlerror}.
 @end deftypefun
 
 @deftypefun {lt_user_data *}lt_dlloader_data (@w{lt_dlloader *@var{place}})
-Return the address of the @code{dlloader_data} of @var{PLACE}, as
+Return the address of the @code{dlloader_data} of @var{place}, as
 obtained from @code{lt_dlloader_next} or @code{lt_dlloader_find}.  If
 this function fails, it will return @code{NULL} and set an error for
 retrieval with @code{lt_dlerror}.
@@ -4595,8 +4595,8 @@ or against both a local convenience library and an installed libltdl
 is bad.  Ensuring that only one copy of the libltdl sources are linked
 into any program is left as an exercise for the reader.
 
-@defmac LT_CONFIG_LTDL_DIR (@var{DIRECTORY})
-Declare @var{DIRECTORY} to be the location of the @code{libltdl}
+@defmac LT_CONFIG_LTDL_DIR (@var{directory})
+Declare @var{directory} to be the location of the @code{libltdl}
 source files, for @command{libtoolize --ltdl} to place
 them. @xref{Invoking libtoolize}, for more details.  Provided that you
 add an appropriate @code{LT_CONFIG_LTDL_DIR} call in your
@@ -4604,7 +4604,7 @@ add an appropriate @code{LT_CONFIG_LTDL_DIR} call in your
 appropriate @code{libltdl} files will be installed automatically.
 @end defmac
 
-@defmac LTDL_INIT (@var{OPTIONS})
+@defmac LTDL_INIT (@var{options})
 @defmacx LT_WITH_LTDL
 @defmacx AC_WITH_LTDL
 @code{AC_WITH_LTDL} and @code{LT_WITH_LTDL} are deprecated names for
@@ -4615,14 +4615,14 @@ This macro adds the following options to the @command{configure}
 script:
 
 @table @option
-@item --with-ltdl-include @var{INSTALLED-LTDL-HEADER-DIR}
+@item --with-ltdl-include @var{installed-ltdl-header-dir}
 The @code{LTDL_INIT} macro will look in the standard header file
 locations to find the installed @code{libltdl} headers.  If
 @code{LTDL_INIT} can't find them by itself, the person who builds
 your package can use this option to tell @command{configure} where
 the installed @code{libltdl} headers are.
 
-@item --with-ltdl-lib @var{INSTALLED-LTDL-LIBRARY-DIR}
+@item --with-ltdl-lib @var{installed-ltdl-library-dir}
 Similarly, the person building your package can use this option to
 help @command{configure} find the installed @file{libltdl.la}.
 
@@ -4674,7 +4674,7 @@ if test "x$with_included_ltdl" != "xyes"; then
 fi
 @end example
 
-@var{OPTIONS} may include no more than one of the following build
+@var{options} may include no more than one of the following build
 modes depending on how you want your project to build @code{libltdl}:
 @samp{nonrecursive}, @samp{recursive}, or @samp{subproject}.  In order
 for @command{libtoolize} to detect this option correctly, if you
@@ -4828,10 +4828,10 @@ installed to the same directory if you use this option.
 @end defmac
 
 Whatever method you use, @samp{LTDL_INIT} will define the shell variable
-@var{LIBLTDL} to the link flag that you should use to link with
-@code{libltdl}, the shell variable @var{LTDLDEPS} to the files that
+@code{LIBLTDL} to the link flag that you should use to link with
+@code{libltdl}, the shell variable @code{LTDLDEPS} to the files that
 can be used as a dependency in @file{Makefile} rules, and the shell
-variable @var{LTDLINCL} to the preprocessor flag that you should use to
+variable @code{LTDLINCL} to the preprocessor flag that you should use to
 compile programs that include @file{ltdl.h}. So, when you want to link a
 program with libltdl, be it a convenience, installed or installable
 library, just use @samp{$(LTDLINCL)} for preprocessing and compilation,
@@ -4840,24 +4840,24 @@ and @samp{$(LIBLTDL)} for linking.
 @itemize @bullet
 @item
 If your package is built using an installed version of @code{libltdl},
-@var{LIBLTDL} will be set to the compiler flags needed to link against
-the installed library, @var{LTDLDEPS} will be empty, and @var{LTDLINCL}
+@code{LIBLTDL} will be set to the compiler flags needed to link against
+the installed library, @code{LTDLDEPS} will be empty, and @code{LTDLINCL}
 will be set to the compiler flags needed to find the @code{libltdl}
 header files.
 
 @item
-If your package is built using the convenience libltdl, @var{LIBLTDL}
-and @var{LTDLDEPS} will be the pathname for the convenience version of
+If your package is built using the convenience libltdl, @code{LIBLTDL}
+and @code{LTDLDEPS} will be the pathname for the convenience version of
 libltdl (starting with @samp{$@{top_builddir@}/} or
-@samp{$@{top_build_prefix@}}) and @var{LTDLINCL} will be @option{-I}
+@samp{$@{top_build_prefix@}}) and @code{LTDLINCL} will be @option{-I}
 followed by the directory that contains @file{ltdl.h} (starting with
 @samp{$@{top_srcdir@}/}).
 
 @item
 If an installable version of the included @code{libltdl} is being
 built, its pathname starting with @samp{$@{top_builddir@}/} or
-@samp{$@{top_build_prefix@}}, will be stored in @var{LIBLTDL} and
-@var{LTDLDEPS}, and @var{LTDLINCL} will be set just like in the case of
+@samp{$@{top_build_prefix@}}, will be stored in @code{LIBLTDL} and
+@code{LTDLDEPS}, and @code{LTDLINCL} will be set just like in the case of
 convenience library.
 @end itemize
 
@@ -5113,8 +5113,8 @@ correspond to libtool's own notion of how your linker behaves.
 @itemx depdemo-relink.test
 @pindex demo-relink.test
 @pindex depdemo-relink.test
-These tests check whether variable @var{shlibpath_overrides_runpath} is
-properly set.  If the test fails and @var{VERBOSE} is set, it will
+These tests check whether variable @code{shlibpath_overrides_runpath} is
+properly set.  If the test fails and @env{VERBOSE} is set, it will
 indicate what the variable should have been set to.
 
 @item demo-noinst-link.test
@@ -5236,7 +5236,7 @@ These programs check to see that the @file{tests/pdemo} subdirectory of
 the libtool distribution can be configured, built, and executed
 correctly.
 
-The @file{pdemo-conf.test} lowers the @var{max_cmd_len} variable in the
+The @file{pdemo-conf.test} lowers the @code{max_cmd_len} variable in the
 generated libtool script to test the measures to evade command line
 length limitations.
 
@@ -5401,7 +5401,7 @@ a normal program.  When the test is invoked in this way, it produces
 output that may be useful in determining what the problem is.
 
 Another way to have the test programs produce output is to set the
-@var{VERBOSE} environment variable to @samp{yes} before running them.
+@env{VERBOSE} environment variable to @samp{yes} before running them.
 For example, @kbd{env VERBOSE=yes make check} runs all the tests, and
 has each of them display debugging information.
 
@@ -5410,7 +5410,7 @@ The new, Autotest-based test suite produces as output a file
 tests.
 
 You can pass options to the test suite through the @command{make}
-variable @var{TESTSUITEFLAGS} (@pxref{testsuite Invocation, ,
+variable @env{TESTSUITEFLAGS} (@pxref{testsuite Invocation, ,
 The Autoconf Manual, autoconf, The Autoconf Manual}).
 
 
@@ -5559,7 +5559,7 @@ writes libtool makes sure @samp{$deplibs} is included in
 looks in the library link path for libraries that have the right
 libname.  Then it runs @samp{$file_magic_cmd} on the library and checks
 for a match against the extended regular expression @var{regex}.  When
-@var{file_magic_test_file} is set by @file{libtool.m4}, it is used as an
+@code{file_magic_test_file} is set by @file{libtool.m4}, it is used as an
 argument to @samp{$file_magic_cmd} in order to verify whether the
 regular expression matches its output, and warn the user otherwise.
 
@@ -5859,7 +5859,7 @@ aren't defined in that library.
 
 @defvar always_export_symbols
 Whether libtool should automatically generate a list of exported symbols
-using @var{export_symbols_cmds} before linking an archive.
+using @code{export_symbols_cmds} before linking an archive.
 Set to @samp{yes} or @samp{no}.  Default is @samp{no}.
 @end defvar
 
@@ -5881,11 +5881,11 @@ not used.
 If a static library must be created from the export symbol list in order to
 correctly link with a shared library, @samp{old_archive_from_expsyms_cmds}
 contains the commands needed to create that static library.  When these
-commands are executed, the variable @var{soname} contains the name of the
-shared library in question, and the @var{$objdir/$newlib} contains the
+commands are executed, the variable @code{soname} contains the name of the
+shared library in question, and the @samp{$objdir/$newlib} contains the
 path of the static library these commands should build.  After executing
-these commands, libtool will proceed to link against @var{$objdir/$newlib}
-instead of @var{soname}.
+these commands, libtool will proceed to link against @samp{$objdir/$newlib}
+instead of @code{soname}.
 @end defvar
 
 @defvar lock_old_archive_extraction
@@ -5948,13 +5948,13 @@ symbols that are defined in the program.
 @end defvar
 
 @defvar export_symbols_cmds
-Commands to extract exported symbols from @var{libobjs} to the
-file @var{export_symbols}.
+Commands to extract exported symbols from @code{libobjs} to the
+file @code{export_symbols}.
 @end defvar
 
 @defvar extract_expsyms_cmds
 Commands to extract the exported symbols list from a shared library.
-These commands are executed if there is no file @var{$objdir/$soname-def},
+These commands are executed if there is no file @samp{$objdir/$soname-def},
 and should write the names of the exported symbols to that file, for
 the use of @samp{old_archive_from_expsyms_cmds}.
 @end defvar
@@ -5963,9 +5963,9 @@ the use of @samp{old_archive_from_expsyms_cmds}.
 Determines whether libtool will privilege the installer or the
 developer.  The assumption is that installers will seldom run programs
 in the build tree, and the developer will seldom install.  This is only
-meaningful on platforms where @var{shlibpath_overrides_runpath} is
-not @samp{yes}, so @var{fast_install} will be set to @samp{needless} in
-this case.  If @var{fast_install} set to @samp{yes}, libtool will create
+meaningful on platforms where @code{shlibpath_overrides_runpath} is
+not @samp{yes}, so @code{fast_install} will be set to @samp{needless} in
+this case.  If @code{fast_install} set to @samp{yes}, libtool will create
 programs that search for installed libraries, and, if a program is run
 in the build tree, a new copy will be linked on-demand to use the
 yet-to-be-installed libraries.  If set to @samp{no}, libtool will create
@@ -5976,8 +5976,8 @@ flags, and it can be turned from @samp{yes} to @samp{no} with the
 configure flag @option{--disable-fast-install}.
 
 On some systems, the linker always hardcodes paths to dependent libraries
-into the output.  In this case, @var{fast_install} is never set to @samp{yes},
-and relinking at install time is triggered.  This also means that @var{DESTDIR}
+into the output.  In this case, @code{fast_install} is never set to @samp{yes},
+and relinking at install time is triggered.  This also means that @env{DESTDIR}
 installation does not work as expected.
 @end defvar
 
@@ -5997,7 +5997,7 @@ specific directory.
 @end defvar
 
 @defvar finish_eval
-Same as @var{finish_cmds}, except the commands are not displayed.
+Same as @code{finish_cmds}, except the commands are not displayed.
 @end defvar
 
 @defvar fix_srcfile_path
@@ -6005,7 +6005,7 @@ Expression to fix the shell variable @samp{$srcfile} for the compiler.
 @end defvar
 
 @defvar global_symbol_pipe
-A pipeline that takes the output of @var{NM}, and produces a listing of
+A pipeline that takes the output of @code{NM}, and produces a listing of
 raw symbols followed by their C names.  For example:
 
 @example
@@ -6022,7 +6022,7 @@ but its meaning is system dependent.
 @end defvar
 
 @defvar global_symbol_to_cdecl
-A pipeline that translates the output of @var{global_symbol_pipe} into
+A pipeline that translates the output of @code{global_symbol_pipe} into
 proper C declarations.  Since some platforms, such as HP/UX, have
 linkers that differentiate code from data, data symbols are declared
 as data, and code symbols are declared as functions.
@@ -6038,13 +6038,13 @@ or if they need to be relinked.
 Set to @samp{yes} or @samp{no}, depending on whether the linker
 hardcodes directories if a library is directly specified on the command
 line (such as @samp{@var{dir}/lib@var{name}.a}) when
-@var{hardcode_libdir_flag_spec} is specified.
+@code{hardcode_libdir_flag_spec} is specified.
 @end defvar
 
 @defvar hardcode_direct_absolute
 Some architectures hardcode "absolute" library directories that can not
-be overridden by @var{shlibpath_var} when @var{hardcode_direct} is
-@samp{yes}.  In that case set @var{hardcode_direct_absolute} to
+be overridden by @code{shlibpath_var} when @code{hardcode_direct} is
+@samp{yes}.  In that case set @code{hardcode_direct_absolute} to
 @samp{yes}, or otherwise @samp{no}.
 @end defvar
 
@@ -6055,13 +6055,13 @@ need to be relinked during installation.  Set to @samp{yes} or @samp{no}.
 @end defvar
 
 @defvar hardcode_libdir_flag_spec
-Flag to hardcode a @var{libdir} variable into a binary, so that the
-dynamic linker searches @var{libdir} for shared libraries at runtime.
+Flag to hardcode a @code{libdir} variable into a binary, so that the
+dynamic linker searches @code{libdir} for shared libraries at runtime.
 If it is empty, libtool will try to use some other hardcoding mechanism.
 @end defvar
 
 @defvar hardcode_libdir_separator
-If the compiler only accepts a single @var{hardcode_libdir_flag}, then
+If the compiler only accepts a single @code{hardcode_libdir_flag}, then
 this variable contains the string that should separate multiple
 arguments to that flag.
 @end defvar
@@ -6069,13 +6069,13 @@ arguments to that flag.
 @defvar hardcode_minus_L
 Set to @samp{yes} or @samp{no}, depending on whether the linker
 hardcodes directories specified by @option{-L} flags into the resulting
-executable when @var{hardcode_libdir_flag_spec} is specified.
+executable when @code{hardcode_libdir_flag_spec} is specified.
 @end defvar
 
 @defvar hardcode_shlibpath_var
 Set to @samp{yes} or @samp{no}, depending on whether the linker
 hardcodes directories by writing the contents of @samp{$shlibpath_var}
-into the resulting executable when @var{hardcode_libdir_flag_spec} is
+into the resulting executable when @code{hardcode_libdir_flag_spec} is
 specified.  Set to @samp{unsupported} if directories specified by
 @samp{$shlibpath_var} are searched at run time, but not at link time.
 @end defvar
@@ -6088,7 +6088,7 @@ configured for.
 @end defvar
 
 @defvar include_expsyms
-List of symbols that must always be exported when using @var{export_symbols}.
+List of symbols that must always be exported when using @code{export_symbols}.
 @end defvar
 
 @defvar inherit_rpath
@@ -6245,7 +6245,7 @@ that appear in this list are never hard-coded into executables.
 Expression to get the compile-time system library search path.  This
 variable is used by libtool when it has to test whether a certain
 library is shared or static.  The directories listed in
-@var{shlibpath_var} are automatically appended to this list, every time
+@code{shlibpath_var} are automatically appended to this list, every time
 libtool runs (i.e., not at configuration time), because some linkers use
 this variable to extend the library search path.  Linker switches such
 as @option{-L} also augment the search path.
@@ -6303,13 +6303,13 @@ than having to trust second-hand observation.
 @item
 Rather than reconfiguring libtool every time I make a change to
 @code{ltmain.in}, I keep a permanent @code{libtool} script in my
-@var{PATH}, which sources @code{ltmain.in} directly.
+@env{PATH}, which sources @code{ltmain.in} directly.
 
 The following steps describe how to create such a script, where
 @code{/home/src/libtool} is the directory containing the libtool source
 tree, @code{/home/src/libtool/libtool} is a libtool script that has been
 configured for your platform, and @code{~/bin} is a directory in your
-@var{PATH}:
+@env{PATH}:
 
 @example
 trick$ cd ~/bin


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Sat Jun 19 11:10:26 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OPzgg-0004JI-4I
	for mharc-libtool-commit@gnu.org; Sat, 19 Jun 2010 11:10:26 -0400
Received: from [140.186.70.92] (port=36106 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OPzgd-0004IO-3B
	for libtool-commit@gnu.org; Sat, 19 Jun 2010 11:10:24 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OPzgb-0000M2-J3
	for libtool-commit@gnu.org; Sat, 19 Jun 2010 11:10:22 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:39988
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OPzgb-0000Lx-HY
	for libtool-commit@gnu.org; Sat, 19 Jun 2010 11:10:21 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OPzga-0004MD-Pb
	for libtool-commit@gnu.org; Sat, 19 Jun 2010 15:10:21 +0000
Received: from rwild by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OPzgZ-0000c9-Ta
	for libtool-commit@gnu.org; Sat, 19 Jun 2010 15:10:20 +0000
From: "Ralf Wildenhues" <Ralf.Wildenhues@gmx.de>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 1f6f90797f1c461faecaae1928c5e728b71c35b5
X-Git-Newrev: 80333a915ca8aafa980e4d284ad9bf2d85c8b59f
Message-Id: <E1OPzgZ-0000c9-Ta@vcs-noshell.in.savannah.gnu.org>
Date: Sat, 19 Jun 2010 15:10:20 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-27-g80333a9
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Jun 2010 15:10:24 -0000

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  80333a915ca8aafa980e4d284ad9bf2d85c8b59f (commit)
      from  1f6f90797f1c461faecaae1928c5e728b71c35b5 (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 80333a915ca8aafa980e4d284ad9bf2d85c8b59f
Author: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date:   Sat Jun 19 17:06:33 2010 +0200

    Fix srcdir computation for manual runs of old tests.
    
    * tests/defs.m4sh: Strip trailing `/tests' from srcdir, to allow
    `$srcdir/tests/FOO.test' to be run from the top build directory.
    
    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

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

Summary of changes:
 ChangeLog       |    4 ++++
 tests/defs.m4sh |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a647279..ae37906 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-06-19  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	Fix srcdir computation for manual runs of old tests.
+	* tests/defs.m4sh: Strip trailing `/tests' from srcdir, to allow
+	`$srcdir/tests/FOO.test' to be run from the top build directory.
+
 	Clean up @var handling in the manual.
 	* doc/libtool.texi: Throughout the manual, replace @var with
 	@samp or @code as appropriate, ensure the argument of remaining
diff --git a/tests/defs.m4sh b/tests/defs.m4sh
index 58296da..1230555 100644
--- a/tests/defs.m4sh
+++ b/tests/defs.m4sh
@@ -2,7 +2,7 @@ AS_INIT[]m4_divert_push([HEADER-COPYRIGHT])dnl
 # @configure_input@
 # defs -- Defines for Libtool testing environment.
 #
-#   Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009 Free Software
+#   Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009, 2010 Free Software
 #   Foundation, Inc.
 #   Written by Gord Matzigkeit, 1996
 #   Rewritten by Gary V. Vaughan, 2003
@@ -59,7 +59,7 @@ DEBUG | debug )
 esac
 
 if test -z "$srcdir"; then
-  srcdir=`$ECHO "$0" | $SED "$dirname"`
+  srcdir=`$ECHO "$0" | $SED "$dirname; s,/tests\$,,"`
   test "$srcdir" = "$0" && srcdir=.
 fi
 


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Sat Jun 19 17:50:19 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OQ5ve-0004Tr-W5
	for mharc-libtool-commit@gnu.org; Sat, 19 Jun 2010 17:50:19 -0400
Received: from [140.186.70.92] (port=47602 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OQ5vb-0004Tl-Ss
	for libtool-commit@gnu.org; Sat, 19 Jun 2010 17:50:17 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OQ5vY-0000BY-VN
	for libtool-commit@gnu.org; Sat, 19 Jun 2010 17:50:15 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:53980
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OQ5vY-0000BS-SZ
	for libtool-commit@gnu.org; Sat, 19 Jun 2010 17:50:12 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OQ5vY-0000gV-B3
	for libtool-commit@gnu.org; Sat, 19 Jun 2010 21:50:12 +0000
Received: from cwilson by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <INVALID.NOREPLY@gnu.org>) id 1OQ5vY-00010l-7J
	for libtool-commit@gnu.org; Sat, 19 Jun 2010 21:50:12 +0000
From: "Charles Wilson" <libtool@cwilson.fastmail.fm>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 80333a915ca8aafa980e4d284ad9bf2d85c8b59f
X-Git-Newrev: c4901206cff33e5e1eae76684a9d8f416df29af5
Message-Id: <E1OQ5vY-00010l-7J@vcs-noshell.in.savannah.gnu.org>
Date: Sat, 19 Jun 2010 21:50:12 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-28-gc490120
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Jun 2010 21:50:18 -0000

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  c4901206cff33e5e1eae76684a9d8f416df29af5 (commit)
      from  80333a915ca8aafa980e4d284ad9bf2d85c8b59f (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 c4901206cff33e5e1eae76684a9d8f416df29af5
Author: Charles Wilson <libtool@cwilson.fastmail.fm>
Date:   Sat Jun 19 16:29:45 2010 -0400

    [cygwin] Fix segfault in C++ exception handling test
    
    * tests/exceptions.at (main.cpp:exceptions_in_module):
    Move dlclose outside catch block; otherwise __cxa_end_catch
    (part of the cygwin g++ ABI) accesses pointers to data inside
    unloaded DLL. This is a platform ABI-specific bug, but is
    likely common to many platforms' g++ and/or other C++
    compilers.
    
    Signed-off-by: Charles Wilson <libtool@cwilson.fastmail.fm>

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

Summary of changes:
 ChangeLog           |   10 ++++++++++
 tests/exceptions.at |    6 ++++++
 2 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ae37906..17a1406 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-06-19  Charles Wilson  <libtool@cwilson.fastmail.fm>
+
+	[cygwin] Fix segfault in C++ exception handling test
+	* tests/exceptions.at (main.cpp:exceptions_in_module):
+	Move dlclose outside catch block; otherwise __cxa_end_catch
+	(part of the cygwin g++ ABI) accesses pointers to data inside
+	unloaded DLL. This is a platform ABI-specific bug, but is
+	likely common to many platforms' g++ and/or other C++
+	compilers.
+
 2010-06-19  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	Fix srcdir computation for manual runs of old tests.
diff --git a/tests/exceptions.at b/tests/exceptions.at
index 293723c..23442a3 100644
--- a/tests/exceptions.at
+++ b/tests/exceptions.at
@@ -202,11 +202,17 @@ int exceptions_in_module (void)
       return 1;
     }
 
+  bool exception_caught = false;
   try {
     (*pf) ();
   }
   catch (modexc e) {
     std::cerr << "caught: " << e.what () << '\n';
+    exception_caught = true;
+  }
+
+  if (exception_caught)
+  {
     if (lt_dlclose (handle))
       {
         std::cerr << "dlclose failed: " << lt_dlerror () << '\n';


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Sun Jun 20 13:19:35 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OQOBD-0001UC-98
	for mharc-libtool-commit@gnu.org; Sun, 20 Jun 2010 13:19:35 -0400
Received: from [140.186.70.92] (port=41944 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OQOBA-0001Td-2q
	for libtool-commit@gnu.org; Sun, 20 Jun 2010 13:19:33 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OQOB8-0007gH-LO
	for libtool-commit@gnu.org; Sun, 20 Jun 2010 13:19:32 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:36754
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OQOB8-0007gC-I7
	for libtool-commit@gnu.org; Sun, 20 Jun 2010 13:19:30 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OQOB8-0006AA-G3
	for libtool-commit@gnu.org; Sun, 20 Jun 2010 17:19:30 +0000
Received: from rwild by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OQOB8-0003e1-6b
	for libtool-commit@gnu.org; Sun, 20 Jun 2010 17:19:30 +0000
From: "Ralf Wildenhues" <Ralf.Wildenhues@gmx.de>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c4901206cff33e5e1eae76684a9d8f416df29af5
X-Git-Newrev: ef76a2349741c5793da74e7cd7aba4216af01dbc
Message-Id: <E1OQOB8-0003e1-6b@vcs-noshell.in.savannah.gnu.org>
Date: Sun, 20 Jun 2010 17:19:30 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-31-gef76a23
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 20 Jun 2010 17:19:33 -0000

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  ef76a2349741c5793da74e7cd7aba4216af01dbc (commit)
       via  8a80206ac01d87696c61e2403aef85fc28da8c91 (commit)
       via  61aac6f3f414b11e624aa5e2fd2acebdd9677122 (commit)
      from  c4901206cff33e5e1eae76684a9d8f416df29af5 (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 ef76a2349741c5793da74e7cd7aba4216af01dbc
Author: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date:   Sat Jun 19 23:59:45 2010 +0200

    Fix clean mode for HP-UX 11.31 sh.
    
    * libltdl/config/ltmain.m4sh (func_mode_uninstall): Do not try
    to match a null string in a case pattern, even with surrounding
    spaces.  Fixes `lt_dlopenadvise library loading' test.
    
    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

commit 8a80206ac01d87696c61e2403aef85fc28da8c91
Author: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date:   Sun Jun 20 19:10:38 2010 +0200

    Add comment for exception handling module unloading issue.
    
    * tests/exceptions.at (C++ exception handling): Add comment
    for last patch.
    
    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

commit 61aac6f3f414b11e624aa5e2fd2acebdd9677122
Author: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date:   Sat Jun 19 21:07:50 2010 +0200

    Fix flags test failure when ld is used as linker.
    
    * tests/flags.at (passing CC flags through libtool): When $LD
    is used for linking libraries, ensure flags passed with `-Wc,'
    are not passed through to $LD, but flags passed with `-Wl,' use
    $wl when linking programs.  Fixed testsuite failure on HP-UX
    10.20.
    
    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

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

Summary of changes:
 ChangeLog                  |   18 ++++++++++++++++++
 libltdl/config/ltmain.m4sh |    5 ++---
 tests/exceptions.at        |    1 +
 tests/flags.at             |   25 +++++++++++++++++++------
 4 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 17a1406..9bc84c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2010-06-20  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Fix clean mode for HP-UX 11.31 sh.
+	* libltdl/config/ltmain.m4sh (func_mode_uninstall): Do not try
+	to match a null string in a case pattern, even with surrounding
+	spaces.  Fixes `lt_dlopenadvise library loading' test.
+
+	Add comment for exception handling module unloading issue.
+	* tests/exceptions.at (C++ exception handling): Add comment
+	for last patch.
+
+	Fix flags test failure when ld is used as linker.
+	* tests/flags.at (passing CC flags through libtool): When $LD
+	is used for linking libraries, ensure flags passed with `-Wc,'
+	are not passed through to $LD, but flags passed with `-Wl,' use
+	$wl when linking programs.  Fixed testsuite failure on HP-UX
+	10.20.
+
 2010-06-19  Charles Wilson  <libtool@cwilson.fastmail.fm>
 
 	[cygwin] Fix segfault in C++ exception handling test
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index acb6e25..a325e27 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -8018,10 +8018,9 @@ func_mode_uninstall ()
 
 	  case "$mode" in
 	  clean)
-	    case "  $library_names " in
-	    # "  " in the beginning catches empty $dlname
+	    case " $library_names " in
 	    *" $dlname "*) ;;
-	    *) rmfiles="$rmfiles $odir/$dlname" ;;
+	    *) test -n "$dlname" && rmfiles="$rmfiles $odir/$dlname" ;;
 	    esac
 	    test -n "$libdir" && rmfiles="$rmfiles $odir/$name $odir/${name}i"
 	    ;;
diff --git a/tests/exceptions.at b/tests/exceptions.at
index 23442a3..aaebd0f 100644
--- a/tests/exceptions.at
+++ b/tests/exceptions.at
@@ -211,6 +211,7 @@ int exceptions_in_module (void)
     exception_caught = true;
   }
 
+  /* Only close the module after all of its objects have gone out of scope. */
   if (exception_caught)
   {
     if (lt_dlclose (handle))
diff --git a/tests/flags.at b/tests/flags.at
index 7f600be..f865757 100644
--- a/tests/flags.at
+++ b/tests/flags.at
@@ -73,8 +73,8 @@ AT_CHECK([$LIBTOOL --tag=lt_tag --mode=compile $compile -c $source],
 # Linker flags are prefixed with ${wl} iff they are passed to the
 # compiler driver, instead of directly to the linker.
 case $archive_cmds in
-*\$LD*\$linker_flags*) maybe_wl= ;;
-*) maybe_wl=$wl ;;
+*\$LD*\$linker_flags*) maybe_wl= compiler_flags_in_liblink=false ;;
+*) maybe_wl=$wl compiler_flags_in_liblink=: ;;
 esac
 
 for flag in -Wc, -Wl, '-Xcompiler ' '-Xlinker '; do
@@ -83,19 +83,32 @@ for flag in -Wc, -Wl, '-Xcompiler ' '-Xlinker '; do
     AT_CHECK([$LIBTOOL -n --tag=lt_tag --mode=compile $compile ]dnl
 	     [$flag-foo -c $source], [], [stdout], [ignore])
     AT_CHECK([$FGREP " -foo" stdout], [], [ignore])
-    flag_prefix=
+    flag_prefix_prog=
+    flag_prefix_lib=
+    flags_in_liblink=$compiler_flags_in_liblink
     ;;
   -Wl, | -Xlinker\ )
-    flag_prefix=$maybe_wl
+    flag_prefix_prog=$wl
+    flag_prefix_lib=$maybe_wl
+    flags_in_liblink=:
     ;;
   esac
 
-  eval set program$EXEEXT "$library_and_module"
+  AT_CHECK([$LIBTOOL -n --tag=lt_tag --mode=link $link ]dnl
+	   [-o program$EXEEXT a.lo $flag-foo], [], [stdout], [ignore])
+  AT_CHECK([$FGREP " $flag_prefix_prog-foo" stdout], [], [ignore])
+
+  eval set x "$library_and_module"
   for output
   do
+    test x = "$output" && continue
     AT_CHECK([$LIBTOOL -n --tag=lt_tag --mode=link $link ]dnl
 	     [-o $output a.lo -rpath /nowhere $flag-foo], [], [stdout], [ignore])
-    AT_CHECK([$FGREP " $flag_prefix-foo" stdout], [], [ignore])
+    if $flags_in_liblink; then
+      AT_CHECK([$FGREP " $flag_prefix_lib-foo" stdout], [], [ignore])
+    else
+      AT_CHECK([$FGREP " $flag_prefix_lib-foo" stdout], [1])
+    fi
   done
 done
 


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Tue Jun 22 01:26:22 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OQw05-0005xE-NE
	for mharc-libtool-commit@gnu.org; Tue, 22 Jun 2010 01:26:21 -0400
Received: from [140.186.70.92] (port=60360 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OQw02-0005x9-U0
	for libtool-commit@gnu.org; Tue, 22 Jun 2010 01:26:20 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OQw01-0000Nc-HN
	for libtool-commit@gnu.org; Tue, 22 Jun 2010 01:26:18 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:57317
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OQw01-0000NY-Dz
	for libtool-commit@gnu.org; Tue, 22 Jun 2010 01:26:17 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OQw00-0006t1-RE
	for libtool-commit@gnu.org; Tue, 22 Jun 2010 05:26:16 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OQw00-00048t-P6
	for libtool-commit@gnu.org; Tue, 22 Jun 2010 05:26:16 +0000
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: ef76a2349741c5793da74e7cd7aba4216af01dbc
X-Git-Newrev: 3d2d3ef899cb7e83d5d77dea695e13dfeb80ee7f
Message-Id: <E1OQw00-00048t-P6@vcs-noshell.in.savannah.gnu.org>
Date: Tue, 22 Jun 2010 05:26:16 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-32-g3d2d3ef
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Jun 2010 05:26:20 -0000

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  3d2d3ef899cb7e83d5d77dea695e13dfeb80ee7f (commit)
      from  ef76a2349741c5793da74e7cd7aba4216af01dbc (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 3d2d3ef899cb7e83d5d77dea695e13dfeb80ee7f
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Mon Jun 21 19:49:29 2010 +0700

    Ensure getopts.m4sh is compatible with Autoconf-2.61 and newer.
    
    * libltdl/config/getopt.m4sh (m4_chomp): Ensure this macro is
    implemented even if Autoconf's m4sugar.m4 doesn't provide it.
    (m4go_expand): New macro based on Autoconf-2.64 m4_expand. Use
    it everywhere incase m4sugar.m4 doesn't have an implementation.
    (m4_ifnblank): Replace all uses with m4_ifval, which was
    available long before m4_ifnblank was introduced.

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

Summary of changes:
 ChangeLog                  |   10 +++++++
 libltdl/config/getopt.m4sh |   64 +++++++++++++++++++++++++++++++++++---------
 2 files changed, 61 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9bc84c8..18e346d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-06-21  Gary V. Vaughan  <gary@gnu.org>
+
+	Ensure getopts.m4sh is compatible with Autoconf-2.61 and newer.
+	* libltdl/config/getopt.m4sh (m4_chomp): Ensure this macro is
+	implemented even if Autoconf's m4sugar.m4 doesn't provide it.
+	(m4go_expand): New macro based on Autoconf-2.64 m4_expand. Use
+	it everywhere incase m4sugar.m4 doesn't have an implementation.
+	(m4_ifnblank): Replace all uses with m4_ifval, which was
+	available long before m4_ifnblank was introduced.
+
 2010-06-20  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	Fix clean mode for HP-UX 11.31 sh.
diff --git a/libltdl/config/getopt.m4sh b/libltdl/config/getopt.m4sh
index 44cf727..031402c 100644
--- a/libltdl/config/getopt.m4sh
+++ b/libltdl/config/getopt.m4sh
@@ -44,8 +44,46 @@ m4_include([general.m4sh])m4_divert_push([KILL])	-*- Autoconf -*-
 # All internal macros begin with `m4go_'.
 m4_pattern_forbid([^_?m4go_])
 
+
+## --------------------------- ##
+## 1. Backwards compatibility. ##
+## --------------------------- ##
+
+# m4_chomp(STRING)
+# ----------------
+# m4_chomp was not introduced until Autoconf-2.64.  Currently we
+# only use it indirectly via m4go_expand, below.  This implementation
+# is taken from Autoconf-2.65.
+m4_ifndef([m4_chomp],
+[m4_define([m4_chomp],
+[m4_format([[%.*s]], m4_index(m4_translit([[$1]], [
+/.], [/  ])[./.], [/.]), [$1])])])
+
+# m4go_expand(ARG)
+# ----------------
+# M4SH_GETOPTS wants to pass unbalanced parentheses to m4_expand to
+# build the branches of a shell `case' statement.  That is only
+# supported by the implementation of m4_expand in Autoconf-2.64 and
+# newer.  Since we want to be compatible back to at least
+# Autoconf-2.62, reimplement our own 2.64 based m4_expand in the
+# m4go_ namespace so that we can be compatible with Autoconf versions
+# supporting either semantic.
+m4_define([m4go_expand],
+[m4_chomp(_$0([$1
+]))])
+
+m4_define([_m4go_expand], [$0_([$1], [(], -=<{($1)}>=-, [}>=-])])
+
+m4_define([_m4go_ignore])
+
+m4_define([_m4go_expand_],
+[m4_if([$4], [}>=-],
+       [m4_changequote([-=<{$2], [)}>=-])$3m4_changequote([, ])],
+       [$0([$1], [($2], -=<{($2$1)}>=-, [}>=-])_m4go_ignore$2])])
+
+
 ## --------------------------------- ##
-## 1. Low level string manipulation. ##
+## 2. Low level string manipulation. ##
 ## --------------------------------- ##
 
 # m4go_slice(STRING, BEGIN, END)
@@ -96,10 +134,10 @@ m4_define([m4go_slice],
 #     to turn them off for the duration.
 #  6. Finally, we need to requote the result to account for the quotes
 #     we probably stripped.  m4_quote() doesn't handle commas well, so
-#     we use m4_expand() to requote without losing whitespace after any
-#     embedded commas.
+#     we use m4go_expand() to requote without losing whitespace after
+#     any embedded commas.
 m4_define([m4go_trimn],
-[m4_changecom()m4_expand([m4go_slice([$1], m4_bregexp(m4_translit([$1],[
+[m4_changecom()m4go_expand([m4go_slice([$1], m4_bregexp(m4_translit([$1],[
 [/,()]], [//     ]), [[^/]]), m4_bregexp(m4_translit([$1], [
 [/,()]], [/     /]), [/*$]))])[]m4_changecom([#])])
 
@@ -119,7 +157,7 @@ m4_define([m4go_unindent],
 
 
 ## ------------------------------ ##
-## 2. Option processing compiler. ##
+## 3. Option processing compiler. ##
 ## ------------------------------ ##
 
 # Shell fragments are piecemeal added to these macros for each
@@ -288,7 +326,7 @@ m4_define([m4go_option],
             [^=],       [],
             [.],        [[$1]],
                         []))],
-    [_$0(opt_[]m4_ifnblank([$2],
+    [_$0(opt_[]m4_ifval([$2],
             m4_translit(m4_bpatsubst([$2], [^--\(no-\)?\([^|]+\).*$],
                                      [\2]), -, _),
                 _short),
@@ -329,11 +367,11 @@ m4_define([_m4go_option],
 [m4_do(
     [m4_append([m4go_defaults],
         m4_bmatch([$3],
-            [[?!;+@^]], [m4_ifnblank([$5], [m4_n([$1="$5"])])],
+            [[?!;+@^]], [m4_ifval([$5], [m4_n([$1="$5"])])],
             [~],        [m4_n([$1=:])],
                         [m4_n([$1=false])]))],
     [m4_append([m4go_branches], [[]dnl (
-      m4_join([|], [$4], m4_ifnblank([$2], [-$2])))
+      m4_join([|], [$4], m4_ifval([$2], [-$2])))
 ])],
     [m4_append([m4go_branches],
         [m4_bmatch([$3], [[!+@]],
@@ -346,8 +384,8 @@ m4_n(m4_bmatch([$3],
     [+],       [			$1_num=`expr 1 + ${$1_num-0}`
 			eval $1_${$1_num}=\"$optarg\"],
     [?],       [m4_bmatch([$3],
-                    [@], [m4_expand([m4go_optional_file_arg([$1])])],
-                         [m4_expand([m4go_optional_arg([$1])])])],
+                    [@], [m4go_expand([m4go_optional_file_arg([$1])])],
+                         [m4go_expand([m4go_optional_arg([$1])])])],
     [[!@]],    [			$1="$optarg"],
     [;],       [			$1="${$1+[$]$1
 }$optarg"],
@@ -356,12 +394,12 @@ m4_n(m4_bmatch([$3],
                [			$1=:]))[]dnl
 dnl only write the file_arg fragment when we didn't already write opt_file_arg:
 m4_bmatch([$3], [@], [m4_bmatch([$3], [?], [],
-                   [m4_expand([m4go_file_arg([$1])])
+                   [m4go_expand([m4go_file_arg([$1])])
 ])])m4_n(m4go_unindent([$6]))[]dnl
 m4_bmatch([$3], [[!+;]], [			shift
 ])			;;
 ])],
-    [m4_ifnblank([$2],
+    [m4_ifval([$2],
         [m4_bmatch([$3],
             [[?!;+@^~]], [m4_append([m4go_shortargs],   [-$2*], [|])],
                        [m4_append([m4go_shortnoargs], [-$2*],
@@ -489,7 +527,7 @@ m4go_validation
 
 
 ## ------------------------- ##
-## 3. Supporting Shell Code. ##
+## 4. Supporting Shell Code. ##
 ## ------------------------- ##
 
 # The shell functions below are expanded verbatim into the shell script


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Thu Jun 24 18:40:39 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ORv67-0001Xv-E0
	for mharc-libtool-commit@gnu.org; Thu, 24 Jun 2010 18:40:39 -0400
Received: from [140.186.70.92] (port=35463 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ORv62-0001RI-JS
	for libtool-commit@gnu.org; Thu, 24 Jun 2010 18:40:36 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1ORv5j-0002kj-FT
	for libtool-commit@gnu.org; Thu, 24 Jun 2010 18:40:17 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:50108
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1ORv5j-0002ke-Dx
	for libtool-commit@gnu.org; Thu, 24 Jun 2010 18:40:15 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1ORv5j-0003nI-9L
	for libtool-commit@gnu.org; Thu, 24 Jun 2010 22:40:15 +0000
Received: from cwilson by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <INVALID.NOREPLY@gnu.org>) id 1ORv5i-0004JL-W2
	for libtool-commit@gnu.org; Thu, 24 Jun 2010 22:40:15 +0000
From: "Charles Wilson" <libtool@cwilson.fastmail.fm>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 3d2d3ef899cb7e83d5d77dea695e13dfeb80ee7f
X-Git-Newrev: ec9de9a8aff88eb4b0bd2a19e713ae82aef37006
Message-Id: <E1ORv5i-0004JL-W2@vcs-noshell.in.savannah.gnu.org>
Date: Thu, 24 Jun 2010 22:40:15 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-33-gec9de9a
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Jun 2010 22:40:37 -0000

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  ec9de9a8aff88eb4b0bd2a19e713ae82aef37006 (commit)
      from  3d2d3ef899cb7e83d5d77dea695e13dfeb80ee7f (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 ec9de9a8aff88eb4b0bd2a19e713ae82aef37006
Author: Charles Wilson <libtool@cwilson.fastmail.fm>
Date:   Sun Jun 20 00:59:02 2010 -0400

    [cygwin] Refactor C++ exception handling for Win32 correctness
    
    * tests/exception.at (common.h): New file, refactored from
    (module.h): Move declaration of modexc to libcommon.
    Include common.h. Use explicit import/export markings for
    symbols when building on win32 or cygwin.
    (common.cpp): New file.
    (module.cpp): Ensure correct symbols markings when including
    module.h.
    (lib.h): Use explicit import/export markings for symbols
    when building on win32 or cygwin.
    (lib.cpp): Ensure correct symbol markings when including lib.h.
    (main.cpp): Include common.h.
    (commands): Ensure correct symbol markings when compiling
    main.cpp, and lib.cpp, and module.cpp. Add command to compile
    common.cpp, and to link libcommon.la.  Add libcommon.la when
    linking module.la and main.  Add command to install libcommon.la.
    
    Signed-off-by: Charles Wilson <libtool@cwilson.fastmail.fm>

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

Summary of changes:
 ChangeLog           |   19 +++++++
 tests/exceptions.at |  140 ++++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 147 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 18e346d..79e2855 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2010-06-24  Charles Wilson  <libtool@cwilson.fastmail.fm>
+
+	[cygwin] Refactor C++ exception handling for Win32 correctness
+	* tests/exception.at (common.h): New file, refactored from
+	(module.h): Move declaration of modexc to libcommon.
+	Include common.h. Use explicit import/export markings for
+	symbols when building on win32 or cygwin.
+	(common.cpp): New file.
+	(module.cpp): Ensure correct symbols markings when including
+	module.h.
+	(lib.h): Use explicit import/export markings for symbols
+	when building on win32 or cygwin.
+	(lib.cpp): Ensure correct symbol markings when including lib.h.
+	(main.cpp): Include common.h.
+	(commands): Ensure correct symbol markings when compiling
+	main.cpp, and lib.cpp, and module.cpp. Add command to compile
+	common.cpp, and to link libcommon.la.  Add libcommon.la when
+	linking module.la and main.  Add command to install libcommon.la.
+
 2010-06-21  Gary V. Vaughan  <gary@gnu.org>
 
 	Ensure getopts.m4sh is compatible with Autoconf-2.61 and newer.
diff --git a/tests/exceptions.at b/tests/exceptions.at
index aaebd0f..235597c 100644
--- a/tests/exceptions.at
+++ b/tests/exceptions.at
@@ -36,10 +36,66 @@ esac], [], [ignore])
 
 CPPFLAGS="$LTDLINCL $CPPFLAGS"
 
-AT_DATA([module.h],
-[[#include <exception>
+# Win32 (and cygwin) notes
+# ------------------------
+# When using C++ and Win32 DLLs, data types used in the DLL's interface
+# which are other-than-POD, must have vtables, typeinfo, and other
+# elements resolved when the client is linked.  This includes exception
+# classes.  Therefore, the exception class "modexc" thrown by the
+# dynamically-loaded module must be defined in a separate DLL, to which
+# both that module and main must be directly linked; hence, the 'common'
+# library. Not using a 'common' library in this manner represents an
+# ODR violation, unless the platform's runtime loader is capable of
+# rationalizing vague linkage items such as vtables, typeinfo, and
+# typename elements) at runtime.  The Win32 loader is not capable of
+# this, but some ELF loaders appear to be.
+#
+# Similar treatment is not necessary for liba (e.g. the libexc
+# exception class), because that library is not dynamically loaded. As a
+# consequence, vague linkage items for the class libexc are resolved at
+# link time using the vague linkage rules, for both Win32 and other
+# (e.g. ELF) platforms.
+#
+# Also, when linking a C++ DLL with another C++ DLL, some versions of
+# the GNU toolchain on Win32 (or cygwin) mistakenly re-export symbols
+# that were imported from the other DLL, when the client DLL is linked
+# using -export-all-symbols.  Similar issues MAY also arise with those
+# versions of the GNU toolchain if using the libtool link flags
+# -export-symbols LIST or -export-symbols-regex REGEX, if any symbols
+# from the dependency, rather than client, library are listed (or match
+# the regex).  However, in this test, none of these situations apply,
+# so we don't directly address it.  Otherwise, the correct mechanism
+# would be to avoid all of those flags, and instead explicitly decorate
+# all symbols with appropriate __attribute__ ((dllexport)) or
+# __attribute__ ((dllimport)) flags when building the DLLs and the
+# clients.
+#
+# For more information, see these two threads:
+#   http://lists.gnu.org/archive/html/bug-libtool/2010-06/msg00069.html
+#   http://cygwin.com/ml/cygwin/2010-06/msg00392.html
+# To sum up: C++ is complicated.
+AT_DATA([common.h],
+[[#ifndef LIBTOOL_TEST_COMMON_HEADER
+#define LIBTOOL_TEST_COMMON_HEADER
+
+#include <exception>
 #include <string>
-class modexc : public std::exception {
+
+#if defined(__CYGWIN__) || defined(_WIN32)
+# if defined(DLL_EXPORT) || defined(USING_COMMON_DLL)
+#  if defined(LIBTOOL_TEST_IN_COMMON)
+#   define COMMON_IMPEXP __attribute__ ((dllexport))
+#  else
+#   define COMMON_IMPEXP __attribute__ ((dllimport))
+#  endif
+# else
+#  define COMMON_IMPEXP
+# endif
+#else
+# define COMMON_IMPEXP
+#endif
+
+class COMMON_IMPEXP modexc : public std::exception {
 public:
   modexc (std::string str) : message (str) { }
   ~modexc () throw () { }
@@ -50,11 +106,45 @@ public:
 private:
   std::string message;
 };
-extern "C" int modfoo () throw (modexc);
+
+extern "C" int COMMON_IMPEXP common_dummy (void);
+#endif
+]])
+
+AT_DATA([common.cpp],
+[[#define LIBTOOL_TEST_IN_COMMON
+#include "common.h"
+
+extern "C"
+int common_dummy (void)
+{
+  return 0;
+}
+]])
+
+AT_DATA([module.h],
+[[#include "common.h"
+
+#if defined(__CYGWIN__) || defined(_WIN32)
+# if defined(DLL_EXPORT) || defined(USING_MODULE_DLL)
+#  if defined(LIBTOOL_TEST_IN_MODULE)
+#   define MODULE_IMPEXP __attribute__ ((dllexport))
+#  else
+#   define MODULE_IMPEXP __attribute__ ((dllimport))
+#  endif
+# else
+#  define MODULE_IMPEXP
+# endif
+#else
+# define MODULE_IMPEXP
+#endif
+
+extern "C" int MODULE_IMPEXP modfoo () throw (modexc);
 ]])
 
 AT_DATA([module.cpp],
 [[#include <iostream>
+#define LIBTOOL_TEST_IN_MODULE
 #include "module.h"
 
 int modbar (void) throw (modexc)
@@ -79,7 +169,23 @@ int modfoo (void) throw (modexc)
 AT_DATA([lib.h],
 [[#include <exception>
 #include <string>
-class libexc : public std::exception {
+
+
+#if defined(__CYGWIN__) || defined(_WIN32)
+# if defined(DLL_EXPORT) || defined(USING_LIB_DLL)
+#  if defined(LIBTOOL_TEST_IN_LIB)
+#   define LIB_IMPEXP __attribute__ ((dllexport))
+#  else
+#   define LIB_IMPEXP __attribute__ ((dllimport))
+#  endif
+# else
+#  define LIB_IMPEXP
+# endif
+#else
+# define LIB_IMPEXP
+#endif
+
+class LIB_IMPEXP libexc : public std::exception {
 public:
   libexc (std::string str) : message (str) { }
   ~libexc () throw () { }
@@ -90,11 +196,12 @@ public:
 private:
   std::string message;
 };
-int libfoo () throw (libexc);
+int LIB_IMPEXP libfoo () throw (libexc);
 ]])
 
 AT_DATA([lib.cpp],
 [[#include <iostream>
+#define LIBTOOL_TEST_IN_LIB
 #include "lib.h"
 
 int libbar (void) throw (libexc)
@@ -121,6 +228,7 @@ AT_DATA([main.cpp],
 #include <iostream>
 #include <exception>
 #include <string>
+#include "common.h"
 #include "lib.h"
 #include "module.h"
 
@@ -251,26 +359,34 @@ moddir=$inst/mod
 mkdir l m $inst $libdir $bindir $moddir
 
 # If the C++ compiler isn't capable, don't bother.
-AT_CHECK([$CXX $CPPFLAGS $CXXFLAGS -c main.cpp || exit 77], [], [ignore], [ignore])
+AT_CHECK([$CXX $CPPFLAGS $CXXFLAGS -DUSING_COMMON_DLL -DUSING_MODULE_DLL -DUSING_LIB_DLL -c main.cpp || exit 77], [], [ignore], [ignore])
 
-for file in lib.cpp module.cpp; do
-  AT_CHECK([$LIBTOOL --mode=compile --tag=CXX $CXX $CPPFLAGS $CXXFLAGS -c $file],
+AT_CHECK([$LIBTOOL --mode=compile --tag=CXX $CXX $CPPFLAGS $CXXFLAGS -c common.cpp],
+	   [], [ignore], [ignore])
+AT_CHECK([$LIBTOOL --mode=compile --tag=CXX $CXX $CPPFLAGS $CXXFLAGS -c lib.cpp],
+	   [], [ignore], [ignore])
+AT_CHECK([$LIBTOOL --mode=compile --tag=CXX $CXX $CPPFLAGS $CXXFLAGS -DUSING_COMMON_DLL -c module.cpp],
 	   [], [ignore], [ignore])
-done
+
+AT_CHECK([$LIBTOOL --mode=link --tag=CXX $CXX $CXXFLAGS $LDFLAGS -o l/libcommon.la ]dnl
+	 [common.lo -no-undefined -version-info 1:0:0 -rpath $libdir],
+	 [], [ignore], [ignore])
 AT_CHECK([$LIBTOOL --mode=link --tag=CXX $CXX $CXXFLAGS $LDFLAGS -o l/liba.la ]dnl
 	 [lib.lo -no-undefined -version-info 1:0:0 -rpath $libdir],
 	 [], [ignore], [ignore])
 AT_CHECK([$LIBTOOL --mode=link --tag=CXX $CXX $CXXFLAGS $LDFLAGS -o m/module.la ]dnl
-	 [module.lo -module -avoid-version -no-undefined -rpath $moddir],
+	 [module.lo l/libcommon.la -module -avoid-version -no-undefined -rpath $moddir],
 	 [], [ignore], [ignore])
 
 # We need -export-dynamic for the exception handling in modules to work.
 AT_CHECK([$LIBTOOL --mode=link --tag=CXX $CXX $CXXFLAGS $LDFLAGS -o main$EXEEXT ]dnl
-	 [main.$OBJEXT l/liba.la -dlopen m/module.la $LIBLTDL -export-dynamic],
+	 [main.$OBJEXT l/liba.la l/libcommon.la -dlopen m/module.la $LIBLTDL -export-dynamic],
 	 [], [ignore], [ignore])
 
 LT_AT_NOINST_EXEC_CHECK([./main], [-dlopen m/module.la], [], [ignore], [ignore])
 
+AT_CHECK([$LIBTOOL --mode=install cp l/libcommon.la $libdir],
+	 [], [ignore], [ignore])
 AT_CHECK([$LIBTOOL --mode=install cp l/liba.la $libdir],
 	 [], [ignore], [ignore])
 AT_CHECK([$LIBTOOL --mode=install cp m/module.la $moddir],


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Sat Jun 26 13:14:43 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OSYxn-0006uV-47
	for mharc-libtool-commit@gnu.org; Sat, 26 Jun 2010 13:14:43 -0400
Received: from [140.186.70.92] (port=40644 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OSYxj-0006u5-2j
	for libtool-commit@gnu.org; Sat, 26 Jun 2010 13:14:41 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OSYxf-0006mU-Aj
	for libtool-commit@gnu.org; Sat, 26 Jun 2010 13:14:38 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:37532
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OSYxf-0006mM-7U
	for libtool-commit@gnu.org; Sat, 26 Jun 2010 13:14:35 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OSYxf-0000x3-0x
	for libtool-commit@gnu.org; Sat, 26 Jun 2010 17:14:35 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OSYxe-0007U6-RY
	for libtool-commit@gnu.org; Sat, 26 Jun 2010 17:14:34 +0000
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: ec9de9a8aff88eb4b0bd2a19e713ae82aef37006
X-Git-Newrev: b8dd17aeba9ae235d189b30ce38d64ba0ff2a309
Message-Id: <E1OSYxe-0007U6-RY@vcs-noshell.in.savannah.gnu.org>
Date: Sat, 26 Jun 2010 17:14:34 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-34-gb8dd17a
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Jun 2010 17:14:42 -0000

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  b8dd17aeba9ae235d189b30ce38d64ba0ff2a309 (commit)
      from  ec9de9a8aff88eb4b0bd2a19e713ae82aef37006 (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 b8dd17aeba9ae235d189b30ce38d64ba0ff2a309
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Sat Jun 12 00:12:09 2010 +0700

    getopt.m4sh generated libtool option parser, and XSI improvements.
    
    * libltdl/m4/libtool.m4 (_LT_PROG_XSI_SHELLFNS): Moved portable
    shell versions of various utility functions from here...
    * libltdl/config/getopt.m4sh (func_split_long_opt): ...to here...
    * libltdl/config/general.m4sh (func_dirname, func_basename)
    (func_dirname_and_basename, func_strip_name): ...here...
    * libltdl/config/ltmain.m4sh (func_append, func_arith, func_len)
    (func_lo2o, func_xform): ...and here.
    * libltdl/config/libtool.m4 (_LT_PROG_XSI_REPLACE): New macro that
    expands into a sed command for replacing the contents of a
    suitably decorated shell function with an alternate XSI
    implementation.
    (_LT_PROG_XSI_SHELLFNS): Use it to replace the portable shell
    versions of the functions above with equivalent XSI
    implementations that avoid unnecessary forks if the host shell
    supports that.
    * libltdl/config/ltmain.m4sh: Replace hand written shell code
    with a call to M4SH_GETOPTS. Rename some option variables in
    the client code to match the generated option parser settings.
    * libltdl/config/general.m4sh (func_echo, func_error)
    (func_warning): Use $opt_mode instead of obsoleted $mode in
    message leader.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 ChangeLog                   |   27 +++
 libltdl/config/general.m4sh |   61 ++++++--
 libltdl/config/getopt.m4sh  |   56 +++++--
 libltdl/config/ltmain.m4sh  |  367 ++++++++++++++++++++-----------------------
 libltdl/m4/libtool.m4       |  255 +++++++-----------------------
 5 files changed, 342 insertions(+), 424 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 79e2855..e95b836 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2010-06-27  Gary V. Vaughan  <gary@gnu.org>
+
+	getopt.m4sh generated libtool option parser, and XSI improvements.
+	* libltdl/m4/libtool.m4 (_LT_PROG_XSI_SHELLFNS): Moved portable
+	shell versions of various utility functions from here...
+	* libltdl/config/getopt.m4sh (func_split_long_opt): ...to here...
+	* libltdl/config/general.m4sh (func_dirname, func_basename)
+	(func_dirname_and_basename, func_strip_name): ...here...
+	* libltdl/config/ltmain.m4sh (func_append, func_arith, func_len)
+	(func_lo2o, func_xform): ...and here.
+	* libltdl/config/libtool.m4 (_LT_PROG_XSI_REPLACE): New macro that
+	expands into a sed command for replacing the contents of a
+	suitably decorated shell function with an alternate XSI
+	implementation.
+	(_LT_PROG_XSI_SHELLFNS): Use it to replace the portable shell
+	versions of the functions above with equivalent XSI
+	implementations that avoid unnecessary forks if the host shell
+	supports that.
+	* libltdl/config/ltmain.m4sh: Replace hand written shell code
+	with a call to M4SH_GETOPTS. Rename some option variables in
+	the client code to match the generated option parser settings.
+	* libltdl/config/general.m4sh (func_echo, func_error)
+	(func_warning): Use $opt_mode instead of obsoleted $mode in
+	message leader.
+	* libltdl/config/getopt.m4sh (m4_version_prereq): This file
+	requires m4sugar.m4 from Autoconf-2.61 or newer. 
+
 2010-06-24  Charles Wilson  <libtool@cwilson.fastmail.fm>
 
 	[cygwin] Refactor C++ exception handling for Win32 correctness
diff --git a/libltdl/config/general.m4sh b/libltdl/config/general.m4sh
index bb254cc..ab79f05 100644
--- a/libltdl/config/general.m4sh
+++ b/libltdl/config/general.m4sh
@@ -73,6 +73,27 @@ IFS=" 	$lt_nl"
 dirname="s,/[^/]*$,,"
 basename="s,^.*/,,"
 
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
+    if test "X$func_dirname_result" = "X${1}"; then
+      func_dirname_result="${3}"
+    else
+      func_dirname_result="$func_dirname_result${2}"
+    fi
+} # func_dirname may be replaced by XSI optimised implementation
+
+
+# func_basename file
+func_basename ()
+{
+    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
+} # func_basename may be replaced by XSI optimised implementation
+
+
 # func_dirname_and_basename file append nondir_replacement
 # perform func_basename and func_dirname in a single function
 # call:
@@ -87,17 +108,31 @@ basename="s,^.*/,,"
 # those functions but instead duplicate the functionality here.
 func_dirname_and_basename ()
 {
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-  func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
-}
+    # Extract subdirectory from the argument.
+    func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
+    if test "X$func_dirname_result" = "X${1}"; then
+      func_dirname_result="${3}"
+    else
+      func_dirname_result="$func_dirname_result${2}"
+    fi
+    func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
+} # func_dirname_and_basename may be replaced by XSI optimised implementation
+
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+    case ${2} in
+      .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+      *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+    esac
+} # func_stripname may be replaced by XSI optimised implementation
 
-# Generated shell functions inserted here.
 
 # These SED scripts presuppose an absolute path with a trailing slash.
 pathcar='s,^/\([^/]*\).*$,\1,'
@@ -308,7 +343,7 @@ opt_warning=:
 # name if it has been set yet.
 func_echo ()
 {
-    $ECHO "$progname${mode+: }$mode: $*"
+    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
 }
 
 # func_verbose arg...
@@ -334,14 +369,14 @@ func_echo_all ()
 # Echo program name prefixed message to standard error.
 func_error ()
 {
-    $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
+    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
 }
 
 # func_warning arg...
 # Echo program name prefixed warning message to standard error.
 func_warning ()
 {
-    $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
+    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
 
     # bash bug again:
     :
diff --git a/libltdl/config/getopt.m4sh b/libltdl/config/getopt.m4sh
index 031402c..76f9d35 100644
--- a/libltdl/config/getopt.m4sh
+++ b/libltdl/config/getopt.m4sh
@@ -49,6 +49,13 @@ m4_pattern_forbid([^_?m4go_])
 ## 1. Backwards compatibility. ##
 ## --------------------------- ##
 
+# We prefer m4sugar.m4 from Autoconf-2.64, but have fallbacks in this
+# section that work back as far as Autoconf-2.61.  This file is used
+# at bootstrap time to generate the shell processing loop for ltmain.sh
+# and libtoolize.in, so it's okay for the requirement to be tighter
+# than the configure time Autoconf prerequisite version.
+m4_version_prereq([2.61])
+
 # m4_chomp(STRING)
 # ----------------
 # m4_chomp was not introduced until Autoconf-2.64.  Currently we
@@ -463,13 +470,7 @@ m4go_defaults
 
 # Parse options once, thoroughly.  This comes as soon as possible in the
 # script to make things like `--version' happen as quickly as we can.
-{M4SH_VERBATIM([[
-  # sed scripts
-  my_sed_single_opt='1s/^\(..\).*$/\1/;q'
-  my_sed_single_rest='1s/^..\(.*\)$/\1/;q'
-  my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
-  my_sed_long_arg='1s/^--[^=]*=//'
-]])
+{
   # this just eases exit handling
   while test [$]# -gt 0; do
     opt="[$]1"
@@ -486,27 +487,24 @@ m4go_branches
 
       # Separate optargs to long options:
       --*=*)
-			arg=`echo "$opt" | $SED "$my_sed_long_arg"`
-			opt=`echo "$opt" | $SED "$my_sed_long_opt"`
-			set dummy "$opt" "$arg" ${1+"[$]@"}
+			func_split_long_opt "$opt"
+			set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"[$]@"}
 			shift
 			;;
 
 m4_ifset([m4go_shortargs], dnl (
 [      # Separate optargs to short options:
       ]m4go_shortargs[)
-			arg=`echo "$opt" |$SED "$my_sed_single_rest"`
-			opt=`echo "$opt" |$SED "$my_sed_single_opt"`
-			set dummy "$opt" "$arg" ${1+"[$]@"}
+			func_split_short_opt "$opt"
+			set dummy "$func_split_short_opt_name" "$func_split_short_opt_arg" ${1+"[$]@"}
 			shift
 			;;
 
 ])m4_ifset([m4go_shortnoargs], dnl (
 [      # Separate non-argument short options:
       ]m4go_shortnoargs[)
-			rest=`echo "$opt" |$SED "$my_sed_single_rest"`
-			opt=`echo "$opt" |$SED "$my_sed_single_opt"`
-			set dummy "$opt" "-$rest" ${1+"[$]@"}
+			func_split_short_opt "$opt"
+			set dummy "$func_split_short_opt_name" "$func_split_short_opt_arg" ${1+"[$]@"}
 			shift
 			;;
 
@@ -619,6 +617,32 @@ func_missing_arg ()
     exit_cmd=exit
 }
 
+
+# func_split_short_opt shortopt
+# Set func_split_short_opt_name and func_split_short_opt_arg shell
+# variables after splitting SHORTOPT at the `=' sign.
+func_split_short_opt ()
+{
+    my_sed_short_opt='1s/^\(..\).*$/\1/;q'
+    my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
+
+    func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
+    func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_arg"`
+} # func_split_short_opt may be replaced by XSI optimised implementation
+
+
+# func_split_long_opt longopt
+# Set func_split_long_opt_name and func_split_long_opt_arg shell
+# variables after splitting LONGOPT at the `=' sign.
+func_split_long_opt ()
+{
+    my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
+    my_sed_long_arg='1s/^--[^=]*=//'
+
+    func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
+    func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
+} # func_split_long_opt may be replaced by XSI optimised implementation
+
 exit_cmd=:
 ]])
 
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index a325e27..0262322 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -133,30 +133,60 @@ m4_define([M4SH_IN_HEADER], [$1])dnl
 m4_include([getopt.m4sh])
 
 M4SH_VERBATIM([[
-
 magic="%%%MAGIC variable%%%"
 magic_exe="%%%MAGIC EXE variable%%%"
 
 # Global variables.
 # $mode is unset
 nonopt=
-execute_dlfiles=
 preserve_args=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"
 extracted_archives=
 extracted_serial=0
 
-opt_dry_run=false
-opt_duplicate_deps=false
-opt_silent=false
-opt_debug=:
-
 # If this variable is set in any of the actions, the command in it
 # will be execed at the end.  This prevents here-documents from being
 # left over by shells.
 exec_cmd=
 
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+    eval "${1}=\$${1}\${2}"
+} # func_append may be replaced by XSI optimised implementation
+
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+    func_arith_result=`expr "${@}"`
+} # func_arith may be replaced by XSI optimised implementation
+
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+    func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
+} # func_len may be replaced by XSI optimised implementation
+
+
+# func_lo2o object
+func_lo2o ()
+{
+    func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
+} # func_lo2o may be replaced by XSI optimised implementation
+
+
+# func_xform libobj-or-source
+func_xform ()
+{
+    func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
+} # func_xform may be replaced by XSI optimised implementation
+
+
 # func_fatal_configuration arg...
 # Echo program name prefixed message to standard error, followed by
 # a configuration failure hint, and exit.
@@ -246,145 +276,6 @@ func_enable_tag ()
   esac
 }
 
-# Parse options once, thoroughly.  This comes as soon as possible in
-# the script to make things like `libtool --version' happen quickly.
-{
-
-  # Shorthand for --mode=foo, only valid as the first argument
-  case $1 in
-  clean|clea|cle|cl)
-    shift; set dummy --mode clean ${1+"$@"}; shift
-    ;;
-  compile|compil|compi|comp|com|co|c)
-    shift; set dummy --mode compile ${1+"$@"}; shift
-    ;;
-  execute|execut|execu|exec|exe|ex|e)
-    shift; set dummy --mode execute ${1+"$@"}; shift
-    ;;
-  finish|finis|fini|fin|fi|f)
-    shift; set dummy --mode finish ${1+"$@"}; shift
-    ;;
-  install|instal|insta|inst|ins|in|i)
-    shift; set dummy --mode install ${1+"$@"}; shift
-    ;;
-  link|lin|li|l)
-    shift; set dummy --mode link ${1+"$@"}; shift
-    ;;
-  uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
-    shift; set dummy --mode uninstall ${1+"$@"}; shift
-    ;;
-  esac
-
-  # Parse non-mode specific arguments:
-  while test "$#" -gt 0; do
-    opt="$1"
-    shift
-
-    case $opt in
-      --config)		func_config					;;
-
-      --debug)		preserve_args="$preserve_args $opt"
-			func_echo "enabling shell trace mode"
-			opt_debug='set -x'
-			$opt_debug
-			;;
-
-      -dlopen)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			execute_dlfiles="$execute_dlfiles $1"
-			shift
-			;;
-
-      --dry-run | -n)	opt_dry_run=:					;;
-      --features)       func_features					;;
-      --finish)		mode="finish"					;;
-
-      --mode)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			case $1 in
-			  # Valid mode arguments:
-			  clean)	;;
-			  compile)	;;
-			  execute)	;;
-			  finish)	;;
-			  install)	;;
-			  link)		;;
-			  relink)	;;
-			  uninstall)	;;
-
-			  # Catch anything else as an error
-			  *) func_error "invalid argument for $opt"
-			     exit_cmd=exit
-			     break
-			     ;;
-		        esac
-
-			mode="$1"
-			shift
-			;;
-
-      --preserve-dup-deps)
-			opt_duplicate_deps=:				;;
-
-      --quiet|--silent)	preserve_args="$preserve_args $opt"
-			opt_silent=:
-			opt_verbose=false
-			;;
-
-      --no-quiet|--no-silent)
-			preserve_args="$preserve_args $opt"
-			opt_silent=false
-			;;
-
-      --verbose| -v)	preserve_args="$preserve_args $opt"
-			opt_silent=false
-			opt_verbose=:
-			;;
-
-      --no-verbose)	preserve_args="$preserve_args $opt"
-			opt_verbose=false
-			;;
-
-      --tag)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			preserve_args="$preserve_args $opt $1"
-			func_enable_tag "$1"	# tagname is set here
-			shift
-			;;
-
-      # Separate optargs to long options:
-      -dlopen=*|--mode=*|--tag=*)
-			func_opt_split "$opt"
-			set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
-			shift
-			;;
-
-      -\?|-h)		func_usage					;;
-      --help)		opt_help=:					;;
-      --help-all)	opt_help=': help-all'				;;
-      --version)	func_version					;;
-
-      -*)		func_fatal_help "unrecognized option \`$opt'"	;;
-
-      *)		nonopt="$opt"
-			break
-			;;
-    esac
-  done
-
-
-  case $host in
-    *cygwin* | *mingw* | *pw32* | *cegcc*)
-      # don't eliminate duplications in $postdeps and $predeps
-      opt_duplicate_compiler_generated_deps=:
-      ;;
-    *)
-      opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
-      ;;
-  esac
-
-  # Having warned about all mis-specified options, bail out if
-  # anything was wrong.
-  $exit_cmd $EXIT_FAILURE
-}
-
 # func_check_version_match
 # Ensure that we are using m4 macros, and libtool script from the same
 # release of libtool.
@@ -421,37 +312,119 @@ _LT_EOF
 }
 
 
-## ----------- ##
-##    Main.    ##
-## ----------- ##
+# Shorthand for --mode=foo, only valid as the first argument
+case $1 in
+clean|clea|cle|cl)
+  shift; set dummy --mode clean ${1+"$@"}; shift
+  ;;
+compile|compil|compi|comp|com|co|c)
+  shift; set dummy --mode compile ${1+"$@"}; shift
+  ;;
+execute|execut|execu|exec|exe|ex|e)
+  shift; set dummy --mode execute ${1+"$@"}; shift
+  ;;
+finish|finis|fini|fin|fi|f)
+  shift; set dummy --mode finish ${1+"$@"}; shift
+  ;;
+install|instal|insta|inst|ins|in|i)
+  shift; set dummy --mode install ${1+"$@"}; shift
+  ;;
+link|lin|li|l)
+  shift; set dummy --mode link ${1+"$@"}; shift
+  ;;
+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+  shift; set dummy --mode uninstall ${1+"$@"}; shift
+  ;;
+esac
+]])
 
-$opt_help || {
-  # Sanity checks first:
-  func_check_version_match
+dnl SHORT	LONG			       DEFAULT		      INIT
+dnl ----------------------------------------------------------------------
+M4SH_GETOPTS(
+  [n],		[--dry-run|--dryrun],		[],			[],
+  [],		[--config],			[], 			[
+	func_config],
+  [;],		[--dlopen|-dlopen],		[],			[],
+  [],		[--preserve-dup-deps],		[],			[],
+  [],		[--features],			[],			[
+	func_features],
+  [],		[--finish],			[],			[
+	set dummy --mode finish ${1+"[$]@"}; shift],
+  [],		[--help],			[],			[],
+  [],		[--help-all],			[],			[
+	opt_help=': help-all'],
+  [!],		[--mode],			[],			[
+	case $optarg in
+	  # Valid mode arguments:
+	  clean|compile|execute|finish|install|link|relink|uninstall) ;;
+
+	  # Catch anything else as an error
+	  *) func_error "invalid argument for $opt"
+	     exit_cmd=exit
+	     break
+	     ;;
+	esac],
+  [],		[--no-silent|--no-quiet],	[false],		[
+	preserve_args="$preserve_args $opt"],
+  [],		[--no-verbose],			[false],		[
+	preserve_args="$preserve_args $opt"],
+  [],		[--silent|--quiet],		[],			[
+	preserve_args="$preserve_args $opt"
+        opt_verbose=false],
+  [],		[--verbose],			[],			[
+	preserve_args="$preserve_args $opt"
+	opt_silent=false],
+  [!],		[--tag],			[],			[
+	preserve_args="$preserve_args $opt $optarg"
+	func_enable_tag "$optarg"],
+[
+  # save first non-option argument
+  nonopt="$opt"; shift
+
+  # preserve --debug
+  $opt_debug && preserve_args="$preserve_args --debug"
 
-  if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-    func_fatal_configuration "not configured to build any kind of library"
-  fi
+  case $host in
+    *cygwin* | *mingw* | *pw32* | *cegcc*)
+      # don't eliminate duplications in $postdeps and $predeps
+      opt_duplicate_compiler_generated_deps=:
+      ;;
+    *)
+      opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
+      ;;
+  esac
 
-  test -z "$mode" && func_fatal_error "error: you must specify a MODE."
+  $opt_help || {
+    # Sanity checks first:
+    func_check_version_match
 
+    if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+      func_fatal_configuration "not configured to build any kind of library"
+    fi
 
-  # Darwin sucks
-  eval std_shrext=\"$shrext_cmds\"
+    test -z "$opt_mode" && func_fatal_error "error: you must specify a MODE."
 
+    # Darwin sucks
+    eval std_shrext=\"$shrext_cmds\"
 
-  # Only execute mode is allowed to have -dlopen flags.
-  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    func_error "unrecognized option \`-dlopen'"
-    $ECHO "$help" 1>&2
-    exit $EXIT_FAILURE
-  fi
+    # Only execute mode is allowed to have -dlopen flags.
+    if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
+      func_error "unrecognized option \`-dlopen'"
+      $ECHO "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
+
+    # Change the help message to a mode-specific one.
+    generic_help="$help"
+    help="Try \`$progname --help --mode=$opt_mode' for more information."
+  }
+])
 
-  # Change the help message to a mode-specific one.
-  generic_help="$help"
-  help="Try \`$progname --help --mode=$mode' for more information."
-}
 
+M4SH_VERBATIM([[
+## ----------- ##
+##    Main.    ##
+## ----------- ##
 
 # func_lalib_p file
 # True iff FILE is a libtool `.la' library or `.lo' object file.
@@ -1014,13 +987,13 @@ compiler."
 }
 
 $opt_help || {
-  test "$mode" = compile && func_mode_compile ${1+"$@"}
+  test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
 }
 
 func_mode_help ()
 {
     # We need to display help for each of the modes.
-    case $mode in
+    case $opt_mode in
       "")
         # Generic help is extracted from the usage comments
         # at the start of this file.
@@ -1196,7 +1169,7 @@ Otherwise, only FILE itself is deleted using RM."
         ;;
 
       *)
-        func_fatal_help "invalid operation mode \`$mode'"
+        func_fatal_help "invalid operation mode \`$opt_mode'"
         ;;
     esac
 
@@ -1211,13 +1184,13 @@ if $opt_help; then
   else
     {
       func_help noexit
-      for mode in compile link execute install finish uninstall clean; do
+      for opt_mode in compile link execute install finish uninstall clean; do
 	func_mode_help
       done
     } | sed -n '1p; 2,$s/^Usage:/  or: /p'
     {
       func_help noexit
-      for mode in compile link execute install finish uninstall clean; do
+      for opt_mode in compile link execute install finish uninstall clean; do
 	echo
 	func_mode_help
       done
@@ -1246,7 +1219,7 @@ func_mode_execute ()
       func_fatal_help "you must specify a COMMAND"
 
     # Handle -dlopen flags immediately.
-    for file in $execute_dlfiles; do
+    for file in $opt_dlopen; do
       test -f "$file" \
 	|| func_fatal_help "\`$file' is not a file"
 
@@ -1364,7 +1337,7 @@ func_mode_execute ()
     fi
 }
 
-test "$mode" = execute && func_mode_execute ${1+"$@"}
+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
 
 
 # func_mode_finish arg...
@@ -1444,7 +1417,7 @@ func_mode_finish ()
     exit $EXIT_SUCCESS
 }
 
-test "$mode" = finish && func_mode_finish ${1+"$@"}
+test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
 
 
 # func_mode_install arg...
@@ -1904,7 +1877,7 @@ func_mode_install ()
     fi
 }
 
-test "$mode" = install && func_mode_install ${1+"$@"}
+test "$opt_mode" = install && func_mode_install ${1+"$@"}
 
 
 # func_generate_dlsyms outputname originator pic_p
@@ -4683,7 +4656,7 @@ func_mode_link ()
     # Find all interdependent deplibs by searching for libraries
     # that are linked more than once (e.g. -la -lb -la)
     for deplib in $deplibs; do
-      if $opt_duplicate_deps ; then
+      if $opt_preserve_dup_deps ; then
 	case "$libs " in
 	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
 	esac
@@ -5080,7 +5053,7 @@ func_mode_link ()
 	  tmp_libs=
 	  for deplib in $dependency_libs; do
 	    deplibs="$deplib $deplibs"
-	    if $opt_duplicate_deps ; then
+	    if $opt_preserve_dup_deps ; then
 	      case "$tmp_libs " in
 	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
 	      esac
@@ -5222,7 +5195,7 @@ func_mode_link ()
 	      # or/and link against static libraries
 	      newdependency_libs="$deplib $newdependency_libs"
 	    fi
-	    if $opt_duplicate_deps ; then
+	    if $opt_preserve_dup_deps ; then
 	      case "$tmp_libs " in
 	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
 	      esac
@@ -5489,7 +5462,7 @@ func_mode_link ()
 	    fi
 	  fi
 
-	  if test "$linkmode" = prog || test "$mode" = relink; then
+	  if test "$linkmode" = prog || test "$opt_mode" = relink; then
 	    add_shlibpath=
 	    add_dir=
 	    add=
@@ -5612,7 +5585,7 @@ func_mode_link ()
 	  tmp_libs=
 	  for deplib in $dependency_libs; do
 	    newdependency_libs="$deplib $newdependency_libs"
-	    if $opt_duplicate_deps ; then
+	    if $opt_preserve_dup_deps ; then
 	      case "$tmp_libs " in
 	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
 	      esac
@@ -6129,7 +6102,7 @@ func_mode_link ()
       libobjs="$libobjs $symfileobj"
       test "X$libobjs" = "X " && libobjs=
 
-      if test "$mode" != relink; then
+      if test "$opt_mode" != relink; then
 	# Remove our outputs, but don't remove object files since they
 	# may have been created when compiling PIC objects.
 	removelist=
@@ -6627,7 +6600,7 @@ EOF
 	  hardcode_libdirs=
 	  dep_rpath=
 	  rpath="$finalize_rpath"
-	  test "$mode" != relink && rpath="$compile_rpath$rpath"
+	  test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
 	  for libdir in $rpath; do
 	    if test -n "$hardcode_libdir_flag_spec"; then
 	      if test -n "$hardcode_libdir_separator"; then
@@ -6676,7 +6649,7 @@ EOF
 	fi
 
 	shlibpath="$finalize_shlibpath"
-	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+	test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
 	if test -n "$shlibpath"; then
 	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
 	fi
@@ -6828,7 +6801,7 @@ EOF
 	fi
 
 	# Make a backup of the uninstalled library when relinking
-	if test "$mode" = relink; then
+	if test "$opt_mode" = relink; then
 	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
 	fi
 
@@ -6995,7 +6968,7 @@ EOF
 		lt_exit=$?
 
 		# Restore the uninstalled library and exit
-		if test "$mode" = relink; then
+		if test "$opt_mode" = relink; then
 		  ( cd "$output_objdir" && \
 		    $RM "${realname}T" && \
 		    $MV "${realname}U" "$realname" )
@@ -7088,7 +7061,7 @@ EOF
 	    lt_exit=$?
 
 	    # Restore the uninstalled library and exit
-	    if test "$mode" = relink; then
+	    if test "$opt_mode" = relink; then
 	      ( cd "$output_objdir" && \
 	        $RM "${realname}T" && \
 		$MV "${realname}U" "$realname" )
@@ -7100,7 +7073,7 @@ EOF
 	IFS="$save_ifs"
 
 	# Restore the uninstalled library and exit
-	if test "$mode" = relink; then
+	if test "$opt_mode" = relink; then
 	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
 
 	  if test -n "$convenience"; then
@@ -7939,7 +7912,7 @@ relink_command=\"$relink_command\""
     exit $EXIT_SUCCESS
 }
 
-{ test "$mode" = link || test "$mode" = relink; } &&
+{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
     func_mode_link ${1+"$@"}
 
 
@@ -7980,10 +7953,10 @@ func_mode_uninstall ()
       fi
       func_basename "$file"
       name="$func_basename_result"
-      test "$mode" = uninstall && odir="$dir"
+      test "$opt_mode" = uninstall && odir="$dir"
 
       # Remember odir for removal later, being careful to avoid duplicates
-      if test "$mode" = clean; then
+      if test "$opt_mode" = clean; then
 	case " $rmdirs " in
 	  *" $odir "*) ;;
 	  *) rmdirs="$rmdirs $odir" ;;
@@ -8016,7 +7989,7 @@ func_mode_uninstall ()
 	  done
 	  test -n "$old_library" && rmfiles="$rmfiles $odir/$old_library"
 
-	  case "$mode" in
+	  case "$opt_mode" in
 	  clean)
 	    case " $library_names " in
 	    *" $dlname "*) ;;
@@ -8062,7 +8035,7 @@ func_mode_uninstall ()
 	;;
 
       *)
-	if test "$mode" = clean ; then
+	if test "$opt_mode" = clean ; then
 	  noexename=$name
 	  case $file in
 	  *.exe)
@@ -8113,16 +8086,16 @@ func_mode_uninstall ()
     exit $exit_status
 }
 
-{ test "$mode" = uninstall || test "$mode" = clean; } &&
+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
     func_mode_uninstall ${1+"$@"}
 
-test -z "$mode" && {
+test -z "$opt_mode" && {
   help="$generic_help"
   func_fatal_help "you must specify a MODE"
 }
 
 test -z "$exec_cmd" && \
-  func_fatal_help "invalid operation mode \`$mode'"
+  func_fatal_help "invalid operation mode \`$opt_mode'"
 
 if test -n "$exec_cmd"; then
   eval exec "$exec_cmd"
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index b93dd0c..0b8a00e 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -748,15 +748,12 @@ _LT_EOF
   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
   # text mode, it properly converts lines to CR/LF.  This bash problem
   # is reportedly fixed, but why not run on old versions too?
-  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
 
   _LT_PROG_XSI_SHELLFNS
 
-  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  mv -f "$cfgfile" "$ofile" ||
+   mv -f "$cfgfile" "$ofile" ||
     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
   chmod +x "$ofile"
 ],
@@ -7254,206 +7251,68 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
 ])# _LT_CHECK_SHELL_FEATURES
 
 
+# _LT_PROG_XSI_REPLACE (FUNCNAME, REPLACEMENT-BODY)
+# -------------------------------------------------
+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
+m4_defun([_LT_PROG_XSI_REPLACE],
+[dnl {
+sed -i .tmp -e '/^$1 ()$/,/^} # $1 /c\
+$1 ()\
+{\
+m4_bpatsubst([$2], [$], [\\])
+} # XSI $1 implementation' "$cfgfile" \
+  || (mv -f "$cfgfile.tmp" "$cfgfile"; exit 1)
+rm -f "$cfgfile.tmp"])
+
+
 # _LT_PROG_XSI_SHELLFNS
 # ---------------------
-# Bourne and XSI compatible variants of some useful shell functions.
+# Replace existing portable implementations of several shell functions with
+# equivalent XSI compatible implementations.
 m4_defun([_LT_PROG_XSI_SHELLFNS],
-[case $xsi_shell in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result="${1##*/}"
-}
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-  func_basename_result="${1##*/}"
-}
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-func_stripname ()
-{
-  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-  # positional parameters, so assign one to ordinary parameter first.
-  func_stripname_result=${3}
-  func_stripname_result=${func_stripname_result#"${1}"}
-  func_stripname_result=${func_stripname_result%"${2}"}
-}
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=${1%%=*}
-  func_opt_split_arg=${1#*=}
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  case ${1} in
-    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-    *)    func_lo2o_result=${1} ;;
-  esac
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=${1%.*}.lo
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=$(( $[*] ))
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=${#1}
-}
-
-_LT_EOF
-    ;;
-  *) # Bourne compatible functions.
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-}
-
-dnl func_dirname_and_basename
-dnl A portable version of this function is already defined in general.m4sh
-dnl so there is no need for it here.
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
-  case ${2} in
-    .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-    *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-  esac
-}
-
-# sed scripts:
-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
-my_sed_long_arg='1s/^-[[^=]]*=//'
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
-  func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
-}
+[if test x"$xsi_shell" = xyes; then
+  _LT_PROG_XSI_REPLACE([func_dirname], [dnl
+    case ${1} in
+      */*) func_dirname_result="${1%/*}${2}" ;;
+      *  ) func_dirname_result="${3}" ;;
+    esac])
+
+  _LT_PROG_XSI_REPLACE([func_basename], [dnl
+    func_basename_result="${1##*/}"])
+
+  _LT_PROG_XSI_REPLACE([func_dirname_and_basename], [dnl
+    case ${1} in
+      */*) func_dirname_result="${1%/*}${2}" ;;
+      *  ) func_dirname_result="${3}" ;;
+    esac
+    func_basename_result="${1##*/}"])
 
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=`expr "$[@]"`
-}
+  _LT_PROG_XSI_REPLACE([func_stripname], [dnl
+    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+    # positional parameters, so assign one to ordinary parameter first.
+    func_stripname_result=${3}
+    func_stripname_result=${func_stripname_result#"${1}"}
+    func_stripname_result=${func_stripname_result%"${2}"}])
 
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
+  _LT_PROG_XSI_REPLACE([func_split_long_opt], [dnl
+    func_split_long_opt_name=${1%%=*}
+    func_split_long_opt_arg=${1#*=}])
 
-_LT_EOF
-esac
+  _LT_PROG_XSI_REPLACE([func_lo2o], [dnl
+    case ${1} in
+      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+      *)    func_lo2o_result=${1} ;;
+    esac])
 
-case $lt_shell_append in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
+  _LT_PROG_XSI_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
 
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$[1]+=\$[2]"
-}
-_LT_EOF
-    ;;
-  *)
-    cat << \_LT_EOF >> "$cfgfile"
+  _LT_PROG_XSI_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
 
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$[1]=\$$[1]\$[2]"
-}
+  _LT_PROG_XSI_REPLACE([func_len], [    func_len_result=${#1}])
+fi
 
-_LT_EOF
-    ;;
-  esac
+if test x"$lt_shell_append" = xyes; then
+  _LT_PROG_XSI_REPLACE([func_append], [    eval "${1}+=\\${2}"])
+fi
 ])


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Sun Jun 27 02:58:03 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OSloZ-0006KM-3P
	for mharc-libtool-commit@gnu.org; Sun, 27 Jun 2010 02:58:03 -0400
Received: from [140.186.70.92] (port=34766 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OSloW-0006Ic-JA
	for libtool-commit@gnu.org; Sun, 27 Jun 2010 02:58:01 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OSloV-0007z1-AE
	for libtool-commit@gnu.org; Sun, 27 Jun 2010 02:58:00 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:56688
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OSloV-0007yv-8T
	for libtool-commit@gnu.org; Sun, 27 Jun 2010 02:57:59 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OSloU-0002o8-Dd
	for libtool-commit@gnu.org; Sun, 27 Jun 2010 06:57:58 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OSloU-0005PV-Bf
	for libtool-commit@gnu.org; Sun, 27 Jun 2010 06:57:58 +0000
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b8dd17aeba9ae235d189b30ce38d64ba0ff2a309
X-Git-Newrev: ee2dde86ba2f1bdc0638726c6580b96800ad4b39
Message-Id: <E1OSloU-0005PV-Bf@vcs-noshell.in.savannah.gnu.org>
Date: Sun, 27 Jun 2010 06:57:58 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-35-gee2dde8
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 27 Jun 2010 06:58:01 -0000

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  ee2dde86ba2f1bdc0638726c6580b96800ad4b39 (commit)
      from  b8dd17aeba9ae235d189b30ce38d64ba0ff2a309 (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 ee2dde86ba2f1bdc0638726c6580b96800ad4b39
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Sun Jun 27 13:57:50 2010 +0700

    Fix portability regressions in today's earlier changeset.
    
    * libltdl/m4/libtool.m4 (_LT_PROG_XSI_REPLACE): `sed -i' is not
    portable; use `mv -f ...|| cp -f ...' instead.
    Add an initial backslash to sed `c' substitutions with leading
    whitespace, so that indentation is not removed by some non-POSIX
    compliant sed implementations.
    (_LT_PROG_XSI_SHELLFNS): Display a diagnostic warning message if
    one or more XSI function replacements failed.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 ChangeLog             |    9 +++++++++
 libltdl/m4/libtool.m4 |   16 +++++++++++-----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e95b836..853ee86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2010-06-27  Gary V. Vaughan  <gary@gnu.org>
 
+	Fix portability regressions in today's earlier changeset.
+	* libltdl/m4/libtool.m4 (_LT_PROG_XSI_REPLACE): `sed -i' is not
+	portable; use `mv -f ...|| cp -f ...' instead.
+	Add an initial backslash to sed `c' substitutions with leading
+	whitespace, so that indentation is not removed by some non-POSIX
+	compliant sed implementations.
+	(_LT_PROG_XSI_SHELLFNS): Display a diagnostic warning message if
+	one or more XSI function replacements failed.
+
 	getopt.m4sh generated libtool option parser, and XSI improvements.
 	* libltdl/m4/libtool.m4 (_LT_PROG_XSI_SHELLFNS): Moved portable
 	shell versions of various utility functions from here...
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 0b8a00e..2079e20 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -7257,13 +7257,15 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
 # '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
 m4_defun([_LT_PROG_XSI_REPLACE],
 [dnl {
-sed -i .tmp -e '/^$1 ()$/,/^} # $1 /c\
+sed -e '/^$1 ()$/,/^} # $1 /c\
 $1 ()\
 {\
-m4_bpatsubst([$2], [$], [\\])
-} # XSI $1 implementation' "$cfgfile" \
-  || (mv -f "$cfgfile.tmp" "$cfgfile"; exit 1)
-rm -f "$cfgfile.tmp"])
+m4_bpatsubsts([$2], [$], [\\], [^\([ 	]\)], [\\\1])
+} # XSI $1 implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_xsi_replace_fail=:
+])
 
 
 # _LT_PROG_XSI_SHELLFNS
@@ -7315,4 +7317,8 @@ fi
 if test x"$lt_shell_append" = xyes; then
   _LT_PROG_XSI_REPLACE([func_append], [    eval "${1}+=\\${2}"])
 fi
+
+if test x"$_lt_xsi_replace_fail" = x":"; then
+  AC_MSG_WARN([Unable to substitute faster XSI functions in $ofile]) 
+fi
 ])


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Sun Jun 27 03:55:11 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OSmhr-0005Fo-Ft
	for mharc-libtool-commit@gnu.org; Sun, 27 Jun 2010 03:55:11 -0400
Received: from [140.186.70.92] (port=53763 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OSmho-0005FT-GZ
	for libtool-commit@gnu.org; Sun, 27 Jun 2010 03:55:09 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OSmhn-0005Lv-07
	for libtool-commit@gnu.org; Sun, 27 Jun 2010 03:55:08 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:39102
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OSmhm-0005Lr-U9
	for libtool-commit@gnu.org; Sun, 27 Jun 2010 03:55:06 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OSmhm-0003Vk-Nr
	for libtool-commit@gnu.org; Sun, 27 Jun 2010 07:55:06 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OSmhm-0008Uc-It
	for libtool-commit@gnu.org; Sun, 27 Jun 2010 07:55:06 +0000
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: ee2dde86ba2f1bdc0638726c6580b96800ad4b39
X-Git-Newrev: 6767ed13de0f741bfa09ffa7fcf2d1cee6d2a3d5
Message-Id: <E1OSmhm-0008Uc-It@vcs-noshell.in.savannah.gnu.org>
Date: Sun, 27 Jun 2010 07:55:06 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-36-g6767ed1
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 27 Jun 2010 07:55:10 -0000

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  6767ed13de0f741bfa09ffa7fcf2d1cee6d2a3d5 (commit)
      from  ee2dde86ba2f1bdc0638726c6580b96800ad4b39 (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 6767ed13de0f741bfa09ffa7fcf2d1cee6d2a3d5
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Sun Jun 27 14:54:57 2010 +0700

    Amend a missed opt_mode rename instance in ltmain.m4sh.
    
    * libltdl/config/ltmain.m4sh <mode>: Rename to opt_mode.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 ChangeLog                  |    3 +++
 libltdl/config/ltmain.m4sh |    3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 853ee86..dd9f861 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-06-27  Gary V. Vaughan  <gary@gnu.org>
 
+	Amend a missed opt_mode rename instance in ltmain.m4sh.
+	* libltdl/config/ltmain.m4sh <mode>: Rename to opt_mode.
+
 	Fix portability regressions in today's earlier changeset.
 	* libltdl/m4/libtool.m4 (_LT_PROG_XSI_REPLACE): `sed -i' is not
 	portable; use `mv -f ...|| cp -f ...' instead.
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 0262322..59fbdb7 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -137,7 +137,6 @@ magic="%%%MAGIC variable%%%"
 magic_exe="%%%MAGIC EXE variable%%%"
 
 # Global variables.
-# $mode is unset
 nonopt=
 preserve_args=
 lo2o="s/\\.lo\$/.${objext}/"
@@ -5364,7 +5363,7 @@ func_mode_link ()
 	    linklib=$newlib
 	  fi # test -n "$old_archive_from_expsyms_cmds"
 
-	  if test "$linkmode" = prog || test "$mode" != relink; then
+	  if test "$linkmode" = prog || test "$opt_mode" != relink; then
 	    add_shlibpath=
 	    add_dir=
 	    add=


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Sun Jun 27 06:19:50 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OSoxq-0002LQ-J6
	for mharc-libtool-commit@gnu.org; Sun, 27 Jun 2010 06:19:50 -0400
Received: from [140.186.70.92] (port=34627 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OSoxn-0002LH-Hu
	for libtool-commit@gnu.org; Sun, 27 Jun 2010 06:19:48 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OSoxm-0005ms-4T
	for libtool-commit@gnu.org; Sun, 27 Jun 2010 06:19:47 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:53435
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OSoxm-0005ml-1q
	for libtool-commit@gnu.org; Sun, 27 Jun 2010 06:19:46 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OSoxl-0005Bu-PU
	for libtool-commit@gnu.org; Sun, 27 Jun 2010 10:19:45 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OSoxl-0000iK-Kd
	for libtool-commit@gnu.org; Sun, 27 Jun 2010 10:19:45 +0000
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 6767ed13de0f741bfa09ffa7fcf2d1cee6d2a3d5
X-Git-Newrev: 001f756ffad29eee44988440e14dfc679bde34dc
Message-Id: <E1OSoxl-0000iK-Kd@vcs-noshell.in.savannah.gnu.org>
Date: Sun, 27 Jun 2010 10:19:45 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-37-g001f756
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 27 Jun 2010 10:19:49 -0000

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  001f756ffad29eee44988440e14dfc679bde34dc (commit)
      from  6767ed13de0f741bfa09ffa7fcf2d1cee6d2a3d5 (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 001f756ffad29eee44988440e14dfc679bde34dc
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Sun Jun 27 17:19:35 2010 +0700

    Use TAB-SPACE in preference to SPACE-TAB.
    
    * libltdl/m4/libtool.m4 (_LT_PROG_XSI_REPLACE): Some editors
    might optimise away the SPACE in SPACE-TAB sequences, so use
    TAB-SPACE just in case.
    Reported by Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 ChangeLog             |    6 ++++++
 libltdl/m4/libtool.m4 |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dd9f861..2336820 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-06-27  Gary V. Vaughan  <gary@gnu.org>
 
+	Use TAB-SPACE in preference to SPACE-TAB.
+	* libltdl/m4/libtool.m4 (_LT_PROG_XSI_REPLACE): Some editors
+	might optimise away the SPACE in SPACE-TAB sequences, so use
+	TAB-SPACE just in case.
+	Reported by Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
 	Amend a missed opt_mode rename instance in ltmain.m4sh.
 	* libltdl/config/ltmain.m4sh <mode>: Rename to opt_mode.
 
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 2079e20..8827d4a 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -7260,7 +7260,7 @@ m4_defun([_LT_PROG_XSI_REPLACE],
 sed -e '/^$1 ()$/,/^} # $1 /c\
 $1 ()\
 {\
-m4_bpatsubsts([$2], [$], [\\], [^\([ 	]\)], [\\\1])
+m4_bpatsubsts([$2], [$], [\\], [^\([	 ]\)], [\\\1])
 } # XSI $1 implementation' "$cfgfile" > $cfgfile.tmp \
   && mv -f "$cfgfile.tmp" "$cfgfile" \
     || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Sun Jun 27 08:19:36 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OSqpk-0000ME-ON
	for mharc-libtool-commit@gnu.org; Sun, 27 Jun 2010 08:19:36 -0400
Received: from [140.186.70.92] (port=32841 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OSqph-0000M7-Vf
	for libtool-commit@gnu.org; Sun, 27 Jun 2010 08:19:34 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OSqpf-0005Jh-K1
	for libtool-commit@gnu.org; Sun, 27 Jun 2010 08:19:33 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:37603
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OSqpf-0005Jc-HS
	for libtool-commit@gnu.org; Sun, 27 Jun 2010 08:19:31 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OSqpf-0006cq-20
	for libtool-commit@gnu.org; Sun, 27 Jun 2010 12:19:31 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OSqpe-0007oK-P3
	for libtool-commit@gnu.org; Sun, 27 Jun 2010 12:19:31 +0000
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 001f756ffad29eee44988440e14dfc679bde34dc
X-Git-Newrev: 0483a52e8b841709ccfd8a80c60db018e8451c1c
Message-Id: <E1OSqpe-0007oK-P3@vcs-noshell.in.savannah.gnu.org>
Date: Sun, 27 Jun 2010 12:19:30 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-38-g0483a52
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 27 Jun 2010 12:19:35 -0000

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  0483a52e8b841709ccfd8a80c60db018e8451c1c (commit)
      from  001f756ffad29eee44988440e14dfc679bde34dc (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 0483a52e8b841709ccfd8a80c60db018e8451c1c
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Sun Jun 27 19:19:18 2010 +0700

    Add missing case branch terminators.
    
    * libltdl/config/ltmain.m4sh: Fixed everal case branches with
    missing ';;' terminators.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 ChangeLog                  |    4 ++++
 libltdl/config/ltmain.m4sh |    8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2336820..69117c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-06-27  Gary V. Vaughan  <gary@gnu.org>
 
+	Add missing case branch terminators.
+	* libltdl/config/ltmain.m4sh: Fixed everal case branches with
+	missing ';;' terminators.
+
 	Use TAB-SPACE in preference to SPACE-TAB.
 	* libltdl/m4/libtool.m4 (_LT_PROG_XSI_REPLACE): Some editors
 	might optimise away the SPACE in SPACE-TAB sequences, so use
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 59fbdb7..93c3222 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -5226,7 +5226,7 @@ func_mode_link ()
 	    *)
 	      case "$compile_rpath " in
 	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
+	      *) compile_rpath="$compile_rpath $absdir" ;;
 	      esac
 	      ;;
 	    esac
@@ -5235,7 +5235,7 @@ func_mode_link ()
 	    *)
 	      case "$finalize_rpath " in
 	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
+	      *) finalize_rpath="$finalize_rpath $libdir" ;;
 	      esac
 	      ;;
 	    esac
@@ -5300,7 +5300,7 @@ func_mode_link ()
 	    *)
 	      case "$compile_rpath " in
 	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
+	      *) compile_rpath="$compile_rpath $absdir" ;;
 	      esac
 	      ;;
 	    esac
@@ -5309,7 +5309,7 @@ func_mode_link ()
 	    *)
 	      case "$finalize_rpath " in
 	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
+	      *) finalize_rpath="$finalize_rpath $libdir" ;;
 	      esac
 	      ;;
 	    esac


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Sun Jun 27 18:42:40 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OT0Yi-0008LS-7u
	for mharc-libtool-commit@gnu.org; Sun, 27 Jun 2010 18:42:40 -0400
Received: from [140.186.70.92] (port=59954 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OT0Yd-0008LJ-3R
	for libtool-commit@gnu.org; Sun, 27 Jun 2010 18:42:39 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OT0YZ-0000ge-3x
	for libtool-commit@gnu.org; Sun, 27 Jun 2010 18:42:32 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:59962
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OT0YZ-0000gZ-18
	for libtool-commit@gnu.org; Sun, 27 Jun 2010 18:42:31 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OT0YY-0005jQ-Qc
	for libtool-commit@gnu.org; Sun, 27 Jun 2010 22:42:30 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OT0YX-00065n-F7
	for libtool-commit@gnu.org; Sun, 27 Jun 2010 22:42:30 +0000
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0483a52e8b841709ccfd8a80c60db018e8451c1c
X-Git-Newrev: 448445c6f8767ca83d019c126fdf894b927792fe
Message-Id: <E1OT0YX-00065n-F7@vcs-noshell.in.savannah.gnu.org>
Date: Sun, 27 Jun 2010 22:42:29 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-39-g448445c
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 27 Jun 2010 22:42:39 -0000

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  448445c6f8767ca83d019c126fdf894b927792fe (commit)
      from  0483a52e8b841709ccfd8a80c60db018e8451c1c (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 448445c6f8767ca83d019c126fdf894b927792fe
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Sun Jun 27 17:21:59 2010 +0700

    Add an XSI replacement for func_split_short_opt, with test cases.
    
    * libltdl/config/getopt.m4sh (m4go_shortnoargs): Remove 'v' now
    that getopt.m4sh doesn't steal that letter for the --version
    short option.
    * libltdl/config/ltmain.m4sh (M4SH_GETOPTS): We can now use 'v'
    as a short option for '--verbose'.
    * libltdl/config/getopt.m4sh (m4go_printopts): Add back in the
    leading '-' for remaining non-argument short options.
    (func_split_short_opt): Use the correct sed script variable.
    * libltdl/m4/libtool.m4 (_LT_CHECK_SHELL_FEATURES): Also ensure
    that XSI substring extraction is supported.
    (_LT_PROG_XSI_SHELLFNS): Use XSI substring extraction to split
    short options to avoid unnecessary forks if the host shell
    supports that.
    * tests/getopt-m4sh.at: New tests for getopt.m4sh coverage.
    * Makefile.am (TESTSUITE_AT): Add getopt-m4sh.at.
    (TESTS_ENVIRONMENT): Pass M4SH and SED for substition into the
    m4sh expansion performed in tests/getopt-m4sh.at.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 ChangeLog                  |   21 +++++++
 Makefile.am                |    3 +-
 libltdl/config/getopt.m4sh |    6 +-
 libltdl/config/ltmain.m4sh |    2 +-
 libltdl/m4/libtool.m4      |   14 +++++
 tests/getopt-m4sh.at       |  132 ++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 173 insertions(+), 5 deletions(-)
 create mode 100644 tests/getopt-m4sh.at

diff --git a/ChangeLog b/ChangeLog
index 69117c9..cf3af83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2010-06-28  Gary V. Vaughan  <gary@gnu.org>
+
+	Add an XSI replacement for func_split_short_opt, with test cases.
+	* libltdl/config/getopt.m4sh (m4go_shortnoargs): Remove 'v' now
+	that getopt.m4sh doesn't steal that letter for the --version
+	short option.
+	* libltdl/config/ltmain.m4sh (M4SH_GETOPTS): We can now use 'v'
+	as a short option for '--verbose'.
+	* libltdl/config/getopt.m4sh (m4go_printopts): Add back in the
+	leading '-' for remaining non-argument short options.
+	(func_split_short_opt): Use the correct sed script variable.
+	* libltdl/m4/libtool.m4 (_LT_CHECK_SHELL_FEATURES): Also ensure
+	that XSI substring extraction is supported.
+	(_LT_PROG_XSI_SHELLFNS): Use XSI substring extraction to split
+	short options to avoid unnecessary forks if the host shell
+	supports that.
+	* tests/getopt-m4sh.at: New tests for getopt.m4sh coverage.
+	* Makefile.am (TESTSUITE_AT): Add getopt-m4sh.at.
+	(TESTS_ENVIRONMENT): Pass M4SH and SED for substition into the
+	m4sh expansion performed in tests/getopt-m4sh.at.
+
 2010-06-27  Gary V. Vaughan  <gary@gnu.org>
 
 	Add missing case branch terminators.
diff --git a/Makefile.am b/Makefile.am
index 5822428..320a2a3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -453,6 +453,7 @@ dist-hook:
 # The testsuite files are evaluated in the order given here.
 TESTSUITE	= tests/testsuite
 TESTSUITE_AT	= tests/testsuite.at \
+		  tests/getopt-m4sh.at \
 		  tests/libtoolize.at \
 		  tests/help.at \
 		  tests/duplicate_members.at \
@@ -519,7 +520,7 @@ EXTRA_DIST     += $(srcdir)/$(TESTSUITE) $(TESTSUITE_AT) $(srcdir)/tests/package
 TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" \
 	CPP="$(CPP)" CPPFLAGS="$(CPPFLAGS)" LD="$(LD)" LDFLAGS="$(LDFLAGS)" \
 	LIBS="$(LIBS)" LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" \
-	STRIP="$(STRIP)" lt_INSTALL="$(INSTALL)" \
+	M4SH="$(M4SH)" SED="$(SED)" STRIP="$(STRIP)" lt_INSTALL="$(INSTALL)" \
 	OBJEXT="$(OBJEXT)" EXEEXT="$(EXEEXT)" \
 	SHELL="$(SHELL)" CONFIG_SHELL="$(SHELL)" \
 	CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" CXXCPP="$(CXXCPP)" \
diff --git a/libltdl/config/getopt.m4sh b/libltdl/config/getopt.m4sh
index 76f9d35..b3bf738 100644
--- a/libltdl/config/getopt.m4sh
+++ b/libltdl/config/getopt.m4sh
@@ -181,7 +181,7 @@ m4_define([m4go_branches], [])	# case branches to process options
 # OPTION, [|])' to insert the separator pipe symbols - which requires
 # that `m4go_shortargs' be undefined if the first option appended is not
 # prefixed by a leading `|'.
-m4_define([m4go_shortnoargs], [-\?*|-h*|-v*])
+m4_define([m4go_shortnoargs], [-\?*|-h*])
 
 
 # M4SH_GETOPTS(SHORT-SPEC1, LONG-MATCH1, DEF1, INIT1,
@@ -504,7 +504,7 @@ m4_ifset([m4go_shortargs], dnl (
 [      # Separate non-argument short options:
       ]m4go_shortnoargs[)
 			func_split_short_opt "$opt"
-			set dummy "$func_split_short_opt_name" "$func_split_short_opt_arg" ${1+"[$]@"}
+			set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"[$]@"}
 			shift
 			;;
 
@@ -627,7 +627,7 @@ func_split_short_opt ()
     my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
 
     func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
-    func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_arg"`
+    func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
 } # func_split_short_opt may be replaced by XSI optimised implementation
 
 
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 93c3222..217643d 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -370,7 +370,7 @@ M4SH_GETOPTS(
   [],		[--silent|--quiet],		[],			[
 	preserve_args="$preserve_args $opt"
         opt_verbose=false],
-  [],		[--verbose],			[],			[
+  [v],		[--verbose],			[],			[
 	preserve_args="$preserve_args $opt"
 	opt_silent=false],
   [!],		[--tag],			[],			[
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 8827d4a..dcb2c43 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -7227,6 +7227,14 @@ lt_shell_append=no
 AC_MSG_RESULT([$lt_shell_append])
 _LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
 
+AC_MSG_CHECKING([whether the shell understands variable substring :-syntax])
+lt_shell_substring=no
+( _lt_dummy="-bar"
+  test "${_lt_dummy:0:2},${_lt_dummy:2}" = -b,ar ) >/dev/null 2>&1 \
+&& lt_shell_substring=yes
+AC_MSG_RESULT([$lt_shell_substring])
+_LT_CONFIG_LIBTOOL_INIT([lt_shell_substring='$lt_shell_substring'])
+
 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
   lt_unset=unset
 else
@@ -7318,6 +7326,12 @@ if test x"$lt_shell_append" = xyes; then
   _LT_PROG_XSI_REPLACE([func_append], [    eval "${1}+=\\${2}"])
 fi
 
+if test x"$lt_shell_substring" = xyes; then
+  _LT_PROG_XSI_REPLACE([func_split_short_opt], [dnl
+    func_split_short_opt_name=${1:0:2}
+    func_split_short_opt_arg=${1:2}])
+fi
+
 if test x"$_lt_xsi_replace_fail" = x":"; then
   AC_MSG_WARN([Unable to substitute faster XSI functions in $ofile]) 
 fi
diff --git a/tests/getopt-m4sh.at b/tests/getopt-m4sh.at
new file mode 100644
index 0000000..c55acfc
--- /dev/null
+++ b/tests/getopt-m4sh.at
@@ -0,0 +1,132 @@
+# getopts-m4sh.at -- test getopts.m4sh option parsers       -*- Autotest -*-
+#
+#   Copyright (C) 2010 Free Software Foundation, Inc.
+#   Written by Gary V. Vaughan, 2010
+#
+#   This 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.
+#
+# GNU Libtool is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from  http://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.
+####
+
+AT_BANNER([Shell option parser generator.])
+
+auxdir="$abs_top_srcdir/libltdl/config"
+
+
+# _LT_AT_GETOPT_M4SH_SETUP
+# ------------------------
+m4_define([_LT_AT_GETOPT_M4SH_SETUP],
+[m4_pattern_allow([AS_INIT])
+m4_pattern_allow([m4_include])
+AT_DATA([options.m4sh],
+[[AS_INIT[]m4_include([getopt.m4sh])
+options=
+M4SH_GETOPTS(
+  [f],	[--force],	[],	[options="$options force"],
+  [i],	[--install],	[],	[options="$options install"],
+  [v],	[--verbose],	[],	[options="$options verbose"],
+  [!],	[--ltdl],	[false],[options="$options ltdl=$optarg"],
+[echo $options])
+]])
+m4_pattern_forbid([m4_include])
+m4_pattern_forbid([AS_INIT])
+
+$M4SH -B $abs_top_srcdir/libltdl/config options.m4sh \
+    | $SED \
+	-e "s,@LN_S\@,$LN_S,g" \
+	-e "s,@SED\@,$SED,g" \
+    > options
+])# _LT_AT_GETOPT_M4SH_SETUP
+
+
+# _LT_AT_XSI_FUNC_EXTRACT(FUNC-NAME)
+# ----------------------------------
+# Extract the XSI decorated function FUNC-NAME from libtool
+m4_define([_LT_AT_XSI_FUNC_EXTRACT],
+[dnl {{
+$SED '/^# $1/q' options > options.tmp
+$SED -n '/^$1/,/^} # XSI $1 /p' $abs_top_builddir/libtool >> options.tmp
+$SED '1,/^} # $1 /d' options >> options.tmp
+rm -f options && mv options.tmp options])
+
+
+## ----------------------- ##
+## Short option splitting. ##
+## ----------------------- ##
+
+AT_SETUP([short option splitting])
+
+AT_DATA(expout,
+[[force verbose install
+]])
+
+_LT_AT_GETOPT_M4SH_SETUP
+
+AT_CHECK([$SHELL ./options -fvi], 0, [expout])
+
+AT_CLEANUP
+
+
+AT_SETUP([enhanced shell short option splitting])
+
+# Don't bother with additional XSI checks unless functions were substituted
+AT_CHECK([fgrep '# XSI func_split_short_opt' $abs_top_builddir/libtool >/dev/null 2>&1 || (exit 77)])
+
+AT_DATA(expout,
+[[force verbose install
+]])
+
+_LT_AT_GETOPT_M4SH_SETUP
+_LT_AT_XSI_FUNC_EXTRACT(func_split_short_opt)
+
+AT_CHECK([$SHELL ./options -fvi], 0, [expout])
+
+AT_CLEANUP
+
+
+## ---------------------- ##
+## Long option splitting. ##
+## ---------------------- ##
+
+AT_SETUP([long option splitting])
+
+AT_DATA(expout,
+[[ltdl=long
+]])
+
+_LT_AT_GETOPT_M4SH_SETUP
+
+AT_CHECK([$SHELL ./options --ltdl=long], 0, [expout])
+
+AT_CLEANUP
+
+
+AT_SETUP([XSI long option splitting])
+
+# Don't bother with additional XSI checks unless functions were substituted
+AT_CHECK([fgrep '# XSI func_split_long_opt' $abs_top_builddir/libtool >/dev/null 2>&1 || (exit 77)])
+
+AT_DATA(expout,
+[[ltdl=long
+]])
+
+_LT_AT_GETOPT_M4SH_SETUP
+_LT_AT_XSI_FUNC_EXTRACT(func_split_long_opt)
+
+AT_CHECK([$SHELL ./options --ltdl=long], 0, [expout])
+
+AT_CLEANUP


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Mon Jun 28 02:50:03 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OT8AN-0000Fx-1a
	for mharc-libtool-commit@gnu.org; Mon, 28 Jun 2010 02:50:03 -0400
Received: from [140.186.70.92] (port=48801 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OT8AH-0000Fb-8A
	for libtool-commit@gnu.org; Mon, 28 Jun 2010 02:50:01 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OT8AE-0001fj-0Z
	for libtool-commit@gnu.org; Mon, 28 Jun 2010 02:49:57 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:36893
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OT8AD-0001fX-UL
	for libtool-commit@gnu.org; Mon, 28 Jun 2010 02:49:53 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OT8AD-00036k-8I
	for libtool-commit@gnu.org; Mon, 28 Jun 2010 06:49:53 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OT8AC-00028h-WD
	for libtool-commit@gnu.org; Mon, 28 Jun 2010 06:49:53 +0000
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 448445c6f8767ca83d019c126fdf894b927792fe
X-Git-Newrev: 0da7d80909d02b7b13cb7d24e5318d38bf6d96bc
Message-Id: <E1OT8AC-00028h-WD@vcs-noshell.in.savannah.gnu.org>
Date: Mon, 28 Jun 2010 06:49:53 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-40-g0da7d80
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Jun 2010 06:50:01 -0000

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  0da7d80909d02b7b13cb7d24e5318d38bf6d96bc (commit)
      from  448445c6f8767ca83d019c126fdf894b927792fe (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 0da7d80909d02b7b13cb7d24e5318d38bf6d96bc
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Mon Jun 28 06:06:22 2010 +0700

    Add func_append_quoted and do inline func_append substitutions.
    
    * libtool/config/ltmain.m4sh: Replace all occurrences of
    `foo="$foo bar"' with func_append. No decorator comment was
    added since /func_append [a-zA-Z0-9_]* "/ is already an
    excellent match regexp, and additional comments would only
    complicate things.
    (func_append_quoted): New function that quotes a value with
    func_quote_for_eval before appending it.  To avoid quoting the
    whitespace in the passed value, a single whitespace is added
    automatically.  Changed callers where possible.
    * libtool/m4/libtool.m4 (_LT_PROG_XSI_SHELLFNS): Perform a
    `+=' implementation substitution for func_append_quoted.  More
    importantly, systematically replace matching func_append calls
    with inline `+=' when supported (for maximum speed), and
    longhand `foo="$foo bar"' otherwise to avoid the function
    overhead.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 ChangeLog                  |   17 ++
 libltdl/config/ltmain.m4sh |  455 ++++++++++++++++++++++----------------------
 libltdl/m4/libtool.m4      |   17 ++
 3 files changed, 263 insertions(+), 226 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cf3af83..e939f43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
 2010-06-28  Gary V. Vaughan  <gary@gnu.org>
 
+	Add func_append_quoted and do inline func_append substitutions.
+	* libtool/config/ltmain.m4sh: Replace all occurrences of
+	`foo="$foo bar"' with func_append. No decorator comment was
+	added since /func_append [a-zA-Z0-9_]* "/ is already an
+	excellent match regexp, and additional comments would only
+	complicate things.
+	(func_append_quoted): New function that quotes a value with
+	func_quote_for_eval before appending it.  To avoid quoting the
+	whitespace in the passed value, a single whitespace is added
+	automatically.  Changed callers where possible.
+	* libtool/m4/libtool.m4 (_LT_PROG_XSI_SHELLFNS): Perform a
+	`+=' implementation substitution for func_append_quoted.  More
+	importantly, systematically replace matching func_append calls
+	with inline `+=' when supported (for maximum speed), and
+	longhand `foo="$foo bar"' otherwise to avoid the function
+	overhead.
+
 	Add an XSI replacement for func_split_short_opt, with test cases.
 	* libltdl/config/getopt.m4sh (m4go_shortnoargs): Remove 'v' now
 	that getopt.m4sh doesn't steal that letter for the --version
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 217643d..46a8aa3 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -156,6 +156,14 @@ func_append ()
     eval "${1}=\$${1}\${2}"
 } # func_append may be replaced by XSI optimised implementation
 
+# func_append_quoted var value
+# Quote VALUE and append to the end of shell variable VAR.
+func_append_quoted ()
+{
+    func_quote_for_eval "${2}"
+    eval "${1}=\$${1} \$func_quote_for_eval_result"
+} # func_append_quoted may be replaced by XSI optimised implementation
+
 
 # func_arith arithmetic-term...
 func_arith ()
@@ -364,24 +372,24 @@ M4SH_GETOPTS(
 	     ;;
 	esac],
   [],		[--no-silent|--no-quiet],	[false],		[
-	preserve_args="$preserve_args $opt"],
+	func_append preserve_args " $opt"],
   [],		[--no-verbose],			[false],		[
-	preserve_args="$preserve_args $opt"],
+	func_append preserve_args " $opt"],
   [],		[--silent|--quiet],		[],			[
-	preserve_args="$preserve_args $opt"
+	func_append preserve_args " $opt"
         opt_verbose=false],
   [v],		[--verbose],			[],			[
-	preserve_args="$preserve_args $opt"
+	func_append preserve_args " $opt"
 	opt_silent=false],
   [!],		[--tag],			[],			[
-	preserve_args="$preserve_args $opt $optarg"
+	func_append preserve_args " $opt $optarg"
 	func_enable_tag "$optarg"],
 [
   # save first non-option argument
   nonopt="$opt"; shift
 
   # preserve --debug
-  $opt_debug && preserve_args="$preserve_args --debug"
+  $opt_debug && func_append preserve_args " --debug"
 
   case $host in
     *cygwin* | *mingw* | *pw32* | *cegcc*)
@@ -548,8 +556,7 @@ func_infer_tag ()
     if test -n "$available_tags" && test -z "$tagname"; then
       CC_quoted=
       for arg in $CC; do
-        func_quote_for_eval "$arg"
-	CC_quoted="$CC_quoted $func_quote_for_eval_result"
+	func_append_quoted CC_quoted "$arg"
       done
       CC_expanded=`func_echo_all $CC`
       CC_quoted_expanded=`func_echo_all $CC_quoted`
@@ -568,8 +575,7 @@ func_infer_tag ()
 	    CC_quoted=
 	    for arg in $CC; do
 	      # Double-quote args containing other shell metacharacters.
-	      func_quote_for_eval "$arg"
-	      CC_quoted="$CC_quoted $func_quote_for_eval_result"
+	      func_append_quoted CC_quoted "$arg"
 	    done
 	    CC_expanded=`func_echo_all $CC`
 	    CC_quoted_expanded=`func_echo_all $CC_quoted`
@@ -678,12 +684,12 @@ func_mode_compile ()
 	  ;;
 
 	-pie | -fpie | -fPIE)
-          pie_flag="$pie_flag $arg"
+          func_append pie_flag " $arg"
 	  continue
 	  ;;
 
 	-shared | -static | -prefer-pic | -prefer-non-pic)
-	  later="$later $arg"
+	  func_append later " $arg"
 	  continue
 	  ;;
 
@@ -704,15 +710,14 @@ func_mode_compile ()
 	  save_ifs="$IFS"; IFS=','
 	  for arg in $args; do
 	    IFS="$save_ifs"
-	    func_quote_for_eval "$arg"
-	    lastarg="$lastarg $func_quote_for_eval_result"
+	    func_append lastarg " $arg"
 	  done
 	  IFS="$save_ifs"
 	  func_stripname ' ' '' "$lastarg"
 	  lastarg=$func_stripname_result
 
 	  # Add the arguments to base_compile.
-	  base_compile="$base_compile $lastarg"
+	  func_append base_compile " $lastarg"
 	  continue
 	  ;;
 
@@ -728,8 +733,7 @@ func_mode_compile ()
       esac    #  case $arg_mode
 
       # Aesthetically quote the previous argument.
-      func_quote_for_eval "$lastarg"
-      base_compile="$base_compile $func_quote_for_eval_result"
+      func_append_quoted base_compile "$lastarg"
     done # for arg
 
     case $arg_mode in
@@ -860,12 +864,12 @@ compiler."
 	$opt_dry_run || $RM $removelist
 	exit $EXIT_FAILURE
       fi
-      removelist="$removelist $output_obj"
+      func_append removelist " $output_obj"
       $ECHO "$srcfile" > "$lockfile"
     fi
 
     $opt_dry_run || $RM $removelist
-    removelist="$removelist $lockfile"
+    func_append removelist " $lockfile"
     trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
 
     if test -n "$fix_srcfile_path"; then
@@ -890,7 +894,7 @@ compiler."
 
       if test -z "$output_obj"; then
 	# Place PIC objects in $objdir
-	command="$command -o $lobj"
+	func_append command " -o $lobj"
       fi
 
       func_show_eval_locale "$command"	\
@@ -937,11 +941,11 @@ compiler."
 	command="$base_compile $qsrcfile $pic_flag"
       fi
       if test "$compiler_c_o" = yes; then
-	command="$command -o $obj"
+	func_append command " -o $obj"
       fi
 
       # Suppress compiler output if we already did a PIC compilation.
-      command="$command$suppress_output"
+      func_append command "$suppress_output"
       func_show_eval_locale "$command" \
         '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
 
@@ -1246,7 +1250,7 @@ func_mode_execute ()
 	dir="$func_dirname_result"
 
 	if test -f "$dir/$objdir/$dlname"; then
-	  dir="$dir/$objdir"
+	  func_append dir "/$objdir"
 	else
 	  if test ! -f "$dir/$dlname"; then
 	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
@@ -1303,8 +1307,7 @@ func_mode_execute ()
 	;;
       esac
       # Quote arguments (to preserve shell metacharacters).
-      func_quote_for_eval "$file"
-      args="$args $func_quote_for_eval_result"
+      func_append_quoted args "$file"
     done
 
     if test "X$opt_dry_run" = Xfalse; then
@@ -1349,7 +1352,7 @@ func_mode_finish ()
     if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
       for dir
       do
-	libdirs="$libdirs $dir"
+	func_append libdirs " $dir"
       done
 
       for libdir in $libdirs; do
@@ -1361,7 +1364,7 @@ func_mode_finish ()
 	if test -n "$finish_eval"; then
 	  # Do the single finish_eval.
 	  eval cmds=\"$finish_eval\"
-	  $opt_dry_run || eval "$cmds" || admincmds="$admincmds
+	  $opt_dry_run || eval "$cmds" || func_append admincmds "
        $cmds"
 	fi
       done
@@ -1441,7 +1444,7 @@ func_mode_install ()
     # The real first argument should be the name of the installation program.
     # Aesthetically quote it.
     func_quote_for_eval "$arg"
-    install_prog="$install_prog$func_quote_for_eval_result"
+    func_append install_prog "$func_quote_for_eval_result"
     install_shared_prog=$install_prog
     case " $install_prog " in
       *[\\\ /]cp\ *) install_cp=: ;;
@@ -1461,7 +1464,7 @@ func_mode_install ()
     do
       arg2=
       if test -n "$dest"; then
-	files="$files $dest"
+	func_append files " $dest"
 	dest=$arg
 	continue
       fi
@@ -1499,11 +1502,11 @@ func_mode_install ()
 
       # Aesthetically quote the argument.
       func_quote_for_eval "$arg"
-      install_prog="$install_prog $func_quote_for_eval_result"
+      func_append install_prog " $func_quote_for_eval_result"
       if test -n "$arg2"; then
 	func_quote_for_eval "$arg2"
       fi
-      install_shared_prog="$install_shared_prog $func_quote_for_eval_result"
+      func_append install_shared_prog " $func_quote_for_eval_result"
     done
 
     test -z "$install_prog" && \
@@ -1515,7 +1518,7 @@ func_mode_install ()
     if test -n "$install_override_mode" && $no_mode; then
       if $install_cp; then :; else
 	func_quote_for_eval "$install_override_mode"
-	install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result"
+	func_append install_shared_prog " -m $func_quote_for_eval_result"
       fi
     fi
 
@@ -1573,7 +1576,7 @@ func_mode_install ()
       case $file in
       *.$libext)
 	# Do the static libraries later.
-	staticlibs="$staticlibs $file"
+	func_append staticlibs " $file"
 	;;
 
       *.la)
@@ -1590,19 +1593,19 @@ func_mode_install ()
 	if test "X$destdir" = "X$libdir"; then
 	  case "$current_libdirs " in
 	  *" $libdir "*) ;;
-	  *) current_libdirs="$current_libdirs $libdir" ;;
+	  *) func_append current_libdirs " $libdir" ;;
 	  esac
 	else
 	  # Note the libdir as a future libdir.
 	  case "$future_libdirs " in
 	  *" $libdir "*) ;;
-	  *) future_libdirs="$future_libdirs $libdir" ;;
+	  *) func_append future_libdirs " $libdir" ;;
 	  esac
 	fi
 
 	func_dirname "$file" "/" ""
 	dir="$func_dirname_result"
-	dir="$dir$objdir"
+	func_append dir "$objdir"
 
 	if test -n "$relink_command"; then
 	  # Determine the prefix the user has applied to our future dir.
@@ -1679,7 +1682,7 @@ func_mode_install ()
 	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
 
 	# Maybe install the static library, too.
-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
 	;;
 
       *.lo)
@@ -2100,7 +2103,7 @@ static const void *lt_preloaded_setup() {
 	for arg in $LTCFLAGS; do
 	  case $arg in
 	  -pie | -fpie | -fPIE) ;;
-	  *) symtab_cflags="$symtab_cflags $arg" ;;
+	  *) func_append symtab_cflags " $arg" ;;
 	  esac
 	done
 
@@ -2297,7 +2300,7 @@ func_extract_archives ()
         func_extract_an_archive "$my_xdir" "$my_xabs"
 	;;
       esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
+      func_append my_oldobjs " "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
     done
 
     func_extract_archives_result="$my_oldobjs"
@@ -3890,9 +3893,9 @@ func_mode_link ()
 	    ;;
 	  *)
 	    if test "$prev" = dlfiles; then
-	      dlfiles="$dlfiles $arg"
+	      func_append dlfiles " $arg"
 	    else
-	      dlprefiles="$dlprefiles $arg"
+	      func_append dlprefiles " $arg"
 	    fi
 	    prev=
 	    continue
@@ -3916,7 +3919,7 @@ func_mode_link ()
 	    *-*-darwin*)
 	      case "$deplibs " in
 		*" $qarg.ltframework "*) ;;
-		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
+		*) func_append deplibs " $qarg.ltframework" # this is fixed later
 		   ;;
 	      esac
 	      ;;
@@ -3935,7 +3938,7 @@ func_mode_link ()
 	    moreargs=
 	    for fil in `cat "$save_arg"`
 	    do
-#	      moreargs="$moreargs $fil"
+#	      func_append moreargs " $fil"
 	      arg=$fil
 	      # A libtool-controlled object.
 
@@ -3964,7 +3967,7 @@ func_mode_link ()
 
 		  if test "$prev" = dlfiles; then
 		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		      dlfiles="$dlfiles $pic_object"
+		      func_append dlfiles " $pic_object"
 		      prev=
 		      continue
 		    else
@@ -3976,7 +3979,7 @@ func_mode_link ()
 		  # CHECK ME:  I think I busted this.  -Ossama
 		  if test "$prev" = dlprefiles; then
 		    # Preload the old-style object.
-		    dlprefiles="$dlprefiles $pic_object"
+		    func_append dlprefiles " $pic_object"
 		    prev=
 		  fi
 
@@ -4046,12 +4049,12 @@ func_mode_link ()
 	  if test "$prev" = rpath; then
 	    case "$rpath " in
 	    *" $arg "*) ;;
-	    *) rpath="$rpath $arg" ;;
+	    *) func_append rpath " $arg" ;;
 	    esac
 	  else
 	    case "$xrpath " in
 	    *" $arg "*) ;;
-	    *) xrpath="$xrpath $arg" ;;
+	    *) func_append xrpath " $arg" ;;
 	    esac
 	  fi
 	  prev=
@@ -4063,28 +4066,28 @@ func_mode_link ()
 	  continue
 	  ;;
 	weak)
-	  weak_libs="$weak_libs $arg"
+	  func_append weak_libs " $arg"
 	  prev=
 	  continue
 	  ;;
 	xcclinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $qarg"
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $qarg"
 	  prev=
 	  func_append compile_command " $qarg"
 	  func_append finalize_command " $qarg"
 	  continue
 	  ;;
 	xcompiler)
-	  compiler_flags="$compiler_flags $qarg"
+	  func_append compiler_flags " $qarg"
 	  prev=
 	  func_append compile_command " $qarg"
 	  func_append finalize_command " $qarg"
 	  continue
 	  ;;
 	xlinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $wl$qarg"
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $wl$qarg"
 	  prev=
 	  func_append compile_command " $wl$qarg"
 	  func_append finalize_command " $wl$qarg"
@@ -4197,8 +4200,8 @@ func_mode_link ()
 	case "$deplibs " in
 	*" -L$dir "*) ;;
 	*)
-	  deplibs="$deplibs -L$dir"
-	  lib_search_path="$lib_search_path $dir"
+	  func_append deplibs " -L$dir"
+	  func_append lib_search_path " $dir"
 	  ;;
 	esac
 	case $host in
@@ -4207,12 +4210,12 @@ func_mode_link ()
 	  case :$dllsearchpath: in
 	  *":$dir:"*) ;;
 	  ::) dllsearchpath=$dir;;
-	  *) dllsearchpath="$dllsearchpath:$dir";;
+	  *) func_append dllsearchpath ":$dir";;
 	  esac
 	  case :$dllsearchpath: in
 	  *":$testbindir:"*) ;;
 	  ::) dllsearchpath=$testbindir;;
-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+	  *) func_append dllsearchpath ":$testbindir";;
 	  esac
 	  ;;
 	esac
@@ -4236,7 +4239,7 @@ func_mode_link ()
 	    ;;
 	  *-*-rhapsody* | *-*-darwin1.[012])
 	    # Rhapsody C and math libraries are in the System framework
-	    deplibs="$deplibs System.ltframework"
+	    func_append deplibs " System.ltframework"
 	    continue
 	    ;;
 	  *-*-sco3.2v5* | *-*-sco5v6*)
@@ -4256,7 +4259,7 @@ func_mode_link ()
 	   ;;
 	 esac
 	fi
-	deplibs="$deplibs $arg"
+	func_append deplibs " $arg"
 	continue
 	;;
 
@@ -4269,7 +4272,7 @@ func_mode_link ()
       # classes, name mangling, and exception handling.
       # Darwin uses the -arch flag to determine output architecture.
       -model|-arch|-isysroot)
-	compiler_flags="$compiler_flags $arg"
+	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
 	prev=xcompiler
@@ -4277,12 +4280,12 @@ func_mode_link ()
 	;;
 
       -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-	compiler_flags="$compiler_flags $arg"
+	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
 	case "$new_inherited_linker_flags " in
 	    *" $arg "*) ;;
-	    * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
+	    * ) func_append new_inherited_linker_flags " $arg" ;;
 	esac
 	continue
 	;;
@@ -4355,7 +4358,7 @@ func_mode_link ()
 	esac
 	case "$xrpath " in
 	*" $dir "*) ;;
-	*) xrpath="$xrpath $dir" ;;
+	*) func_append xrpath " $dir" ;;
 	esac
 	continue
 	;;
@@ -4408,8 +4411,8 @@ func_mode_link ()
 	for flag in $args; do
 	  IFS="$save_ifs"
           func_quote_for_eval "$flag"
-	  arg="$arg $func_quote_for_eval_result"
-	  compiler_flags="$compiler_flags $func_quote_for_eval_result"
+	  func_append arg " $func_quote_for_eval_result"
+	  func_append compiler_flags " $func_quote_for_eval_result"
 	done
 	IFS="$save_ifs"
 	func_stripname ' ' '' "$arg"
@@ -4424,9 +4427,9 @@ func_mode_link ()
 	for flag in $args; do
 	  IFS="$save_ifs"
           func_quote_for_eval "$flag"
-	  arg="$arg $wl$func_quote_for_eval_result"
-	  compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
-	  linker_flags="$linker_flags $func_quote_for_eval_result"
+	  func_append arg " $wl$func_quote_for_eval_result"
+	  func_append compiler_flags " $wl$func_quote_for_eval_result"
+	  func_append linker_flags " $func_quote_for_eval_result"
 	done
 	IFS="$save_ifs"
 	func_stripname ' ' '' "$arg"
@@ -4471,7 +4474,7 @@ func_mode_link ()
 	arg="$func_quote_for_eval_result"
         func_append compile_command " $arg"
         func_append finalize_command " $arg"
-        compiler_flags="$compiler_flags $arg"
+        func_append compiler_flags " $arg"
         continue
         ;;
 
@@ -4483,7 +4486,7 @@ func_mode_link ()
 
       *.$objext)
 	# A standard object.
-	objs="$objs $arg"
+	func_append objs " $arg"
 	;;
 
       *.lo)
@@ -4514,7 +4517,7 @@ func_mode_link ()
 
 	    if test "$prev" = dlfiles; then
 	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		dlfiles="$dlfiles $pic_object"
+		func_append dlfiles " $pic_object"
 		prev=
 		continue
 	      else
@@ -4526,7 +4529,7 @@ func_mode_link ()
 	    # CHECK ME:  I think I busted this.  -Ossama
 	    if test "$prev" = dlprefiles; then
 	      # Preload the old-style object.
-	      dlprefiles="$dlprefiles $pic_object"
+	      func_append dlprefiles " $pic_object"
 	      prev=
 	    fi
 
@@ -4571,8 +4574,8 @@ func_mode_link ()
 
       *.$libext)
 	# An archive.
-	deplibs="$deplibs $arg"
-	old_deplibs="$old_deplibs $arg"
+	func_append deplibs " $arg"
+	func_append old_deplibs " $arg"
 	continue
 	;;
 
@@ -4581,14 +4584,14 @@ func_mode_link ()
 
 	if test "$prev" = dlfiles; then
 	  # This library was specified with -dlopen.
-	  dlfiles="$dlfiles $arg"
+	  func_append dlfiles " $arg"
 	  prev=
 	elif test "$prev" = dlprefiles; then
 	  # The library was specified with -dlpreopen.
-	  dlprefiles="$dlprefiles $arg"
+	  func_append dlprefiles " $arg"
 	  prev=
 	else
-	  deplibs="$deplibs $arg"
+	  func_append deplibs " $arg"
 	fi
 	continue
 	;;
@@ -4657,10 +4660,10 @@ func_mode_link ()
     for deplib in $deplibs; do
       if $opt_preserve_dup_deps ; then
 	case "$libs " in
-	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
 	esac
       fi
-      libs="$libs $deplib"
+      func_append libs " $deplib"
     done
 
     if test "$linkmode" = lib; then
@@ -4673,9 +4676,9 @@ func_mode_link ()
       if $opt_duplicate_compiler_generated_deps; then
 	for pre_post_dep in $predeps $postdeps; do
 	  case "$pre_post_deps " in
-	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
+	  *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
 	  esac
-	  pre_post_deps="$pre_post_deps $pre_post_dep"
+	  func_append pre_post_deps " $pre_post_dep"
 	done
       fi
       pre_post_deps=
@@ -4753,7 +4756,7 @@ func_mode_link ()
             deplib_base=$func_basename_result
 	    case " $weak_libs " in
 	    *" $deplib_base "*) ;;
-	    *) deplibs="$deplibs $deplib" ;;
+	    *) func_append deplibs " $deplib" ;;
 	    esac
 	  done
 	done
@@ -4774,11 +4777,11 @@ func_mode_link ()
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
 	  else
-	    compiler_flags="$compiler_flags $deplib"
+	    func_append compiler_flags " $deplib"
 	    if test "$linkmode" = lib ; then
 		case "$new_inherited_linker_flags " in
 		    *" $deplib "*) ;;
-		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
 		esac
 	    fi
 	  fi
@@ -4863,7 +4866,7 @@ func_mode_link ()
 	    if test "$linkmode" = lib ; then
 		case "$new_inherited_linker_flags " in
 		    *" $deplib "*) ;;
-		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
 		esac
 	    fi
 	  fi
@@ -4876,7 +4879,7 @@ func_mode_link ()
 	    test "$pass" = conv && continue
 	    newdependency_libs="$deplib $newdependency_libs"
 	    func_stripname '-L' '' "$deplib"
-	    newlib_search_path="$newlib_search_path $func_stripname_result"
+	    func_append newlib_search_path " $func_stripname_result"
 	    ;;
 	  prog)
 	    if test "$pass" = conv; then
@@ -4890,7 +4893,7 @@ func_mode_link ()
 	      finalize_deplibs="$deplib $finalize_deplibs"
 	    fi
 	    func_stripname '-L' '' "$deplib"
-	    newlib_search_path="$newlib_search_path $func_stripname_result"
+	    func_append newlib_search_path " $func_stripname_result"
 	    ;;
 	  *)
 	    func_warning "\`-L' is ignored for archives/objects"
@@ -4905,7 +4908,7 @@ func_mode_link ()
 	    # Make sure the xrpath contains only unique directories.
 	    case "$xrpath " in
 	    *" $dir "*) ;;
-	    *) xrpath="$xrpath $dir" ;;
+	    *) func_append xrpath " $dir" ;;
 	    esac
 	  fi
 	  deplibs="$deplib $deplibs"
@@ -4974,11 +4977,11 @@ func_mode_link ()
 	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
 	      # If there is no dlopen support or we're linking statically,
 	      # we need to preload.
-	      newdlprefiles="$newdlprefiles $deplib"
+	      func_append newdlprefiles " $deplib"
 	      compile_deplibs="$deplib $compile_deplibs"
 	      finalize_deplibs="$deplib $finalize_deplibs"
 	    else
-	      newdlfiles="$newdlfiles $deplib"
+	      func_append newdlfiles " $deplib"
 	    fi
 	  fi
 	  continue
@@ -5024,7 +5027,7 @@ func_mode_link ()
 	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
 	    case " $new_inherited_linker_flags " in
 	      *" $tmp_inherited_linker_flag "*) ;;
-	      *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
+	      *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
 	    esac
 	  done
 	fi
@@ -5032,8 +5035,8 @@ func_mode_link ()
 	if test "$linkmode,$pass" = "lib,link" ||
 	   test "$linkmode,$pass" = "prog,scan" ||
 	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+	  test -n "$dlopen" && func_append dlfiles " $dlopen"
+	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
 	fi
 
 	if test "$pass" = conv; then
@@ -5044,8 +5047,8 @@ func_mode_link ()
 	      func_fatal_error "cannot find name of link library for \`$lib'"
 	    fi
 	    # It is a libtool convenience library, so add in its objects.
-	    convenience="$convenience $ladir/$objdir/$old_library"
-	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
+	    func_append convenience " $ladir/$objdir/$old_library"
+	    func_append old_convenience " $ladir/$objdir/$old_library"
 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
 	    func_fatal_error "\`$lib' is not a convenience library"
 	  fi
@@ -5054,10 +5057,10 @@ func_mode_link ()
 	    deplibs="$deplib $deplibs"
 	    if $opt_preserve_dup_deps ; then
 	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
 	      esac
 	    fi
-	    tmp_libs="$tmp_libs $deplib"
+	    func_append tmp_libs " $deplib"
 	  done
 	  continue
 	fi # $pass = conv
@@ -5084,9 +5087,9 @@ func_mode_link ()
 	    # statically, we need to preload.  We also need to preload any
 	    # dependent libraries so libltdl's deplib preloader doesn't
 	    # bomb out in the load deplibs phase.
-	    dlprefiles="$dlprefiles $lib $dependency_libs"
+	    func_append dlprefiles " $lib $dependency_libs"
 	  else
-	    newdlfiles="$newdlfiles $lib"
+	    func_append newdlfiles " $lib"
 	  fi
 	  continue
 	fi # $pass = dlopen
@@ -5123,12 +5126,12 @@ func_mode_link ()
 	    dir="$ladir"
 	    absdir="$abs_ladir"
 	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
+	    func_append notinst_path " $abs_ladir"
 	  else
 	    dir="$ladir/$objdir"
 	    absdir="$abs_ladir/$objdir"
 	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
+	    func_append notinst_path " $abs_ladir"
 	  fi
 	fi # $installed = yes
 	func_stripname 'lib' '.la' "$laname"
@@ -5142,16 +5145,16 @@ func_mode_link ()
 	  # Prefer using a static library (so that no silly _DYNAMIC symbols
 	  # are required to link).
 	  if test -n "$old_library"; then
-	    newdlprefiles="$newdlprefiles $dir/$old_library"
+	    func_append newdlprefiles " $dir/$old_library"
 	    # Keep a list of preopened convenience libraries to check
 	    # that they are being used correctly in the link pass.
 	    test -z "$libdir" && \
-		dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
+		func_append dlpreconveniencelibs " $dir/$old_library"
 	  # Otherwise, use the dlname, so that lt_dlopen finds it.
 	  elif test -n "$dlname"; then
-	    newdlprefiles="$newdlprefiles $dir/$dlname"
+	    func_append newdlprefiles " $dir/$dlname"
 	  else
-	    newdlprefiles="$newdlprefiles $dir/$linklib"
+	    func_append newdlprefiles " $dir/$linklib"
 	  fi
 	fi # $pass = dlpreopen
 
@@ -5170,7 +5173,7 @@ func_mode_link ()
 
 
 	if test "$linkmode" = prog && test "$pass" != link; then
-	  newlib_search_path="$newlib_search_path $ladir"
+	  func_append newlib_search_path " $ladir"
 	  deplibs="$lib $deplibs"
 
 	  linkalldeplibs=no
@@ -5183,7 +5186,7 @@ func_mode_link ()
 	  for deplib in $dependency_libs; do
 	    case $deplib in
 	    -L*) func_stripname '-L' '' "$deplib"
-	         newlib_search_path="$newlib_search_path $func_stripname_result"
+	         func_append newlib_search_path " $func_stripname_result"
 		 ;;
 	    esac
 	    # Need to link against all dependency_libs?
@@ -5196,10 +5199,10 @@ func_mode_link ()
 	    fi
 	    if $opt_preserve_dup_deps ; then
 	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
 	      esac
 	    fi
-	    tmp_libs="$tmp_libs $deplib"
+	    func_append tmp_libs " $deplib"
 	  done # for deplib
 	  continue
 	fi # $linkmode = prog...
@@ -5214,7 +5217,7 @@ func_mode_link ()
 	      # Make sure the rpath contains only unique directories.
 	      case "$temp_rpath:" in
 	      *"$absdir:"*) ;;
-	      *) temp_rpath="$temp_rpath$absdir:" ;;
+	      *) func_append temp_rpath "$absdir:" ;;
 	      esac
 	    fi
 
@@ -5226,7 +5229,7 @@ func_mode_link ()
 	    *)
 	      case "$compile_rpath " in
 	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir" ;;
+	      *) func_append compile_rpath " $absdir" ;;
 	      esac
 	      ;;
 	    esac
@@ -5235,7 +5238,7 @@ func_mode_link ()
 	    *)
 	      case "$finalize_rpath " in
 	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir" ;;
+	      *) func_append finalize_rpath " $libdir" ;;
 	      esac
 	      ;;
 	    esac
@@ -5260,12 +5263,12 @@ func_mode_link ()
 	  case $host in
 	  *cygwin* | *mingw* | *cegcc*)
 	      # No point in relinking DLLs because paths are not encoded
-	      notinst_deplibs="$notinst_deplibs $lib"
+	      func_append notinst_deplibs " $lib"
 	      need_relink=no
 	    ;;
 	  *)
 	    if test "$installed" = no; then
-	      notinst_deplibs="$notinst_deplibs $lib"
+	      func_append notinst_deplibs " $lib"
 	      need_relink=yes
 	    fi
 	    ;;
@@ -5300,7 +5303,7 @@ func_mode_link ()
 	    *)
 	      case "$compile_rpath " in
 	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir" ;;
+	      *) func_append compile_rpath " $absdir" ;;
 	      esac
 	      ;;
 	    esac
@@ -5309,7 +5312,7 @@ func_mode_link ()
 	    *)
 	      case "$finalize_rpath " in
 	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir" ;;
+	      *) func_append finalize_rpath " $libdir" ;;
 	      esac
 	      ;;
 	    esac
@@ -5419,7 +5422,7 @@ func_mode_link ()
 		if test -n "$inst_prefix_dir"; then
 		  case $libdir in
 		    [\\/]*)
-		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
+		      func_append add_dir " -L$inst_prefix_dir$libdir"
 		      ;;
 		  esac
 		fi
@@ -5441,7 +5444,7 @@ func_mode_link ()
 	    if test -n "$add_shlibpath"; then
 	      case :$compile_shlibpath: in
 	      *":$add_shlibpath:"*) ;;
-	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
+	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
 	      esac
 	    fi
 	    if test "$linkmode" = prog; then
@@ -5455,7 +5458,7 @@ func_mode_link ()
 		 test "$hardcode_shlibpath_var" = yes; then
 		case :$finalize_shlibpath: in
 		*":$libdir:"*) ;;
-		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+		*) func_append finalize_shlibpath "$libdir:" ;;
 		esac
 	      fi
 	    fi
@@ -5475,7 +5478,7 @@ func_mode_link ()
 	    elif test "$hardcode_shlibpath_var" = yes; then
 	      case :$finalize_shlibpath: in
 	      *":$libdir:"*) ;;
-	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+	      *) func_append finalize_shlibpath "$libdir:" ;;
 	      esac
 	      add="-l$name"
 	    elif test "$hardcode_automatic" = yes; then
@@ -5492,7 +5495,7 @@ func_mode_link ()
 	      if test -n "$inst_prefix_dir"; then
 		case $libdir in
 		  [\\/]*)
-		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
+		    func_append add_dir " -L$inst_prefix_dir$libdir"
 		    ;;
 		esac
 	      fi
@@ -5569,15 +5572,15 @@ func_mode_link ()
 	           temp_xrpath=$func_stripname_result
 		   case " $xrpath " in
 		   *" $temp_xrpath "*) ;;
-		   *) xrpath="$xrpath $temp_xrpath";;
+		   *) func_append xrpath " $temp_xrpath";;
 		   esac;;
-	      *) temp_deplibs="$temp_deplibs $libdir";;
+	      *) func_append temp_deplibs " $libdir";;
 	      esac
 	    done
 	    dependency_libs="$temp_deplibs"
 	  fi
 
-	  newlib_search_path="$newlib_search_path $absdir"
+	  func_append newlib_search_path " $absdir"
 	  # Link against this library
 	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
 	  # ... and its dependency_libs
@@ -5586,10 +5589,10 @@ func_mode_link ()
 	    newdependency_libs="$deplib $newdependency_libs"
 	    if $opt_preserve_dup_deps ; then
 	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
 	      esac
 	    fi
-	    tmp_libs="$tmp_libs $deplib"
+	    func_append tmp_libs " $deplib"
 	  done
 
 	  if test "$link_all_deplibs" != no; then
@@ -5627,8 +5630,8 @@ func_mode_link ()
                       if test -z "$darwin_install_name"; then
                           darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
                       fi
-		      compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
-		      linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
+		      func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
+		      func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
 		      path=
 		    fi
 		  fi
@@ -5661,7 +5664,7 @@ func_mode_link ()
 	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
 	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
 	else
-	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  func_append compiler_flags " "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
 	fi
       fi
       dependency_libs="$newdependency_libs"
@@ -5678,7 +5681,7 @@ func_mode_link ()
 	  for dir in $newlib_search_path; do
 	    case "$lib_search_path " in
 	    *" $dir "*) ;;
-	    *) lib_search_path="$lib_search_path $dir" ;;
+	    *) func_append lib_search_path " $dir" ;;
 	    esac
 	  done
 	  newlib_search_path=
@@ -5736,10 +5739,10 @@ func_mode_link ()
 	    -L*)
 	      case " $tmp_libs " in
 	      *" $deplib "*) ;;
-	      *) tmp_libs="$tmp_libs $deplib" ;;
+	      *) func_append tmp_libs " $deplib" ;;
 	      esac
 	      ;;
-	    *) tmp_libs="$tmp_libs $deplib" ;;
+	    *) func_append tmp_libs " $deplib" ;;
 	    esac
 	  done
 	  eval $var=\"$tmp_libs\"
@@ -5755,7 +5758,7 @@ func_mode_link ()
 	  ;;
 	esac
 	if test -n "$i" ; then
-	  tmp_libs="$tmp_libs $i"
+	  func_append tmp_libs " $i"
 	fi
       done
       dependency_libs=$tmp_libs
@@ -5796,7 +5799,7 @@ func_mode_link ()
       # Now set the variables for building old libraries.
       build_libtool_libs=no
       oldlibs="$output"
-      objs="$objs$old_deplibs"
+      func_append objs "$old_deplibs"
       ;;
 
     lib)
@@ -5832,7 +5835,7 @@ func_mode_link ()
 	  echo
 	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
 	  $ECHO "*** objects $objs is not portable!"
-	  libobjs="$libobjs $objs"
+	  func_append libobjs " $objs"
 	fi
       fi
 
@@ -6030,7 +6033,7 @@ func_mode_link ()
 	  done
 
 	  # Make executables depend on our current version.
-	  verstring="$verstring:${current}.0"
+	  func_append verstring ":${current}.0"
 	  ;;
 
 	qnx)
@@ -6098,7 +6101,7 @@ func_mode_link ()
       fi
 
       func_generate_dlsyms "$libname" "$libname" "yes"
-      libobjs="$libobjs $symfileobj"
+      func_append libobjs " $symfileobj"
       test "X$libobjs" = "X " && libobjs=
 
       if test "$opt_mode" != relink; then
@@ -6117,7 +6120,7 @@ func_mode_link ()
 		   continue
 		 fi
 	       fi
-	       removelist="$removelist $p"
+	       func_append removelist " $p"
 	       ;;
 	    *) ;;
 	  esac
@@ -6128,7 +6131,7 @@ func_mode_link ()
 
       # Now set the variables for building old libraries.
       if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-	oldlibs="$oldlibs $output_objdir/$libname.$libext"
+	func_append oldlibs " $output_objdir/$libname.$libext"
 
 	# Transform .lo files to .o files.
 	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
@@ -6145,10 +6148,10 @@ func_mode_link ()
 	# If the user specified any rpath flags, then add them.
 	temp_xrpath=
 	for libdir in $xrpath; do
-	  temp_xrpath="$temp_xrpath -R$libdir"
+	  func_append temp_xrpath " -R$libdir"
 	  case "$finalize_rpath " in
 	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+	  *) func_append finalize_rpath " $libdir" ;;
 	  esac
 	done
 	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
@@ -6162,7 +6165,7 @@ func_mode_link ()
       for lib in $old_dlfiles; do
 	case " $dlprefiles $dlfiles " in
 	*" $lib "*) ;;
-	*) dlfiles="$dlfiles $lib" ;;
+	*) func_append dlfiles " $lib" ;;
 	esac
       done
 
@@ -6172,7 +6175,7 @@ func_mode_link ()
       for lib in $old_dlprefiles; do
 	case "$dlprefiles " in
 	*" $lib "*) ;;
-	*) dlprefiles="$dlprefiles $lib" ;;
+	*) func_append dlprefiles " $lib" ;;
 	esac
       done
 
@@ -6184,7 +6187,7 @@ func_mode_link ()
 	    ;;
 	  *-*-rhapsody* | *-*-darwin1.[012])
 	    # Rhapsody C library is in the System framework
-	    deplibs="$deplibs System.ltframework"
+	    func_append deplibs " System.ltframework"
 	    ;;
 	  *-*-netbsd*)
 	    # Don't link with libc until the a.out ld.so is fixed.
@@ -6201,7 +6204,7 @@ func_mode_link ()
 	  *)
 	    # Add libc to deplibs on all other systems if necessary.
 	    if test "$build_libtool_need_lc" = "yes"; then
-	      deplibs="$deplibs -lc"
+	      func_append deplibs " -lc"
 	    fi
 	    ;;
 	  esac
@@ -6250,7 +6253,7 @@ EOF
 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		  case " $predeps $postdeps " in
 		  *" $i "*)
-		    newdeplibs="$newdeplibs $i"
+		    func_append newdeplibs " $i"
 		    i=""
 		    ;;
 		  esac
@@ -6261,7 +6264,7 @@ EOF
 		  set dummy $deplib_matches; shift
 		  deplib_match=$1
 		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		    newdeplibs="$newdeplibs $i"
+		    func_append newdeplibs " $i"
 		  else
 		    droppeddeps=yes
 		    echo
@@ -6275,7 +6278,7 @@ EOF
 		fi
 		;;
 	      *)
-		newdeplibs="$newdeplibs $i"
+		func_append newdeplibs " $i"
 		;;
 	      esac
 	    done
@@ -6293,7 +6296,7 @@ EOF
 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		    case " $predeps $postdeps " in
 		    *" $i "*)
-		      newdeplibs="$newdeplibs $i"
+		      func_append newdeplibs " $i"
 		      i=""
 		      ;;
 		    esac
@@ -6304,7 +6307,7 @@ EOF
 		    set dummy $deplib_matches; shift
 		    deplib_match=$1
 		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		      newdeplibs="$newdeplibs $i"
+		      func_append newdeplibs " $i"
 		    else
 		      droppeddeps=yes
 		      echo
@@ -6326,7 +6329,7 @@ EOF
 		fi
 		;;
 	      *)
-		newdeplibs="$newdeplibs $i"
+		func_append newdeplibs " $i"
 		;;
 	      esac
 	    done
@@ -6343,7 +6346,7 @@ EOF
 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		case " $predeps $postdeps " in
 		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
+		  func_append newdeplibs " $a_deplib"
 		  a_deplib=""
 		  ;;
 		esac
@@ -6386,7 +6389,7 @@ EOF
 		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
 			 $SED -e 10q |
 			 $EGREP "$file_magic_regex" > /dev/null; then
-			newdeplibs="$newdeplibs $a_deplib"
+			func_append newdeplibs " $a_deplib"
 			a_deplib=""
 			break 2
 		      fi
@@ -6411,7 +6414,7 @@ EOF
 	      ;;
 	    *)
 	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
+	      func_append newdeplibs " $a_deplib"
 	      ;;
 	    esac
 	  done # Gone through all deplibs.
@@ -6427,7 +6430,7 @@ EOF
 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		case " $predeps $postdeps " in
 		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
+		  func_append newdeplibs " $a_deplib"
 		  a_deplib=""
 		  ;;
 		esac
@@ -6440,7 +6443,7 @@ EOF
 		    potlib="$potent_lib" # see symlink-check above in file_magic test
 		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
 		       $EGREP "$match_pattern_regex" > /dev/null; then
-		      newdeplibs="$newdeplibs $a_deplib"
+		      func_append newdeplibs " $a_deplib"
 		      a_deplib=""
 		      break 2
 		    fi
@@ -6465,7 +6468,7 @@ EOF
 	      ;;
 	    *)
 	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
+	      func_append newdeplibs " $a_deplib"
 	      ;;
 	    esac
 	  done # Gone through all deplibs.
@@ -6569,7 +6572,7 @@ EOF
 	*)
 	  case " $deplibs " in
 	  *" -L$path/$objdir "*)
-	    new_libs="$new_libs -L$path/$objdir" ;;
+	    func_append new_libs "_libs -L$path/$objdir" ;;
 	  esac
 	  ;;
 	esac
@@ -6579,10 +6582,10 @@ EOF
 	-L*)
 	  case " $new_libs " in
 	  *" $deplib "*) ;;
-	  *) new_libs="$new_libs $deplib" ;;
+	  *) func_append new_libs " $deplib" ;;
 	  esac
 	  ;;
-	*) new_libs="$new_libs $deplib" ;;
+	*) func_append new_libs " $deplib" ;;
 	esac
       done
       deplibs="$new_libs"
@@ -6611,18 +6614,18 @@ EOF
 		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 		    ;;
 		  *)
-		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
 		    ;;
 		  esac
 		fi
 	      else
 		eval flag=\"$hardcode_libdir_flag_spec\"
-		dep_rpath="$dep_rpath $flag"
+		func_append dep_rpath " $flag"
 	      fi
 	    elif test -n "$runpath_var"; then
 	      case "$perm_rpath " in
 	      *" $libdir "*) ;;
-	      *) perm_rpath="$perm_rpath $libdir" ;;
+	      *) func_apped perm_rpath " $libdir" ;;
 	      esac
 	    fi
 	  done
@@ -6640,7 +6643,7 @@ EOF
 	    # We should set the runpath_var.
 	    rpath=
 	    for dir in $perm_rpath; do
-	      rpath="$rpath$dir:"
+	      func_append rpath "$dir:"
 	    done
 	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
 	  fi
@@ -6674,7 +6677,7 @@ EOF
 	linknames=
 	for link
 	do
-	  linknames="$linknames $link"
+	  func_append linknames " $link"
 	done
 
 	# Use standard objects if they are pic
@@ -6685,7 +6688,7 @@ EOF
 	if test -n "$export_symbols" && test -n "$include_expsyms"; then
 	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
 	  export_symbols="$output_objdir/$libname.uexp"
-	  delfiles="$delfiles $export_symbols"
+	  func_append delfiles " $export_symbols"
 	fi
 
 	orig_export_symbols=
@@ -6756,7 +6759,7 @@ EOF
 	  # global variables. join(1) would be nice here, but unfortunately
 	  # isn't a blessed tool.
 	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	  delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+	  func_append delfiles " $export_symbols $output_objdir/$libname.filter"
 	  export_symbols=$output_objdir/$libname.def
 	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
 	fi
@@ -6766,7 +6769,7 @@ EOF
 	  case " $convenience " in
 	  *" $test_deplib "*) ;;
 	  *)
-	    tmp_deplibs="$tmp_deplibs $test_deplib"
+	    func_append tmp_deplibs " $test_deplib"
 	    ;;
 	  esac
 	done
@@ -6786,17 +6789,17 @@ EOF
 	    test "X$libobjs" = "X " && libobjs=
 	  else
 	    gentop="$output_objdir/${outputname}x"
-	    generated="$generated $gentop"
+	    func_append generated " $gentop"
 
 	    func_extract_archives $gentop $convenience
-	    libobjs="$libobjs $func_extract_archives_result"
+	    func_append libobjs " $func_extract_archives_result"
 	    test "X$libobjs" = "X " && libobjs=
 	  fi
 	fi
 
 	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
 	  eval flag=\"$thread_safe_flag_spec\"
-	  linker_flags="$linker_flags $flag"
+	  func_append linker_flags " $flag"
 	fi
 
 	# Make a backup of the uninstalled library when relinking
@@ -6865,7 +6868,7 @@ EOF
 	      $ECHO "$obj" >> $output
 	    done
 	    echo ')' >> $output
-	    delfiles="$delfiles $output"
+	    func_append delfiles " $output"
 	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
 	    output=${output_objdir}/${output_la}.lnk
 	    func_verbose "creating linker input file list: $output"
@@ -6881,7 +6884,7 @@ EOF
 	    do
 	      $ECHO "$obj" >> $output
 	    done
-	    delfiles="$delfiles $output"
+	    func_append delfiles " $output"
 	    output=$firstobj\"$file_list_spec$output\"
 	  else
 	    if test -n "$save_libobjs"; then
@@ -6933,7 +6936,7 @@ EOF
 	      if test -n "$last_robj"; then
 	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
 	      fi
-	      delfiles="$delfiles $output"
+	      func_append delfiles " $output"
 
 	    else
 	      output=
@@ -7000,7 +7003,7 @@ EOF
 	      # global variables. join(1) would be nice here, but unfortunately
 	      # isn't a blessed tool.
 	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	      delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+	      func_append delfiles " $export_symbols $output_objdir/$libname.filter"
 	      export_symbols=$output_objdir/$libname.def
 	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
 	    fi
@@ -7041,10 +7044,10 @@ EOF
 	# Add any objects from preloaded convenience libraries
 	if test -n "$dlprefiles"; then
 	  gentop="$output_objdir/${outputname}x"
-	  generated="$generated $gentop"
+	  func_append generated " $gentop"
 
 	  func_extract_archives $gentop $dlprefiles
-	  libobjs="$libobjs $func_extract_archives_result"
+	  func_append libobjs " $func_extract_archives_result"
 	  test "X$libobjs" = "X " && libobjs=
 	fi
 
@@ -7156,7 +7159,7 @@ EOF
 	  reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
 	else
 	  gentop="$output_objdir/${obj}x"
-	  generated="$generated $gentop"
+	  func_append generated " $gentop"
 
 	  func_extract_archives $gentop $convenience
 	  reload_conv_objs="$reload_objs $func_extract_archives_result"
@@ -7239,8 +7242,8 @@ EOF
 	if test "$tagname" = CXX ; then
 	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
 	    10.[0123])
-	      compile_command="$compile_command ${wl}-bind_at_load"
-	      finalize_command="$finalize_command ${wl}-bind_at_load"
+	      func_append compile_command " ${wl}-bind_at_load"
+	      func_append finalize_command " ${wl}-bind_at_load"
 	    ;;
 	  esac
 	fi
@@ -7260,7 +7263,7 @@ EOF
 	*)
 	  case " $compile_deplibs " in
 	  *" -L$path/$objdir "*)
-	    new_libs="$new_libs -L$path/$objdir" ;;
+	    func_append new_libs " -L$path/$objdir" ;;
 	  esac
 	  ;;
 	esac
@@ -7270,17 +7273,17 @@ EOF
 	-L*)
 	  case " $new_libs " in
 	  *" $deplib "*) ;;
-	  *) new_libs="$new_libs $deplib" ;;
+	  *) func_append new_libs " $deplib" ;;
 	  esac
 	  ;;
-	*) new_libs="$new_libs $deplib" ;;
+	*) func_append new_libs " $deplib" ;;
 	esac
       done
       compile_deplibs="$new_libs"
 
 
-      compile_command="$compile_command $compile_deplibs"
-      finalize_command="$finalize_command $finalize_deplibs"
+      func_append compile_command " $compile_deplibs"
+      func_append finalize_command " $finalize_deplibs"
 
       if test -n "$rpath$xrpath"; then
 	# If the user specified any rpath flags, then add them.
@@ -7288,7 +7291,7 @@ EOF
 	  # This is the magic to use -rpath.
 	  case "$finalize_rpath " in
 	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+	  *) func_append finalize_rpath " $libdir" ;;
 	  esac
 	done
       fi
@@ -7307,18 +7310,18 @@ EOF
 	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 		;;
 	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
 		;;
 	      esac
 	    fi
 	  else
 	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
+	    func_append rpath " $flag"
 	  fi
 	elif test -n "$runpath_var"; then
 	  case "$perm_rpath " in
 	  *" $libdir "*) ;;
-	  *) perm_rpath="$perm_rpath $libdir" ;;
+	  *) func_append perm_rpath " $libdir" ;;
 	  esac
 	fi
 	case $host in
@@ -7327,12 +7330,12 @@ EOF
 	  case :$dllsearchpath: in
 	  *":$libdir:"*) ;;
 	  ::) dllsearchpath=$libdir;;
-	  *) dllsearchpath="$dllsearchpath:$libdir";;
+	  *) func_append dllsearchpath ":$libdir";;
 	  esac
 	  case :$dllsearchpath: in
 	  *":$testbindir:"*) ;;
 	  ::) dllsearchpath=$testbindir;;
-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+	  *) func_append dllsearchpath ":$testbindir";;
 	  esac
 	  ;;
 	esac
@@ -7358,18 +7361,18 @@ EOF
 	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 		;;
 	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		func_append hardcode_libdirs "_libdirs$hardcode_libdir_separator$libdir"
 		;;
 	      esac
 	    fi
 	  else
 	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
+	    func_append rpath " $flag"
 	  fi
 	elif test -n "$runpath_var"; then
 	  case "$finalize_perm_rpath " in
 	  *" $libdir "*) ;;
-	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
+	  *) func_append finalize_perm_rpath " $libdir" ;;
 	  esac
 	fi
       done
@@ -7442,7 +7445,7 @@ EOF
 	  # We should set the runpath_var.
 	  rpath=
 	  for dir in $perm_rpath; do
-	    rpath="$rpath$dir:"
+	    func_append rpath "$dir:"
 	  done
 	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
 	fi
@@ -7450,7 +7453,7 @@ EOF
 	  # We should set the runpath_var.
 	  rpath=
 	  for dir in $finalize_perm_rpath; do
-	    rpath="$rpath$dir:"
+	    func_append rpath "$dir:"
 	  done
 	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
 	fi
@@ -7595,7 +7598,7 @@ EOF
 	else
 	  oldobjs="$old_deplibs $non_pic_objects"
 	  if test "$preload" = yes && test -f "$symfileobj"; then
-	    oldobjs="$oldobjs $symfileobj"
+	    func_append oldobjs " $symfileobj"
 	  fi
 	fi
 	addlibs="$old_convenience"
@@ -7603,10 +7606,10 @@ EOF
 
       if test -n "$addlibs"; then
 	gentop="$output_objdir/${outputname}x"
-	generated="$generated $gentop"
+	func_append generated " $gentop"
 
 	func_extract_archives $gentop $addlibs
-	oldobjs="$oldobjs $func_extract_archives_result"
+	func_append oldobjs " $func_extract_archives_result"
       fi
 
       # Do each command in the archive commands.
@@ -7617,10 +7620,10 @@ EOF
 	# Add any objects from preloaded convenience libraries
 	if test -n "$dlprefiles"; then
 	  gentop="$output_objdir/${outputname}x"
-	  generated="$generated $gentop"
+	  func_append generated " $gentop"
 
 	  func_extract_archives $gentop $dlprefiles
-	  oldobjs="$oldobjs $func_extract_archives_result"
+	  func_append oldobjs " $func_extract_archives_result"
 	fi
 
 	# POSIX demands no paths to be encoded in archives.  We have
@@ -7638,7 +7641,7 @@ EOF
 	else
 	  echo "copying selected object files to avoid basename conflicts..."
 	  gentop="$output_objdir/${outputname}x"
-	  generated="$generated $gentop"
+	  func_append generated " $gentop"
 	  func_mkdir_p "$gentop"
 	  save_oldobjs=$oldobjs
 	  oldobjs=
@@ -7662,9 +7665,9 @@ EOF
 		esac
 	      done
 	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-	      oldobjs="$oldobjs $gentop/$newobj"
+	      func_append oldobjs " $gentop/$newobj"
 	      ;;
-	    *) oldobjs="$oldobjs $obj" ;;
+	    *) func_append oldobjs " $obj" ;;
 	    esac
 	  done
 	fi
@@ -7770,9 +7773,9 @@ EOF
 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$deplib' is not a valid libtool archive"
-		newdependency_libs="$newdependency_libs $libdir/$name"
+		func_append newdependency_libs " $libdir/$name"
 		;;
-	      *) newdependency_libs="$newdependency_libs $deplib" ;;
+	      *) func_append newdependency_libs " $deplib" ;;
 	      esac
 	    done
 	    dependency_libs="$newdependency_libs"
@@ -7786,9 +7789,9 @@ EOF
 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$lib' is not a valid libtool archive"
-		newdlfiles="$newdlfiles $libdir/$name"
+		func_append newdlfiles " $libdir/$name"
 		;;
-	      *) newdlfiles="$newdlfiles $lib" ;;
+	      *) func_append newdlfiles " $lib" ;;
 	      esac
 	    done
 	    dlfiles="$newdlfiles"
@@ -7805,7 +7808,7 @@ EOF
 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$lib' is not a valid libtool archive"
-		newdlprefiles="$newdlprefiles $libdir/$name"
+		func_append newdlprefiles " $libdir/$name"
 		;;
 	      esac
 	    done
@@ -7817,7 +7820,7 @@ EOF
 		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
 		*) abs=`pwd`"/$lib" ;;
 	      esac
-	      newdlfiles="$newdlfiles $abs"
+	      func_append newdlfiles " $abs"
 	    done
 	    dlfiles="$newdlfiles"
 	    newdlprefiles=
@@ -7826,7 +7829,7 @@ EOF
 		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
 		*) abs=`pwd`"/$lib" ;;
 	      esac
-	      newdlprefiles="$newdlprefiles $abs"
+	      func_append newdlprefiles " $abs"
 	    done
 	    dlprefiles="$newdlprefiles"
 	  fi
@@ -7931,9 +7934,9 @@ func_mode_uninstall ()
     for arg
     do
       case $arg in
-      -f) RM="$RM $arg"; rmforce=yes ;;
-      -*) RM="$RM $arg" ;;
-      *) files="$files $arg" ;;
+      -f) func_append RM " $arg"; rmforce=yes ;;
+      -*) func_append RM " $arg" ;;
+      *) func_append files " $arg" ;;
       esac
     done
 
@@ -7958,7 +7961,7 @@ func_mode_uninstall ()
       if test "$opt_mode" = clean; then
 	case " $rmdirs " in
 	  *" $odir "*) ;;
-	  *) rmdirs="$rmdirs $odir" ;;
+	  *) func_append rmdirs " $odir" ;;
 	esac
       fi
 
@@ -7984,17 +7987,17 @@ func_mode_uninstall ()
 
 	  # Delete the libtool libraries and symlinks.
 	  for n in $library_names; do
-	    rmfiles="$rmfiles $odir/$n"
+	    func_append rmfiles " $odir/$n"
 	  done
-	  test -n "$old_library" && rmfiles="$rmfiles $odir/$old_library"
+	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
 
 	  case "$opt_mode" in
 	  clean)
 	    case " $library_names " in
 	    *" $dlname "*) ;;
-	    *) test -n "$dlname" && rmfiles="$rmfiles $odir/$dlname" ;;
+	    *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
 	    esac
-	    test -n "$libdir" && rmfiles="$rmfiles $odir/$name $odir/${name}i"
+	    test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
 	    ;;
 	  uninstall)
 	    if test -n "$library_names"; then
@@ -8022,13 +8025,13 @@ func_mode_uninstall ()
 	  # Add PIC object to the list of files to remove.
 	  if test -n "$pic_object" &&
 	     test "$pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$pic_object"
+	    func_append rmfiles " $dir/$pic_object"
 	  fi
 
 	  # Add non-PIC object to the list of files to remove.
 	  if test -n "$non_pic_object" &&
 	     test "$non_pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$non_pic_object"
+	    func_append rmfiles " $dir/$non_pic_object"
 	  fi
 	fi
 	;;
@@ -8044,7 +8047,7 @@ func_mode_uninstall ()
 	    noexename=$func_stripname_result
 	    # $file with .exe has already been added to rmfiles,
 	    # add $file without .exe
-	    rmfiles="$rmfiles $file"
+	    func_append rmfiles " $file"
 	    ;;
 	  esac
 	  # Do a test to see if this is a libtool program.
@@ -8053,7 +8056,7 @@ func_mode_uninstall ()
 	      func_ltwrapper_scriptname "$file"
 	      relink_command=
 	      func_source $func_ltwrapper_scriptname_result
-	      rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
+	      func_append rmfiles " $func_ltwrapper_scriptname_result"
 	    else
 	      relink_command=
 	      func_source $dir/$noexename
@@ -8061,12 +8064,12 @@ func_mode_uninstall ()
 
 	    # note $name still contains .exe if it was in $file originally
 	    # as does the version of $file that was added into $rmfiles
-	    rmfiles="$rmfiles $odir/$name $odir/${name}S.${objext}"
+	    func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
 	    if test "$fast_install" = yes && test -n "$relink_command"; then
-	      rmfiles="$rmfiles $odir/lt-$name"
+	      func_append rmfiles " $odir/lt-$name"
 	    fi
 	    if test "X$noexename" != "X$name" ; then
-	      rmfiles="$rmfiles $odir/lt-${noexename}.c"
+	      func_append rmfiles " $odir/lt-${noexename}.c"
 	    fi
 	  fi
 	fi
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index dcb2c43..01a9c41 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -7324,6 +7324,23 @@ fi
 
 if test x"$lt_shell_append" = xyes; then
   _LT_PROG_XSI_REPLACE([func_append], [    eval "${1}+=\\${2}"])
+
+  _LT_PROG_XSI_REPLACE([func_append_quoted], [dnl
+    func_quote_for_eval "${2}"
+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
+    eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
+
+  # Save a `func_append' function call where possible by direct use of '+='
+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_xsi_replace_fail=:
+else
+  # Save a `func_append' function call even when '+=' is not available
+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="\1%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_xsi_replace_fail=:
 fi
 
 if test x"$lt_shell_substring" = xyes; then


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Tue Jun 29 05:29:44 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OTX8R-00040Q-U4
	for mharc-libtool-commit@gnu.org; Tue, 29 Jun 2010 05:29:44 -0400
Received: from [140.186.70.92] (port=49405 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OTX8M-0003wr-Us
	for libtool-commit@gnu.org; Tue, 29 Jun 2010 05:29:40 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OTX8L-0002J6-Qy
	for libtool-commit@gnu.org; Tue, 29 Jun 2010 05:29:38 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:53360
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OTX8L-0002J0-N7
	for libtool-commit@gnu.org; Tue, 29 Jun 2010 05:29:37 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OTX8L-0006ea-4b
	for libtool-commit@gnu.org; Tue, 29 Jun 2010 09:29:37 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OTX8L-0004MM-2d
	for libtool-commit@gnu.org; Tue, 29 Jun 2010 09:29:37 +0000
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0da7d80909d02b7b13cb7d24e5318d38bf6d96bc
X-Git-Newrev: 6639fdbe2fe01d54f4bd21414c9bf6b7ec99f18b
Message-Id: <E1OTX8L-0004MM-2d@vcs-noshell.in.savannah.gnu.org>
Date: Tue, 29 Jun 2010 09:29:37 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-41-g6639fdb
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Jun 2010 09:29:40 -0000

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  6639fdbe2fe01d54f4bd21414c9bf6b7ec99f18b (commit)
      from  0da7d80909d02b7b13cb7d24e5318d38bf6d96bc (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 6639fdbe2fe01d54f4bd21414c9bf6b7ec99f18b
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Tue Jun 29 16:29:30 2010 +0700

    Use a real XSI compliant func_split_short_opt substitution.
    
    * libtool/m4/libtool.m4 (_LT_CHECK_SHELL_FEATURES): Remove
    test ${foo:n:m} substrings, instead adding a ${foo%??} check
    to the existing XSI tests.
    (_LT_PROG_XSI_SHELLFNS): Remove the ${foo:n:m} based
    func_split_short_opt substitution in favour of a properly
    XSI compliant substitution.
    Suggested by Paolo Bonzini.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 ChangeLog             |   11 +++++++++++
 libltdl/m4/libtool.m4 |   22 ++++++----------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e939f43..0a09fae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-06-29  Gary V. Vaughan  <gary@gnu.org>
+
+	Use a real XSI compliant func_split_short_opt substitution.
+	* libtool/m4/libtool.m4 (_LT_CHECK_SHELL_FEATURES): Remove
+	test ${foo:n:m} substrings, instead adding a ${foo%??} check
+	to the existing XSI tests.
+	(_LT_PROG_XSI_SHELLFNS): Remove the ${foo:n:m} based
+	func_split_short_opt substitution in favour of a properly
+	XSI compliant substitution.
+	Suggested by Paolo Bonzini.
+
 2010-06-28  Gary V. Vaughan  <gary@gnu.org>
 
 	Add func_append_quoted and do inline func_append substitutions.
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 01a9c41..7140627 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -7211,8 +7211,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],
 # Try some XSI features
 xsi_shell=no
 ( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,, \
+  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,b/c, \
     && eval 'test $(( 1 + 1 )) -eq 2 \
     && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
   && xsi_shell=yes
@@ -7227,14 +7227,6 @@ lt_shell_append=no
 AC_MSG_RESULT([$lt_shell_append])
 _LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
 
-AC_MSG_CHECKING([whether the shell understands variable substring :-syntax])
-lt_shell_substring=no
-( _lt_dummy="-bar"
-  test "${_lt_dummy:0:2},${_lt_dummy:2}" = -b,ar ) >/dev/null 2>&1 \
-&& lt_shell_substring=yes
-AC_MSG_RESULT([$lt_shell_substring])
-_LT_CONFIG_LIBTOOL_INIT([lt_shell_substring='$lt_shell_substring'])
-
 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
   lt_unset=unset
 else
@@ -7309,6 +7301,10 @@ m4_defun([_LT_PROG_XSI_SHELLFNS],
     func_split_long_opt_name=${1%%=*}
     func_split_long_opt_arg=${1#*=}])
 
+  _LT_PROG_XSI_REPLACE([func_split_short_opt], [dnl
+    func_split_short_opt_arg=${1#??}
+    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
+
   _LT_PROG_XSI_REPLACE([func_lo2o], [dnl
     case ${1} in
       *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
@@ -7343,12 +7339,6 @@ else
   test 0 -eq $? || _lt_xsi_replace_fail=:
 fi
 
-if test x"$lt_shell_substring" = xyes; then
-  _LT_PROG_XSI_REPLACE([func_split_short_opt], [dnl
-    func_split_short_opt_name=${1:0:2}
-    func_split_short_opt_arg=${1:2}])
-fi
-
 if test x"$_lt_xsi_replace_fail" = x":"; then
   AC_MSG_WARN([Unable to substitute faster XSI functions in $ofile]) 
 fi


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Tue Jun 29 05:32:56 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OTXBY-0004wN-JK
	for mharc-libtool-commit@gnu.org; Tue, 29 Jun 2010 05:32:56 -0400
Received: from [140.186.70.92] (port=49960 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OTXBV-0004w9-7O
	for libtool-commit@gnu.org; Tue, 29 Jun 2010 05:32:54 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OTXBU-0002oF-9T
	for libtool-commit@gnu.org; Tue, 29 Jun 2010 05:32:53 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:53384
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OTXBU-0002oA-3e
	for libtool-commit@gnu.org; Tue, 29 Jun 2010 05:32:52 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OTXBU-0006i7-07
	for libtool-commit@gnu.org; Tue, 29 Jun 2010 09:32:52 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OTXBT-0004cF-SQ
	for libtool-commit@gnu.org; Tue, 29 Jun 2010 09:32:51 +0000
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 6639fdbe2fe01d54f4bd21414c9bf6b7ec99f18b
X-Git-Newrev: e4edceb028dde5ac764a7158b05bb74eda7d00a7
Message-Id: <E1OTXBT-0004cF-SQ@vcs-noshell.in.savannah.gnu.org>
Date: Tue, 29 Jun 2010 09:32:51 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-42-ge4edceb
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Jun 2010 09:32:54 -0000

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  e4edceb028dde5ac764a7158b05bb74eda7d00a7 (commit)
      from  6639fdbe2fe01d54f4bd21414c9bf6b7ec99f18b (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 e4edceb028dde5ac764a7158b05bb74eda7d00a7
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Tue Jun 29 16:32:46 2010 +0700

    Correct func_split_short_opt comment cut-n-pasto.
    
    * libtool/config/getopt.m4sh (func_split_short_opt): Fix
    the function comment.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 ChangeLog                  |    4 ++++
 libltdl/config/getopt.m4sh |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0a09fae..8e075ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-06-29  Gary V. Vaughan  <gary@gnu.org>
 
+	Correct func_split_short_opt comment cut-n-pasto.
+	* libtool/config/getopt.m4sh (func_split_short_opt): Fix
+	the function comment.
+
 	Use a real XSI compliant func_split_short_opt substitution.
 	* libtool/m4/libtool.m4 (_LT_CHECK_SHELL_FEATURES): Remove
 	test ${foo:n:m} substrings, instead adding a ${foo%??} check
diff --git a/libltdl/config/getopt.m4sh b/libltdl/config/getopt.m4sh
index b3bf738..e9da56f 100644
--- a/libltdl/config/getopt.m4sh
+++ b/libltdl/config/getopt.m4sh
@@ -620,7 +620,7 @@ func_missing_arg ()
 
 # func_split_short_opt shortopt
 # Set func_split_short_opt_name and func_split_short_opt_arg shell
-# variables after splitting SHORTOPT at the `=' sign.
+# variables after splitting SHORTOPT after the 2nd character.
 func_split_short_opt ()
 {
     my_sed_short_opt='1s/^\(..\).*$/\1/;q'


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Tue Jun 29 18:12:53 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OTj2z-0006Gh-Bt
	for mharc-libtool-commit@gnu.org; Tue, 29 Jun 2010 18:12:53 -0400
Received: from [140.186.70.92] (port=40460 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OTj2w-0006FO-1x
	for libtool-commit@gnu.org; Tue, 29 Jun 2010 18:12:51 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OTj2u-0000hU-QA
	for libtool-commit@gnu.org; Tue, 29 Jun 2010 18:12:49 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:38242
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OTj2u-0000hQ-MD
	for libtool-commit@gnu.org; Tue, 29 Jun 2010 18:12:48 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OTj2u-0007XT-FB
	for libtool-commit@gnu.org; Tue, 29 Jun 2010 22:12:48 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OTj2u-0005xD-CT
	for libtool-commit@gnu.org; Tue, 29 Jun 2010 22:12:48 +0000
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e4edceb028dde5ac764a7158b05bb74eda7d00a7
X-Git-Newrev: d8bdf9339ba7de82f40c49705650506e0cc3f979
Message-Id: <E1OTj2u-0005xD-CT@vcs-noshell.in.savannah.gnu.org>
Date: Tue, 29 Jun 2010 22:12:48 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-43-gd8bdf93
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Jun 2010 22:12:51 -0000

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  d8bdf9339ba7de82f40c49705650506e0cc3f979 (commit)
      from  e4edceb028dde5ac764a7158b05bb74eda7d00a7 (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 d8bdf9339ba7de82f40c49705650506e0cc3f979
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Wed Jun 30 05:12:42 2010 +0700

    Add func_append test cases for smart and retarded implementations.
    
    * tests/getopt-m4sh.at (_LT_AT_FALLBACK_FUNC_EXTRACT): New
    macro to extract a fallback function implementation from
    ltmain.m4sh.
    [option appending]: Use it for a test of the fallback
    implementation of func_append.
    [enhanced shell option appending]: And also test the enhanced
    implementation.
    * libltdl/config/ltmain.m4sh (func_append_quoted): Fix missing \
    to escape a quoted space for eval.
    * libltdl/m4/libtool.m4 (_LT_PROG_XSI_SHELLFNS): Fix missing $ in
    dereference of func_append inline replacement for retarded
    shells.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 ChangeLog                  |   16 ++++++++++++
 libltdl/config/ltmain.m4sh |    2 +-
 libltdl/m4/libtool.m4      |    2 +-
 tests/getopt-m4sh.at       |   57 ++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 73 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8e075ad..e9ca7a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2010-06-30  Gary V. Vaughan  <gary@gnu.org>
+
+	Add func_append test cases for smart and retarded implementations.
+	* tests/getopt-m4sh.at (_LT_AT_FALLBACK_FUNC_EXTRACT): New
+	macro to extract a fallback function implementation from
+	ltmain.m4sh.
+	[option appending]: Use it for a test of the fallback
+	implementation of func_append.
+	[enhanced shell option appending]: And also test the enhanced
+	implementation.
+	* libltdl/config/ltmain.m4sh (func_append_quoted): Fix missing \\
+	to escape a quoted space for eval.
+	* libltdl/m4/libtool.m4 (_LT_PROG_XSI_SHELLFNS): Fix missing $ in
+	dereference of func_append inline replacement for retarded
+	shells.
+
 2010-06-29  Gary V. Vaughan  <gary@gnu.org>
 
 	Correct func_split_short_opt comment cut-n-pasto.
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 46a8aa3..fc2358e 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -161,7 +161,7 @@ func_append ()
 func_append_quoted ()
 {
     func_quote_for_eval "${2}"
-    eval "${1}=\$${1} \$func_quote_for_eval_result"
+    eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
 } # func_append_quoted may be replaced by XSI optimised implementation
 
 
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 7140627..f3ebc87 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -7333,7 +7333,7 @@ dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
   test 0 -eq $? || _lt_xsi_replace_fail=:
 else
   # Save a `func_append' function call even when '+=' is not available
-  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="\1%g' $cfgfile > $cfgfile.tmp \
+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
     && mv -f "$cfgfile.tmp" "$cfgfile" \
       || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
   test 0 -eq $? || _lt_xsi_replace_fail=:
diff --git a/tests/getopt-m4sh.at b/tests/getopt-m4sh.at
index c55acfc..572522a 100644
--- a/tests/getopt-m4sh.at
+++ b/tests/getopt-m4sh.at
@@ -34,13 +34,17 @@ m4_define([_LT_AT_GETOPT_M4SH_SETUP],
 m4_pattern_allow([m4_include])
 AT_DATA([options.m4sh],
 [[AS_INIT[]m4_include([getopt.m4sh])
+nl='
+'
+list=
 options=
 M4SH_GETOPTS(
+  [a!],	[--append],	[],	[func_append list "$optarg$nl"],
   [f],	[--force],	[],	[options="$options force"],
   [i],	[--install],	[],	[options="$options install"],
   [v],	[--verbose],	[],	[options="$options verbose"],
   [!],	[--ltdl],	[false],[options="$options ltdl=$optarg"],
-[echo $options])
+[echo "$list"$options])
 ]])
 m4_pattern_forbid([m4_include])
 m4_pattern_forbid([AS_INIT])
@@ -53,13 +57,25 @@ $M4SH -B $abs_top_srcdir/libltdl/config options.m4sh \
 ])# _LT_AT_GETOPT_M4SH_SETUP
 
 
+# _LT_AT_FALLBACK_FUNC_EXTRACT(FUNC-NAME)
+# ---------------------------------------
+# Extract the fallback function FUNC-NAME from ltmain.m4sh
+m4_define([_LT_AT_FALLBACK_FUNC_EXTRACT],
+[dnl {{
+$SED '/^# func_dirname /q' options > options.tmp
+echo '# func_append var value' >> options.tmp
+$SED -n '/^$1 ()/,/^} # $1 /p' $abs_top_srcdir/libltdl/config/ltmain.m4sh >> options.tmp
+$SED '1,/^# func_dirname/d' options >> options.tmp
+rm -f options && mv options.tmp options])
+
+
 # _LT_AT_XSI_FUNC_EXTRACT(FUNC-NAME)
 # ----------------------------------
 # Extract the XSI decorated function FUNC-NAME from libtool
 m4_define([_LT_AT_XSI_FUNC_EXTRACT],
 [dnl {{
 $SED '/^# $1/q' options > options.tmp
-$SED -n '/^$1/,/^} # XSI $1 /p' $abs_top_builddir/libtool >> options.tmp
+$SED -n '/^$1 ()/,/^} # XSI $1 /p' $abs_top_builddir/libtool >> options.tmp
 $SED '1,/^} # $1 /d' options >> options.tmp
 rm -f options && mv options.tmp options])
 
@@ -130,3 +146,40 @@ _LT_AT_XSI_FUNC_EXTRACT(func_split_long_opt)
 AT_CHECK([$SHELL ./options --ltdl=long], 0, [expout])
 
 AT_CLEANUP
+
+
+## ----------------- ##
+## Option appending. ##
+## ----------------- ##
+
+AT_SETUP([option appending])
+
+AT_DATA(expout,
+[[first   --append second
+third
+
+]])
+
+_LT_AT_GETOPT_M4SH_SETUP
+_LT_AT_FALLBACK_FUNC_EXTRACT(func_append)
+
+AT_CHECK([$SHELL ./options -a "first   --append second" -athird], 0, [expout])
+
+AT_CLEANUP
+
+
+AT_SETUP([enhanced shell option appending])
+
+AT_DATA(expout,
+[[first   --append second
+third
+
+]])
+
+_LT_AT_GETOPT_M4SH_SETUP
+_LT_AT_FALLBACK_FUNC_EXTRACT(func_append)
+_LT_AT_XSI_FUNC_EXTRACT(func_append)
+
+AT_CHECK([$SHELL ./options -a "first   --append second" -athird], 0, [expout])
+
+AT_CLEANUP


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Wed Jun 30 23:44:22 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OUAhK-00071o-IO
	for mharc-libtool-commit@gnu.org; Wed, 30 Jun 2010 23:44:22 -0400
Received: from [140.186.70.92] (port=57206 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OUAhI-0006zx-1Y
	for libtool-commit@gnu.org; Wed, 30 Jun 2010 23:44:21 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OUAhG-000547-Rj
	for libtool-commit@gnu.org; Wed, 30 Jun 2010 23:44:19 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:45972
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OUAhG-00053z-P5
	for libtool-commit@gnu.org; Wed, 30 Jun 2010 23:44:18 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OUAhG-0003lQ-F0
	for libtool-commit@gnu.org; Thu, 01 Jul 2010 03:44:18 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OUAhG-0002Wz-8u
	for libtool-commit@gnu.org; Thu, 01 Jul 2010 03:44:18 +0000
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d8bdf9339ba7de82f40c49705650506e0cc3f979
X-Git-Newrev: 57a4a21e9c6b0d83fb947121d0bb55799cb569cd
Message-Id: <E1OUAhG-0002Wz-8u@vcs-noshell.in.savannah.gnu.org>
Date: Thu, 01 Jul 2010 03:44:18 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [SCM] GNU Libtool branch, master, updated. v2.2.10-44-g57a4a21
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Jul 2010 03:44:21 -0000

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  57a4a21e9c6b0d83fb947121d0bb55799cb569cd (commit)
      from  d8bdf9339ba7de82f40c49705650506e0cc3f979 (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 57a4a21e9c6b0d83fb947121d0bb55799cb569cd
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Thu Jul 1 10:44:12 2010 +0700

    Skip `enhanced shell option appending' test when not available.
    
    * tests/getopt-m4sh.at [enhanced shell option appending]:
    _LT_AT_XSI_FUNC_EXTRACT will not be able to find the enhanced
    libtool func_append function if the replacement wasn't substituted
    by configure, since the decorator comments will be different - in
    that case simply skip the test.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 ChangeLog            |    9 +++++++++
 tests/getopt-m4sh.at |    3 +++
 2 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e9ca7a8..0bce799 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-07-01  Gary V. Vaughan  <gary@gnu.org>
+
+	Skip `enhanced shell option appending' test when not available.
+	* tests/getopt-m4sh.at [enhanced shell option appending]:
+	_LT_AT_XSI_FUNC_EXTRACT will not be able to find the enhanced
+	libtool func_append function if the replacement wasn't substituted
+	by configure, since the decorator comments will be different - in
+	that case simply skip the test.
+
 2010-06-30  Gary V. Vaughan  <gary@gnu.org>
 
 	Add func_append test cases for smart and retarded implementations.
diff --git a/tests/getopt-m4sh.at b/tests/getopt-m4sh.at
index 572522a..8373c8e 100644
--- a/tests/getopt-m4sh.at
+++ b/tests/getopt-m4sh.at
@@ -170,6 +170,9 @@ AT_CLEANUP
 
 AT_SETUP([enhanced shell option appending])
 
+# Don't bother with additional += check unless functions were substituted
+AT_CHECK([fgrep '# XSI func_append ' $abs_top_builddir/libtool >/dev/null 2>&1 || (exit 77)])
+
 AT_DATA(expout,
 [[first   --append second
 third


hooks/post-receive
-- 
GNU Libtool


