aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Djärv2004-10-06 12:28:31 +0000
committerJan Djärv2004-10-06 12:28:31 +0000
commit05cf15c600b4131921a51cceb2708a293da70bd1 (patch)
tree48b909b4838b1f56fdaca438983f7a10148b2a8d
parent96fcad045a178e675e6c9be966e6143b75cb056f (diff)
downloademacs-05cf15c600b4131921a51cceb2708a293da70bd1.tar.gz
emacs-05cf15c600b4131921a51cceb2708a293da70bd1.zip
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 87efe955d9e..aa5d01c16f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
12004-10-06 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> 12004-10-06 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2 2
3 * configure.in (HAVE_RANDOM_HEAPSTART): Change AC_MSG_ERROR to 3 * configure.in (HAVE_RANDOM_HEAPSTART): Change AC_MSG_ERROR to
4 AC_MSG_WARN. 4 AC_MSG_WARN. Move output of warning message to end of configure run.
5 5
62004-10-05 Jan Dj,Ad(Brv. <jan.h.d@swipnet.se> 62004-10-05 Jan Dj,Ad(Brv. <jan.h.d@swipnet.se>
7 7
diff --git a/configure b/configure
index 7f1a82f8dfc..83ac957143d 100755
--- a/configure
+++ b/configure
@@ -7854,26 +7854,7 @@ cat >>confdefs.h <<\_ACEOF
7854_ACEOF 7854_ACEOF
7855 7855
7856 else 7856 else
7857 { echo "$as_me:$LINENO: WARNING: 7857 emacs_cv_randomheap=warn
7858**********************************************************************
7859
7860Heap start address is randomized and no workaround is known.
7861Emacs will probably dump core when temacs is run in the build phase.
7862Maybe exec-shield is turned on. Read about exec-shield in \`etc/PROBLEMS'
7863for further information.
7864
7865**********************************************************************
7866" >&5
7867echo "$as_me: WARNING:
7868**********************************************************************
7869
7870Heap start address is randomized and no workaround is known.
7871Emacs will probably dump core when temacs is run in the build phase.
7872Maybe exec-shield is turned on. Read about exec-shield in \`etc/PROBLEMS'
7873for further information.
7874
7875**********************************************************************
7876" >&2;}
7877 fi 7858 fi
7878fi 7859fi
7879 7860
@@ -21452,6 +21433,29 @@ echo " Does Emacs use -lpng? ${HAVE_PNG}"
21452echo " Does Emacs use X toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}" 21433echo " Does Emacs use X toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}"
21453echo 21434echo
21454 21435
21436if test "$emacs_cv_randomheap" = warn; then
21437 { echo "$as_me:$LINENO: WARNING:
21438**********************************************************************
21439
21440Heap start address is randomized and no workaround is known.
21441Emacs will probably dump core when temacs is run in the build phase.
21442Maybe exec-shield is turned on. Read about exec-shield in \`etc/PROBLEMS'
21443for further information.
21444
21445**********************************************************************
21446" >&5
21447echo "$as_me: WARNING:
21448**********************************************************************
21449
21450Heap start address is randomized and no workaround is known.
21451Emacs will probably dump core when temacs is run in the build phase.
21452Maybe exec-shield is turned on. Read about exec-shield in \`etc/PROBLEMS'
21453for further information.
21454
21455**********************************************************************
21456" >&2;}
21457fi
21458
21455# Remove any trailing slashes in these variables. 21459# Remove any trailing slashes in these variables.
21456test "${prefix}" != NONE && 21460test "${prefix}" != NONE &&
21457 prefix=`echo "${prefix}" | sed 's,\([^/]\)/*$,\1,'` 21461 prefix=`echo "${prefix}" | sed 's,\([^/]\)/*$,\1,'`
diff --git a/configure.in b/configure.in
index 0bbcb76b262..4e534a53485 100644
--- a/configure.in
+++ b/configure.in
@@ -1613,16 +1613,8 @@ if test "$emacs_cv_randomheap" = yes; then
1613 AC_DEFINE(HAVE_RANDOM_HEAPSTART, 1, 1613 AC_DEFINE(HAVE_RANDOM_HEAPSTART, 1,
1614 [Define to 1 if this OS randomizes the start address of the heap.]) 1614 [Define to 1 if this OS randomizes the start address of the heap.])
1615 else 1615 else
1616 AC_MSG_WARN([ 1616 dnl We do the warning at the end of the configure run so it is seen.
1617********************************************************************** 1617 emacs_cv_randomheap=warn
1618
1619Heap start address is randomized and no workaround is known.
1620Emacs will probably dump core when temacs is run in the build phase.
1621Maybe exec-shield is turned on. Read about exec-shield in `etc/PROBLEMS'
1622for further information.
1623
1624**********************************************************************
1625])
1626 fi 1618 fi
1627fi 1619fi
1628 1620
@@ -3094,6 +3086,19 @@ echo " Does Emacs use -lpng? ${HAVE_PNG}"
3094echo " Does Emacs use X toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}" 3086echo " Does Emacs use X toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}"
3095echo 3087echo
3096 3088
3089if test "$emacs_cv_randomheap" = warn; then
3090 AC_MSG_WARN([
3091**********************************************************************
3092
3093Heap start address is randomized and no workaround is known.
3094Emacs will probably dump core when temacs is run in the build phase.
3095Maybe exec-shield is turned on. Read about exec-shield in `etc/PROBLEMS'
3096for further information.
3097
3098**********************************************************************
3099])
3100fi
3101
3097# Remove any trailing slashes in these variables. 3102# Remove any trailing slashes in these variables.
3098[test "${prefix}" != NONE && 3103[test "${prefix}" != NONE &&
3099 prefix=`echo "${prefix}" | sed 's,\([^/]\)/*$,\1,'` 3104 prefix=`echo "${prefix}" | sed 's,\([^/]\)/*$,\1,'`