Commit dd571c2f authored by Jan Djärv's avatar Jan Djärv

* configure.in (HAVE_EXECSHIELD): Only define on x86.

* configure: Rebuild.
parent 1f02a4ba
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.
......
......@@ -4302,7 +4302,7 @@ else
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 @@ echo "${ECHO_T}no" >&6
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.
......
......@@ -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.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment