comparison configure @ 89989:e23928ac5a97

Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-47 Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-571 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-572 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-574 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-576 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-579 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-580 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-31 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-33 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-34 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-35 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-37 Update from CVS
author Miles Bader <miles@gnu.org>
date Wed, 29 Sep 2004 07:22:20 +0000
parents 0b158db81c28 4408561037cf
children 6c1af301b455
comparison
equal deleted inserted replaced
89988:3c5b3356d8e5 89989:e23928ac5a97
4300 else 4300 else
4301 emacs_cv_execshield=0 4301 emacs_cv_execshield=0
4302 fi 4302 fi
4303 4303
4304 if test "$emacs_cv_execshield" = 1; then 4304 if test "$emacs_cv_execshield" = 1; then
4305 # Extract the first word of "setarch", so it can be a program name with args. 4305 # Extract the first word of "setarch", so it can be a program name with args.
4306 set dummy setarch; ac_word=$2 4306 set dummy setarch; ac_word=$2
4307 echo "$as_me:$LINENO: checking for $ac_word" >&5 4307 echo "$as_me:$LINENO: checking for $ac_word" >&5
4308 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 4308 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
4309 if test "${ac_cv_path_SETARCH+set}" = set; then 4309 if test "${ac_cv_path_SETARCH+set}" = set; then
4310 echo $ECHO_N "(cached) $ECHO_C" >&6 4310 echo $ECHO_N "(cached) $ECHO_C" >&6
4341 echo "$as_me:$LINENO: result: no" >&5 4341 echo "$as_me:$LINENO: result: no" >&5
4342 echo "${ECHO_T}no" >&6 4342 echo "${ECHO_T}no" >&6
4343 fi 4343 fi
4344 4344
4345 4345
4346 if test "$setarch" != no; then 4346 if test "$setarch" != no && test "$machine" = "intel386"; then
4347 4347
4348 cat >>confdefs.h <<\_ACEOF 4348 cat >>confdefs.h <<\_ACEOF
4349 #define HAVE_EXECSHIELD 1 4349 #define HAVE_EXECSHIELD 1
4350 _ACEOF 4350 _ACEOF
4351 4351
4352 fi 4352 else
4353 case "`cat /proc/sys/kernel/exec-shield`" in
4354 0) ;;
4355 *)
4356 { { echo "$as_me:$LINENO: error: Exec-shield is turned on.
4357 Emacs can not dump itself if exec-shield is turned on.
4358 See \`etc/PROBLEMS' for further information." >&5
4359 echo "$as_me: error: Exec-shield is turned on.
4360 Emacs can not dump itself if exec-shield is turned on.
4361 See \`etc/PROBLEMS' for further information." >&2;}
4362 { (exit 1); exit 1; }; }
4363 esac
4364 fi
4353 fi 4365 fi
4354 4366
4355 #### Extract some information from the operating system and machine files. 4367 #### Extract some information from the operating system and machine files.
4356 4368
4357 { echo "$as_me:$LINENO: checking the machine- and system-dependent files to find out 4369 { echo "$as_me:$LINENO: checking the machine- and system-dependent files to find out