From: Gary V. Vaughan <gary@gnu.org>
Date: Thu, 7 Oct 2004 02:53:45 +0000 (+0000)
Subject: * m4/libtool.m4 (_LT_FORMAT_COMMENT): Shell meta-characters in
X-Git-Tag: release-2-1b~925
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90ecb876403d2d9da11070131a65021c82978740;p=thirdparty%2Flibtool.git

* m4/libtool.m4 (_LT_FORMAT_COMMENT): Shell meta-characters in
_LT_DECL descriptions were not being escaped before injection into
TAG CONFIG here documents in config.status.
---

diff --git a/ChangeLog b/ChangeLog
index 9118f03eb..9976fb708 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-07  Gary V. Vaughan  <gary@gnu.org>
+
+	* m4/libtool.m4 (_LT_FORMAT_COMMENT): Shell meta-characters in
+	_LT_DECL descriptions were not being escaped before injection into
+	TAG CONFIG here documents in config.status.
+
 2004-10-06  Peter O'Gorman  <peter@pogma.com>
 
 	* m4/libtool.m4 (_LT_PROG_CXX, _LT_PROG_F77): New macros to work
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index e158528a7..3378d2643 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -261,7 +261,8 @@ _LT_CONFIG_LIBTOOL_INIT([$2])
 # full-stop to the whole comment if one is not present already.
 m4_define([_LT_FORMAT_COMMENT],
 [m4_ifval([$1], [
-m4_bpatsubst([$1], [^ *], [# ])]m4_bmatch([$1], [[!?.]$], [], [.])
+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
+              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
 )])
 
 
@@ -4471,11 +4472,11 @@ m4_defun([_LT_PROG_CXX],
 pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
 AC_PROG_CXX
 if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || 
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
     (test "X$CXX" != "Xg++"))) ; then
   AC_PROG_CXXCPP
-else  
-  _lt_caught_CXX_error=yes 
+else
+  _lt_caught_CXX_error=yes
 fi
 popdef([AC_MSG_ERROR])
 ])# _LT_PROG_CXX
@@ -5579,7 +5580,7 @@ m4_defun([_LT_PROG_F77],
 pushdef([AC_MSG_ERROR], [_lt_caught_F77_error=yes])
 AC_PROG_F77
 if test -z "$F77"; then
-  _lt_caught_F77_error=yes 
+  _lt_caught_F77_error=yes
 fi
 popdef([AC_MSG_ERROR])
 ])# _LT_PROG_F77