Patch up configure tests for cpp to avoid problems when running gcc

4.5's cpp on makefiles. PR 45669.

Unfortunately, this does not by itself fix the build; now I'm getting

   ./temacs -batch -l loadup dump
   gmake[1]: *** [emacs] Segmentation fault

and I have a bad feeling that this may be the same issue that the
other emacs versions are sometimes hitting.

2 files changed, 70 insertions, 6 deletions

diff --git a/editors/emacs20/distinfo b/editors/emacs20/distinfo
index a9405a1db51..996d58d0d4e 100644
--- a/editors/emacs20/distinfo
+++ b/editors/emacs20/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2011/08/01 05:44:26 dholland Exp $
+$NetBSD: distinfo,v 1.19 2011/12/01 04:05:40 dholland Exp $
 
 SHA1 (emacs-20.7-mule-4.1b-elc.tar.gz) = 3894fb2b81bb326545f6ccc3bf0a8405c23004ff
 RMD160 (emacs-20.7-mule-4.1b-elc.tar.gz) = c675b31dafaa4321a453af9d87eddf051ee71b1f
@@ -13,7 +13,7 @@ SHA1 (emacs20-xim-20000713.diff) = 5bed39e7b8a52941f77088529566aaa3bcf06670
 RMD160 (emacs20-xim-20000713.diff) = 5887a4d43ee92e8cad65d6412c9ecbce08e781da
 Size (emacs20-xim-20000713.diff) = 21296 bytes
 SHA1 (patch-aa) = 3b3fd76c058a0a46e0458338ce4c2327a238fb3d
-SHA1 (patch-ab) = 3d9497d4894cd126ca49636d9adfdd14cc31b017
+SHA1 (patch-ab) = 2ef7b4d9c7a192ebd00efc85f94d8e7d116cf0b7
 SHA1 (patch-ac) = abf5971279a8d875504be4c17b8d36cb8cc24885
 SHA1 (patch-ad) = dd21028a6360ccfb442ecced4c67717f60ea78a6
 SHA1 (patch-ae) = 26b8b56822d343d33330f426d83951b8fec074fa
diff --git a/editors/emacs20/patches/patch-ab b/editors/emacs20/patches/patch-ab
index 1e753f40b56..2e75c1a8c1f 100644
--- a/editors/emacs20/patches/patch-ab
+++ b/editors/emacs20/patches/patch-ab
@@ -1,4 +1,10 @@
-$NetBSD: patch-ab,v 1.3 2006/01/04 17:00:32 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2011/12/01 04:05:41 dholland Exp $
+
+Caution: the extra cpp checking (the three hunks containing "Should be
+one line") is manually hacked and not reflected in configure.in; do
+not regenerate configure with autoconf without merging it. This
+checking is required because somewhere between gcc 4.1 and 4.5 cpp
+started doing regrettable things with backslash-escaped newlines.
 
 --- configure.orig	2000-06-12 20:05:56.000000000 +0000
 +++ configure
@@ -48,7 +54,65 @@ $NetBSD: patch-ab,v 1.3 2006/01/04 17:00:32 joerg Exp $
        *-nextstep* )             opsys=nextstep ;;
        ## Otherwise, we'll fall through to the generic opsys code at the bottom.
      esac
-@@ -3823,6 +3837,53 @@ else
+@@ -1916,15 +1930,21 @@ else
+   CPP="${CC-cc} -E"
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp.
++  # And, gcc 4.5? and up does not preserve escaped newlines, which is
++  # fatal for preprocessing makefiles.
+   cat > conftest.$ac_ext <<EOF
+ #line 1921 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
++Should \\
++be one line.
+ EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++ac_try="$ac_cpp conftest.$ac_ext >conftest2.out 2>conftest.out"
+ { (eval echo configure:1927: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"; \
++    grep -L "Should  *be one line" conftest2.out \
++    `
+ if test -z "$ac_err"; then
+   :
+ else
+@@ -1938,10 +1958,14 @@ else
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
++Should \\
++be one line.
+ EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++ac_try="$ac_cpp conftest.$ac_ext >conftest2.out 2>conftest.out"
+ { (eval echo configure:1944: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"; \
++    grep -L "Should  *be one line" conftest2.out \
++    `
+ if test -z "$ac_err"; then
+   :
+ else
+@@ -1955,10 +1979,14 @@ else
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
++Should \\
++be one line.
+ EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++ac_try="$ac_cpp conftest.$ac_ext >conftest2.out 2>conftest.out"
+ { (eval echo configure:1961: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"; \
++    grep -L "Should  *be one line" conftest2.out \
++    `
+ if test -z "$ac_err"; then
+   :
+ else
+@@ -3823,6 +3851,53 @@ else
    echo "$ac_t""no" 1>&6
  fi
  
@@ -102,7 +166,7 @@ $NetBSD: patch-ab,v 1.3 2006/01/04 17:00:32 joerg Exp $
    LIBS="$OLDLIBS"
  fi
  
-@@ -4906,6 +4967,64 @@ EOF
+@@ -4906,6 +4981,64 @@ EOF
  
  fi
  
@@ -167,7 +231,7 @@ $NetBSD: patch-ab,v 1.3 2006/01/04 17:00:32 joerg Exp $
  # Set up the CFLAGS for real compilation, so we can substitute it.
  CFLAGS="$REAL_CFLAGS"
  
-@@ -5211,6 +5330,7 @@ s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
+@@ -5211,6 +5346,7 @@ s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
  s%@INSTALL_DATA@%$INSTALL_DATA%g
  s%@YACC@%$YACC%g
  s%@SET_MAKE@%$SET_MAKE%g