[Emacs-diffs] emacs ChangeLog configure configure.in

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/10/23 16:19:39

Modified files:
        .              : ChangeLog configure configure.in 

Log message:
        * 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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/ChangeLog?cvsroot=emacs&r1=1.860&r2=1.861
http://cvs.savannah.gnu.org/viewcvs/emacs/configure?cvsroot=emacs&r1=1.332&r2=1.333
http://cvs.savannah.gnu.org/viewcvs/emacs/configure.in?cvsroot=emacs&r1=1.611&r2=1.612

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/ChangeLog,v
retrieving revision 1.860
retrieving revision 1.861
diff -u -b -r1.860 -r1.861
--- ChangeLog   20 Oct 2009 08:06:02 -0000      1.860
+++ ChangeLog   23 Oct 2009 16:19:37 -0000      1.861
@@ -1,3 +1,12 @@
+2009-10-23  Jim Meyering  <address@hidden>
+
+       * 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  <address@hidden>
 
        * configure.in (vax-dec-vms): Remove, not supported anymore.

Index: configure
===================================================================
RCS file: /sources/emacs/emacs/configure,v
retrieving revision 1.332
retrieving revision 1.333
diff -u -b -r1.332 -r1.333
--- configure   19 Oct 2009 22:48:52 -0000      1.332
+++ configure   23 Oct 2009 16:19:37 -0000      1.333
@@ -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

Index: configure.in
===================================================================
RCS file: /sources/emacs/emacs/configure.in,v
retrieving revision 1.611
retrieving revision 1.612
diff -u -b -r1.611 -r1.612
--- configure.in        19 Oct 2009 22:48:54 -0000      1.611
+++ configure.in        23 Oct 2009 16:19:39 -0000      1.612
@@ -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