diff options
| author | Zack Weinberg <zack@owlfolio.org> | 2023-12-18 18:25:27 -0500 |
|---|---|---|
| committer | Zack Weinberg <zack@owlfolio.org> | 2023-12-18 18:25:27 -0500 |
| commit | 2d36f11a5266c22a4d40e8bea2fec7fdd5c42297 (patch) | |
| tree | e8af3b92e6f8dee6197a26d5c5165f26e6f64a36 | |
| parent | 5d3f81d4b33218e00ac90bfa92d08eff06de9200 (diff) | |
| download | autoconf-2d36f11a5266c22a4d40e8bea2fec7fdd5c42297.tar.gz | |
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>.
| -rw-r--r-- | lib/autoconf/status.m4 | 2 | ||||
| -rw-r--r-- | tests/torture.at | 29 |
2 files changed, 0 insertions, 31 deletions
diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4 index e5eb67b..2bfaf32 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 4e81d0d..ba52e12 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. ## |
