Mercurial > emacs
changeset 105724:73190af7ce73
* configure.in: Invoke $CPP with -P when creating Makefile and
src/Makefile. Without this, gcc 4.4.2 converts each
backslash-newline pair in the input to a bare newline, yielding
invalid Makefiles.
* configure: Regenerate.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Fri, 23 Oct 2009 16:19:37 +0000 |
| parents | 438abba8b301 |
| children | 597007306f48 |
| files | ChangeLog configure configure.in |
| diffstat | 3 files changed, 15 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Oct 23 16:17:17 2009 +0000 +++ b/ChangeLog Fri Oct 23 16:19:37 2009 +0000 @@ -1,3 +1,12 @@ +2009-10-23 Jim Meyering <meyering@redhat.com> + + * configure.in: Invoke $CPP with -P when creating Makefile and + src/Makefile. Without this, gcc 4.4.2 converts each + backslash-newline pair in the input to a bare newline, yielding + invalid Makefiles. + + * configure: Regenerate. + 2009-10-19 Dan Nicolaescu <dann@ics.uci.edu> * configure.in (vax-dec-vms): Remove, not supported anymore.
--- a/configure Fri Oct 23 16:17:17 2009 +0000 +++ b/configure Fri Oct 23 16:19:37 2009 +0000 @@ -2707,6 +2707,7 @@ case "${canonical}" in i[3456]86-* ) machine=intel386 ;; powerpc-* ) machine=macppc ;; + x86_64-* ) machine=amdx86-64 ;; * ) unported=yes ;; esac opsys=darwin @@ -25283,6 +25284,7 @@ + cat >>confdefs.h <<_ACEOF #define EMACS_CONFIGURATION "${canonical}" _ACEOF @@ -26762,7 +26764,7 @@ sed -e '1,/start of cpp stuff/d'\ -e 's,/\*\*/#\(.*\)$,/* \1 */,' \ < Makefile.c > junk.c - $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ + $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c cat junk1.c junk2.c > Makefile.new rm -f junk.c junk1.c junk2.c @@ -26778,7 +26780,7 @@ sed -e '1,/start of cpp stuff/d'\ -e 's,/\*\*/#\(.*\)$,/* \1 */,' \ < Makefile.c > junk.c - $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ + $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c cat junk1.c junk2.c > Makefile.new rm -f junk.c junk1.c junk2.c
--- a/configure.in Fri Oct 23 16:17:17 2009 +0000 +++ b/configure.in Fri Oct 23 16:19:37 2009 +0000 @@ -3057,7 +3057,7 @@ sed -e '1,/start of cpp stuff/d'\ -e 's,/\*\*/#\(.*\)$,/* \1 */,' \ < Makefile.c > junk.c - $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ + $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c cat junk1.c junk2.c > Makefile.new rm -f junk.c junk1.c junk2.c @@ -3073,7 +3073,7 @@ sed -e '1,/start of cpp stuff/d'\ -e 's,/\*\*/#\(.*\)$,/* \1 */,' \ < Makefile.c > junk.c - $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ + $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c cat junk1.c junk2.c > Makefile.new rm -f junk.c junk1.c junk2.c