diff options
author | Chong Yidong <cyd@stupidchicken.com> | 2009-10-23 16:19:37 +0000 |
---|---|---|
committer | Chong Yidong <cyd@stupidchicken.com> | 2009-10-23 16:19:37 +0000 |
commit | 16abbbf51d9ae4cefd41abdcc0940e94a188a028 (patch) | |
tree | 6a7d09e6b3e27e40871eca099ec1f08acbd48817 /configure | |
parent | dc13397c4334992aed8f2e1abef05a264ad93697 (diff) | |
download | emacs-16abbbf51d9ae4cefd41abdcc0940e94a188a028.tar.gz |
* 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.
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/configure b/configure index ee6871bf1a3..d2cdc493658 100755 --- a/configure +++ b/configure @@ -2707,6 +2707,7 @@ _ACEOF 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 @@ fi + cat >>confdefs.h <<_ACEOF #define EMACS_CONFIGURATION "${canonical}" _ACEOF @@ -26762,7 +26764,7 @@ echo creating lib-src/Makefile 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 @@ echo creating src/Makefile 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 |