[BUG] CR handling related autoconf problem

[Andris Pavenis]

Current handling CR in config.status breaks for DJGPP all
packeges which configure script has been updated with new
autoconf versions (like 2.63).

The awk script subs.awk generated by config.status contains
\r at end of each line instead of real CR (see attachment
for an example). As result awk fails with an error message:

configure: creating ./config.status
config.status: creating Makefile
gawk: ./conf6531-11753/subs.awk:1: BEGIN {\r
gawk: ./conf6531-11753/subs.awk:1:        ^ backslash not last character on line
config.status: error: could not create Makefile
Configure failed

The attached one line patch for lib/autoconf/status.m4 should fix the problem
(patch is against version 1.63).

Andris

BEGIN {\r
S["LTLIBOBJS"]=""\r
S["LIBOBJS"]=""\r
S["ALLOCA"]=""\r
S["NMEDIT"]=""\r
S["DSYMUTIL"]=""\r
S["lt_ECHO"]="echo"\r
S["RANLIB"]="ranlib"\r
S["AR"]="ar"\r
S["LN_S"]="ln -s"\r
S["NM"]="/dev/env/DJDIR/bin/nm -B"\r
S["ac_ct_DUMPBIN"]=""\r
S["DUMPBIN"]=""\r
S["LD"]="c:/comp/djgpp/bin/ld.exe"\r
S["FGREP"]="/dev/env/DJDIR/bin/grep -F"\r
S["LIBTOOL"]="$(SHELL) $(top_builddir)/libtool"\r
S["OBJDUMP"]="objdump"\r
S["DLLTOOL"]="dlltool"\r
S["AS"]="as"\r
S["CXXCPP"]="gpp -E"\r
S["ac_ct_F77"]="gfortran"\r
S["FFLAGS"]="-g -O2"\r
S["F77"]="gfortran"\r
S["am__fastdepCXX_FALSE"]="#"\r
S["am__fastdepCXX_TRUE"]=""\r
S["CXXDEPMODE"]="depmode=gcc3"\r
S["ac_ct_CXX"]="gpp"\r
S["CXXFLAGS"]="-g -O2"\r
S["CXX"]="gpp"\r
S["MPFR_LIBM"]="-lm"\r
S["ANSI2KNR"]=""\r
S["U"]=""\r
S["SED"]="/dev/env/DJDIR/bin/sed"\r
S["EGREP"]="/dev/env/DJDIR/bin/grep -E"\r
S["GREP"]="/dev/env/DJDIR/bin/grep"\r
S["CPP"]="gcc -E"\r
S["am__fastdepCC_FALSE"]="#"\r
S["am__fastdepCC_TRUE"]=""\r
S["CCDEPMODE"]="depmode=gcc3"\r
S["AMDEPBACKSLASH"]="\\"\r
S["AMDEP_FALSE"]="#"\r
S["AMDEP_TRUE"]=""\r
S["am__quote"]=""\r
S["am__include"]="include"\r
S["DEPDIR"]=".deps"\r
S["OBJEXT"]="o"\r
S["EXEEXT"]=".exe"\r
S["ac_ct_CC"]="gcc"\r
S["CPPFLAGS"]=""\r
S["LDFLAGS"]=""\r
S["CFLAGS"]="-Wall -Wmissing-prototypes -Wpointer-arith -m32 -O2 
-fomit-frame-pointer -mtune=i386 -march=i386 -ffloat-store"\r
S["CC"]="gcc"\r
S["host_os"]="msdosdjgpp"\r
S["host_vendor"]="pc"\r
S["host_cpu"]="i786"\r
S["host"]="i786-pc-msdosdjgpp"\r
S["build_os"]="msdosdjgpp"\r
S["build_vendor"]="pc"\r
S["build_cpu"]="i786"\r
S["build"]="i786-pc-msdosdjgpp"\r
S["MAINT"]=""\r
S["MAINTAINER_MODE_FALSE"]="#"\r
S["MAINTAINER_MODE_TRUE"]=""\r
S["am__untar"]="${AMTAR} xf -"\r
S["am__tar"]="${AMTAR} chof - \"$$tardir\""\r
S["AMTAR"]="${SHELL} /dev/g/djdev/mpfr/gnu/mpfr-2.41/missing --run tar"\r
S["am__leading_dot"]="."\r
S["SET_MAKE"]=""\r
S["AWK"]="gawk"\r
S["mkdir_p"]="/dev/env/DJDIR/bin/mkdir -p"\r
S["MKDIR_P"]="/dev/env/DJDIR/bin/mkdir -p"\r
S["INSTALL_STRIP_PROGRAM"]="$(install_sh) -c -s"\r
S["STRIP"]="strip"\r
S["install_sh"]="$(SHELL) /dev/g/djdev/mpfr/gnu/mpfr-2.41/install-sh"\r
S["MAKEINFO"]="${SHELL} /dev/g/djdev/mpfr/gnu/mpfr-2.41/missing --run 
makeinfo"\r
S["AUTOHEADER"]="${SHELL} /dev/g/djdev/mpfr/gnu/mpfr-2.41/missing --run 
autoheader"\r
S["AUTOMAKE"]="${SHELL} /dev/g/djdev/mpfr/gnu/mpfr-2.41/missing --run 
automake-1.10"\r
S["AUTOCONF"]="${SHELL} /dev/g/djdev/mpfr/gnu/mpfr-2.41/missing --run 
autoconf"\r
S["ACLOCAL"]="${SHELL} /dev/g/djdev/mpfr/gnu/mpfr-2.41/missing --run 
aclocal-1.10"\r
S["VERSION"]="2.4.1"\r
S["PACKAGE"]="mpfr"\r
S["CYGPATH_W"]="echo"\r
S["am__isrc"]=""\r
S["INSTALL_DATA"]="${INSTALL} -m 644"\r
S["INSTALL_SCRIPT"]="${INSTALL}"\r
S["INSTALL_PROGRAM"]="${INSTALL}"\r
S["target_alias"]="i386-pc-msdosdjgpp"\r
S["host_alias"]=""\r
S["build_alias"]=""\r
S["LIBS"]="-lgmp "\r
S["ECHO_T"]=""\r
S["ECHO_N"]="-n"\r
S["ECHO_C"]=""\r
S["DEFS"]="-DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DTIME_WITH_SYS_TIME=1 
-DHAVE_LOCALE_H=1 -DHAVE_WCHAR_H=1 -DHAVE_STDARG=1 -DHAVE_SYS_TIME_H=1 
-DHAVE_STDINT_H="\\r
"1 -DHAVE_SETLOCALE=1 -DHAVE_GETTIMEOFDAY=1 -DHAVE_LONG_LONG=1 
-DHAVE_INTMAX_T=1 -DHAVE_DENORMS=1 -DHAVE_FLOOR=1 -DHAVE_CEIL=1 
-DHAVE_LDOUBLE_IEEE_EX"\\r
"T_LITTLE=1 -DLT_OBJDIR=\\\".libs/\\\" -DHAVE_ATTRIBUTE_MODE=1"\r
S["mandir"]="${datarootdir}/man"\r
S["localedir"]="${datarootdir}/locale"\r
S["libdir"]="${exec_prefix}/lib"\r
S["psdir"]="${docdir}"\r
S["pdfdir"]="${docdir}"\r
S["dvidir"]="${docdir}"\r
S["htmldir"]="${docdir}"\r
S["infodir"]="${datarootdir}/info"\r
S["docdir"]="${datarootdir}/doc/${PACKAGE_TARNAME}"\r
S["oldincludedir"]="/usr/include"\r
S["includedir"]="${prefix}/include"\r
S["localstatedir"]="${prefix}/var"\r
S["sharedstatedir"]="${prefix}/com"\r
S["sysconfdir"]="${prefix}/etc"\r
S["datadir"]="${datarootdir}"\r
S["datarootdir"]="${prefix}/share"\r
S["libexecdir"]="${exec_prefix}/libexec"\r
S["sbindir"]="${exec_prefix}/sbin"\r
S["bindir"]="${exec_prefix}/bin"\r
S["program_transform_name"]="s,x,x,"\r
S["prefix"]="/dev/env/DJDIR"\r
S["exec_prefix"]="${prefix}"\r
S["PACKAGE_BUGREPORT"]=""\r
S["PACKAGE_STRING"]="MPFR 2.4.1"\r
S["PACKAGE_VERSION"]="2.4.1"\r
S["PACKAGE_TARNAME"]="mpfr"\r
S["PACKAGE_NAME"]="MPFR"\r
S["PATH_SEPARATOR"]=":"\r
S["SHELL"]="/dev/env/DJDIR/bin/bash.exe"\r
  for (key in S) S_is_set[key] = 1\r
  FS = ""\r
\r
}\r
{\r
  line = $ 0\r
  nfields = split(line, field, "@")\r
  substed = 0\r
  len = length(field[1])\r
  for (i = 2; i < nfields; i++) {\r
    key = field[i]\r
    keylen = length(key)\r
    if (S_is_set[key]) {\r
      value = S[key]\r
      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)\r
      len += length(value) + length(field[++i])\r
      substed = 1\r
    } else\r
      len += 1 + keylen\r
  }\r
\r
  print line\r
}\r
\r

--- status.m4.orig      2009-03-20 20:01:18.000000000 +0000
+++ status.m4   2009-03-20 20:02:26.000000000 +0000
@@ -373,7 +373,7 @@
 ac_cr=''
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
+  ac_cs_awk_cr='\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi