* config/general.m4sh (SP2NL, NL2SP): Simplify.

diff --git a/ChangeLog b/ChangeLog
index 78d481c3124239f42af510ea98a3518efec0eafb..980bbc7b115d0757546d32d6abeebc5d0698701f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-18  Stepan Kasal  <kasal@ucw.cz>
+
+       * config/general.m4sh (SP2NL, NL2SP): Simplify.
+
 2005-08-17  Gary V. Vaughan  <gary@gnu.org>
 
        * m4/ltdl.m4 (LTDL_INIT): Fix mismatched parens.

diff --git a/config/general.m4sh b/config/general.m4sh
index 8510d33d0da9e85c28ccbdb8e1cf4cda8bb58b7d..ce2b3e2ccd0500b10cf4986ab46409efb4fdeebf 100644 (file)
--- 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