From MAILER-DAEMON Thu Jul 01 05:07:41 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OUFkD-0003eU-1j
	for mharc-libtool-commit@gnu.org; Thu, 01 Jul 2010 05:07:41 -0400
Received: from [140.186.70.92] (port=53994 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OUFk8-0003bR-PN
	for libtool-commit@gnu.org; Thu, 01 Jul 2010 05:07:39 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OUFk1-00046s-Vc
	for libtool-commit@gnu.org; Thu, 01 Jul 2010 05:07:36 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:33317
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OUFk1-00046m-Qu
	for libtool-commit@gnu.org; Thu, 01 Jul 2010 05:07:29 -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 1OUFk1-0007lz-Dj
	for libtool-commit@gnu.org; Thu, 01 Jul 2010 09:07:29 +0000
Received: from pekberg by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <INVALID.NOREPLY@gnu.org>) id 1OUFk1-0005FW-2v
	for libtool-commit@gnu.org; Thu, 01 Jul 2010 09:07:29 +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: 57a4a21e9c6b0d83fb947121d0bb55799cb569cd
X-Git-Newrev: c20dbb8781f88b1ae6e6659359229db64bc052e0
Message-Id: <E1OUFk1-0005FW-2v@vcs-noshell.in.savannah.gnu.org>
Date: Thu, 01 Jul 2010 09:07: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-46-gc20dbb8
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 09:07: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  c20dbb8781f88b1ae6e6659359229db64bc052e0 (commit)
       via  1ac3ced59db72099c6049e05b3643042fd5a9ea4 (commit)
      from  57a4a21e9c6b0d83fb947121d0bb55799cb569cd (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 c20dbb8781f88b1ae6e6659359229db64bc052e0
Author: Peter Rosin <peda@lysator.liu.se>
Date:   Mon Jun 28 09:31:11 2010 +0200

    For MSVC, embed the manifest as a resource in the executable.
    
    Fixes a lot of testsuite failures with MSVC 2003 (v8.0) and
    above (and perhaps also MSVC .Net) related to running programs
    that have been moved (e.g. installed) without their manifests
    also having been moved.
    
    * libltdl/m4/libtool.m4 (_LT_PATH_MANIFEST_TOOL): New macro
    that locates the Manifest Tool (mt) and verifies that it is
    indeed the manifest tool. The result is stored in the new
    variable MANIFEST_TOOL.
    (_LT_LINKER_SHLIBS) <postlink_cmds>: New tag variable.
    [ cygwin, mingw, cegcc ] <cl*>: Embed the manifest file as a
    resource. Make sure the embedding work regardless of if the
    @OUTPUT@ file name includes a trailing $EXEEXT.
    (_LT_LANG_CXX_CONFIG): Likewise.
    (_LT_LINKER_SHLIBS, _LT_LANG_CXX_CONFIG): Require the above
    _LT_PATH_MANIFEST_TOOL.
    * libltdl/config/ltmain.m4sh (func_mode_link): After linking
    a program, replace @OUTPUT@ in $postlink_cmds and then execute
    the commands.
    * doc/libtool.texi (libtool script contents): Document
    new postlink_cmds variable.
    (LT_INIT): Add that the MANIFEST_TOOL environment variable can
    be used to override the manifest tool to use.
    * tests/exeext.at: New. Make sure linking with both -o prog
    and -o prog$EXEEXT works.
    * Makefile.am (TESTSUITE_AT): Update.
    (TESTS_ENVIRONMENT): Propagate $(MANIFEST_TOOL) to the
    testsuite.
    * NEWS: Add note of the new MANIFEST_TOOL environment variable.

commit 1ac3ced59db72099c6049e05b3643042fd5a9ea4
Author: Peter Rosin <peda@lysator.liu.se>
Date:   Thu Jun 24 07:28:16 2010 +0200

    Add MSVC support.
    
    * libltdl/m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER)
    (_LT_LINKER_SHLIBS, _LT_LANG_CXX_CONFIG) [mingw, cygwin]: Add
    support for the Microsoft C/C++ Compiler (cl) relying on help
    from the compile script in Automake.
    * NEWS: Add note of the above.

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

Summary of changes:
 ChangeLog                        |   41 +++++++
 Makefile.am                      |    2 +
 NEWS                             |    6 +
 doc/libtool.texi                 |   14 +++
 libltdl/config/ltmain.m4sh       |   16 +++
 libltdl/m4/libtool.m4            |  230 ++++++++++++++++++++++++++++++-------
 tests/{pic_flag.at => exeext.at} |   50 +++++----
 7 files changed, 291 insertions(+), 68 deletions(-)
 copy tests/{pic_flag.at => exeext.at} (51%)

diff --git a/ChangeLog b/ChangeLog
index 0bce799..9dab360 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,44 @@
+2010-06-28  Peter Rosin  <peda@lysator.liu.se>
+
+	For MSVC, embed the manifest as a resource in the executable.
+	Fixes a lot of testsuite failures with MSVC 2003 (v8.0) and
+	above (and perhaps also MSVC .Net) related to running programs
+	that have been moved (e.g. installed) without their manifests
+	also having been moved.
+	* libltdl/m4/libtool.m4 (_LT_PATH_MANIFEST_TOOL): New macro
+	that locates the Manifest Tool (mt) and verifies that it is
+	indeed the manifest tool. The result is stored in the new
+	variable MANIFEST_TOOL.
+	(_LT_LINKER_SHLIBS) <postlink_cmds>: New tag variable.
+	[ cygwin, mingw, cegcc ] <cl*>: Embed the manifest file as a
+	resource. Make sure the embedding work regardless of if the
+	@OUTPUT@ file name includes a trailing $EXEEXT.
+	(_LT_LANG_CXX_CONFIG): Likewise.
+	(_LT_LINKER_SHLIBS, _LT_LANG_CXX_CONFIG): Require the above
+	_LT_PATH_MANIFEST_TOOL.
+	* libltdl/config/ltmain.m4sh (func_mode_link): After linking
+	a program, replace @OUTPUT@ in $postlink_cmds and then execute
+	the commands.
+	* doc/libtool.texi (libtool script contents): Document
+	new postlink_cmds variable.
+	(LT_INIT): Add that the MANIFEST_TOOL environment variable can
+	be used to override the manifest tool to use.
+	* tests/exeext.at: New. Make sure linking with both -o prog
+	and -o prog$EXEEXT works.
+	* Makefile.am (TESTSUITE_AT): Update.
+	(TESTS_ENVIRONMENT): Propagate $(MANIFEST_TOOL) to the
+	testsuite.
+	* NEWS: Add note of the new MANIFEST_TOOL environment variable.
+
+2010-06-24  Peter Rosin  <peda@lysator.liu.se>
+
+	Add MSVC support.
+	* libltdl/m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER)
+	(_LT_LINKER_SHLIBS, _LT_LANG_CXX_CONFIG) [mingw, cygwin]: Add
+	support for the Microsoft C/C++ Compiler (cl) relying on help
+	from the compile script in Automake.
+	* NEWS: Add note of the above.
+
 2010-07-01  Gary V. Vaughan  <gary@gnu.org>
 
 	Skip `enhanced shell option appending' test when not available.
diff --git a/Makefile.am b/Makefile.am
index 320a2a3..ef3c984 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -472,6 +472,7 @@ TESTSUITE_AT	= tests/testsuite.at \
 		  tests/search-path.at \
 		  tests/indirect_deps.at \
 		  tests/archive-in-archive.at \
+		  tests/exeext.at \
 		  tests/execute-mode.at \
 		  tests/bindir.at \
 		  tests/cwrapper.at \
@@ -521,6 +522,7 @@ 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)" \
 	M4SH="$(M4SH)" SED="$(SED)" STRIP="$(STRIP)" lt_INSTALL="$(INSTALL)" \
+	MANIFEST_TOOL="$(MANIFEST_TOOL)" \
 	OBJEXT="$(OBJEXT)" EXEEXT="$(EXEEXT)" \
 	SHELL="$(SHELL)" CONFIG_SHELL="$(SHELL)" \
 	CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" CXXCPP="$(CXXCPP)" \
diff --git a/NEWS b/NEWS
index 33531dc..95fa97d 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,12 @@ New in 2.2.12 2010-08-??: git version 2.2.11a, Libtool team:
   - On non-cygwin Windows systems, we now lookup potential library
     file names without regard to file name case.
 
+* Changes in supported systems or compilers:
+  - Initial support for the Microsoft C/C++ Compiler, with help from
+    the compile script in unreleased Automake 1.12. Override the manifest
+    tool used to embed the manifest resource through the environment
+    variable MANIFEST_TOOL.
+
 New in 2.2.10 2010-06-10: git version 2.2.9a, Libtool team:
 
 * New features:
diff --git a/doc/libtool.texi b/doc/libtool.texi
index 7ae2c66..af6e13d 100644
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -2306,6 +2306,11 @@ Program to use rather than checking for @command{as}.  Only used on
 Cygwin/MS-Windows at the moment.
 @end defvar
 
+@defvar MANIFEST_TOOL
+Program to use rather than checking for @command{mt}, the Manifest Tool.
+Only used on Cygwin/MS-Windows at the moment.
+@end defvar
+
 With 1.3 era libtool, if you wanted to know any details of what
 libtool had discovered about your architecture and environment, you
 had to run the script with @option{--config} and grep through the
@@ -6199,6 +6204,15 @@ Commands run after installing a shared or static library, respectively.
 Commands run after uninstalling a shared or static library, respectively.
 @end defvar
 
+@defvar postlink_cmds
+Commands necessary for finishing linking programs. @code{postlink_cmds}
+are executed immediately after the program is linked. Any occurance of
+the string @code{@@OUTPUT@@} in @code{postlink_cmds} is replaced by the
+name of the created executable (i.e. not the wrapper, if a wrapper is
+generated) prior to execution. Normally disabled (i.e.
+@code{postlink_cmds} empty).
+@end defvar
+
 @defvar reload_cmds
 @defvarx reload_flag
 Commands to create a reloadable object.
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index fc2358e..760b6aa 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -7423,6 +7423,11 @@ EOF
 	exit_status=0
 	func_show_eval "$link_command" 'exit_status=$?'
 
+	if test -n "$postlink_cmds"; then
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
 	# Delete the generated files.
 	if test -f "$output_objdir/${outputname}S.${objext}"; then
 	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
@@ -7468,6 +7473,12 @@ EOF
 	$opt_dry_run || $RM $output
 	# Link the executable and exit
 	func_show_eval "$link_command" 'exit $?'
+
+	if test -n "$postlink_cmds"; then
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
 	exit $EXIT_SUCCESS
       fi
 
@@ -7501,6 +7512,11 @@ EOF
 
       func_show_eval "$link_command" 'exit $?'
 
+      if test -n "$postlink_cmds"; then
+	postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+	func_execute_cmds "$postlink_cmds" 'exit $?'
+      fi
+
       # Now create the wrapper script.
       func_verbose "creating $output"
 
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index f3ebc87..89785c1 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -2198,8 +2198,9 @@ cygwin* | mingw* | pw32* | cegcc*)
   need_version=no
   need_lib_prefix=no
 
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
     postinstall_cmds='base_file=`basename \${file}`~
@@ -2232,13 +2233,42 @@ m4_if([$1], [],[
       library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}.lib'
+    sys_lib_search_path_spec="$LIB"
+    if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+      # It is most probably a Windows format PATH.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+    else
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+    fi
+    # FIXME: find the short name or the path components, as spaces are
+    # common. (e.g. "Program Files" -> "PROGRA~1")
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
     ;;
 
   *)
+    # Assume MSVC wrapper
     library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    dynamic_linker='Win32 ld.exe'
     ;;
   esac
-  dynamic_linker='Win32 ld.exe'
   # FIXME: first we should search . and the directory the executable is in
   shlibpath_var=PATH
   ;;
@@ -3290,6 +3320,28 @@ dnl AC_DEFUN([AM_PROG_NM], [])
 dnl AC_DEFUN([AC_PROG_NM], [])
 
 
+# _LT_PATH_MANIFEST_TOOL
+# ----------------------
+# locate the manifest tool
+m4_defun([_LT_PATH_MANIFEST_TOOL],
+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
+  [lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*])
+if test "x$lt_cv_path_mainfest_tool" != xyes; then
+  MANIFEST_TOOL=:
+fi
+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
+])# _LT_PATH_MANIFEST_TOOL
+
+
 # LT_LIB_M
 # --------
 # check for math library
@@ -4226,6 +4278,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
 m4_defun([_LT_LINKER_SHLIBS],
 [AC_REQUIRE([LT_PATH_LD])dnl
 AC_REQUIRE([LT_PATH_NM])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_DECL_EGREP])dnl
 m4_require([_LT_DECL_SED])dnl
@@ -4248,13 +4301,18 @@ m4_if([$1], [CXX], [
     ;;
   pw32*)
     _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-  ;;
+    ;;
   cygwin* | mingw* | cegcc*)
-    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
+    case $cc_basename in
+    cl*) ;;
+    *)
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      ;;
+    esac
+    ;;
   *)
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
+    ;;
   esac
   _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
 ], [
@@ -4794,20 +4852,60 @@ _LT_EOF
       # Microsoft Visual C++.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-      # FIXME: Should let the user specify the lib program.
-      _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	_LT_TAGVAR(always_export_symbols, $1)=yes
+	_LT_TAGVAR(file_list_spec, $1)='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	  else
+	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	  fi~
+	  $CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs @$output_objdir/$soname.exp -Wl,-DLL~
+	  linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+	  case $lt_outputfile in
+	    *.exe | *.EXE) ;;
+	    *) lt_outputfile="$lt_outputfile.exe" ;;
+	  esac~
+	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	    $MANIFEST_TOOL -manifest "$lt_outputfile.manifest" -outputresource:"$lt_outputfile" || exit 1;
+	    $RM "$lt_outputfile.manifest";
+	  fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	# FIXME: Should let the user specify the lib program.
+	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	_LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	;;
+      esac
       ;;
 
     darwin* | rhapsody*)
@@ -5342,6 +5440,8 @@ _LT_TAGDECL([], [include_expsyms], [1],
     [Symbols that must always be exported])
 _LT_TAGDECL([], [prelink_cmds], [2],
     [Commands necessary for linking programs (against libraries) with templates])
+_LT_TAGDECL([], [postlink_cmds], [2],
+    [Commands necessary for finishing linking programs])
 _LT_TAGDECL([], [file_list_spec], [1],
     [Specify filename containing input files])
 dnl FIXME: Not yet implemented
@@ -5443,6 +5543,7 @@ CC="$lt_save_CC"
 m4_defun([_LT_LANG_CXX_CONFIG],
 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
 if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
     ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
     (test "X$CXX" != "Xg++"))) ; then
@@ -5738,29 +5839,70 @@ if test "$_lt_caught_CXX_error" != yes; then
         ;;
 
       cygwin* | mingw* | pw32* | cegcc*)
-        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-        # as there is no search path for DLLs.
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
-        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-        _LT_TAGVAR(always_export_symbols, $1)=no
-        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-          # If the export-symbols file already is a .def file (1st line
-          # is EXPORTS), use it as is; otherwise, prepend...
-          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    cp $export_symbols $output_objdir/$soname.def;
-          else
-	    echo EXPORTS > $output_objdir/$soname.def;
-	    cat $export_symbols >> $output_objdir/$soname.def;
-          fi~
-          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-        else
-          _LT_TAGVAR(ld_shlibs, $1)=no
-        fi
-        ;;
+	case $GXX,$cc_basename in
+	,cl* | no,cl*)
+	  # Native MSVC
+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
+	  # no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=yes
+	  _LT_TAGVAR(file_list_spec, $1)='@'
+	  # Tell ltmain to make .lib files, not .a files.
+	  libext=lib
+	  # Tell ltmain to make .dll files, not .so files.
+	  shrext_cmds=".dll"
+	  # FIXME: Setting linknames here is a bad hack.
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	    else
+	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	    fi~
+	    $CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs @$output_objdir/$soname.exp -Wl,-DLL~
+	    linknames='
+	  # The linker will not automatically build a static lib if we build a DLL.
+	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	  # Don't use ranlib
+	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+	    case $lt_outputfile in
+	      *.exe *.EXE) ;;
+	      *) lt_outputfile="$lt_outputfile.exe" ;;
+	    esac~
+	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	      $MANIFEST_TOOL -manifest "$lt_outputfile.manifest" -outputresource:"$lt_outputfile" || exit 1;
+	      $RM "$lt_outputfile.manifest";
+	    fi'
+	  ;;
+	*)
+	  # g++
+	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+	  # as there is no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=no
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    # If the export-symbols file already is a .def file (1st line
+	    # is EXPORTS), use it as is; otherwise, prepend...
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      cp $export_symbols $output_objdir/$soname.def;
+	    else
+	      echo EXPORTS > $output_objdir/$soname.def;
+	      cat $export_symbols >> $output_objdir/$soname.def;
+	    fi~
+	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	  ;;
+	esac
+	;;
       darwin* | rhapsody*)
         _LT_DARWIN_LINKER_FEATURES($1)
 	;;
diff --git a/tests/pic_flag.at b/tests/exeext.at
similarity index 51%
copy from tests/pic_flag.at
copy to tests/exeext.at
index a729d16..ee5d755 100644
--- a/tests/pic_flag.at
+++ b/tests/exeext.at
@@ -1,6 +1,7 @@
-# pic_flag.at -- override the pic_flag at configure time   -*- Autotest -*-
-
+# exeext.at -- ensure that exeext handling works  -*- Autotest -*-
+#
 #   Copyright (C) 2010 Free Software Foundation, Inc.
+#   Written by Peter Rosin
 #
 #   This file is part of GNU Libtool.
 #
@@ -21,31 +22,32 @@
 # 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_SETUP([both of -o prog and -o prog$EXEEXT work])
+AT_KEYWORDS([libtool])
+
+AT_CHECK([test -n "$EXEEXT" || exit 77])
+
+bin=`pwd`/bin
+binext=`pwd`/binext
+mkdir src $bin srcext $binext
 
-AT_DATA([foo.c],
-[[int data = 42;
-int func(void) { return data; }
+AT_DATA(src/prog.c,
+[[
+int main(void) { return 0; }
 ]])
 
-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])
+$CC $CPPFLAGS $CFLAGS -c src/prog.c -o src/prog.$OBJEXT
+
+AT_CHECK($LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o src/prog src/prog.$OBJEXT,
+	 [0], [ignore], [ignore])
+AT_CHECK($LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o srcext/prog$EXEEXT src/prog.$OBJEXT,
+	 [0], [ignore], [ignore])
+
+$LIBTOOL --mode=install cp src/prog $bin/prog
+$LIBTOOL --mode=install cp srcext/prog$EXEEXT $binext/prog$EXEEXT
+
+LT_AT_EXEC_CHECK([$bin/prog])
+LT_AT_EXEC_CHECK([$binext/prog$EXEEXT])
 
 AT_CLEANUP


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Thu Jul 01 13:25:11 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OUNVf-0002Zv-Kw
	for mharc-libtool-commit@gnu.org; Thu, 01 Jul 2010 13:25:11 -0400
Received: from [140.186.70.92] (port=49240 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OUNVZ-0002YV-I0
	for libtool-commit@gnu.org; Thu, 01 Jul 2010 13:25:10 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OUNVU-0002l5-3I
	for libtool-commit@gnu.org; Thu, 01 Jul 2010 13:25:05 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:53510
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OUNVU-0002l0-0l
	for libtool-commit@gnu.org; Thu, 01 Jul 2010 13:25: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 1OUNVT-0005KA-8e
	for libtool-commit@gnu.org; Thu, 01 Jul 2010 17:24:59 +0000
Received: from pekberg by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <INVALID.NOREPLY@gnu.org>) id 1OUNVT-0006YJ-46
	for libtool-commit@gnu.org; Thu, 01 Jul 2010 17:24:59 +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: c20dbb8781f88b1ae6e6659359229db64bc052e0
X-Git-Newrev: 60dde3d469b48f716c74c07abeb2566ac386acd3
Message-Id: <E1OUNVT-0006YJ-46@vcs-noshell.in.savannah.gnu.org>
Date: Thu, 01 Jul 2010 17:24: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-47-g60dde3d
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 17:25: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  60dde3d469b48f716c74c07abeb2566ac386acd3 (commit)
      from  c20dbb8781f88b1ae6e6659359229db64bc052e0 (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 60dde3d469b48f716c74c07abeb2566ac386acd3
Author: Peter Rosin <peda@lysator.liu.se>
Date:   Thu Jul 1 19:22:29 2010 +0200

    Fix regression caused by "Add func_append_quoted and do..."
    
    * libltdl/config/ltmain.m4sh (func_mode_link): Remove leftover
    "_libs" trash.
    
    Signed-off-by: Peter Rosin <peda@lysator.liu.se>

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

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

diff --git a/ChangeLog b/ChangeLog
index 9dab360..ac85014 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-01  Peter Rosin  <peda@lysator.liu.se>
+
+	Fix regression caused by "Add func_append_quoted and do..."
+	* libltdl/config/ltmain.m4sh (func_mode_link): Remove leftover
+	"_libs" trash.
+
 2010-06-28  Peter Rosin  <peda@lysator.liu.se>
 
 	For MSVC, embed the manifest as a resource in the executable.
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 760b6aa..e5b68af 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -6572,7 +6572,7 @@ EOF
 	*)
 	  case " $deplibs " in
 	  *" -L$path/$objdir "*)
-	    func_append new_libs "_libs -L$path/$objdir" ;;
+	    func_append new_libs " -L$path/$objdir" ;;
 	  esac
 	  ;;
 	esac


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Fri Jul 02 02:32:01 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OUZn6-0002ER-RG
	for mharc-libtool-commit@gnu.org; Fri, 02 Jul 2010 02:32:00 -0400
Received: from [140.186.70.92] (port=51419 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OUZn3-0002Ca-PI
	for libtool-commit@gnu.org; Fri, 02 Jul 2010 02:31:59 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OUZn1-0000xW-Kk
	for libtool-commit@gnu.org; Fri, 02 Jul 2010 02:31:57 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:57928
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OUZn1-0000xM-IO
	for libtool-commit@gnu.org; Fri, 02 Jul 2010 02:31: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 1OUZn0-0006S2-Uo
	for libtool-commit@gnu.org; Fri, 02 Jul 2010 06:31:54 +0000
Received: from pekberg by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <INVALID.NOREPLY@gnu.org>) id 1OUZn0-0001YI-My
	for libtool-commit@gnu.org; Fri, 02 Jul 2010 06:31:54 +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: 60dde3d469b48f716c74c07abeb2566ac386acd3
X-Git-Newrev: 3ab9879a99dd0a4690c65a80edbcacaffae8bce9
Message-Id: <E1OUZn0-0001YI-My@vcs-noshell.in.savannah.gnu.org>
Date: Fri, 02 Jul 2010 06:31: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.10-48-g3ab9879
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, 02 Jul 2010 06:31: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  3ab9879a99dd0a4690c65a80edbcacaffae8bce9 (commit)
      from  60dde3d469b48f716c74c07abeb2566ac386acd3 (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 3ab9879a99dd0a4690c65a80edbcacaffae8bce9
Author: Peter Rosin <peda@lysator.liu.se>
Date:   Fri Jul 2 08:17:19 2010 +0200

    Don't trigger file name expansion when embedding manifests.
    
    * libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS)
    [ cygwin, mingw, cegcc ] <cl*>: Remove all spaces in the
    case statement of postlink_cmds to make file name expansion
    more unlikely.
    (_LT_LANG_CXX_CONFIG): Likewise, but also add the missing |.
    
    Signed-off-by: Peter Rosin <peda@lysator.liu.se>

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

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

diff --git a/ChangeLog b/ChangeLog
index ac85014..4064851 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-07-02  Peter Rosin  <peda@lysator.liu.se>
+
+	Don't trigger file name expansion when embedding manifests.
+	* libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS)
+	[ cygwin, mingw, cegcc ] <cl*>: Remove all spaces in the
+	case statement of postlink_cmds to make file name expansion
+	more unlikely.
+	(_LT_LANG_CXX_CONFIG): Likewise, but also add the missing |.
+
 2010-07-01  Peter Rosin  <peda@lysator.liu.se>
 
 	Fix regression caused by "Add func_append_quoted and do..."
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 89785c1..8475d4b 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -4880,7 +4880,7 @@ _LT_EOF
 	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
 	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
 	  case $lt_outputfile in
-	    *.exe | *.EXE) ;;
+	    *.exe|*.EXE) ;;
 	    *) lt_outputfile="$lt_outputfile.exe" ;;
 	  esac~
 	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
@@ -5868,7 +5868,7 @@ if test "$_lt_caught_CXX_error" != yes; then
 	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
 	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
 	    case $lt_outputfile in
-	      *.exe *.EXE) ;;
+	      *.exe|*.EXE) ;;
 	      *) lt_outputfile="$lt_outputfile.exe" ;;
 	    esac~
 	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Sat Jul 03 04:15:24 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OUxsi-0005uX-Gg
	for mharc-libtool-commit@gnu.org; Sat, 03 Jul 2010 04:15:24 -0400
Received: from [140.186.70.92] (port=49498 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OUxsf-0005tX-2K
	for libtool-commit@gnu.org; Sat, 03 Jul 2010 04:15:22 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OUxsd-0005eR-R1
	for libtool-commit@gnu.org; Sat, 03 Jul 2010 04:15:20 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:33088
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OUxsd-0005eJ-Pe
	for libtool-commit@gnu.org; Sat, 03 Jul 2010 04:15: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 1OUxsd-0008LZ-8B
	for libtool-commit@gnu.org; Sat, 03 Jul 2010 08:15:19 +0000
Received: from pekberg by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <INVALID.NOREPLY@gnu.org>) id 1OUxsc-0005dZ-Us
	for libtool-commit@gnu.org; Sat, 03 Jul 2010 08:15: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: 3ab9879a99dd0a4690c65a80edbcacaffae8bce9
X-Git-Newrev: c13532ae1f073a9a237ac880bd794c64026bf391
Message-Id: <E1OUxsc-0005dZ-Us@vcs-noshell.in.savannah.gnu.org>
Date: Sat, 03 Jul 2010 08:15: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.10-49-gc13532a
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, 03 Jul 2010 08:15: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  c13532ae1f073a9a237ac880bd794c64026bf391 (commit)
      from  3ab9879a99dd0a4690c65a80edbcacaffae8bce9 (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 c13532ae1f073a9a237ac880bd794c64026bf391
Author: Peter Rosin <peda@lysator.liu.se>
Date:   Sat Jul 3 10:14:35 2010 +0200

    Fix typo in "Add func_append_quoted and do..."
    
    * libltdl/config/ltmain.m4sh (func_mode_compile): Use
    func_append_quoted instead of func_append.
    
    Signed-off-by: Peter Rosin <peda@lysator.liu.se>

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

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

diff --git a/ChangeLog b/ChangeLog
index 4064851..ed4d472 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-03  Peter Rosin  <peda@lysator.liu.se>
+
+	Fix typo in "Add func_append_quoted and do..."
+	* libltdl/config/ltmain.m4sh (func_mode_compile): Use
+	func_append_quoted instead of func_append.
+
 2010-07-02  Peter Rosin  <peda@lysator.liu.se>
 
 	Don't trigger file name expansion when embedding manifests.
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index e5b68af..d2676f9 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -710,7 +710,7 @@ func_mode_compile ()
 	  save_ifs="$IFS"; IFS=','
 	  for arg in $args; do
 	    IFS="$save_ifs"
-	    func_append lastarg " $arg"
+	    func_append_quoted lastarg " $arg"
 	  done
 	  IFS="$save_ifs"
 	  func_stripname ' ' '' "$lastarg"


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Sun Jul 04 00:30:16 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OVGqO-0006nb-3A
	for mharc-libtool-commit@gnu.org; Sun, 04 Jul 2010 00:30:16 -0400
Received: from [140.186.70.92] (port=60832 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OVGqL-0006lc-8J
	for libtool-commit@gnu.org; Sun, 04 Jul 2010 00:30:14 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OVGqK-0004Bf-0X
	for libtool-commit@gnu.org; Sun, 04 Jul 2010 00:30:13 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:53894
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OVGqJ-0004Bb-Uq
	for libtool-commit@gnu.org; Sun, 04 Jul 2010 00:30: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 1OVGqJ-0006MW-FX
	for libtool-commit@gnu.org; Sun, 04 Jul 2010 04:30:11 +0000
Received: from cwilson by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <INVALID.NOREPLY@gnu.org>) id 1OVGqJ-0005R4-4m
	for libtool-commit@gnu.org; Sun, 04 Jul 2010 04:30:11 +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: c13532ae1f073a9a237ac880bd794c64026bf391
X-Git-Newrev: cec246760f4e5a5d93068858bfb4b80d560275d1
Message-Id: <E1OVGqJ-0005R4-4m@vcs-noshell.in.savannah.gnu.org>
Date: Sun, 04 Jul 2010 04:30:11 +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-50-gcec2467
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, 04 Jul 2010 04:30: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  cec246760f4e5a5d93068858bfb4b80d560275d1 (commit)
      from  c13532ae1f073a9a237ac880bd794c64026bf391 (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 cec246760f4e5a5d93068858bfb4b80d560275d1
Author: Charles Wilson <libtool@cwilson.fastmail.fm>
Date:   Fri Jun 25 00:06:30 2010 -0400

    Avoid false failures caused by filesystem interaction
    
    * tests/dlloader-api.at (dlloader API): Use uglified names for
    pseudo-modules.
    
    Signed-off-by: Charles Wilson <libtool@cwilson.fastmail.fm>

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

Summary of changes:
 ChangeLog             |    6 ++++++
 tests/dlloader-api.at |   29 +++++++++++++++++++++++------
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ed4d472..0ed11fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-03  Charles Wilson  <libtool@cwilson.fastmail.fm>
+
+	Avoid false failures caused by filesystem interaction
+	* tests/dlloader-api.at (dlloader API): Use uglified names for
+	pseudo-modules.
+
 2010-07-03  Peter Rosin  <peda@lysator.liu.se>
 
 	Fix typo in "Add func_append_quoted and do..."
diff --git a/tests/dlloader-api.at b/tests/dlloader-api.at
index 37c8984..5eeafba 100644
--- a/tests/dlloader-api.at
+++ b/tests/dlloader-api.at
@@ -45,7 +45,11 @@ first_open (lt_user_data data, const char *filename, lt_dladvise advise)
   static const char *first_module = "first";
   const char *ctx = (const char *) data;
 
-  if (!filename || strcmp (filename, "first"))
+  /* Use a magic string to avoid possible interactions with filesystem
+   * objects.  Prepend '/' to short-circuit libltdl's search of
+   * $shlibpath_var (e.g. PATH, LD_LIBRARY_PATH, or similar).
+   */
+  if (!filename || strcmp (filename, "/libltdl_dlloader_api_test_first"))
     {
       printf ("first_open denies a request\n");
       lt_dlseterror (LT_ERROR_FILE_NOT_FOUND);
@@ -111,7 +115,11 @@ last_open (lt_user_data data, const char *filename, lt_dladvise advise)
   static const char *last_module = "last";
   const char *ctx = (const char *) data;
 
-  if (!filename || strcmp (filename, "last"))
+  /* Use a magic string to avoid possible interactions with filesystem
+   * objects.  Prepend '/' to short-circuit libltdl's search of
+   * $shlibpath_var (e.g. PATH, LD_LIBRARY_PATH, or similar).
+   */
+  if (!filename || strcmp (filename, "/libltdl_dlloader_api_test_last"))
     {
       printf ("last_open denies a request\n");
       lt_dlseterror (LT_ERROR_FILE_NOT_FOUND);
@@ -269,7 +277,11 @@ main (int argc, char* argv[])
 
   printf ("Found loader \"%s\"\n", finder->name);
 
-  module = lt_dlopen ("first");
+  /* Use a magic string to avoid possible interactions with filesystem
+   * objects.  Prepend '/' to short-circuit libltdl's search of
+   * $shlibpath_var (e.g. PATH, LD_LIBRARY_PATH, or similar).
+   */
+  module = lt_dlopen ("/libltdl_dlloader_api_test_first");
 
   if (!module)
     {
@@ -311,7 +323,12 @@ main (int argc, char* argv[])
   printf ("result: %s\n", symbol ());
 
   lt_dlclose (module);
-  module = lt_dlopen ("last");
+
+  /* Use a magic string to avoid possible interactions with filesystem
+   * objects.  Prepend '/' to short-circuit libltdl's search of
+   * $shlibpath_var (e.g. PATH, LD_LIBRARY_PATH, or similar).
+   */
+  module = lt_dlopen ("/libltdl_dlloader_api_test_last");
 
   if (!module)
     {
@@ -375,14 +392,14 @@ LT_AT_HOST_DATA(expout,
 Found loader "first"
 last_init: last_ctx
 Found loader "last"
-first_open ("first"): first_ctx
+first_open ("/libltdl_dlloader_api_test_first"): first_ctx
 first_sym (first): first_ctx
 result: first_symbol
 first_close (first): first_ctx
 first_open denies a request
 result: module_symbol
 first_open denies a request
-last_open ("last"): last_ctx
+last_open ("/libltdl_dlloader_api_test_last"): last_ctx
 last_sym (last): last_ctx
 result: last_symbol
 first_open denies a request


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Sun Jul 04 10:40:08 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OVQMa-0003dx-GA
	for mharc-libtool-commit@gnu.org; Sun, 04 Jul 2010 10:40:08 -0400
Received: from [140.186.70.92] (port=37234 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OUy0W-0007Ca-Vu
	for libtool-commit@gnu.org; Sat, 03 Jul 2010 04:23:30 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gary@vaughan.pe>) id 1OUy0V-0006wr-Kr
	for libtool-commit@gnu.org; Sat, 03 Jul 2010 04:23:28 -0400
Received: from mailbigip.dreamhost.com ([208.97.132.5]:42194
	helo=homiemail-a17.g.dreamhost.com)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gary@vaughan.pe>) id 1OUy0V-0006wk-Gu
	for libtool-commit@gnu.org; Sat, 03 Jul 2010 04:23:27 -0400
Received: from homiemail-a17.g.dreamhost.com (localhost [127.0.0.1])
	by homiemail-a17.g.dreamhost.com (Postfix) with ESMTP id D563E7A806C;
	Sat,  3 Jul 2010 01:23:25 -0700 (PDT)
DomainKey-Signature: a=rsa-sha1; c=nofws; d=vaughan.pe; h=subject
	:mime-version:content-type:from:in-reply-to:date:cc
	:content-transfer-encoding:message-id:references:to; q=dns; s=
	vaughan.pe; b=l/FNBWv+ieDzTzfcWxEWPhO3KX6aqFdQNcgjGp60CV+q0C7om9
	f6lSP4P+J0ecBIWz7pC+a0kkyea0Y2gLu3wgZS8vkmISkSmJE2gPR4Vjt32G3bZY
	ZLVvqDn+63WzjdwAZpjbnIJFvUFG2Ys8A6F+KXFLeZcrpJ22WD+mrY2Nc=
DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=vaughan.pe; h=subject
	:mime-version:content-type:from:in-reply-to:date:cc
	:content-transfer-encoding:message-id:references:to; s=
	vaughan.pe; bh=VX4At91paem/iSo6zmInKp3f2yo=; b=W8bMUnDYQqn6tat9C
	uCxndvbDAxbpbKp+931ASz1jsNCqu8un0tTeLjjaWXU8Z5RvKBcLg4eCabKrcRRs
	I2DXl+Q1hZXLPoe+Q+82ToqGJ2D/MYDEaTs3j2a9gUMYCeJNoM/7mH1h0EyLWYBC
	xXbR/XNp5p1ZD2uw1bnZ9cIwQU=
Received: from [192.168.1.4] (unknown [110.164.249.188])
	(using TLSv1 with cipher AES128-SHA (128/128 bits))
	(No client certificate requested)
	(Authenticated sender: gary@vaughan.pe)
	by homiemail-a17.g.dreamhost.com (Postfix) with ESMTPSA id 4E1D67A8063; 
	Sat,  3 Jul 2010 01:23:20 -0700 (PDT)
Mime-Version: 1.0 (Apple Message framework v1081)
Content-Type: text/plain; charset=us-ascii
From: "Gary V. Vaughan" <gary@vaughan.pe>
In-Reply-To: <E1OUxsc-0005dZ-Us@vcs-noshell.in.savannah.gnu.org>
Date: Sat, 3 Jul 2010 15:23:12 +0700
Content-Transfer-Encoding: 7bit
Message-Id: <FE72954D-C0EE-439A-9E64-D77FF04B7DAD@vaughan.pe>
References: <E1OUxsc-0005dZ-Us@vcs-noshell.in.savannah.gnu.org>
To: "Peter Rosin" <peda@lysator.liu.se>
X-Mailer: Apple Mail (2.1081)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Mailman-Approved-At: Sun, 04 Jul 2010 10:40:06 -0400
Cc: libtool-commit@gnu.org
Subject: Re: [SCM] GNU Libtool branch, master, updated. v2.2.10-49-gc13532a
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, 03 Jul 2010 08:23:30 -0000

Hi Peter,

On 3 Jul 2010, at 15:15, Peter Rosin wrote:
>    Fix typo in "Add func_append_quoted and do..."
> 
>    * libltdl/config/ltmain.m4sh (func_mode_compile): Use
>    func_append_quoted instead of func_append.

> --- a/libltdl/config/ltmain.m4sh
> +++ b/libltdl/config/ltmain.m4sh
> @@ -710,7 +710,7 @@ func_mode_compile ()
> 	  save_ifs="$IFS"; IFS=','
> 	  for arg in $args; do
> 	    IFS="$save_ifs"
> -	    func_append lastarg " $arg"
> +	    func_append_quoted lastarg " $arg"
> 	  done
> 	  IFS="$save_ifs"
> 	  func_stripname ' ' '' "$lastarg"


Sorry, I should have paid more attention while haring through
last weeks email backlog.  Instead I didn't give this patch
enough thought before okaying it...

func_append_quoted automatically adds an unquoted space before
the appended quoted string (so as to avoid func_quote_for_eval
inserting a quoted space, \'\ \'), so it's quite possible that
it's necessary to write:

   func_append_quoted lastarg "$arg"

to avoid a latent bug with $lastarg not separating arguments
correctly when it is evaled later.

In an ideal world, we'd have test coverage of this part of the
code, and I would never have made the bogus commit in the 
first place :(

I'm going to be too busy to tackle this for a week or so. I've
added it to my TODO list, but if you want to make the edit,
test and push, I'll tackle trying to write a test in due
course... otherwise I'll get to it myself in about a week.

Cheers,
-- 
Gary V. Vaughan (gary@gnu.org)


From MAILER-DAEMON Sun Jul 04 15:51:18 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OVVDi-0002sd-Ai
	for mharc-libtool-commit@gnu.org; Sun, 04 Jul 2010 15:51:18 -0400
Received: from [140.186.70.92] (port=40073 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OVVDf-0002qu-Ad
	for libtool-commit@gnu.org; Sun, 04 Jul 2010 15:51:16 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OVVDd-00024P-UO
	for libtool-commit@gnu.org; Sun, 04 Jul 2010 15:51:15 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:35809
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OVVDd-00024K-Q1
	for libtool-commit@gnu.org; Sun, 04 Jul 2010 15:51: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 1OVVDd-0000u8-Hi
	for libtool-commit@gnu.org; Sun, 04 Jul 2010 19:51:13 +0000
Received: from rwild by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OVVDd-0007bl-Cl
	for libtool-commit@gnu.org; Sun, 04 Jul 2010 19:51:13 +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: cec246760f4e5a5d93068858bfb4b80d560275d1
X-Git-Newrev: 1e7ce72416cad66b1f82cd503d37f92ecdbe4b8a
Message-Id: <E1OVVDd-0007bl-Cl@vcs-noshell.in.savannah.gnu.org>
Date: Sun, 04 Jul 2010 19:51:13 +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-51-g1e7ce72
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, 04 Jul 2010 19:51:16 -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  1e7ce72416cad66b1f82cd503d37f92ecdbe4b8a (commit)
      from  cec246760f4e5a5d93068858bfb4b80d560275d1 (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 1e7ce72416cad66b1f82cd503d37f92ecdbe4b8a
Author: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date:   Sat Aug 16 18:19:43 2008 +0200

    Fix ccache test for MSVC.
    
    * tests/static.at (ccache -all-static): Ignore compiler stderr.
    Reported by Peter Rosin.
    
    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

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

Summary of changes:
 ChangeLog       |    6 ++++++
 tests/static.at |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0ed11fd..f9bb7dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-04  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Fix ccache test for MSVC.
+	* tests/static.at (ccache -all-static): Ignore compiler stderr.
+	Reported by Peter Rosin.
+
 2010-07-03  Charles Wilson  <libtool@cwilson.fastmail.fm>
 
 	Avoid false failures caused by filesystem interaction
diff --git a/tests/static.at b/tests/static.at
index f59b124..dfa4c42 100644
--- a/tests/static.at
+++ b/tests/static.at
@@ -371,7 +371,7 @@ AT_DATA([a.c],
 [[int main(void) { return 0; }
 ]])
 
-AT_CHECK([$CC $CPPFLAGS $CFLAGS -c a.c], [], [ignore])
+AT_CHECK([$CC $CPPFLAGS $CFLAGS -c a.c], [], [ignore], [ignore])
 AT_CHECK([$LIBTOOL --mode=link --tag=CC ./ccache $CC $CFLAGS $LDFLAGS -all-static a.$OBJEXT -o a$EXEEXT],
 	 [], [ignore], [ignore])
 


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Mon Jul 05 07:04:04 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OVjT2-0002vG-2N
	for mharc-libtool-commit@gnu.org; Mon, 05 Jul 2010 07:04:04 -0400
Received: from [140.186.70.92] (port=60177 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OVjSy-0002v4-Ui
	for libtool-commit@gnu.org; Mon, 05 Jul 2010 07:04:02 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OVjSx-0003o7-6h
	for libtool-commit@gnu.org; Mon, 05 Jul 2010 07:04:00 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:56874
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OVjSw-0003o2-Sv
	for libtool-commit@gnu.org; Mon, 05 Jul 2010 07:03: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 1OVjSw-0003Un-Nv
	for libtool-commit@gnu.org; Mon, 05 Jul 2010 11:03:58 +0000
Received: from pekberg by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <INVALID.NOREPLY@gnu.org>) id 1OVjSw-0008Np-GM
	for libtool-commit@gnu.org; Mon, 05 Jul 2010 11:03:58 +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: 1e7ce72416cad66b1f82cd503d37f92ecdbe4b8a
X-Git-Newrev: b28132eabade54dbb9ff18a5761be445d916e148
Message-Id: <E1OVjSw-0008Np-GM@vcs-noshell.in.savannah.gnu.org>
Date: Mon, 05 Jul 2010 11:03: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-53-gb28132e
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, 05 Jul 2010 11:04:03 -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  b28132eabade54dbb9ff18a5761be445d916e148 (commit)
       via  0b56641c0323833e9603deeeb6c778e8c34780ef (commit)
      from  1e7ce72416cad66b1f82cd503d37f92ecdbe4b8a (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 b28132eabade54dbb9ff18a5761be445d916e148
Author: Peter Rosin <peda@lysator.liu.se>
Date:   Mon Jul 5 13:02:54 2010 +0200

    * tests/export.at [MSVC]: dllimport all imported variables.
    
    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
    Signed-off-by: Peter Rosin <peda@lysator.liu.se>

commit 0b56641c0323833e9603deeeb6c778e8c34780ef
Author: Peter Rosin <peda@lysator.liu.se>
Date:   Thu Jul 1 11:36:05 2010 +0200

    Support for response files with $NM.
    
    * libltdl/m4/libtool.m4 (_LT_CMD_GLOBAL_SYMBOLS)
    <nm_file_list_spec>: New tag variable. Set it to '@' if input
    files can be passed to $NM in a file named with the '@' option.
    * libltdl/config/ltmain.m4sh (func_mode_link): When
    nm_file_list_spec is nonempty, use it to avoid skipped_export.
    * doc/libtool.texi (libtool script contents): Document
    new variable.

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

Summary of changes:
 ChangeLog                  |   16 ++++++++++++++++
 doc/libtool.texi           |    4 ++++
 libltdl/config/ltmain.m4sh |   20 ++++++++++++++++++--
 libltdl/m4/libtool.m4      |    9 +++++++++
 tests/export.at            |   30 +++++++++++++++++++++++-------
 5 files changed, 70 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f9bb7dc..f5fa68f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2010-07-05  Peter Rosin  <peda@lysator.liu.se>
+
+	* tests/export.at [MSVC]: dllimport all imported variables.
+
+2010-07-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+	    Peter Rosin  <peda@lysator.liu.se>
+
+	Support for response files with $NM.
+	* libltdl/m4/libtool.m4 (_LT_CMD_GLOBAL_SYMBOLS)
+	<nm_file_list_spec>: New tag variable. Set it to '@' if input
+	files can be passed to $NM in a file named with the '@' option.
+	* libltdl/config/ltmain.m4sh (func_mode_link): When
+	nm_file_list_spec is nonempty, use it to avoid skipped_export.
+	* doc/libtool.texi (libtool script contents): Document
+	new variable.
+
 2010-07-04  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	Fix ccache test for MSVC.
diff --git a/doc/libtool.texi b/doc/libtool.texi
index af6e13d..914bd1d 100644
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -6171,6 +6171,10 @@ Whether files must be locked to prevent conflicts when compiling
 simultaneously.  Set to @samp{yes} or @samp{no}.
 @end defvar
 
+@defvar nm_file_list_spec
+Specify filename containing input files for @code{NM}.
+@end defvar
+
 @defvar no_builtin_flag
 Compiler flag to disable builtin functions that conflict with declaring
 external global symbols as @code{char}.
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index d2676f9..8cb8285 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -6719,14 +6719,30 @@ EOF
 	    $opt_dry_run || $RM $export_symbols
 	    cmds=$export_symbols_cmds
 	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $cmds; do
+	    for cmd1 in $cmds; do
 	      IFS="$save_ifs"
-	      eval cmd=\"$cmd\"
+	      eval cmd=\"$cmd1\"
 	      func_len " $cmd"
 	      len=$func_len_result
 	      if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
 		func_show_eval "$cmd" 'exit $?'
 		skipped_export=false
+	      elif test -n "$nm_file_list_spec"; then
+		output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
+		save_libobjs=$libobjs
+		save_output=$output
+		output=${output_objdir}/${output_la}.nm
+		libobjs=$nm_file_list_spec$output
+		func_append delfiles " $output"
+		func_verbose "creating $NM input file list: $output"
+		for obj in $save_libobjs; do
+		  $ECHO "$obj"
+		done > "$output"
+		eval cmd=\"$cmd1\"
+		func_show_eval "$cmd" 'exit $?'
+		output=$save_output
+		libobjs=$save_libobjs
+		skipped_export=false
 	      else
 		# The command line is too long to execute in one step.
 		func_verbose "using reloadable object file for export list..."
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 8475d4b..bb6957e 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -3615,6 +3615,13 @@ else
   AC_MSG_RESULT(ok)
 fi
 
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
     [Take the output of nm and produce a listing of raw symbols and C names])
 _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
@@ -3625,6 +3632,8 @@ _LT_DECL([global_symbol_to_c_name_address],
 _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
     [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
     [Transform the output of nm in a C name address pair when lib prefix is needed])
+_LT_DECL([], [nm_file_list_spec], [1],
+    [Specify filename containing input files for $NM])
 ]) # _LT_CMD_GLOBAL_SYMBOLS
 
 
diff --git a/tests/export.at b/tests/export.at
index a330d40..39adfbc 100644
--- a/tests/export.at
+++ b/tests/export.at
@@ -93,32 +93,48 @@ v15
 
 AT_DATA(main.c,
 [[
+/* w32 fun.  With GCC, you can have auto-import, which will work for
+ * functions and non-const variables.  With MSVC, you have to explicitly
+ * import all variables.  Depending on the amount of portability, you
+ * need these annotations: LIBA_SCOPE for GCC, and also LIBA_SCOPE_VAR
+ * for MSVC.  Of course you can merge both to one, this test only avoids
+ * that in order to expose the auto-import feature on Cygwin.
+ *
+ * For users, it's best to realize that they should not provide any
+ * non-function API at all.
+ */
 #if defined(LIBA_DLL_IMPORT)
 #  if defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__)
 #    define LIBA_SCOPE extern __declspec(dllimport)
+#    if defined(_MSC_VER)
+#      define LIBA_SCOPE_VAR LIBA_SCOPE
+#    endif
 #  endif
 #endif
 #if !defined(LIBA_SCOPE)
 #  define LIBA_SCOPE extern
 #endif
+#if !defined(LIBA_SCOPE_VAR)
+#  define LIBA_SCOPE_VAR extern
+#endif
 #ifdef __cplusplus
 extern "C" {
 #endif
-extern int v1;
-extern int v3, v4;
+LIBA_SCOPE_VAR int v1;
+LIBA_SCOPE_VAR int v3, v4;
 LIBA_SCOPE const int v5, v6;
-extern const char* v7;
-extern const char v8[];
+LIBA_SCOPE_VAR const char* v7;
+LIBA_SCOPE_VAR const char v8[];
 extern int v9(void);
-extern int (*v10) (void);
-extern int (*v11) (void);
+LIBA_SCOPE_VAR int (*v10) (void);
+LIBA_SCOPE_VAR int (*v11) (void);
 LIBA_SCOPE int (*const v12) (void);
 #ifdef __cplusplus
 }
 #endif
 
 typedef struct { int arr[1000]; } large;
-extern large v13, v14, v15;
+LIBA_SCOPE_VAR large v13, v14, v15;
 
 int main (void)
 {


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Wed Jul 07 00:43:03 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OWMTP-0002oc-Ol
	for mharc-libtool-commit@gnu.org; Wed, 07 Jul 2010 00:43:03 -0400
Received: from [140.186.70.92] (port=57613 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OWMTL-0002oT-CN
	for libtool-commit@gnu.org; Wed, 07 Jul 2010 00:43:01 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OWMTJ-0008V0-3A
	for libtool-commit@gnu.org; Wed, 07 Jul 2010 00:42:59 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:51753
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OWMTJ-0008Uw-1Q
	for libtool-commit@gnu.org; Wed, 07 Jul 2010 00:42: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 1OWMTI-0008Hd-VT
	for libtool-commit@gnu.org; Wed, 07 Jul 2010 04:42:57 +0000
Received: from cwilson by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <INVALID.NOREPLY@gnu.org>) id 1OWMTI-00012L-Oa
	for libtool-commit@gnu.org; Wed, 07 Jul 2010 04:42:56 +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: b28132eabade54dbb9ff18a5761be445d916e148
X-Git-Newrev: e83da49a1faf9df1c7e351df9e9b175388d76619
Message-Id: <E1OWMTI-00012L-Oa@vcs-noshell.in.savannah.gnu.org>
Date: Wed, 07 Jul 2010 04:42: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-54-ge83da49
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, 07 Jul 2010 04:43: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  e83da49a1faf9df1c7e351df9e9b175388d76619 (commit)
      from  b28132eabade54dbb9ff18a5761be445d916e148 (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 e83da49a1faf9df1c7e351df9e9b175388d76619
Author: Charles Wilson <libtool@cwilson.fastmail.fm>
Date:   Fri Jan 2 20:39:15 2009 -0500

    [cygwin|mingw] fix dlpreopen with --disable-static
    
    * libltdl/config/general.m4sh (func_tr_sh): New function.
    * libltdl/config/ltmain.m4sh (func_generate_dlsyms) [cygwin|mingw]:
    Obtain DLL name corresponding to import library by using value
    stored in unique variable libfile_$(transliterated implib name).
    If that fails, use $sharedlib_from_linklib_cmd to extract DLL
    name from import library directly. Also, properly extract dlsyms
    from the import library.
    (func_mode_link) [cygwin|mingw]: Prefer to dlpreopen DLLs
    over static libs when both are available.  When dlpreopening
    DLLs, use linklib (that is, import lib) as dlpreopen file,
    rather than DLL. Store name of associated la file in
    unique variable libfile_$(transliterated implib name)
    for later use.
    (func_win32_libid): Accomodate pei-i386 import libs
    as well as pe-i386.
    (func_cygming_dll_for_implib): New function.
    (func_cygming_dll_for_implib_fallback): New function.
    (func_cygming_dll_for_implib_fallback_core): New function.
    (func_cygming_gnu_implib_p): New function.
    (func_cygming_ms_implib_p): New function.
    * libltdl/m4/libtool.m4 (_LT_CMD_GLOBAL_SYMBOLS): Adjust sed
    expressions for lt_cv_sys_global_symbol_to_c_name_address and
    lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
    as trailing space after module name is optional.
    (_LT_LINKER_SHLIBS) [cygwin|mingw][C++]:
    Set exclude_expsyms correctly for $host. Simplify regular
    expression in export_symbols_cmds.
    (_LT_LINKER_SHLIBS) [cygwin|mingw|pw32][C]: Set exclude_expsyms
    correctly for $host. Enable export_symbols_cmds to identify
    DATA exports by _nm_ prefix.
    (_LT_CHECK_SHAREDLIB_FROM_LINKLIB): New macro sets
    sharedlib_from_linklib_cmd variable.
    (_LT_DECL_DLLTOOL): New macro ensures DLLTOOL is always set.

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

Summary of changes:
 ChangeLog                   |   37 +++++++
 libltdl/config/general.m4sh |   17 ++++
 libltdl/config/ltmain.m4sh  |  224 +++++++++++++++++++++++++++++++++++++++----
 libltdl/m4/libtool.m4       |   61 +++++++++++-
 4 files changed, 316 insertions(+), 23 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f5fa68f..16c66d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,40 @@
+2010-07-07  Charles Wilson  <libtool@cwilson.fastmail.fm>
+
+	[cygwin|mingw] fix dlpreopen with --disable-static
+	* libltdl/config/general.m4sh (func_tr_sh): New function.
+	* libltdl/config/ltmain.m4sh (func_generate_dlsyms) [cygwin|mingw]:
+	Obtain DLL name corresponding to import library by using value
+	stored in unique variable libfile_$(transliterated implib name).
+	If that fails, use $sharedlib_from_linklib_cmd to extract DLL
+	name from import library directly. Also, properly extract dlsyms
+	from the import library.
+	(func_mode_link) [cygwin|mingw]: Prefer to dlpreopen DLLs
+	over static libs when both are available.  When dlpreopening
+	DLLs, use linklib (that is, import lib) as dlpreopen file,
+	rather than DLL. Store name of associated la file in
+	unique variable libfile_$(transliterated implib name)
+	for later use.
+	(func_win32_libid): Accomodate pei-i386 import libs
+	as well as pe-i386.
+	(func_cygming_dll_for_implib): New function.
+	(func_cygming_dll_for_implib_fallback): New function.
+	(func_cygming_dll_for_implib_fallback_core): New function.
+	(func_cygming_gnu_implib_p): New function.
+	(func_cygming_ms_implib_p): New function.
+	* libltdl/m4/libtool.m4 (_LT_CMD_GLOBAL_SYMBOLS): Adjust sed
+	expressions for lt_cv_sys_global_symbol_to_c_name_address and
+	lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
+	as trailing space after module name is optional.
+	(_LT_LINKER_SHLIBS) [cygwin|mingw][C++]:
+	Set exclude_expsyms correctly for $host. Simplify regular
+	expression in export_symbols_cmds.
+	(_LT_LINKER_SHLIBS) [cygwin|mingw|pw32][C]: Set exclude_expsyms
+	correctly for $host. Enable export_symbols_cmds to identify
+	DATA exports by _nm_ prefix.
+	(_LT_CHECK_SHAREDLIB_FROM_LINKLIB): New macro sets
+	sharedlib_from_linklib_cmd variable.
+	(_LT_DECL_DLLTOOL): New macro ensures DLLTOOL is always set.
+
 2010-07-05  Peter Rosin  <peda@lysator.liu.se>
 
 	* tests/export.at [MSVC]: dllimport all imported variables.
diff --git a/libltdl/config/general.m4sh b/libltdl/config/general.m4sh
index ab79f05..5d7bef7 100644
--- a/libltdl/config/general.m4sh
+++ b/libltdl/config/general.m4sh
@@ -594,4 +594,21 @@ func_show_eval_locale ()
       fi
     fi
 }
+
+# func_tr_sh
+# Turn $1 into a string suitable for a shell variable name.
+# Result is stored in $func_tr_sh_result.  All characters
+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
+# if $1 begins with a digit, a '_' is prepended as well.
+func_tr_sh ()
+{
+  case $1 in
+  [0-9]* | *[!a-zA-Z0-9_]*)
+    func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
+    ;;
+  * )
+    func_tr_sh_result=$1
+    ;;
+  esac
+}
 ]])
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 8cb8285..365ba0c 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -1987,10 +1987,49 @@ extern \"C\" {
 	  func_verbose "extracting global C symbols from \`$dlprefile'"
 	  func_basename "$dlprefile"
 	  name="$func_basename_result"
-	  $opt_dry_run || {
-	    eval '$ECHO ": $name " >> "$nlist"'
-	    eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-	  }
+          case $host in
+	    *cygwin* | *mingw* | *cegcc* )
+	      # if an import library, we need to obtain dlname
+	      if func_win32_import_lib_p "$dlprefile"; then
+	        func_tr_sh "$dlprefile"
+	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
+	        dlprefile_dlbasename=""
+	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
+	          # Use subshell, to avoid clobbering current variable values
+	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
+	          if test -n "$dlprefile_dlname" ; then
+	            func_basename "$dlprefile_dlname"
+	            dlprefile_dlbasename="$func_basename_result"
+	          else
+	            # no lafile. user explicitly requested -dlpreopen <import library>.
+	            $sharedlib_from_linklib "$dlprefile"
+	            dlprefile_dlbasename=$sharedlib_from_linklib_result
+	          fi
+	        fi
+	        $opt_dry_run || {
+	          if test -n "$dlprefile_dlbasename" ; then
+	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
+	          else
+	            func_warning "Could not compute DLL name from $name"
+	            eval '$ECHO ": $name " >> "$nlist"'
+	          fi
+	          eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe |
+	            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
+	        }
+	      else # not an import lib
+	        $opt_dry_run || {
+	          eval '$ECHO ": $name " >> "$nlist"'
+	          eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	        }
+	      fi
+	    ;;
+	    *)
+	      $opt_dry_run || {
+	        eval '$ECHO ": $name " >> "$nlist"'
+	        eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	      }
+	    ;;
+          esac
 	done
 
 	$opt_dry_run || {
@@ -2195,6 +2234,129 @@ func_win32_libid ()
   $ECHO "$win32_libid_type"
 }
 
+# func_cygming_dll_for_implib ARG
+#
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib ()
+{
+  $opt_debug
+  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
+}
+
+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
+#
+# The is the core of a fallback implementation of a
+# platform-specific function to extract the name of the
+# DLL associated with the specified import library LIBNAME.
+#
+# SECTION_NAME is either .idata$6 or .idata$7, depending
+# on the platform and compiler that created the implib.
+#
+# Echos the name of the DLL associated with the
+# specified import library.
+func_cygming_dll_for_implib_fallback_core ()
+{
+  $opt_debug
+  match_literal=`$ECHO "$1" | $SED 's/[].[^$\\*|]/\\\\&/g'`
+  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
+    $SED '/^Contents of section '"$match_literal"':/{
+      # Place marker at beginning of archive member dllname section
+      s/.*/====MARK====/
+      p
+      d
+    }
+    # These lines can sometimes be longer than 43 characters, but
+    # are always uninteresting
+    /:[	 ]*file format pe[i]\{,1\}-/d
+    /^In archive [^:]*:/d
+    # Ensure marker is printed
+    /^====MARK====/p
+    # Remove all lines with less than 43 characters
+    /^.\{43\}/!d
+    # From remaining lines, remove first 43 characters
+    s/^.\{43\}//' |
+    $SED -n '
+      # Join marker and all lines until next marker into a single line
+      /^====MARK====/ b para
+      H
+      $ b para
+      b
+      :para
+      x
+      s/\n//g
+      # Remove the marker
+      s/^====MARK====//
+      # Remove trailing dots and whitespace
+      s/[\. \t]*$//
+      # Print
+      /./p' |
+    # we now have a list, one entry per line, of the stringified
+    # contents of the appropriate section of all members of the
+    # archive which possess that section. Heuristic: eliminate
+    # all those which have a first or second character that is
+    # a '.' (that is, objdump's representation of an unprintable
+    # character.) This should work for all archives with less than
+    # 0x302f exports -- but will fail for DLLs whose name actually
+    # begins with a literal '.' or a single character followed by
+    # a '.'.
+    #
+    # Of those that remain, print the first one.
+    $SED -e '/^\./d;/^.\./d;q'
+}
+
+# func_cygming_gnu_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is a GNU/binutils-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_gnu_implib_p ()
+{
+  $opt_debug
+  func_cygming_gnu_implib_tmp=`$NM $1 | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
+  test -n "$func_cygming_gnu_implib_tmp"
+}
+
+# func_cygming_ms_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is an MS-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_ms_implib_p ()
+{
+  $opt_debug
+  func_cygming_ms_implib_tmp=`$NM $1 | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
+  test -n "$func_cygming_ms_implib_tmp"
+}
+
+# func_cygming_dll_for_implib_fallback ARG
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+#
+# This fallback implementation is for use when $DLLTOOL
+# does not support the --identify-strict option.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib_fallback ()
+{
+  $opt_debug
+  if func_cygming_gnu_implib_p "$1" ; then
+    # binutils import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
+  elif func_cygming_ms_implib_p "$1" ; then
+    # ms-generated import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
+  else
+    # unknown
+    sharedlib_from_linklib_result=""
+  fi
+}
 
 
 # func_extract_an_archive dir oldlib
@@ -5142,20 +5304,46 @@ func_mode_link ()
 	  if test -z "$libdir" && test "$linkmode" = prog; then
 	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
 	  fi
-	  # Prefer using a static library (so that no silly _DYNAMIC symbols
-	  # are required to link).
-	  if test -n "$old_library"; then
-	    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" && \
-		func_append dlpreconveniencelibs " $dir/$old_library"
-	  # Otherwise, use the dlname, so that lt_dlopen finds it.
-	  elif test -n "$dlname"; then
-	    func_append newdlprefiles " $dir/$dlname"
-	  else
-	    func_append newdlprefiles " $dir/$linklib"
-	  fi
+	  case "$host" in
+	    # special handling for platforms with PE-DLLs.
+	    *cygwin* | *mingw* | *cegcc* )
+	      # Linker will automatically link against shared library if both
+	      # static and shared are present.  Therefore, ensure we extract
+	      # symbols from the import library if a shared library is present
+	      # (otherwise, the dlopen module name will be incorrect).  We do
+	      # this by putting the import library name into $newdlprefiles.
+	      # We recover the dlopen module name by 'saving' the la file
+	      # name in a special purpose variable, and (later) extracting the
+	      # dlname from the la file.
+	      if test -n "$dlname"; then
+	        func_tr_sh "$dir/$linklib"
+	        eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
+	        func_append newdlprefiles " $dir/$linklib"
+	      else
+	        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" && \
+	          func_append dlpreconveniencelibs " $dir/$old_library"
+	      fi
+	    ;;
+	    * )
+	      # Prefer using a static library (so that no silly _DYNAMIC symbols
+	      # are required to link).
+	      if test -n "$old_library"; then
+	        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" && \
+	          func_append dlpreconveniencelibs " $dir/$old_library"
+	      # Otherwise, use the dlname, so that lt_dlopen finds it.
+	      elif test -n "$dlname"; then
+	        func_append newdlprefiles " $dir/$dlname"
+	      else
+	        func_append newdlprefiles " $dir/$linklib"
+	      fi
+	    ;;
+	  esac
 	fi # $pass = dlpreopen
 
 	if test -z "$libdir"; then
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index bb6957e..164a6c1 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -170,6 +170,7 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_CHECK_SHELL_FEATURES])dnl
 m4_require([_LT_CMD_RELOAD])dnl
 m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
 m4_require([_LT_CMD_OLD_ARCHIVE])dnl
 m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
 
@@ -3319,6 +3320,45 @@ dnl aclocal-1.4 backwards compatibility:
 dnl AC_DEFUN([AM_PROG_NM], [])
 dnl AC_DEFUN([AC_PROG_NM], [])
 
+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+# ----------------------
+# how to determine the name of the shared library
+# associated with a specific link library.
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+m4_require([_LT_DECL_DLLTOOL])
+AC_CACHE_CHECK([how to associate runtime and link libraries],
+lt_cv_sharedlib_from_linklib_cmd,
+[lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh
+  # decide which to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+  ;;
+esac
+])
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
+    [Command to associate shared and link libraries])
+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+
 
 # _LT_PATH_MANIFEST_TOOL
 # ----------------------
@@ -3467,8 +3507,8 @@ esac
 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
 
 # Handle CRLF in mingw tool chain
 opt_cr=
@@ -4296,6 +4336,7 @@ m4_require([_LT_TAG_COMPILER])dnl
 AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
 m4_if([$1], [CXX], [
   _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
   case $host_os in
   aix[[4-9]]*)
     # If we're using GNU nm, then we don't want the "-C" option.
@@ -4315,7 +4356,8 @@ m4_if([$1], [CXX], [
     case $cc_basename in
     cl*) ;;
     *)
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
       ;;
     esac
     ;;
@@ -4323,7 +4365,6 @@ m4_if([$1], [CXX], [
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
     ;;
   esac
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
 ], [
   runpath_var=
   _LT_TAGVAR(allow_undefined_flag, $1)=
@@ -4491,7 +4532,8 @@ _LT_EOF
       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
       _LT_TAGVAR(always_export_symbols, $1)=no
       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
 
       if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -7269,6 +7311,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
 AC_SUBST([OBJDUMP])
 ])
 
+# _LT_DECL_DLLTOOL
+# ----------------
+# Ensure DLLTOOL variable is set.
+m4_defun([_LT_DECL_DLLTOOL],
+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
+AC_SUBST([DLLTOOL])
+])
 
 # _LT_DECL_SED
 # ------------


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Wed Jul 07 04:02:18 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OWPaD-0007GS-Um
	for mharc-libtool-commit@gnu.org; Wed, 07 Jul 2010 04:02:18 -0400
Received: from [140.186.70.92] (port=39140 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OWPaB-0007GH-B8
	for libtool-commit@gnu.org; Wed, 07 Jul 2010 04:02:16 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OWPa9-0004qU-TY
	for libtool-commit@gnu.org; Wed, 07 Jul 2010 04:02:15 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:55485
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OWPa9-0004qQ-Qf
	for libtool-commit@gnu.org; Wed, 07 Jul 2010 04:02: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 1OWPa9-0002ED-Er
	for libtool-commit@gnu.org; Wed, 07 Jul 2010 08:02:13 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OWPa9-00025c-1S
	for libtool-commit@gnu.org; Wed, 07 Jul 2010 08:02:13 +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: e83da49a1faf9df1c7e351df9e9b175388d76619
X-Git-Newrev: 94d129e2e36f677f11895424693c5483e8324877
Message-Id: <E1OWPa9-00025c-1S@vcs-noshell.in.savannah.gnu.org>
Date: Wed, 07 Jul 2010 08:02:13 +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-55-g94d129e
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, 07 Jul 2010 08:02:16 -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  94d129e2e36f677f11895424693c5483e8324877 (commit)
      from  e83da49a1faf9df1c7e351df9e9b175388d76619 (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 94d129e2e36f677f11895424693c5483e8324877
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Wed Jul 7 15:02:07 2010 +0700

    Tidy m4 comment header underline.
    
    * libltdl/m4/libtool.m4 (_LT_CHECK_SHAREDLIB_FROM_LINKLIB): Make
    sure hyphens in function name comment header underline line up.
    
    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 16c66d4..c8e628d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-07  Gary V. Vaughan  <gary@gnu.org>
+
+	Tidy m4 comment header underline.
+	* libltdl/m4/libtool.m4 (_LT_CHECK_SHAREDLIB_FROM_LINKLIB): Make
+	sure hyphens in function name comment header underline line up.
+
 2010-07-07  Charles Wilson  <libtool@cwilson.fastmail.fm>
 
 	[cygwin|mingw] fix dlpreopen with --disable-static
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 164a6c1..eeec7f5 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -3321,7 +3321,7 @@ dnl AC_DEFUN([AM_PROG_NM], [])
 dnl AC_DEFUN([AC_PROG_NM], [])
 
 # _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-# ----------------------
+# --------------------------------
 # how to determine the name of the shared library
 # associated with a specific link library.
 #  -- PORTME fill in with the dynamic library characteristics


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Thu Jul 08 07:33:46 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OWpMQ-000498-3B
	for mharc-libtool-commit@gnu.org; Thu, 08 Jul 2010 07:33:46 -0400
Received: from [140.186.70.92] (port=51525 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OWpMN-00046n-JE
	for libtool-commit@gnu.org; Thu, 08 Jul 2010 07:33:44 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OWpMM-0007cs-HC
	for libtool-commit@gnu.org; Thu, 08 Jul 2010 07:33:43 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:52224
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OWpMM-0007co-Fs
	for libtool-commit@gnu.org; Thu, 08 Jul 2010 07:33:42 -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 1OWpMM-0005Bi-8f
	for libtool-commit@gnu.org; Thu, 08 Jul 2010 11:33:42 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OWpML-00004q-T6
	for libtool-commit@gnu.org; Thu, 08 Jul 2010 11:33:42 +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: 94d129e2e36f677f11895424693c5483e8324877
X-Git-Newrev: 2e5ed25df3ccbc6e0fef5195199ba2e7649c2767
Message-Id: <E1OWpML-00004q-T6@vcs-noshell.in.savannah.gnu.org>
Date: Thu, 08 Jul 2010 11:33:41 +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-56-g2e5ed25
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, 08 Jul 2010 11:33: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  2e5ed25df3ccbc6e0fef5195199ba2e7649c2767 (commit)
      from  94d129e2e36f677f11895424693c5483e8324877 (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 2e5ed25df3ccbc6e0fef5195199ba2e7649c2767
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Thu Jul 8 18:33:31 2010 +0700

    Fix a cut-n-pasto in "2010-07-07 Charles Wilson" patch.
    
    * libltdl/config/ltmain.m4sh (func_mode_link): Remove spurious
    variable dereference.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

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

diff --git a/ChangeLog b/ChangeLog
index c8e628d..b180dc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-08  Gary V. Vaughan  <gary@gnu.org>
+
+	Fix a cut-n-pasto in "2010-07-07 Charles Wilson" patch.
+	* libltdl/config/ltmain.m4sh (func_mode_link): Remove spurious
+	variable dereference.
+
 2010-07-07  Gary V. Vaughan  <gary@gnu.org>
 
 	Tidy m4 comment header underline.
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 365ba0c..1a2c02d 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -5331,7 +5331,7 @@ func_mode_link ()
 	      # Prefer using a static library (so that no silly _DYNAMIC symbols
 	      # are required to link).
 	      if test -n "$old_library"; then
-	        func_append $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" && \


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Thu Jul 08 08:27:33 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OWqCT-0006jd-8T
	for mharc-libtool-commit@gnu.org; Thu, 08 Jul 2010 08:27:33 -0400
Received: from [140.186.70.92] (port=42348 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OWqCQ-0006i4-B1
	for libtool-commit@gnu.org; Thu, 08 Jul 2010 08:27:31 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OWqCO-0005sA-Nx
	for libtool-commit@gnu.org; Thu, 08 Jul 2010 08:27:30 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:36641
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OWqCO-0005s4-Lo
	for libtool-commit@gnu.org; Thu, 08 Jul 2010 08:27:28 -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 1OWqCN-0005qj-Q1
	for libtool-commit@gnu.org; Thu, 08 Jul 2010 12:27:27 +0000
Received: from pekberg by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <INVALID.NOREPLY@gnu.org>) id 1OWqCN-00045c-9J
	for libtool-commit@gnu.org; Thu, 08 Jul 2010 12:27:27 +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: 2e5ed25df3ccbc6e0fef5195199ba2e7649c2767
X-Git-Newrev: 3f22cab581a21d240df9cbfc6d1fdedaa1aa2b97
Message-Id: <E1OWqCN-00045c-9J@vcs-noshell.in.savannah.gnu.org>
Date: Thu, 08 Jul 2010 12:27:27 +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-57-g3f22cab
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, 08 Jul 2010 12:27:31 -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  3f22cab581a21d240df9cbfc6d1fdedaa1aa2b97 (commit)
      from  2e5ed25df3ccbc6e0fef5195199ba2e7649c2767 (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 3f22cab581a21d240df9cbfc6d1fdedaa1aa2b97
Author: Peter Rosin <peda@lysator.liu.se>
Date:   Thu Jul 8 14:23:02 2010 +0200

    Optimize assignment of output_la.
    
    * libltdl/config/ltmain.m4sh (func_mode_link): Save two fork/exec
    instances.
    Report by Ralf Wildenhues.

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

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

diff --git a/ChangeLog b/ChangeLog
index b180dc6..16de0b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-07-08  Peter Rosin  <peda@lysator.liu.se>
+
+	Optimize assignment of output_la.
+	* libltdl/config/ltmain.m4sh (func_mode_link): Save two fork/exec
+	instances.
+	Report by Ralf Wildenhues.
+
 2010-07-08  Gary V. Vaughan  <gary@gnu.org>
 
 	Fix a cut-n-pasto in "2010-07-07 Charles Wilson" patch.
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 1a2c02d..a8f0ac1 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -6916,7 +6916,8 @@ EOF
 		func_show_eval "$cmd" 'exit $?'
 		skipped_export=false
 	      elif test -n "$nm_file_list_spec"; then
-		output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
+		func_basename "$output"
+		output_la=$func_basename_result
 		save_libobjs=$libobjs
 		save_output=$output
 		output=${output_objdir}/${output_la}.nm


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Thu Jul 08 09:30:32 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OWrBQ-000524-4K
	for mharc-libtool-commit@gnu.org; Thu, 08 Jul 2010 09:30:32 -0400
Received: from [140.186.70.92] (port=44288 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OWrBK-00051u-1J
	for libtool-commit@gnu.org; Thu, 08 Jul 2010 09:30:30 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OWrBI-00087M-Go
	for libtool-commit@gnu.org; Thu, 08 Jul 2010 09:30:26 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:48829
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OWrBI-00087D-AI
	for libtool-commit@gnu.org; Thu, 08 Jul 2010 09:30:24 -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 1OWrBH-0006ct-P3
	for libtool-commit@gnu.org; Thu, 08 Jul 2010 13:30:23 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OWrBH-0005pf-9k
	for libtool-commit@gnu.org; Thu, 08 Jul 2010 13:30:23 +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: 3f22cab581a21d240df9cbfc6d1fdedaa1aa2b97
X-Git-Newrev: de8a0992b21b76a13c302cf48588ad5f6042595c
Message-Id: <E1OWrBH-0005pf-9k@vcs-noshell.in.savannah.gnu.org>
Date: Thu, 08 Jul 2010 13:30: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-58-gde8a099
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, 08 Jul 2010 13:30:30 -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  de8a0992b21b76a13c302cf48588ad5f6042595c (commit)
      from  3f22cab581a21d240df9cbfc6d1fdedaa1aa2b97 (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 de8a0992b21b76a13c302cf48588ad5f6042595c
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Thu Jul 8 18:47:59 2010 +0700

    Rename _LT_PROG_XSI_REPLACE macro to _LT_PROG_FUNCTION_REPLACE.
    
    * libltdl/m4/libtool.m4 (_LT_PROG_XSI_SHELLFNS): Rename to
    _LT_PROG_REPLACE_SHELLFNS.
    (_LT_PROG_XSI_REPLACE): Rename to _LT_PROG_FUNCTION_REPLACE.
    (_LT_PROG_FUNCTION_REPLACE): Change decorator comment to use
    'Extended shell' rather than 'XSI' on successful replacement.
    * libltdl/config/general.m4sh (func_dirname, func_basename)
    (func_dirname_and_basename, func_stripname): Change decorator
    comment to use 'extended shell' rather than 'XSI' on fallback
    implementations.
    * libltdl/config/getopt.m4sh (func_split_short_opt)
    (func_split_long_opt): Ditto.
    * libltdl/config/ltmain.m4sh (func_append, func_append_quoted)
    (func_arith, func_len, func_lo2o, func_xform): Ditto.
    * tests/getopt-m4sh.at (_LT_AT_XSI_FUNC_EXTRACT): Rename to
    _LT_AT_EXTENDED_SHELL_FUNC_EXTRACT.
    (_LT_AT_EXTENDED_SHELL_FUNC_EXTRACT): Change regular expression to
    match new replacable function decorator comments.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 ChangeLog                   |   19 +++++++++++++++
 libltdl/config/general.m4sh |    8 +++---
 libltdl/config/getopt.m4sh  |    4 +-
 libltdl/config/ltmain.m4sh  |   12 +++++-----
 libltdl/m4/libtool.m4       |   52 +++++++++++++++++++++---------------------
 tests/getopt-m4sh.at        |    8 +++---
 6 files changed, 61 insertions(+), 42 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 16de0b3..9d3cf53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,25 @@
 
 2010-07-08  Gary V. Vaughan  <gary@gnu.org>
 
+	Rename _LT_PROG_XSI_REPLACE macro to _LT_PROG_FUNCTION_REPLACE.
+	* libltdl/m4/libtool.m4 (_LT_PROG_XSI_SHELLFNS): Rename to
+	_LT_PROG_REPLACE_SHELLFNS.
+	(_LT_PROG_XSI_REPLACE): Rename to _LT_PROG_FUNCTION_REPLACE.
+	(_LT_PROG_FUNCTION_REPLACE): Change decorator comment to use
+	'Extended shell' rather than 'XSI' on successful replacement.
+	* libltdl/config/general.m4sh (func_dirname, func_basename)
+	(func_dirname_and_basename, func_stripname): Change decorator
+	comment to use 'extended shell' rather than 'XSI' on fallback
+	implementations.
+	* libltdl/config/getopt.m4sh (func_split_short_opt)
+	(func_split_long_opt): Ditto.
+	* libltdl/config/ltmain.m4sh (func_append, func_append_quoted)
+	(func_arith, func_len, func_lo2o, func_xform): Ditto.
+	* tests/getopt-m4sh.at (_LT_AT_XSI_FUNC_EXTRACT): Rename to
+	_LT_AT_EXTENDED_SHELL_FUNC_EXTRACT.
+	(_LT_AT_EXTENDED_SHELL_FUNC_EXTRACT): Change regular expression to
+	match new replacable function decorator comments.
+
 	Fix a cut-n-pasto in "2010-07-07 Charles Wilson" patch.
 	* libltdl/config/ltmain.m4sh (func_mode_link): Remove spurious
 	variable dereference.
diff --git a/libltdl/config/general.m4sh b/libltdl/config/general.m4sh
index 5d7bef7..1245fe5 100644
--- a/libltdl/config/general.m4sh
+++ b/libltdl/config/general.m4sh
@@ -84,14 +84,14 @@ func_dirname ()
     else
       func_dirname_result="$func_dirname_result${2}"
     fi
-} # func_dirname may be replaced by XSI optimised implementation
+} # func_dirname may be replaced by extended shell implementation
 
 
 # func_basename file
 func_basename ()
 {
     func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-} # func_basename may be replaced by XSI optimised implementation
+} # func_basename may be replaced by extended shell implementation
 
 
 # func_dirname_and_basename file append nondir_replacement
@@ -116,7 +116,7 @@ func_dirname_and_basename ()
       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_dirname_and_basename may be replaced by extended shell implementation
 
 
 # func_stripname prefix suffix name
@@ -131,7 +131,7 @@ func_stripname ()
       .*) 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
+} # func_stripname may be replaced by extended shell implementation
 
 
 # These SED scripts presuppose an absolute path with a trailing slash.
diff --git a/libltdl/config/getopt.m4sh b/libltdl/config/getopt.m4sh
index e9da56f..806c1d4 100644
--- a/libltdl/config/getopt.m4sh
+++ b/libltdl/config/getopt.m4sh
@@ -628,7 +628,7 @@ func_split_short_opt ()
 
     func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
     func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
-} # func_split_short_opt may be replaced by XSI optimised implementation
+} # func_split_short_opt may be replaced by extended shell implementation
 
 
 # func_split_long_opt longopt
@@ -641,7 +641,7 @@ func_split_long_opt ()
 
     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
+} # func_split_long_opt may be replaced by extended shell implementation
 
 exit_cmd=:
 ]])
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index a8f0ac1..897a5e8 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -154,7 +154,7 @@ exec_cmd=
 func_append ()
 {
     eval "${1}=\$${1}\${2}"
-} # func_append may be replaced by XSI optimised implementation
+} # func_append may be replaced by extended shell implementation
 
 # func_append_quoted var value
 # Quote VALUE and append to the end of shell variable VAR.
@@ -162,14 +162,14 @@ 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_append_quoted may be replaced by extended shell implementation
 
 
 # func_arith arithmetic-term...
 func_arith ()
 {
     func_arith_result=`expr "${@}"`
-} # func_arith may be replaced by XSI optimised implementation
+} # func_arith may be replaced by extended shell implementation
 
 
 # func_len string
@@ -177,21 +177,21 @@ func_arith ()
 func_len ()
 {
     func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
-} # func_len may be replaced by XSI optimised implementation
+} # func_len may be replaced by extended shell implementation
 
 
 # func_lo2o object
 func_lo2o ()
 {
     func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-} # func_lo2o may be replaced by XSI optimised implementation
+} # func_lo2o may be replaced by extended shell 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_xform may be replaced by extended shell implementation
 
 
 # func_fatal_configuration arg...
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index eeec7f5..83d03bf 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -752,7 +752,7 @@ _LT_EOF
   sed '$q' "$ltmain" >> "$cfgfile" \
      || (rm -f "$cfgfile"; exit 1)
 
-  _LT_PROG_XSI_SHELLFNS
+  _LT_PROG_REPLACE_SHELLFNS
 
    mv -f "$cfgfile" "$ofile" ||
     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
@@ -7453,77 +7453,77 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
 ])# _LT_CHECK_SHELL_FEATURES
 
 
-# _LT_PROG_XSI_REPLACE (FUNCNAME, REPLACEMENT-BODY)
-# -------------------------------------------------
+# _LT_PROG_FUNCTION_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],
+m4_defun([_LT_PROG_FUNCTION_REPLACE],
 [dnl {
 sed -e '/^$1 ()$/,/^} # $1 /c\
 $1 ()\
 {\
 m4_bpatsubsts([$2], [$], [\\], [^\([	 ]\)], [\\\1])
-} # XSI $1 implementation' "$cfgfile" > $cfgfile.tmp \
+} # Extended-shell $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=:
+test 0 -eq $? || _lt_function_replace_fail=:
 ])
 
 
-# _LT_PROG_XSI_SHELLFNS
-# ---------------------
+# _LT_PROG_REPLACE_SHELLFNS
+# -------------------------
 # Replace existing portable implementations of several shell functions with
-# equivalent XSI compatible implementations.
-m4_defun([_LT_PROG_XSI_SHELLFNS],
+# equivalent extended shell implementations where those features are available..
+m4_defun([_LT_PROG_REPLACE_SHELLFNS],
 [if test x"$xsi_shell" = xyes; then
-  _LT_PROG_XSI_REPLACE([func_dirname], [dnl
+  _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
     case ${1} in
       */*) func_dirname_result="${1%/*}${2}" ;;
       *  ) func_dirname_result="${3}" ;;
     esac])
 
-  _LT_PROG_XSI_REPLACE([func_basename], [dnl
+  _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
     func_basename_result="${1##*/}"])
 
-  _LT_PROG_XSI_REPLACE([func_dirname_and_basename], [dnl
+  _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
     case ${1} in
       */*) func_dirname_result="${1%/*}${2}" ;;
       *  ) func_dirname_result="${3}" ;;
     esac
     func_basename_result="${1##*/}"])
 
-  _LT_PROG_XSI_REPLACE([func_stripname], [dnl
+  _LT_PROG_FUNCTION_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}"}])
 
-  _LT_PROG_XSI_REPLACE([func_split_long_opt], [dnl
+  _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
     func_split_long_opt_name=${1%%=*}
     func_split_long_opt_arg=${1#*=}])
 
-  _LT_PROG_XSI_REPLACE([func_split_short_opt], [dnl
+  _LT_PROG_FUNCTION_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
+  _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
     case ${1} in
       *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
       *)    func_lo2o_result=${1} ;;
     esac])
 
-  _LT_PROG_XSI_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
+  _LT_PROG_FUNCTION_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
 
-  _LT_PROG_XSI_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
+  _LT_PROG_FUNCTION_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
 
-  _LT_PROG_XSI_REPLACE([func_len], [    func_len_result=${#1}])
+  _LT_PROG_FUNCTION_REPLACE([func_len], [    func_len_result=${#1}])
 fi
 
 if test x"$lt_shell_append" = xyes; then
-  _LT_PROG_XSI_REPLACE([func_append], [    eval "${1}+=\\${2}"])
+  _LT_PROG_FUNCTION_REPLACE([func_append], [    eval "${1}+=\\${2}"])
 
-  _LT_PROG_XSI_REPLACE([func_append_quoted], [dnl
+  _LT_PROG_FUNCTION_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"])
@@ -7532,16 +7532,16 @@ dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
   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=:
+  test 0 -eq $? || _lt_function_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=:
+  test 0 -eq $? || _lt_function_replace_fail=:
 fi
 
-if test x"$_lt_xsi_replace_fail" = x":"; then
-  AC_MSG_WARN([Unable to substitute faster XSI functions in $ofile]) 
+if test x"$_lt_function_replace_fail" = x":"; then
+  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) 
 fi
 ])
diff --git a/tests/getopt-m4sh.at b/tests/getopt-m4sh.at
index 8373c8e..b5f23fd 100644
--- a/tests/getopt-m4sh.at
+++ b/tests/getopt-m4sh.at
@@ -69,13 +69,13 @@ $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
+# _LT_AT_EXTENDED_SHELL_FUNC_EXTRACT(FUNC-NAME)
+# ---------------------------------------------
+# Extract the 'Extended-shell'-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 ()/,/^} # Extended-shell $1 /p' $abs_top_builddir/libtool >> options.tmp
 $SED '1,/^} # $1 /d' options >> options.tmp
 rm -f options && mv options.tmp options])
 


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Thu Jul 08 09:37:27 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OWrI7-0008At-Mz
	for mharc-libtool-commit@gnu.org; Thu, 08 Jul 2010 09:37:27 -0400
Received: from [140.186.70.92] (port=34420 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OWrI5-0008A3-Ts
	for libtool-commit@gnu.org; Thu, 08 Jul 2010 09:37:27 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OWrI4-0000nF-95
	for libtool-commit@gnu.org; Thu, 08 Jul 2010 09:37:25 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:38523
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OWrI4-0000n8-7g
	for libtool-commit@gnu.org; Thu, 08 Jul 2010 09:37:24 -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 1OWrI3-0006hu-Cu
	for libtool-commit@gnu.org; Thu, 08 Jul 2010 13:37:23 +0000
Received: from gary by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OWrI3-0006BJ-AZ
	for libtool-commit@gnu.org; Thu, 08 Jul 2010 13:37:23 +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: de8a0992b21b76a13c302cf48588ad5f6042595c
X-Git-Newrev: 8c4dae1232958c24989f31ab5b5768d00be2ef03
Message-Id: <E1OWrI3-0006BJ-AZ@vcs-noshell.in.savannah.gnu.org>
Date: Thu, 08 Jul 2010 13:37: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-59-g8c4dae1
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, 08 Jul 2010 13:37: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  8c4dae1232958c24989f31ab5b5768d00be2ef03 (commit)
      from  de8a0992b21b76a13c302cf48588ad5f6042595c (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 8c4dae1232958c24989f31ab5b5768d00be2ef03
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Thu Jul 8 18:47:59 2010 +0700

    Fix a spurious trailing space and a botched merge.
    
    * libltdl/m4/libtool.m4 (_LT_PROG_FUNCTION_REPLACE): Remove
    spurious trailing space.
    * ChangeLog: Reorder to match commit order after botched
    merge.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

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

diff --git a/ChangeLog b/ChangeLog
index 9d3cf53..641ee0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,3 @@
-2010-07-08  Peter Rosin  <peda@lysator.liu.se>
-
-	Optimize assignment of output_la.
-	* libltdl/config/ltmain.m4sh (func_mode_link): Save two fork/exec
-	instances.
-	Report by Ralf Wildenhues.
-
 2010-07-08  Gary V. Vaughan  <gary@gnu.org>
 
 	Rename _LT_PROG_XSI_REPLACE macro to _LT_PROG_FUNCTION_REPLACE.
@@ -26,6 +19,15 @@
 	(_LT_AT_EXTENDED_SHELL_FUNC_EXTRACT): Change regular expression to
 	match new replacable function decorator comments.
 
+2010-07-08  Peter Rosin  <peda@lysator.liu.se>
+
+	Optimize assignment of output_la.
+	* libltdl/config/ltmain.m4sh (func_mode_link): Save two fork/exec
+	instances.
+	Report by Ralf Wildenhues.
+
+2010-07-08  Gary V. Vaughan  <gary@gnu.org>
+
 	Fix a cut-n-pasto in "2010-07-07 Charles Wilson" patch.
 	* libltdl/config/ltmain.m4sh (func_mode_link): Remove spurious
 	variable dereference.
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 83d03bf..47d2558 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -7542,6 +7542,6 @@ else
 fi
 
 if test x"$_lt_function_replace_fail" = x":"; then
-  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) 
+  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
 fi
 ])


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Thu Jul 08 12:28:48 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OWtxv-00063d-JA
	for mharc-libtool-commit@gnu.org; Thu, 08 Jul 2010 12:28:47 -0400
Received: from [140.186.70.92] (port=42321 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OWtxr-0005u3-Aa
	for libtool-commit@gnu.org; Thu, 08 Jul 2010 12:28:46 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OWtmL-0000rI-GK
	for libtool-commit@gnu.org; Thu, 08 Jul 2010 12:16:51 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:52334
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OWtmL-0000r5-Eu
	for libtool-commit@gnu.org; Thu, 08 Jul 2010 12:16:49 -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 1OWtmK-0000Ca-RQ
	for libtool-commit@gnu.org; Thu, 08 Jul 2010 16:16:48 +0000
Received: from pekberg by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <INVALID.NOREPLY@gnu.org>) id 1OWtmK-0007Dh-O0
	for libtool-commit@gnu.org; Thu, 08 Jul 2010 16:16:48 +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: 8c4dae1232958c24989f31ab5b5768d00be2ef03
X-Git-Newrev: 0656b19eb95ce33ea8be5927ec7ebb0f9a8d0b52
Message-Id: <E1OWtmK-0007Dh-O0@vcs-noshell.in.savannah.gnu.org>
Date: Thu, 08 Jul 2010 16:16: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-60-g0656b19
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, 08 Jul 2010 16:28: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  0656b19eb95ce33ea8be5927ec7ebb0f9a8d0b52 (commit)
      from  8c4dae1232958c24989f31ab5b5768d00be2ef03 (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 0656b19eb95ce33ea8be5927ec7ebb0f9a8d0b52
Author: Peter Rosin <peda@lysator.liu.se>
Date:   Thu Jul 8 18:12:02 2010 +0200

    Make preloading heed libname_spec.
    
    Fixes testsuite failure for lt_dladvise.at on MSYS/MSVC.
    
    * libltdl/ltdl.c (libprefix): New static variable describing
    the prefix of static archives.
    (try_dlopen): Use libprefix.
    * libltdl/m4/ltdl.m4 (_LTDL_SETUP): Export prefix of static
    archives to config.h. Also fix assignment of LTDLOPEN to be more
    efficient and less error prone while at it.

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

Summary of changes:
 ChangeLog          |   12 ++++++++++++
 libltdl/ltdl.c     |   18 +++++++++++++++---
 libltdl/m4/ltdl.m4 |    7 ++++++-
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 641ee0b..a20add4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-08  Peter Rosin  <peda@lysator.liu.se>
+	    Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Make preloading heed libname_spec.
+	Fixes testsuite failure for lt_dladvise.at on MSYS/MSVC.
+	* libltdl/ltdl.c (libprefix): New static variable describing
+	the prefix of static archives.
+	(try_dlopen): Use libprefix.
+	* libltdl/m4/ltdl.m4 (_LTDL_SETUP): Export prefix of static
+	archives to config.h. Also fix assignment of LTDLOPEN to be more
+	efficient and less error prone while at it.
+
 2010-07-08  Gary V. Vaughan  <gary@gnu.org>
 
 	Rename _LT_PROG_XSI_REPLACE macro to _LT_PROG_FUNCTION_REPLACE.
diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index 1213f0d..992584c 100644
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -54,6 +54,10 @@ or obtained by writing to the Free Software Foundation, Inc.,
 #  define LT_LIBEXT "a"
 #endif
 
+#if !defined(LT_LIBPREFIX)
+#  define LT_LIBPREFIX "lib"
+#endif
+
 /* This is the maximum symbol size that won't require malloc/free */
 #undef	LT_SYMBOL_LENGTH
 #define LT_SYMBOL_LENGTH	128
@@ -72,6 +76,7 @@ or obtained by writing to the Free Software Foundation, Inc.,
 static	const char	objdir[]		= LT_OBJDIR;
 static	const char	archive_ext[]		= LT_ARCHIVE_EXT;
 static  const char	libext[]		= LT_LIBEXT;
+static  const char	libprefix[]		= LT_LIBPREFIX;
 #if defined(LT_MODULE_EXT)
 static	const char	shlib_ext[]		= LT_MODULE_EXT;
 #endif
@@ -1272,8 +1277,8 @@ try_dlopen (lt_dlhandle *phandle, const char *filename, const char *ext,
 
       if (vtable)
 	{
-	  /* name + "." + libext + NULL */
-	  archive_name = MALLOC (char, LT_STRLEN (name) + strlen (libext) + 2);
+	  /* libprefix + name + "." + libext + NULL */
+	  archive_name = MALLOC (char, strlen (libprefix) + LT_STRLEN (name) + strlen (libext) + 2);
 	  *phandle = (lt_dlhandle) lt__zalloc (sizeof (struct lt__handle));
 
 	  if ((*phandle == NULL) || (archive_name == NULL))
@@ -1285,7 +1290,14 @@ try_dlopen (lt_dlhandle *phandle, const char *filename, const char *ext,
 
 	  /* Preloaded modules are always named according to their old
 	     archive name.  */
-	  sprintf (archive_name, "%s.%s", name, libext);
+	  if (strncmp(name, "lib", 3) == 0)
+	    {
+	      sprintf (archive_name, "%s%s.%s", libprefix, name + 3, libext);
+	    }
+	  else
+	    {
+	      sprintf (archive_name, "%s.%s", name, libext);
+	    }
 
 	  if (tryall_dlopen (&newhandle, archive_name, advise, vtable) == 0)
 	    {
diff --git a/libltdl/m4/ltdl.m4 b/libltdl/m4/ltdl.m4
index 93de12a..42e07e9 100644
--- a/libltdl/m4/ltdl.m4
+++ b/libltdl/m4/ltdl.m4
@@ -410,8 +410,13 @@ AC_CHECK_FUNCS([strlcat strlcpy], [], [AC_LIBOBJ([lt__strl])])
 m4_pattern_allow([LT_LIBEXT])dnl
 AC_DEFINE_UNQUOTED([LT_LIBEXT],["$libext"],[The archive extension])
 
+name=
+eval "lt_libprefix=\"$libname_spec\""
+m4_pattern_allow([LT_LIBPREFIX])dnl
+AC_DEFINE_UNQUOTED([LT_LIBPREFIX],["$lt_libprefix"],[The archive prefix])
+
 name=ltdl
-LTDLOPEN=`eval "\\$ECHO \"$libname_spec\""`
+eval "LTDLOPEN=\"$libname_spec\""
 AC_SUBST([LTDLOPEN])
 ])# _LTDL_SETUP
 


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Fri Jul 16 22:31:15 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OZxBK-0006S0-U4
	for mharc-libtool-commit@gnu.org; Fri, 16 Jul 2010 22:31:14 -0400
Received: from [140.186.70.92] (port=34648 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OZxBI-0006Rl-N8
	for libtool-commit@gnu.org; Fri, 16 Jul 2010 22:31:13 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OZxBG-0000Aj-Qt
	for libtool-commit@gnu.org; Fri, 16 Jul 2010 22:31:12 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:35642
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OZxBG-0000Af-ON
	for libtool-commit@gnu.org; Fri, 16 Jul 2010 22:31: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 1OZxBG-0003Ue-9j
	for libtool-commit@gnu.org; Sat, 17 Jul 2010 02:31:10 +0000
Received: from pekberg by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <INVALID.NOREPLY@gnu.org>) id 1OZxBG-0004ur-4P
	for libtool-commit@gnu.org; Sat, 17 Jul 2010 02:31:10 +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: 0656b19eb95ce33ea8be5927ec7ebb0f9a8d0b52
X-Git-Newrev: 653fa66d07f238fa9a3a337d3f8a72d95583d3c4
Message-Id: <E1OZxBG-0004ur-4P@vcs-noshell.in.savannah.gnu.org>
Date: Sat, 17 Jul 2010 02:31: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.10-61-g653fa66
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, 17 Jul 2010 02:31: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  653fa66d07f238fa9a3a337d3f8a72d95583d3c4 (commit)
      from  0656b19eb95ce33ea8be5927ec7ebb0f9a8d0b52 (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 653fa66d07f238fa9a3a337d3f8a72d95583d3c4
Author: Peter Rosin <peda@lysator.liu.se>
Date:   Sat Jul 17 04:05:33 2010 +0200

    dllimport the variable for MSVC in link-order.at
    
    * tests/link-order.at [MSVC]: Makes the test pass by dllimporting
    imported variables when working with shared libraries.

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

Summary of changes:
 ChangeLog           |    6 ++++++
 tests/link-order.at |   22 ++++++++++++++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a20add4..5c425b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-17  Peter Rosin  <peda@lysator.liu.se>
+
+	dllimport the variable for MSVC in link-order.at
+	* tests/link-order.at [MSVC]: Makes the test pass by dllimporting
+	imported variables when working with shared libraries.
+
 2010-07-08  Peter Rosin  <peda@lysator.liu.se>
 	    Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
diff --git a/tests/link-order.at b/tests/link-order.at
index 0122a45..05ce776 100644
--- a/tests/link-order.at
+++ b/tests/link-order.at
@@ -48,13 +48,31 @@ for i in old new; do
   mkdir src
 
   cat >src/a_$i.c <<EOF
-extern int c;
+/* w32 fun, MSVC needs to dllimport when using a shared library, so use
+ * DLL_EXPORT to discriminate as that happens to coinside in this case.
+ * gnu has auto import.
+ */
+#if defined _MSC_VER && defined DLL_EXPORT
+#  define LIBCEE_SCOPE __declspec(dllimport)
+#else
+#  define LIBCEE_SCOPE extern
+#endif
+LIBCEE_SCOPE int c;
 extern int b_$i();
 int a_$i() { return c + b_$i(); }
 EOF
 
   cat >src/b_$i.c <<EOF
-extern int c;
+/* w32 fun, MSVC needs to dllimport when using a shared library, so use
+ * DLL_EXPORT to discriminate as that happens to coinside in this case.
+ * gnu has auto import.
+ */
+#if defined _MSC_VER && defined DLL_EXPORT
+#  define LIBCEE_SCOPE __declspec(dllimport)
+#else
+#  define LIBCEE_SCOPE extern
+#endif
+LIBCEE_SCOPE int c;
 int b_$i() { return 1 + c; }
 EOF
 


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Wed Jul 21 12:23:25 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Obc4q-0001XK-PC
	for mharc-libtool-commit@gnu.org; Wed, 21 Jul 2010 12:23:24 -0400
Received: from [140.186.70.92] (port=58986 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Obc4o-0001Vf-32
	for libtool-commit@gnu.org; Wed, 21 Jul 2010 12:23:23 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Obc4m-0006Bw-AN
	for libtool-commit@gnu.org; Wed, 21 Jul 2010 12:23:21 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:42740
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Obc4m-0006Be-6E
	for libtool-commit@gnu.org; Wed, 21 Jul 2010 12:23: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 1Obc4l-0007X8-Ob
	for libtool-commit@gnu.org; Wed, 21 Jul 2010 16:23:19 +0000
Received: from pekberg by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <INVALID.NOREPLY@gnu.org>) id 1Obc4k-0006bk-SC
	for libtool-commit@gnu.org; Wed, 21 Jul 2010 16:23: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: 653fa66d07f238fa9a3a337d3f8a72d95583d3c4
X-Git-Newrev: 0e01d00c70fe1eba2b746a6bb52e3c9277a4f1ef
Message-Id: <E1Obc4k-0006bk-SC@vcs-noshell.in.savannah.gnu.org>
Date: Wed, 21 Jul 2010 16:23: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.10-63-g0e01d00
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, 21 Jul 2010 16:23: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 branch, master has been updated
       via  0e01d00c70fe1eba2b746a6bb52e3c9277a4f1ef (commit)
       via  937319cb0a2a1d13d1b4d95e6aa0585e612c6023 (commit)
      from  653fa66d07f238fa9a3a337d3f8a72d95583d3c4 (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 0e01d00c70fe1eba2b746a6bb52e3c9277a4f1ef
Author: Peter Rosin <peda@lysator.liu.se>
Date:   Sun Jul 18 17:17:15 2010 +0200

    dllimport when the lib is shared and not linking with -static
    
    * tests/stresstest.at: Link with main.lo when liba is shared
    and linking main with -no-install.

commit 937319cb0a2a1d13d1b4d95e6aa0585e612c6023
Author: Peter Rosin <peda@lysator.liu.se>
Date:   Sun Jul 18 17:17:06 2010 +0200

    dllimport variables for MSVC in stresstest.at
    
    * tests/stresstest.at [MSVC]: dllimport all imported
    variables.

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

Summary of changes:
 ChangeLog           |   10 ++++++++++
 tests/stresstest.at |   49 ++++++++++++++++++++++++++++++++-----------------
 2 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5c425b7..d7aecc4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-07-18  Peter Rosin  <peda@lysator.liu.se>
+
+	* tests/stresstest.at: Link with main.lo when liba is shared
+	and linking main with -no-install.
+
+2010-07-18  Peter Rosin  <peda@lysator.liu.se>
+
+	* tests/stresstest.at [MSVC]: dllimport all imported
+	variables.
+
 2010-07-17  Peter Rosin  <peda@lysator.liu.se>
 
 	dllimport the variable for MSVC in link-order.at
diff --git a/tests/stresstest.at b/tests/stresstest.at
index ee5fd29..e71d492 100644
--- a/tests/stresstest.at
+++ b/tests/stresstest.at
@@ -93,29 +93,35 @@ AT_DATA(main.c,
 #if defined(LIBA_DLL_IMPORT)
 #  if defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__)
 #    define LIBA_SCOPE extern __declspec(dllimport)
+#    if defined(_MSC_VER)
+#      define LIBA_SCOPE_VAR LIBA_SCOPE
+#    endif
 #  endif
 #endif
 #if !defined(LIBA_SCOPE)
 #  define LIBA_SCOPE extern
 #endif
+#if !defined(LIBA_SCOPE_VAR)
+#  define LIBA_SCOPE_VAR extern
+#endif
 #ifdef __cplusplus
 extern "C" {
 #endif
-extern int v1;
-extern int v3, v4;
+LIBA_SCOPE_VAR int v1;
+LIBA_SCOPE_VAR int v3, v4;
 LIBA_SCOPE const int v5, v6;
-extern const char* v7;
-extern const char v8[];
+LIBA_SCOPE_VAR const char* v7;
+LIBA_SCOPE_VAR const char v8[];
 extern int v9(void);
-extern int (*v10) (void);
-extern int (*v11) (void);
+LIBA_SCOPE_VAR int (*v10) (void);
+LIBA_SCOPE_VAR int (*v11) (void);
 LIBA_SCOPE int (*const v12) (void);
 #ifdef __cplusplus
 }
 #endif
 
 typedef struct { int arr[1000]; } large;
-extern large v13, v14, v15;
+LIBA_SCOPE_VAR large v13, v14, v15;
 
 int main(void)
 {
@@ -131,26 +137,32 @@ AT_DATA(dlself.c,
 #if defined(LIBA_DLL_IMPORT)
 #  if defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__)
 #    define LIBA_SCOPE extern __declspec(dllimport)
+#    if defined(_MSC_VER)
+#      define LIBA_SCOPE_VAR LIBA_SCOPE
+#    endif
 #  endif
 #endif
 #if !defined(LIBA_SCOPE)
 #  define LIBA_SCOPE extern
 #endif
+#if !defined(LIBA_SCOPE_VAR)
+#  define LIBA_SCOPE_VAR extern
+#endif
 #ifdef __cplusplus
 extern "C" {
 #endif
-extern int v1;
-extern int v3, v4;
+LIBA_SCOPE_VAR int v1;
+LIBA_SCOPE_VAR int v3, v4;
 LIBA_SCOPE const int v5, v6;
-extern const char* v7;
-extern const char v8[];
+LIBA_SCOPE_VAR const char* v7;
+LIBA_SCOPE_VAR const char v8[];
 extern int v9(void);
-extern int (*v10) (void);
-extern int (*v11) (void);
+LIBA_SCOPE_VAR int (*v10) (void);
+LIBA_SCOPE_VAR int (*v11) (void);
 LIBA_SCOPE int (*const v12) (void);
 
 typedef struct { int arr[1000]; } large;
-extern large v13, v14, v15;
+LIBA_SCOPE_VAR large v13, v14, v15;
 
 extern int w1;
 extern int w3, w4;
@@ -252,9 +264,12 @@ do
 	         [0],[ignore],[ignore])
 	for st in '' '-static' '-no-install'
 	do
-          case $st,$l3 in
-          ,-rpath*) mst= ;;
-          *) mst=-static ;;
+	  # if -static is not passed, and the library is shared, then we have
+	  # to use -DLIBA_DLL_IMPORT, thus main.lo (and not main-static.lo).
+	  case $st,$l3 in
+	  -static,*) mst=-static ;;
+	  *,-rpath*) mst= ;;
+	  *) mst=-static ;;
 	  esac
 
 	  LT_AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $st -o "$rel"main$EXEEXT "$rel"main$mst.lo "$rel"sub2/liba.la],


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Mon Jul 26 20:40:28 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OdYDc-0007aF-JC
	for mharc-libtool-commit@gnu.org; Mon, 26 Jul 2010 20:40:28 -0400
Received: from [140.186.70.92] (port=42038 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OdYDX-0007Xw-9G
	for libtool-commit@gnu.org; Mon, 26 Jul 2010 20:40:28 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OdYDS-0001mG-5L
	for libtool-commit@gnu.org; Mon, 26 Jul 2010 20:40:23 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:51167
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1OdYDS-0001mB-1b
	for libtool-commit@gnu.org; Mon, 26 Jul 2010 20:40: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 1OdYDR-0007eX-AX
	for libtool-commit@gnu.org; Tue, 27 Jul 2010 00:40:17 +0000
Received: from cwilson by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <INVALID.NOREPLY@gnu.org>) id 1OdYDR-0007ym-7f
	for libtool-commit@gnu.org; Tue, 27 Jul 2010 00:40:17 +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: 0e01d00c70fe1eba2b746a6bb52e3c9277a4f1ef
X-Git-Newrev: 32a6c3b33c25177b206c0f618d7cf56c4cef4c86
Message-Id: <E1OdYDR-0007ym-7f@vcs-noshell.in.savannah.gnu.org>
Date: Tue, 27 Jul 2010 00:40: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-64-g32a6c3b
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, 27 Jul 2010 00:40: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  32a6c3b33c25177b206c0f618d7cf56c4cef4c86 (commit)
      from  0e01d00c70fe1eba2b746a6bb52e3c9277a4f1ef (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 32a6c3b33c25177b206c0f618d7cf56c4cef4c86
Author: Charles Wilson <libtool@cwilson.fastmail.fm>
Date:   Mon Jul 26 00:03:07 2010 -0400

    Don't always skip XSI tests
    
    tests/getopt-m4sh.at: Use new signature as implemented by
    de8a0992b21b76a13c302cf48588ad5f6042595c, when determining
    whether to test Extended-shell functions.

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

Summary of changes:
 ChangeLog            |    7 +++++++
 tests/getopt-m4sh.at |    6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d7aecc4..a5ef374 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-07-26  Charles Wilson  <libtool@cwilson.fastmail.fm>
+
+	Don't always skip XSI tests
+	tests/getopt-m4sh.at: Use new signature as implemented by
+	de8a0992b21b76a13c302cf48588ad5f6042595c, when determining
+	whether to test Extended-shell functions.
+
 2010-07-18  Peter Rosin  <peda@lysator.liu.se>
 
 	* tests/stresstest.at: Link with main.lo when liba is shared
diff --git a/tests/getopt-m4sh.at b/tests/getopt-m4sh.at
index b5f23fd..ca5d5b8 100644
--- a/tests/getopt-m4sh.at
+++ b/tests/getopt-m4sh.at
@@ -100,7 +100,7 @@ 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_CHECK([fgrep '# Extended-shell func_split_short_opt' $abs_top_builddir/libtool >/dev/null 2>&1 || (exit 77)])
 
 AT_DATA(expout,
 [[force verbose install
@@ -134,7 +134,7 @@ 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_CHECK([fgrep '# Extended-shell func_split_long_opt' $abs_top_builddir/libtool >/dev/null 2>&1 || (exit 77)])
 
 AT_DATA(expout,
 [[ltdl=long
@@ -171,7 +171,7 @@ 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_CHECK([fgrep '# Extended-shell func_append ' $abs_top_builddir/libtool >/dev/null 2>&1 || (exit 77)])
 
 AT_DATA(expout,
 [[first   --append second


hooks/post-receive
-- 
GNU Libtool


