summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorJan Djärv <jan.h.d@swipnet.se>2004-09-25 20:41:08 +0000
committerJan Djärv <jan.h.d@swipnet.se>2004-09-25 20:41:08 +0000
commitdd571c2fb007f7a2fc5f32dcc08fe4e7f0a703f2 (patch)
tree149878951035a184bf91a111e8d97422168905c3 /configure.in
parent1f02a4ba8d725336e678baf503d12a9d063bea39 (diff)
* configure.in (HAVE_EXECSHIELD): Only define on x86.
* configure: Rebuild.
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in21
1 files changed, 15 insertions, 6 deletions
diff --git a/configure.in b/configure.in
index 52c35bb2b0..95ff1f855f 100644
--- a/configure.in
+++ b/configure.in
@@ -1288,13 +1288,22 @@ AC_AIX
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.