[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/configure [emacs-unicode-2]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/configure [emacs-unicode-2] |
Date: |
Wed, 29 Sep 2004 03:28:45 -0400 |
Index: emacs/configure
diff -c emacs/configure:1.119.2.6 emacs/configure:1.119.2.7
*** emacs/configure:1.119.2.6 Sat Sep 25 12:05:34 2004
--- emacs/configure Wed Sep 29 07:22:20 2004
***************
*** 4302,4308 ****
fi
if test "$emacs_cv_execshield" = 1; then
! # 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
--- 4302,4308 ----
fi
if test "$emacs_cv_execshield" = 1; then
! # 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,4355 ****
fi
! if test "$setarch" != no; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_EXECSHIELD 1
_ACEOF
! fi
fi
#### Extract some information from the operating system and machine files.
--- 4343,4367 ----
fi
! if test "$setarch" != no && test "$machine" = "intel386"; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_EXECSHIELD 1
_ACEOF
! 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.