From 3ab9879a99dd0a4690c65a80edbcacaffae8bce9 Mon Sep 17 00:00:00 2001 From: Peter Rosin Date: Fri, 2 Jul 2010 08:17:19 +0200 Subject: [PATCH] Don't trigger file name expansion when embedding manifests. * libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS) [ cygwin, mingw, cegcc ] : 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 --- ChangeLog | 9 +++++++++ libltdl/m4/libtool.m4 | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ac8501489..4064851ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2010-07-02 Peter Rosin + + Don't trigger file name expansion when embedding manifests. + * libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS) + [ cygwin, mingw, cegcc ] : 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 Fix regression caused by "Add func_append_quoted and do..." diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4 index 89785c12d..8475d4bcb 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 -- 2.47.2