From: Zack Weinberg <zack@owlfolio.org>
Date: Mon, 18 Dec 2023 23:25:27 +0000 (-0500)
Subject: Revert "config.status: handle CRLF line endings in AC_CONFIG_HEADERS input"
X-Git-Tag: v2.72e~5
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=2d36f11a5266c22a4d40e8bea2fec7fdd5c42297;p=thirdparty%2Fautoconf.git

Revert "config.status: handle CRLF line endings in AC_CONFIG_HEADERS input"

Solaris 10 /usr/bin/awk doesn't implement sub().  Let's defer this
change until after the release and I have time to think about it
some more.

This reverts commit bfd3894367e4d1c36c514e02c62173cde157f06b.
This reopens bug <https://savannah.gnu.org/support/?110554>.
---

diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index e5eb67bf..2bfaf32b 100644
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -503,7 +503,6 @@ cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
 }
 {
   line = $ 0
-  sub(/\r\$/, "", line)
   nfields = split(line, field, "@")
   substed = 0
   len = length(field[1])
@@ -825,7 +824,6 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   for (key in D) D_is_set[key] = 1
   FS = ""
 }
-{ sub(/\r\$/, "", \$ 0) }
 /^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
   line = \$ 0
   split(line, arg, " ")
diff --git a/tests/torture.at b/tests/torture.at
index 4e81d0dc..ba52e12d 100644
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -1093,35 +1093,6 @@ AT_CHECK_DEFINES([[#define foo one
 
 AT_CLEANUP
 
-## ------------------- ##
-## CRLF line endings.  ##
-## ------------------- ##
-
-AT_SETUP([CRLF line endings in .in files])
-
-AT_CONFIGURE_AC([[
-AC_DEFINE([MACRO], [1], [Define MACRO as 1 always.])
-AC_SUBST([VARIABLE], [value])
-AC_CONFIG_FILES([config.out:config.oin])
-]])
-
-# Shell `printf` should understand \r.
-AT_CHECK([printf '%s\r\n' \
-  '/* Define MACRO as 1 always. */' \
-  '#undef MACRO' \
-  > config.hin])
-AT_CHECK([printf '%s\r\n' \
-  'VARIABLE=@VARIABLE@' \
-  > config.oin])
-
-AT_SKIP_IF([grep '\\r' config.hin > /dev/null])
-
-AT_CHECK_AUTOCONF
-AT_CHECK_CONFIGURE
-AT_CHECK([grep '#define MACRO 1' config.h > /dev/null])
-AT_CHECK([grep 'VARIABLE=value' config.out > /dev/null])
-
-AT_CLEANUP
 
 ## ------------------------------------ ##
 ## AC_SUBST: variable name validation.  ##