diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2004-09-24 07:19:05 +0000 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2004-09-24 07:19:05 +0000 |
| commit | 83f1cb949ff65524c9aa0e1a447ebb9434337643 (patch) | |
| tree | e516628a8f368e0ec8c20a527beb92da9260690d | |
| parent | 4489ece2663ff713da6e5b08e8e3cb96a8af9fdc (diff) | |
| download | emacs-83f1cb949ff65524c9aa0e1a447ebb9434337643.tar.gz | |
* config.in: Rebuild.
* Makefile.in: Run setarh i386 ./temacs if exec-shield is present.
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/Makefile.in | 15 | ||||
| -rw-r--r-- | src/config.in | 3 |
3 files changed, 20 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e71a0e3217d..7a7b18a36b9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2004-09-24 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * config.in: Rebuild. + + * Makefile.in: Run setarh i386 ./temacs if exec-shield is present. + 2004-09-18 Stefan Monnier <monnier@iro.umontreal.ca> * xterm.c (x_term_init): Work around a bug in some X servers. diff --git a/src/Makefile.in b/src/Makefile.in index 5769e8a1e07..9fc7f7e4a9f 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -905,6 +905,13 @@ LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) \ #define OBJECTS_MACHINE #endif +#ifdef HAVE_EXECSHIELD +#undef i386 +RUN_TEMACS = @SETARCH@ i386 ./temacs +#else +RUN_TEMACS = ./temacs +#endif + all: emacs${EXEEXT} OTHER_FILES emacs${EXEEXT}: temacs${EXEEXT} ${etc}DOC ${lisp} @@ -913,9 +920,9 @@ emacs${EXEEXT}: temacs${EXEEXT} ${etc}DOC ${lisp} ln temacs${EXEEXT} emacs${EXEEXT} #else #ifdef HAVE_SHM - LC_ALL=C ./temacs -nl -batch -l loadup dump + LC_ALL=C $(RUN_TEMACS) -nl -batch -l loadup dump #else /* ! defined (HAVE_SHM) */ - LC_ALL=C ./temacs -batch -l loadup dump + LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump #endif /* ! defined (HAVE_SHM) */ #endif /* ! defined (CANNOT_DUMP) */ -./emacs -q -batch -f list-load-path-shadows @@ -1332,9 +1339,9 @@ bootstrap-emacs${EXEEXT}: temacs${EXEEXT} ln temacs${EXEEXT} bootstrap-emacs${EXEEXT} #else #ifdef HAVE_SHM - ./temacs -nl -batch -l loadup bootstrap + $(RUN_TEMACS) -nl -batch -l loadup bootstrap #else /* ! defined (HAVE_SHM) */ - ./temacs --batch --load loadup bootstrap + $(RUN_TEMACS) --batch --load loadup bootstrap #endif /* ! defined (HAVE_SHM) */ mv -f emacs${EXEEXT} bootstrap-emacs${EXEEXT} #endif /* ! defined (CANNOT_DUMP) */ diff --git a/src/config.in b/src/config.in index 0fb4b3f3444..fac26db0a84 100644 --- a/src/config.in +++ b/src/config.in @@ -136,6 +136,9 @@ Boston, MA 02111-1307, USA. */ /* Define to 1 if you have the `euidaccess' function. */ #undef HAVE_EUIDACCESS +/* Define to 1 if this OS has exec shield. */ +#undef HAVE_EXECSHIELD + /* Define to 1 if you have the <fcntl.h> header file. */ #undef HAVE_FCNTL_H |