diff options
author | jkim <jkim@FreeBSD.org> | 2016-03-25 22:32:26 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2016-03-25 22:32:26 +0000 |
commit | dd1a30de836b690831f5f91a9009a967ed8b0f65 (patch) | |
tree | 34a5eee9afabfc66ad5b29c0294b46bd5bee383a /contrib/byacc/aclocal.m4 | |
parent | 96eb07ae2bc336657abd2d9e1615783f37819579 (diff) | |
download | FreeBSD-src-dd1a30de836b690831f5f91a9009a967ed8b0f65.zip FreeBSD-src-dd1a30de836b690831f5f91a9009a967ed8b0f65.tar.gz |
Merge byacc 20160324.
Diffstat (limited to 'contrib/byacc/aclocal.m4')
-rw-r--r-- | contrib/byacc/aclocal.m4 | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/contrib/byacc/aclocal.m4 b/contrib/byacc/aclocal.m4 index 41358a2..f98d089 100644 --- a/contrib/byacc/aclocal.m4 +++ b/contrib/byacc/aclocal.m4 @@ -1,7 +1,7 @@ -dnl $Id: aclocal.m4,v 1.38 2015/07/05 22:16:23 tom Exp $ +dnl $Id: aclocal.m4,v 1.39 2016/03/25 00:06:44 tom Exp $ dnl Macros for byacc configure script (Thomas E. Dickey) dnl --------------------------------------------------------------------------- -dnl Copyright 2004-2014,2015 Thomas E. Dickey +dnl Copyright 2004-2015,2016 Thomas E. Dickey dnl dnl Permission is hereby granted, free of charge, to any person obtaining a dnl copy of this software and associated documentation files (the @@ -1121,7 +1121,7 @@ if test "$with_dmalloc" = yes ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_MAN2HTML version: 4 updated: 2015/05/03 19:10:48 +dnl CF_WITH_MAN2HTML version: 5 updated: 2015/08/20 04:51:36 dnl ---------------- dnl Check for man2html and groff. Optionally prefer man2html over groff. dnl Generate a shell script which hides the differences between the two. @@ -1157,7 +1157,7 @@ esac MAN2HTML_TEMP="man2html.tmp" cat >$MAN2HTML_TEMP <<CF_EOF -#!/bin/sh +#!$SHELL # Temporary script generated by CF_WITH_MAN2HTML # Convert inputs to html, sending result to standard output. # @@ -1184,7 +1184,7 @@ then MAN2HTML_NOTE="$GROFF_NOTE" MAN2HTML_PATH="$GROFF_PATH" cat >>$MAN2HTML_TEMP <<CF_EOF -/bin/sh -c "tbl \${ROOT}.\${TYPE} | $GROFF_PATH -P -o0 -I\${ROOT}_ -Thtml -\${MACS}" +$SHELL -c "tbl \${ROOT}.\${TYPE} | $GROFF_PATH -P -o0 -I\${ROOT}_ -Thtml -\${MACS}" CF_EOF else MAN2HTML_NOTE="" @@ -1287,7 +1287,7 @@ fi fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_SOURCE version: 49 updated: 2015/04/12 15:39:00 +dnl CF_XOPEN_SOURCE version: 50 updated: 2015/10/17 19:03:33 dnl --------------- dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions, dnl or adapt to the vendor's definitions to get equivalent functionality, @@ -1357,6 +1357,9 @@ case $host_os in (openbsd*) # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw ;; +(os2*) + cf_XOPEN_SOURCE= + ;; (osf[[45]]*) cf_xopen_source="-D_OSF_SOURCE" ;; |