Merge the improved cpp checks from emacs20's patch-ab. Should fix build

breakage on -current.

2 files changed, 68 insertions, 4 deletions

diff --git a/editors/emacs21/distinfo b/editors/emacs21/distinfo
index d198dc4db74..f332a91c8c4 100644
--- a/editors/emacs21/distinfo
+++ b/editors/emacs21/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.11 2011/12/31 11:40:27 dholland Exp $
+$NetBSD: distinfo,v 1.12 2011/12/31 16:37:25 dholland Exp $
 
 SHA1 (emacs-21.4a.tar.gz) = cdb33731180fe4a912838af805dd35e3f55394d4
 RMD160 (emacs-21.4a.tar.gz) = c312e739935b56d08783bbfe97992297a363cb8a
 Size (emacs-21.4a.tar.gz) = 20403483 bytes
 SHA1 (patch-aa) = fee6fe91fb9a2f75300903cc5c6e023bb8de6be5
-SHA1 (patch-ab) = 9c268f822b4422307787f27a63ebc67ae43aa8a7
+SHA1 (patch-ab) = b6510c3994b744460576be13e12144cad007c849
 SHA1 (patch-ac) = a2de7619fece50cb42b0e23b1651b5bf742ff69a
 SHA1 (patch-ad) = 39a11bc214ae3d2f9d634c30b196a46d473ab92f
 SHA1 (patch-ae) = e2b66b23efb90608470aef5ebd0c75e27bcd6b55
diff --git a/editors/emacs21/patches/patch-ab b/editors/emacs21/patches/patch-ab
index f48cbd6a6c0..cd835d22db1 100644
--- a/editors/emacs21/patches/patch-ab
+++ b/editors/emacs21/patches/patch-ab
@@ -1,4 +1,10 @@
-$NetBSD: patch-ab,v 1.1 2007/06/11 13:38:33 markd Exp $
+$NetBSD: patch-ab,v 1.2 2011/12/31 16:37:25 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	2003-03-18 14:19:12.000000000 +0000
 +++ configure
@@ -39,7 +45,65 @@ $NetBSD: patch-ab,v 1.1 2007/06/11 13:38:33 markd Exp $
        *-nextstep* )             opsys=nextstep ;;
        ## Otherwise, we'll fall through to the generic opsys code at the bottom.
      esac
-@@ -9124,6 +9137,22 @@ EOF
+@@ -2052,15 +2065,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 2057 "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:2063: \"$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" contest2.out \
++    `
+ if test -z "$ac_err"; then
+   :
+ else
+@@ -2074,10 +2093,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:2080: \"$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" contest2.out \
++    `
+ if test -z "$ac_err"; then
+   :
+ else
+@@ -2091,10 +2114,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:2097: \"$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" contest2.out \
++    `
+ if test -z "$ac_err"; then
+   :
+ else
+@@ -9124,6 +9151,22 @@ EOF
  fi