|
Line
Link Here
|
| 0 |
-- emacs-orig/configure.in |
0 |
++ emacs/configure.in |
|
Lines 713-718
Link Here
|
| 713 |
AC_PATH_PROG(INSTALL_INFO, install-info,:, /sbin) |
713 |
AC_PATH_PROG(INSTALL_INFO, install-info,:, /sbin) |
| 714 |
dnl Don't use GZIP, which is used by gzip for additional parameters. |
714 |
dnl Don't use GZIP, which is used by gzip for additional parameters. |
| 715 |
AC_PATH_PROG(GZIP_PROG, gzip) |
715 |
AC_PATH_PROG(GZIP_PROG, gzip) |
|
|
716 |
AC_PATH_PROG(PAXCTL, paxctl,, |
| 717 |
[$PATH$PATH_SEPARATOR/sbin$PATH_SEPARATOR/usr/sbin]) |
| 716 |
|
718 |
|
| 717 |
|
719 |
|
| 718 |
## Need makeinfo >= 4.7 (?) to build the manuals. |
720 |
## Need makeinfo >= 4.7 (?) to build the manuals. |
| 719 |
-- emacs-orig/src/Makefile.in |
721 |
++ emacs/src/Makefile.in |
|
Lines 113-118
Link Here
|
| 113 |
## $LDFLAGS or empty if NS_IMPL_GNUSTEP (for some reason). |
113 |
## $LDFLAGS or empty if NS_IMPL_GNUSTEP (for some reason). |
| 114 |
TEMACS_LDFLAGS2 = @TEMACS_LDFLAGS2@ |
114 |
TEMACS_LDFLAGS2 = @TEMACS_LDFLAGS2@ |
| 115 |
|
115 |
|
|
|
116 |
## If available, the full path to the paxctl program. |
| 117 |
## On grsecurity/PaX systems, unexec will fail because memory regions |
| 118 |
## of executables are randomized. This can be prevented by disabling |
| 119 |
## RANDMMAP of temacs with "paxctl -r". See bug#11398. |
| 120 |
PAXCTL = @PAXCTL@ |
| 121 |
|
| 116 |
## Some systems define this to request special libraries. |
122 |
## Some systems define this to request special libraries. |
| 117 |
LIBS_SYSTEM=@LIBS_SYSTEM@ |
123 |
LIBS_SYSTEM=@LIBS_SYSTEM@ |
| 118 |
|
124 |
|
|
Lines 403-408
Link Here
|
| 403 |
-f list-load-path-shadows || true; \ |
409 |
-f list-load-path-shadows || true; \ |
| 404 |
else \ |
410 |
else \ |
| 405 |
LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump || exit 1; \ |
411 |
LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump || exit 1; \ |
|
|
412 |
test -z "$(PAXCTL)" || $(PAXCTL) -zex emacs$(EXEEXT); \ |
| 406 |
ln -f emacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \ |
413 |
ln -f emacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \ |
| 407 |
./emacs -batch -f list-load-path-shadows || true; \ |
414 |
./emacs -batch -f list-load-path-shadows || true; \ |
| 408 |
fi |
415 |
fi |
|
Lines 450-455
Link Here
|
| 450 |
temacs$(EXEEXT): $(START_FILES) stamp-oldxmenu $(obj) $(otherobj) $(lib)/libgnu.a |
457 |
temacs$(EXEEXT): $(START_FILES) stamp-oldxmenu $(obj) $(otherobj) $(lib)/libgnu.a |
| 451 |
$(CC) $(LD_FIRSTFLAG) $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(TEMACS_LDFLAGS2) \ |
458 |
$(CC) $(LD_FIRSTFLAG) $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(TEMACS_LDFLAGS2) \ |
| 452 |
-o temacs $(START_FILES) $(obj) $(otherobj) $(lib)/libgnu.a $(LIBES) |
459 |
-o temacs $(START_FILES) $(obj) $(otherobj) $(lib)/libgnu.a $(LIBES) |
|
|
460 |
test "$(CANNOT_DUMP)" = "yes" || \ |
| 461 |
test -z "$(PAXCTL)" || $(PAXCTL) -r temacs$(EXEEXT) |
| 453 |
|
462 |
|
| 454 |
## The following oldxmenu-related rules are only (possibly) used if |
463 |
## The following oldxmenu-related rules are only (possibly) used if |
| 455 |
## HAVE_X11 && !USE_GTK, but there is no harm in always defining them |
464 |
## HAVE_X11 && !USE_GTK, but there is no harm in always defining them |
|
Lines 597-602
Link Here
|
| 597 |
ln -f temacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \ |
606 |
ln -f temacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \ |
| 598 |
else \ |
607 |
else \ |
| 599 |
$(RUN_TEMACS) --batch --load loadup bootstrap || exit 1; \ |
608 |
$(RUN_TEMACS) --batch --load loadup bootstrap || exit 1; \ |
|
|
609 |
test -z "$(PAXCTL)" || $(PAXCTL) -zex emacs$(EXEEXT); \ |
| 600 |
mv -f emacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \ |
610 |
mv -f emacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \ |
| 601 |
fi |
611 |
fi |
| 602 |
@: Compile some files earlier to speed up further compilation. |
612 |
@: Compile some files earlier to speed up further compilation. |
