Commit 83f1cb94 authored by Jan Djärv's avatar Jan Djärv
Browse files

* config.in: Rebuild.

* Makefile.in: Run setarh i386 ./temacs if exec-shield  is present.
parent 4489ece2
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.
......
......@@ -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) */
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment