Subject: bug#8637: emacs-23 doesn't build on Ubuntu 11.04

From: Paul Eggert <[email-masked]>
Date: Sun, 08 May 2011 09:21:25 -0700

The emacs-23 branch (and, I assume, Emacs 23) does not
build on Ubuntu 11.04 x86.  I'd like to install the following
fix.  Normally I don't mess with the emacs-23 branch so I'm
being cautious and filing this bug report rather than simply
installing it.

=== modified file 'src/ChangeLog'
--- src/ChangeLog	2011-04-29 14:23:44 +0000
+++ src/ChangeLog	2011-05-08 16:20:25 +0000
@@ -1,3 +1,7 @@
+2011-05-08  Paul Eggert  <[email-masked]>
+
+	* Makefile.in (i386): #undef, for Ubuntu 11.04 x86.
+
 2011-04-29  Eli Zaretskii  <[email-masked]>
 
 	* w32heap.c (allocate_heap) [USE_LISP_UNION_TYPE || USE_LSB_TAG]:

=== modified file 'src/Makefile.in'
--- src/Makefile.in	2011-02-19 17:34:50 +0000
+++ src/Makefile.in	2011-05-08 16:20:25 +0000
@@ -100,6 +100,14 @@
 #undef X11
 #endif
 
+/* Do not let CFLAGs get messed up on systems like Ubuntu 11.04 x86.
+   For example, DBUS_CFLAGS should contain
+   "-I/usr/lib/i386-linux-gnu/dbus-1.0/include",
+   but the preprocessor expands "i386" to "1 ".  */
+#ifdef i386
+#undef i386
+#endif
+
 /* On some machines #define register is done in config;
    do not let it interfere with this file.  */
 #undef register