[Emacs-diffs] master 920afa2: Do not worry about paxctl on newer NetBSD

[Paul Eggert]

branch: master
commit 920afa22651b2ae16f18e4ea1bb2e110c5e3d0af
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Do not worry about paxctl on newer NetBSD
    
    Problem reported privately by Thomas Klausner.
    * configure.ac (emacs_uname_r): New var.  Use it to avoid paxctl
    on newer NetBSD platforms, where it is not needed.  Also use it to
    simplify Cygwin diagnostic.
---
 configure.ac | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index e4647c6..c3e440a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -175,6 +175,7 @@ esac
 
 canonical=$host
 configuration=${host_alias-${build_alias-$host}}
+emacs_uname_r=`uname -r`
 
 dnl Support for --program-prefix, --program-suffix and
 dnl --program-transform-name options
@@ -1222,8 +1223,8 @@ if test $opsys = gnu-linux; then
     AC_SUBST([SETFATTR])
   fi
 fi
-case $opsys,$PAXCTL_notdumped in
-  gnu-linux, | netbsd,)
+case $opsys,$PAXCTL_notdumped,$emacs_uname_r in
+  gnu-linux,,* | netbsd,,[0-7].*)
     AC_PATH_PROG([PAXCTL], [paxctl], [],
       [$PATH$PATH_SEPARATOR/sbin$PATH_SEPARATOR/usr/sbin])
     if test -n "$PAXCTL"; then
@@ -5509,13 +5510,12 @@ to run if these resources are not installed."])
    echo
 fi
 
-if test "${opsys}" = "cygwin"; then
-  case `uname -r` in
-    1.5.*) AC_MSG_WARN([[building Emacs on Cygwin 1.5 is not supported.]])
+case $opsys,$emacs_uname_r in
+  cygwin,1.5.*)
+    AC_MSG_WARN([[building Emacs on Cygwin 1.5 is not supported.]])
            echo
           ;;
-  esac
-fi
+esac
 
 # Remove any trailing slashes in these variables.
 case $prefix in