From: Ralf Menzel <menzel@ls6.cs.uni-dortmund.de>
Date: Fri, 23 Feb 2007 18:18:34 +0000 (+0000)
Subject: * libltdl/config/general.m4sh (sed_double_backslash): Fix
X-Git-Tag: release-2-1b~183
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3fa76ea860f3e223d47554de313c42bd445ccb95;p=thirdparty%2Flibtool.git

* libltdl/config/general.m4sh (sed_double_backslash): Fix
hacky sed script to avoid limitations but retain portability to
Solaris /bin/sed.  Remove old obsolete cruft.
---

diff --git a/ChangeLog b/ChangeLog
index a1aab6cf0..c68ad8729 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-23  Ralf Menzel  <menzel@ls6.cs.uni-dortmund.de>  (tiny change)
+
+	* libltdl/config/general.m4sh (sed_double_backslash): Fix
+	hacky sed script to avoid limitations but retain portability to
+	Solaris /bin/sed.  Remove old obsolete cruft.
+
 2007-02-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* libltdl/config/ltmain.m4sh (func_mode_link): Fix the check for
diff --git a/libltdl/config/general.m4sh b/libltdl/config/general.m4sh
index 4e1d1f1bd..697e47104 100644
--- a/libltdl/config/general.m4sh
+++ b/libltdl/config/general.m4sh
@@ -101,28 +101,16 @@ double_quote_subst='s/\([["`\\]]\)/\\\1/g'
 # in input to double_quote_subst, that '$' was protected from expansion.
 # Since each input `\' is now two `\'s, look for any number of runs of
 # four `\'s followed by two `\'s and then a '$'.  `\' that '$'. 
-#
-# Note in the first, non-portable but general version, the embedded single
-# quotes serve only to enhance readability.
-#sed_double_backslash='s/^\(\(''\\\\''\\\\''\)*''\\\\''\)\$/\1\\$/;
-#                s/\([[^\\]]\(''\\\\''\\\\''\)*''\\\\''\)\$/\1\\$/g'
 bs='\\'
 bs2='\\\\'
 bs4='\\\\\\\\'
 dollar='\$'
 sed_double_backslash="\
+  s/$bs4/&\\
+/g
   s/^$bs2$dollar/$bs&/
-  s/^$bs4$bs2$dollar/$bs&/
-  s/^$bs4$bs4$bs2$dollar/$bs&/
-  s/^$bs4$bs4$bs4$bs2$dollar/$bs&/
-  s/^$bs4$bs4$bs4$bs4$bs2$dollar/$bs&/
-  s/^$bs4$bs4$bs4$bs4$bs4$bs2$dollar/$bs&/
-  s/\\([[^$bs]]\\)\\($bs2$dollar\\)/\\1$bs\\2/g
-  s/\\([[^$bs]]\\)\\($bs4$bs2$dollar\\)/\\1$bs\\2/g
-  s/\\([[^$bs]]\\)\\($bs4$bs4$bs2$dollar\\)/\\1$bs\\2/g
-  s/\\([[^$bs]]\\)\\($bs4$bs4$bs4$bs2$dollar\\)/\\1$bs\\2/g
-  s/\\([[^$bs]]\\)\\($bs4$bs4$bs4$bs4$bs2$dollar\\)/\\1$bs\\2/g
-  s/\\([[^$bs]]\\)\\($bs4$bs4$bs4$bs4$bs4$bs2$dollar\\)/\\1$bs\\2/g"
+  s/\\([[^$bs]]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
+  s/\n//g"
 
 # Standard options:
 opt_dry_run=false