diff options
| author | Miles Bader <miles@gnu.org> | 2010-05-09 17:37:59 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-05-09 17:37:59 -0700 |
| commit | 8290c6b9e657060bbbfaf77d42c1b5abf87b229a (patch) | |
| tree | 18182a19f2c31c0e05c3deaa9b36197e83764fcd | |
| parent | e1cb2c1314c1a58d9d83293019b5d563a3edb072 (diff) | |
| download | emacs-8290c6b9e657060bbbfaf77d42c1b5abf87b229a.tar.gz emacs-8290c6b9e657060bbbfaf77d42c1b5abf87b229a.tar.bz2 emacs-8290c6b9e657060bbbfaf77d42c1b5abf87b229a.zip | |
Backport from trunk: close bug#5857.
* configure.in: Get rid of "unix" pre-defined macro when
preprocessing Makefile. (Bug#5857) [Backport from trunk]
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 2 |
2 files changed, 6 insertions, 1 deletions
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'`"] |