emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] Changes to emacs/configure


From: Jan Djärv
Subject: [Emacs-diffs] Changes to emacs/configure
Date: Sat, 25 Sep 2004 17:03:46 -0400

Index: emacs/configure
diff -c emacs/configure:1.133 emacs/configure:1.134
*** emacs/configure:1.133       Fri Sep 24 07:18:15 2004
--- emacs/configure     Sat Sep 25 20:41:08 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.




reply via email to

[Prev in Thread] Current Thread [Next in Thread]