From: Chong Yidong <cyd@stupidchicken.com>
Date: Fri, 23 Oct 2009 16:19:37 +0000 (+0000)
Subject: * configure.in: Invoke $CPP with -P when creating Makefile and
X-Git-Tag: emacs-pretest-23.1.90~692
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=912314214b404c3131a1ecebc2756f0e54a79a44;p=emacs.git

* 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.
---

diff --git a/ChangeLog b/ChangeLog
index ce05b51d7f0..677f3abea3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
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
@@ -25281,6 +25282,7 @@ fi
 
 
 
+
 
 
 cat >>confdefs.h <<_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
diff --git a/configure.in b/configure.in
index 87c820ff81c..a1104078089 100644
--- a/configure.in
+++ b/configure.in
@@ -3057,7 +3057,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
@@ -3073,7 +3073,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