From: Miles Bader <miles@gnu.org>
Date: Mon, 10 May 2010 00:37:59 +0000 (-0700)
Subject: Backport from trunk: close bug#5857.
X-Git-Tag: emacs-pretest-23.2.90~139^2~180
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8290c6b9e657060bbbfaf77d42c1b5abf87b229a;p=emacs.git

Backport from trunk: close bug#5857.
* configure.in: Get rid of "unix" pre-defined macro when
preprocessing Makefile.  (Bug#5857)  [Backport from trunk]
---

diff --git a/ChangeLog b/ChangeLog
index 6b2c016534c..b218314d2ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-10  Miles Bader  <miles@gnu.org>
+
+	* configure.in: Get rid of "unix" pre-defined macro when
+	preprocessing Makefile.  (Bug#5857)  [Backport from trunk]
+
 2010-05-07  Chong Yidong  <cyd@stupidchicken.com>
 
 	* Version 23.2 released.
diff --git a/configure.in b/configure.in
index 7b681f6e6c2..304f6ab2f91 100644
--- a/configure.in
+++ b/configure.in
@@ -3072,7 +3072,7 @@ test "${exec_prefix}" != NONE &&
 # the C preprocessor to some helpful value like 1, or maybe the empty
 # string.  Needless to say consequent macro substitutions are less
 # than conducive to the makefile finding the correct directory.
-[cpp_undefs="`echo $srcdir $configuration $canonical |
+[cpp_undefs="`echo $srcdir $configuration $canonical unix |
   sed -e 's/[^a-zA-Z0-9_]/ /g' -e 's/^/ /' -e 's/  *$//' \
   -e 's/  */ -U/g' -e 's/-U[0-9][^ ]*//g'`"]