From: Stepan Kasal Date: Thu, 18 Aug 2005 06:11:03 +0000 (+0000) Subject: * config/general.m4sh (SP2NL, NL2SP): Simplify. X-Git-Tag: release-2-1b~580 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a93c73ba11633695e072a1cb8af8dafe01dcdb1;p=thirdparty%2Flibtool.git * config/general.m4sh (SP2NL, NL2SP): Simplify. --- diff --git a/ChangeLog b/ChangeLog index 78d481c31..980bbc7b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-08-18 Stepan Kasal + + * config/general.m4sh (SP2NL, NL2SP): Simplify. + 2005-08-17 Gary V. Vaughan * m4/ltdl.m4 (LTDL_INIT): Fix mismatched parens. diff --git a/config/general.m4sh b/config/general.m4sh index 8510d33d0..ce2b3e2cc 100644 --- a/config/general.m4sh +++ b/config/general.m4sh @@ -106,14 +106,15 @@ sed_double_backslash='s/^\(\(''\\\\''\\\\''\)*''\\\\''\)\$/\1\\$/; s/\([[^\\]]\(''\\\\''\\\\''\)*''\\\\''\)\$/\1\\$/g' # test EBCDIC or ASCII -case `$ECHO A|tr A '\301'` in - A) # EBCDIC based system - SP2NL="tr '\100' '\n'" - NL2SP="tr '\r\n' '\100\100'" +case `echo X|tr X '\101'` in + A) # ASCII based system + # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr + SP2NL='tr \040 \012' + NL2SP='tr \015\012 \040\040' ;; - *) # Assume ASCII based system - SP2NL="tr '\040' '\012'" - NL2SP="tr '\015\012' '\040\040'" + *) # EBCDIC based system + SP2NL='tr \100 \n' + NL2SP='tr \r\n \100\100' ;; esac