[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99802: Backport from trunk: close bug#5857.

[Glenn Morris]

------------------------------------------------------------
revno: 99802
author: Miles Bader <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: emacs-23
timestamp: Sun 2010-05-09 17:37:59 -0700
message:
  Backport from trunk: close bug#5857.
  * configure.in: Get rid of "unix" pre-defined macro when
  preprocessing Makefile.  (Bug#5857)  [Backport from trunk]
modified:
  ChangeLog
  configure.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-05-08 03:28:26 +0000
+++ b/ChangeLog 2010-05-10 00:37:59 +0000
@@ -1,3 +1,8 @@
+2010-05-10  Miles Bader  <address@hidden>
+
+       * configure.in: Get rid of "unix" pre-defined macro when
+       preprocessing Makefile.  (Bug#5857)  [Backport from trunk]
+
 2010-05-07  Chong Yidong  <address@hidden>
 
        * Version 23.2 released.

=== modified file 'configure.in'
--- a/configure.in      2010-05-08 04:46:44 +0000
+++ b/configure.in      2010-05-10 00:37:59 +0000
@@ -3072,7 +3072,7 @@
 # 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'`"]