Mercurial > emacs
comparison configure.in @ 89991:6c1af301b455
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-48
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-581
Fix exec-shield autoconf test
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-582
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-584
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-585
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-586
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-38
Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 30 Sep 2004 01:20:39 +0000 |
parents | e23928ac5a97 6ce2eaa4905a |
children | ff0e824afa37 |
comparison
equal
deleted
inserted
replaced
89990:9cdfbf04b9ea | 89991:6c1af301b455 |
---|---|
1290 AC_CHECK_FILE(/proc/sys/kernel/exec-shield, emacs_cv_execshield=1, | 1290 AC_CHECK_FILE(/proc/sys/kernel/exec-shield, emacs_cv_execshield=1, |
1291 emacs_cv_execshield=0) | 1291 emacs_cv_execshield=0) |
1292 if test "$emacs_cv_execshield" = 1; then | 1292 if test "$emacs_cv_execshield" = 1; then |
1293 AC_PATH_PROG(SETARCH, setarch, no) | 1293 AC_PATH_PROG(SETARCH, setarch, no) |
1294 AC_SUBST(SETARCH) | 1294 AC_SUBST(SETARCH) |
1295 if test "$setarch" != no && test "$machine" = "intel386"; then | 1295 if test "$SETARCH" != no && test "$machine" = "intel386"; then |
1296 AC_DEFINE(HAVE_EXECSHIELD, 1, | 1296 AC_DEFINE(HAVE_EXECSHIELD, 1, |
1297 [Define to 1 if this OS has exec shield and we can handle it.]) | 1297 [Define to 1 if this OS has exec shield and we can handle it.]) |
1298 else | 1298 else |
1299 case "`cat /proc/sys/kernel/exec-shield`" in | 1299 case "`cat /proc/sys/kernel/exec-shield`" in |
1300 0) ;; | 1300 0) ;; |