Mercurial > emacs
changeset 57230:4408561037cf
* configure.in (HAVE_EXECSHIELD): Only define on x86.
* configure: Rebuild.
| author | Jan Djärv <jan.h.d@swipnet.se> |
|---|---|
| date | Sat, 25 Sep 2004 20:41:08 +0000 |
| parents | fb9de0d75bef |
| children | 4aab6ff6ec6c |
| files | ChangeLog configure configure.in |
| diffstat | 3 files changed, 35 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Sep 25 20:39:13 2004 +0000 +++ b/ChangeLog Sat Sep 25 20:41:08 2004 +0000 @@ -1,3 +1,8 @@ +2004-09-25 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * configure.in (HAVE_EXECSHIELD): Only define on x86. + * configure: Rebuild. + 2004-09-24 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> * configure.in: Check for exec-shield.
--- a/configure Sat Sep 25 20:39:13 2004 +0000 +++ b/configure Sat Sep 25 20:41:08 2004 +0000 @@ -4302,7 +4302,7 @@ fi if test "$emacs_cv_execshield" = 1; then - # Extract the first word of "setarch", so it can be a program name with args. + # 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 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 @@ -4343,13 +4343,25 @@ fi - if test "$setarch" != no; then + if test "$setarch" != no && test "$machine" = "intel386"; then cat >>confdefs.h <<\_ACEOF #define HAVE_EXECSHIELD 1 _ACEOF - fi + else + case "`cat /proc/sys/kernel/exec-shield`" in + 0) ;; + *) + { { echo "$as_me:$LINENO: error: Exec-shield is turned on. +Emacs can not dump itself if exec-shield is turned on. +See \`etc/PROBLEMS' for further information." >&5 +echo "$as_me: error: Exec-shield is turned on. +Emacs can not dump itself if exec-shield is turned on. +See \`etc/PROBLEMS' for further information." >&2;} + { (exit 1); exit 1; }; } + esac + fi fi #### Extract some information from the operating system and machine files.
--- a/configure.in Sat Sep 25 20:39:13 2004 +0000 +++ b/configure.in Sat Sep 25 20:41:08 2004 +0000 @@ -1288,13 +1288,22 @@ dnl check if exec-shield is present. AC_CHECK_FILE(/proc/sys/kernel/exec-shield, emacs_cv_execshield=1, - emacs_cv_execshield=0) + emacs_cv_execshield=0) if test "$emacs_cv_execshield" = 1; then - AC_PATH_PROG(SETARCH, setarch, no) - AC_SUBST(SETARCH) - if test "$setarch" != no; then - AC_DEFINE(HAVE_EXECSHIELD, 1, [Define to 1 if this OS has exec shield.]) - fi + AC_PATH_PROG(SETARCH, setarch, no) + AC_SUBST(SETARCH) + if test "$setarch" != no && test "$machine" = "intel386"; then + AC_DEFINE(HAVE_EXECSHIELD, 1, + [Define to 1 if this OS has exec shield and we can handle it.]) + else + case "`cat /proc/sys/kernel/exec-shield`" in + 0) ;; + *) + AC_MSG_ERROR([Exec-shield is turned on. +Emacs can not dump itself if exec-shield is turned on. +See `etc/PROBLEMS' for further information.]) + esac + fi fi #### Extract some information from the operating system and machine files.