summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Djärv <jan.h.d@swipnet.se>2004-10-06 12:28:31 +0000
committerJan Djärv <jan.h.d@swipnet.se>2004-10-06 12:28:31 +0000
commit05cf15c600b4131921a51cceb2708a293da70bd1 (patch)
tree48b909b4838b1f56fdaca438983f7a10148b2a8d
parent96fcad045a178e675e6c9be966e6143b75cb056f (diff)
configure.in (HAVE_RANDOM_HEAPSTART): Move output of warning message to end
of configure run.
-rw-r--r--ChangeLog2
-rwxr-xr-xconfigure44
-rw-r--r--configure.in25
3 files changed, 40 insertions, 31 deletions
diff --git a/ChangeLog b/ChangeLog
index 87efe955d9..aa5d01c16f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
2004-10-06 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* configure.in (HAVE_RANDOM_HEAPSTART): Change AC_MSG_ERROR to
- AC_MSG_WARN.
+ AC_MSG_WARN. Move output of warning message to end of configure run.
2004-10-05 Jan Dj,Ad(Brv. <jan.h.d@swipnet.se>
diff --git a/configure b/configure
index 7f1a82f8df..83ac957143 100755
--- a/configure
+++ b/configure
@@ -7854,26 +7854,7 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
else
- { 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;}
+ emacs_cv_randomheap=warn
fi
fi
@@ -21452,6 +21433,29 @@ echo " Does Emacs use -lpng? ${HAVE_PNG}"
echo " Does Emacs use X toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}"
echo
+if test "$emacs_cv_randomheap" = warn; then
+ { 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
+
# Remove any trailing slashes in these variables.
test "${prefix}" != NONE &&
prefix=`echo "${prefix}" | sed 's,\([^/]\)/*$,\1,'`
diff --git a/configure.in b/configure.in
index 0bbcb76b26..4e534a5348 100644
--- a/configure.in
+++ b/configure.in
@@ -1613,16 +1613,8 @@ if test "$emacs_cv_randomheap" = yes; then
AC_DEFINE(HAVE_RANDOM_HEAPSTART, 1,
[Define to 1 if this OS randomizes the start address of the heap.])
else
- 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.
-
-**********************************************************************
-])
+ dnl We do the warning at the end of the configure run so it is seen.
+ emacs_cv_randomheap=warn
fi
fi
@@ -3094,6 +3086,19 @@ echo " Does Emacs use -lpng? ${HAVE_PNG}"
echo " Does Emacs use X toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}"
echo
+if test "$emacs_cv_randomheap" = warn; then
+ 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
+
# Remove any trailing slashes in these variables.
[test "${prefix}" != NONE &&
prefix=`echo "${prefix}" | sed 's,\([^/]\)/*$,\1,'`