aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2017-07-29 00:01:02 -0700
committerPaul Eggert2017-07-29 00:01:54 -0700
commit920afa22651b2ae16f18e4ea1bb2e110c5e3d0af (patch)
tree14547affe4240fd972899437fc27453e649e360d
parent6238b6c0d4176621a1f224291f41e5d71c0c9968 (diff)
downloademacs-920afa22651b2ae16f18e4ea1bb2e110c5e3d0af.tar.gz
emacs-920afa22651b2ae16f18e4ea1bb2e110c5e3d0af.zip
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.
-rw-r--r--configure.ac14
1 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index e4647c6a301..c3e440adcaa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -175,6 +175,7 @@ esac
175 175
176canonical=$host 176canonical=$host
177configuration=${host_alias-${build_alias-$host}} 177configuration=${host_alias-${build_alias-$host}}
178emacs_uname_r=`uname -r`
178 179
179dnl Support for --program-prefix, --program-suffix and 180dnl Support for --program-prefix, --program-suffix and
180dnl --program-transform-name options 181dnl --program-transform-name options
@@ -1222,8 +1223,8 @@ if test $opsys = gnu-linux; then
1222 AC_SUBST([SETFATTR]) 1223 AC_SUBST([SETFATTR])
1223 fi 1224 fi
1224fi 1225fi
1225case $opsys,$PAXCTL_notdumped in 1226case $opsys,$PAXCTL_notdumped,$emacs_uname_r in
1226 gnu-linux, | netbsd,) 1227 gnu-linux,,* | netbsd,,[0-7].*)
1227 AC_PATH_PROG([PAXCTL], [paxctl], [], 1228 AC_PATH_PROG([PAXCTL], [paxctl], [],
1228 [$PATH$PATH_SEPARATOR/sbin$PATH_SEPARATOR/usr/sbin]) 1229 [$PATH$PATH_SEPARATOR/sbin$PATH_SEPARATOR/usr/sbin])
1229 if test -n "$PAXCTL"; then 1230 if test -n "$PAXCTL"; then
@@ -5509,13 +5510,12 @@ to run if these resources are not installed."])
5509 echo 5510 echo
5510fi 5511fi
5511 5512
5512if test "${opsys}" = "cygwin"; then 5513case $opsys,$emacs_uname_r in
5513 case `uname -r` in 5514 cygwin,1.5.*)
5514 1.5.*) AC_MSG_WARN([[building Emacs on Cygwin 1.5 is not supported.]]) 5515 AC_MSG_WARN([[building Emacs on Cygwin 1.5 is not supported.]])
5515 echo 5516 echo
5516 ;; 5517 ;;
5517 esac 5518esac
5518fi
5519 5519
5520# Remove any trailing slashes in these variables. 5520# Remove any trailing slashes in these variables.
5521case $prefix in 5521case $prefix in