|
Line
Link Here
|
| 0 |
-- emacs-23.4-orig/configure.in |
0 |
++ emacs-23.4/configure.in |
|
Lines 800-805
Link Here
|
| 800 |
AC_PATH_PROG(INSTALL_INFO, install-info,:, /sbin) |
800 |
AC_PATH_PROG(INSTALL_INFO, install-info,:, /sbin) |
| 801 |
dnl Don't use GZIP, which is used by gzip for additional parameters. |
801 |
dnl Don't use GZIP, which is used by gzip for additional parameters. |
| 802 |
AC_PATH_PROG(GZIP_PROG, gzip) |
802 |
AC_PATH_PROG(GZIP_PROG, gzip) |
|
|
803 |
AC_PATH_PROG(PAXCTL, paxctl,, |
| 804 |
[$PATH$PATH_SEPARATOR/sbin$PATH_SEPARATOR/usr/sbin]) |
| 803 |
|
805 |
|
| 804 |
|
806 |
|
| 805 |
## Need makeinfo >= 4.6 (?) to build the manuals. |
807 |
## Need makeinfo >= 4.6 (?) to build the manuals. |
| 806 |
-- emacs-23.4-orig/src/Makefile.in |
808 |
++ emacs-23.4/src/Makefile.in |
|
Lines 508-513
Link Here
|
| 508 |
some cpps. */ |
508 |
some cpps. */ |
| 509 |
TEMACS_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_MACHINE LD_SWITCH_MACHINE_TEMACS |
509 |
TEMACS_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_MACHINE LD_SWITCH_MACHINE_TEMACS |
| 510 |
|
510 |
|
|
|
511 |
/* If available, the full path to the paxctl program. |
| 512 |
On grsecurity/PaX systems, unexec will fail because memory regions |
| 513 |
of executables are randomized. This can be prevented by disabling |
| 514 |
RANDMMAP of temacs with "paxctl -r". See bug#11398. */ |
| 515 |
PAXCTL = @PAXCTL@ |
| 516 |
|
| 511 |
/* A macro which other sections of Makefile can redefine to munge the |
517 |
/* A macro which other sections of Makefile can redefine to munge the |
| 512 |
flags before they are passed to LD. This is helpful if you have |
518 |
flags before they are passed to LD. This is helpful if you have |
| 513 |
redefined LD to something odd, like "gcc". |
519 |
redefined LD to something odd, like "gcc". |
|
Lines 933-938
Link Here
|
| 933 |
-EMACSLOADPATH=${lispsource} ./emacs -q -batch -f list-load-path-shadows |
939 |
-EMACSLOADPATH=${lispsource} ./emacs -q -batch -f list-load-path-shadows |
| 934 |
#else |
940 |
#else |
| 935 |
LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump |
941 |
LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump |
|
|
942 |
test -z "$(PAXCTL)" || $(PAXCTL) -zex emacs$(EXEEXT) |
| 936 |
@: This new Emacs is as functional and more efficient then |
943 |
@: This new Emacs is as functional and more efficient then |
| 937 |
@: bootstrap-emacs, so let us replace it. |
944 |
@: bootstrap-emacs, so let us replace it. |
| 938 |
-ln -f emacs${EXEEXT} bootstrap-emacs${EXEEXT} |
945 |
-ln -f emacs${EXEEXT} bootstrap-emacs${EXEEXT} |
|
Lines 974-979
Link Here
|
| 974 |
-o temacs ${STARTFILES} ${obj} ${otherobj} \ |
981 |
-o temacs ${STARTFILES} ${obj} ${otherobj} \ |
| 975 |
${LIBES} |
982 |
${LIBES} |
| 976 |
#endif |
983 |
#endif |
|
|
984 |
#ifndef CANNOT_DUMP |
| 985 |
test -z "$(PAXCTL)" || $(PAXCTL) -r temacs$(EXEEXT) |
| 986 |
#endif |
| 977 |
|
987 |
|
| 978 |
/* We do not use ALL_LDFLAGS because LD_SWITCH_SYSTEM and LD_SWITCH_MACHINE |
988 |
/* We do not use ALL_LDFLAGS because LD_SWITCH_SYSTEM and LD_SWITCH_MACHINE |
| 979 |
often contain options that have to do with using Emacs''s crt0, |
989 |
often contain options that have to do with using Emacs''s crt0, |
|
Lines 1419-1424
Link Here
|
| 1419 |
ln -f temacs${EXEEXT} bootstrap-emacs${EXEEXT} |
1429 |
ln -f temacs${EXEEXT} bootstrap-emacs${EXEEXT} |
| 1420 |
#else |
1430 |
#else |
| 1421 |
$(RUN_TEMACS) --batch --load loadup bootstrap |
1431 |
$(RUN_TEMACS) --batch --load loadup bootstrap |
|
|
1432 |
test -z "$(PAXCTL)" || $(PAXCTL) -zex emacs$(EXEEXT) |
| 1422 |
mv -f emacs${EXEEXT} bootstrap-emacs${EXEEXT} |
1433 |
mv -f emacs${EXEEXT} bootstrap-emacs${EXEEXT} |
| 1423 |
#endif /* ! defined (CANNOT_DUMP) */ |
1434 |
#endif /* ! defined (CANNOT_DUMP) */ |
| 1424 |
@: Compile some files earlier to speed up further compilation. |
1435 |
@: Compile some files earlier to speed up further compilation. |
