* configure.in (HAVE_RANDOM_HEAPSTART): Change AC_MSG_ERROR to

AC_MSG_WARN.

diff --git a/ChangeLog b/ChangeLog
index c97ba6e77c54d35002e4ca105c03667bf6bdc321..87efe955d9eefc308815185312662b112f6e8754 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2004-10-05  Jan D.  <jhd@ostrich.localdomain>
+2004-10-06  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
+
+       * configure.in (HAVE_RANDOM_HEAPSTART): Change AC_MSG_ERROR to
+       AC_MSG_WARN.
+
+2004-10-05  Jan Dj\e,Ad\e(Brv.  <jan.h.d@swipnet.se>
 
        * configure.in (HAVE_RANDOM_HEAPSTART): Renamed HAVE_EXECSHIELD.
        Run test to see if heap start address is random.

diff --git a/configure b/configure
index 7add8b6767b8037430bf2ad5e589635d0d13ead4..7f1a82f8dfcb6f550635fa57aafe60d18b004c51 100755 (executable)
--- a/configure
+++ b/configure
@@ -7746,7 +7746,7 @@ echo $ECHO_N "checking whether heap start address is randomized... $ECHO_C" >&6
 if test x"$ac_cv_header_unistd_h" != x && test x"$ac_cv_header_stdlib_h" != x
 then
   if test "$cross_compiling" = yes; then
-  emacs_cv_execshield='assuming no'
+  emacs_cv_randomheap='assuming no'
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -7788,24 +7788,24 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  emacs_cv_execshield=yes
+  emacs_cv_randomheap=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-emacs_cv_execshield=no
+emacs_cv_randomheap=no
 fi
 rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 else
-  emacs_cv_execshield='assuming no'
+  emacs_cv_randomheap='assuming no'
 fi
-echo "$as_me:$LINENO: result: $emacs_cv_execshield" >&5
-echo "${ECHO_T}$emacs_cv_execshield" >&6
+echo "$as_me:$LINENO: result: $emacs_cv_randomheap" >&5
+echo "${ECHO_T}$emacs_cv_randomheap" >&6
 
-if test "$emacs_cv_execshield" = yes; then
+if test "$emacs_cv_randomheap" = yes; then
   # Extract the first word of "setarch", so it can be a program name with args.
 set dummy setarch; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -7854,13 +7854,26 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
   else
-    { { echo "$as_me:$LINENO: error: Heap start address is randomized and no workaround is known.
-Probably exec-shield is turned on.  Emacs can not dump itself if this is the
-case.  Read about exec-shield in \`etc/PROBLEMS' for further information." >&5
-echo "$as_me: error: Heap start address is randomized and no workaround is known.
-Probably exec-shield is turned on.  Emacs can not dump itself if this is the
-case.  Read about exec-shield in \`etc/PROBLEMS' for further information." >&2;}
-   { (exit 1); exit 1; }; }
+    { echo "$as_me:$LINENO: WARNING:
+**********************************************************************
+
+Heap start address is randomized and no workaround is known.
+Emacs will probably dump core when temacs is run in the build phase.
+Maybe exec-shield is turned on.  Read about exec-shield in \`etc/PROBLEMS'
+for further information.
+
+**********************************************************************
+" >&5
+echo "$as_me: WARNING:
+**********************************************************************
+
+Heap start address is randomized and no workaround is known.
+Emacs will probably dump core when temacs is run in the build phase.
+Maybe exec-shield is turned on.  Read about exec-shield in \`etc/PROBLEMS'
+for further information.
+
+**********************************************************************
+" >&2;}
   fi
 fi
 

diff --git a/configure.in b/configure.in
index 73c62988fd78ec69378358beaece257f53ac6930..0bbcb76b2628d7177d08a68b8130d7dbd95b05ab 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1599,23 +1599,30 @@ int main (int argc, char *argv[])
     exit (-1);
   }
   exit (this_sbrk == old_sbrk);
-}], emacs_cv_execshield=yes, emacs_cv_execshield=no,
-     emacs_cv_execshield='assuming no')
+}], emacs_cv_randomheap=yes, emacs_cv_randomheap=no,
+     emacs_cv_randomheap='assuming no')
 else
-  emacs_cv_execshield='assuming no'
+  emacs_cv_randomheap='assuming no'
 fi
-AC_MSG_RESULT($emacs_cv_execshield)
+AC_MSG_RESULT($emacs_cv_randomheap)
 
-if test "$emacs_cv_execshield" = yes; then
+if test "$emacs_cv_randomheap" = yes; then
   AC_PATH_PROG(SETARCH, setarch, no)
   AC_SUBST(SETARCH)
   if test "$SETARCH" != no && test "$machine" = "intel386"; then
     AC_DEFINE(HAVE_RANDOM_HEAPSTART, 1,
     [Define to 1 if this OS randomizes the start address of the heap.])
   else
-    AC_MSG_ERROR([Heap start address is randomized and no workaround is known.
-Probably exec-shield is turned on.  Emacs can not dump itself if this is the
-case.  Read about exec-shield in `etc/PROBLEMS' for further information.])
+    AC_MSG_WARN([
+**********************************************************************
+
+Heap start address is randomized and no workaround is known.
+Emacs will probably dump core when temacs is run in the build phase.
+Maybe exec-shield is turned on.  Read about exec-shield in `etc/PROBLEMS'
+for further information.
+
+**********************************************************************
+])
   fi
 fi
 

diff --git a/src/ChangeLog b/src/ChangeLog
index ba6ae2d4777256bae6b63535c4fbc02a956bdfbc..b7ff8d45c25f15e7ea69a44403e00262f19b5ada 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2004-10-05  Jan D.  <jhd@ostrich.localdomain>
+2004-10-05  Jan Dj\e,Ad\e(Brv.  <jan.h.d@swipnet.se>
 
        * config.in: Regenerate.