Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
dd571c2f
Commit
dd571c2f
authored
Sep 25, 2004
by
Jan Djärv
Browse files
* configure.in (HAVE_EXECSHIELD): Only define on x86.
* configure: Rebuild.
parent
1f02a4ba
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
35 additions
and
9 deletions
+35
-9
ChangeLog
ChangeLog
+5
-0
configure
configure
+15
-3
configure.in
configure.in
+15
-6
No files found.
ChangeLog
View file @
dd571c2f
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.
...
...
configure
View file @
dd571c2f
...
...
@@ -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.
...
...
configure.in
View file @
dd571c2f
...
...
@@ -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.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment