Mercurial > emacs
comparison configure @ 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 | 18fec2baa411 |
children | e6af95c4c862 |
comparison
equal
deleted
inserted
replaced
105723:438abba8b301 | 105724:73190af7ce73 |
---|---|
2705 ## Apple Darwin / Mac OS X | 2705 ## Apple Darwin / Mac OS X |
2706 *-apple-darwin* ) | 2706 *-apple-darwin* ) |
2707 case "${canonical}" in | 2707 case "${canonical}" in |
2708 i[3456]86-* ) machine=intel386 ;; | 2708 i[3456]86-* ) machine=intel386 ;; |
2709 powerpc-* ) machine=macppc ;; | 2709 powerpc-* ) machine=macppc ;; |
2710 x86_64-* ) machine=amdx86-64 ;; | |
2710 * ) unported=yes ;; | 2711 * ) unported=yes ;; |
2711 esac | 2712 esac |
2712 opsys=darwin | 2713 opsys=darwin |
2713 # Define CPP as follows to make autoconf work correctly. | 2714 # Define CPP as follows to make autoconf work correctly. |
2714 CPP="${CC-cc} -E -no-cpp-precomp" | 2715 CPP="${CC-cc} -E -no-cpp-precomp" |
25238 $as_echo "$as_me: WARNING: version mismatch between \`${srcdir}/configure.in' and \`${srcdir}/lisp/version.el'." >&2;} | 25239 $as_echo "$as_me: WARNING: version mismatch between \`${srcdir}/configure.in' and \`${srcdir}/lisp/version.el'." >&2;} |
25239 fi | 25240 fi |
25240 | 25241 |
25241 ### Specify what sort of things we'll be editing into Makefile and config.h. | 25242 ### Specify what sort of things we'll be editing into Makefile and config.h. |
25242 ### Use configuration here uncanonicalized to avoid exceeding size limits. | 25243 ### Use configuration here uncanonicalized to avoid exceeding size limits. |
25244 | |
25243 | 25245 |
25244 | 25246 |
25245 | 25247 |
25246 | 25248 |
25247 | 25249 |
26761 sed -e '/start of cpp stuff/q' \ | 26763 sed -e '/start of cpp stuff/q' \ |
26762 < Makefile.c > junk1.c | 26764 < Makefile.c > junk1.c |
26763 sed -e '1,/start of cpp stuff/d'\ | 26765 sed -e '1,/start of cpp stuff/d'\ |
26764 -e 's,/\*\*/#\(.*\)$,/* \1 */,' \ | 26766 -e 's,/\*\*/#\(.*\)$,/* \1 */,' \ |
26765 < Makefile.c > junk.c | 26767 < Makefile.c > junk.c |
26766 $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ | 26768 $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ |
26767 sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c | 26769 sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c |
26768 cat junk1.c junk2.c > Makefile.new | 26770 cat junk1.c junk2.c > Makefile.new |
26769 rm -f junk.c junk1.c junk2.c | 26771 rm -f junk.c junk1.c junk2.c |
26770 chmod 444 Makefile.new | 26772 chmod 444 Makefile.new |
26771 mv -f Makefile.new Makefile | 26773 mv -f Makefile.new Makefile |
26777 sed -e '/start of cpp stuff/q' \ | 26779 sed -e '/start of cpp stuff/q' \ |
26778 < Makefile.c > junk1.c | 26780 < Makefile.c > junk1.c |
26779 sed -e '1,/start of cpp stuff/d'\ | 26781 sed -e '1,/start of cpp stuff/d'\ |
26780 -e 's,/\*\*/#\(.*\)$,/* \1 */,' \ | 26782 -e 's,/\*\*/#\(.*\)$,/* \1 */,' \ |
26781 < Makefile.c > junk.c | 26783 < Makefile.c > junk.c |
26782 $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ | 26784 $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ |
26783 sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c | 26785 sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c |
26784 cat junk1.c junk2.c > Makefile.new | 26786 cat junk1.c junk2.c > Makefile.new |
26785 rm -f junk.c junk1.c junk2.c | 26787 rm -f junk.c junk1.c junk2.c |
26786 chmod 444 Makefile.new | 26788 chmod 444 Makefile.new |
26787 mv -f Makefile.new Makefile | 26789 mv -f Makefile.new Makefile |