aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Djärv <[email protected]>2004-10-05 20:26:00 +0000
committerJan Djärv <[email protected]>2004-10-05 20:26:00 +0000
commitd8b43276ce75e3e8c38f12fdecf01e636b48915a (patch)
treea9590be9a351dd67dd1e77a07c73685d265cb476
parent4494a266b4b1556948e4f12e33fea380ebfe6fea (diff)
* config.in: Regenerate.
* Makefile.in (RUN_TEMACS): Check HAVE_RANDOM_HEAPSTART instead of HAVE_EXECSHIELD.
-rw-r--r--src/ChangeLog7
-rw-r--r--src/Makefile.in2
-rw-r--r--src/config.in6
3 files changed, 11 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index b823dbe6f3..ba6ae2d477 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2004-10-05 Jan D. <[email protected]>
+
+ * config.in: Regenerate.
+
+ * Makefile.in (RUN_TEMACS): Check HAVE_RANDOM_HEAPSTART instead of
+ HAVE_EXECSHIELD.
+
2004-10-05 Jan Dj,Ad(Brv <[email protected]>
* xterm.c (x_find_modifier_meanings): Ignore any Super or Hyper for
diff --git a/src/Makefile.in b/src/Makefile.in
index 9fc7f7e4a9..f25e0f9d84 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -905,7 +905,7 @@ LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) \
#define OBJECTS_MACHINE
#endif
-#ifdef HAVE_EXECSHIELD
+#ifdef HAVE_RANDOM_HEAPSTART
#undef i386
RUN_TEMACS = @SETARCH@ i386 ./temacs
#else
diff --git a/src/config.in b/src/config.in
index d87d235fe5..cc37606b71 100644
--- a/src/config.in
+++ b/src/config.in
@@ -136,9 +136,6 @@ 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 and we can handle it. */
-#undef HAVE_EXECSHIELD
-
/* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H
@@ -432,6 +429,9 @@ Boston, MA 02111-1307, USA. */
/* Define to 1 if you have the `random' function. */
#undef HAVE_RANDOM
+/* Define to 1 if this OS randomizes the start address of the heap. */
+#undef HAVE_RANDOM_HEAPSTART
+
/* Define to 1 if you have the `recvfrom' function. */
#undef HAVE_RECVFROM