Mercurial > hg > early-roguelike
changeset 312:029c1f5c5588
Update the Autoconf files.
These are mostly automatic updates for obsolete macros.
| author | John "Elwin" Edwards |
|---|---|
| date | Tue, 11 May 2021 22:30:03 -0400 |
| parents | 28e22fb35989 |
| children | 2f75940cc544 |
| files | arogue5/acinclude.m4 arogue5/configure.ac arogue7/acinclude.m4 arogue7/configure.ac install-sh rogue3/acinclude.m4 rogue3/configure.ac rogue4/acinclude.m4 rogue4/configure.ac rogue5/acinclude.m4 rogue5/configure.ac srogue/acinclude.m4 srogue/configure.ac urogue/acinclude.m4 urogue/configure.ac xrogue/acinclude.m4 xrogue/configure.ac |
| diffstat | 17 files changed, 187 insertions(+), 314 deletions(-) [+] |
line wrap: on
line diff
--- a/arogue5/acinclude.m4 Tue May 04 21:03:47 2021 -0400 +++ b/arogue5/acinclude.m4 Tue May 11 22:30:03 2021 -0400 @@ -6,14 +6,10 @@ then AC_CACHE_CHECK([for working curses], mp_cv_curses, [LIBS="$LIBS -lcurses" - AC_TRY_LINK( - [#include <curses.h>], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_curses=yes, mp_cv_curses=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_curses=yes],[mp_cv_curses=no])]) if test "$mp_cv_curses" = yes then AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested]) - #AC_DEFINE(HAVE_CURSES_H) CURSES_LIB="-lcurses" fi fi @@ -21,10 +17,7 @@ then AC_CACHE_CHECK([for working ncurses], mp_cv_ncurses, [LIBS="$mp_save_LIBS -lncurses" - AC_TRY_LINK( - [#include <ncurses.h>], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_ncurses=yes, mp_cv_ncurses=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ncurses.h>]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_ncurses=yes],[mp_cv_ncurses=no])]) if test "$mp_cv_ncurses" = yes then AC_DEFINE(HAVE_NCURSES_H, 1, [Define to 1 if libncurses is requested]) @@ -35,10 +28,7 @@ then AC_CACHE_CHECK([for working pdcurses], mp_cv_pdcurses, [LIBS="$mp_save_LIBS -lpdcurses" - AC_TRY_LINK( - [#include <curses.h>], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_pdcurses=yes, mp_cv_pdcurses=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_pdcurses=yes],[mp_cv_pdcurses=no])]) if test "$mp_cv_pdcurses" = yes then AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested]) @@ -49,10 +39,7 @@ then AC_CACHE_CHECK([for working pdcur], mp_cv_pdcur, [LIBS="$mp_save_LIBS -lpdcur" - AC_TRY_LINK( - [#include <curses.h>], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_pdcur=yes, mp_cv_pdcur=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_pdcur=yes],[mp_cv_pdcur=no])]) if test "$mp_cv_pdcur" = yes then AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested]) @@ -63,10 +50,7 @@ then AC_CACHE_CHECK([for working peer pdcurses], mp_cv_lpdcurses, [LIBS="$mp_save_LIBS ../pdcurses/pdcurses.a" - AC_TRY_LINK( - [#include "../pdcurses/curses.h"], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_lpdcurses=yes, mp_cv_lpdcurses=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "../pdcurses/curses.h"]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_lpdcurses=yes],[mp_cv_lpdcurses=no])]) if test "$mp_cv_lpdcurses" = yes then AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested]) @@ -76,12 +60,10 @@ fi AC_CACHE_CHECK([for ESCDELAY variable], [mc_cv_ncurses_escdelay], - [AC_TRY_LINK([], [ + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ extern int ESCDELAY; ESCDELAY = 0; - ], - [mc_cv_ncurses_escdelay=yes], - [mc_cv_ncurses_escdelay=no]) + ]])],[mc_cv_ncurses_escdelay=yes],[mc_cv_ncurses_escdelay=no]) ]) if test "$mc_cv_ncurses_escdelay" = yes; then AC_DEFINE(HAVE_ESCDELAY, 1,
--- a/arogue5/configure.ac Tue May 04 21:03:47 2021 -0400 +++ b/arogue5/configure.ac Tue May 11 22:30:03 2021 -0400 @@ -1,10 +1,9 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_PREREQ(2.56) -AC_INIT([ARogue],[5.8.2], [yendor@rogueforge.net], [arogue5]) +AC_PREREQ([2.69]) +AC_INIT([Advanced Rogue],[5.8.2],[elwin@sdf.org],[arogue5]) AC_CONFIG_HEADERS([config.h]) -# May not be needed for the documentation AC_CONFIG_FILES([Makefile]) # Checks for programs. @@ -23,17 +22,16 @@ AC_PROG_GCC_TRADITIONAL AC_FUNC_LSTAT AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK -AC_TYPE_SIGNAL AC_FUNC_STAT AC_FUNC_VPRINTF AC_CHECK_FUNCS([erasechar killchar alarm getpass memset setenv strchr nlist _spawnl spawnl getpwuid loadav getloadavg strerror setgid setuid getuid getgid]) AC_PROG_INSTALL -AC_ARG_WITH(program-name, AC_HELP_STRING([--with-program-name=NAME],[alternate executable name]),[progname="$withval" ], [progname="arogue5"] ) +AC_ARG_WITH(program-name, AS_HELP_STRING([--with-program-name=NAME],[alternate executable name]),[progname="$withval" ], [progname="arogue5"] ) PROGRAM=$progname AC_SUBST(PROGRAM) -AC_ARG_ENABLE(setgid, AC_HELP_STRING([--enable-setgid=NAME],[install executable as setgid with group ownership of NAME @<:@default=no@:>@]),[],[]) +AC_ARG_ENABLE(setgid, AS_HELP_STRING([--enable-setgid=NAME],[install executable as setgid with group ownership of NAME @<:@default=no@:>@]),[],[]) AC_MSG_CHECKING([if using setgid execute bit]) if test "x$enable_setgid" = "xno" ; then GROUPOWNER= @@ -54,7 +52,7 @@ AC_SUBST(GROUPOWNER) -AC_ARG_ENABLE([scorefile],[AC_HELP_STRING([--enable-scorefile=SCOREFILE], [enable scoreboard with given filename])],[],[]) +AC_ARG_ENABLE([scorefile],[AS_HELP_STRING([--enable-scorefile=SCOREFILE],[enable scoreboard with given filename])],[],[]) AC_MSG_CHECKING([for scoreboard file]) if test "x$enable_scorefile" = "xno" ; then SCOREFILE= @@ -75,7 +73,7 @@ AC_SUBST(SCOREFILE) -AC_ARG_ENABLE([logfile],[AC_HELP_STRING([--enable-logfile=LOGFILE], [enable logfile with given filename])],[],[]) +AC_ARG_ENABLE([logfile],[AS_HELP_STRING([--enable-logfile=LOGFILE],[enable logfile with given filename])],[],[]) AC_MSG_CHECKING([for log file]) if test "x$enable_logfile" = "xno" ; then LOGFILE= @@ -96,7 +94,7 @@ AC_SUBST(LOGFILE) -AC_ARG_ENABLE([savedir],[AC_HELP_STRING([--enable-savedir=SAVEDIR], [enable systemwide location for saved games])],[],[enable_savedir="no"]) +AC_ARG_ENABLE([savedir],[AS_HELP_STRING([--enable-savedir=SAVEDIR],[enable systemwide location for saved games])],[],[enable_savedir="no"]) AC_MSG_CHECKING([for save directory]) if test "x$enable_savedir" = "xno" ; then SAVEDIR= @@ -119,7 +117,7 @@ AC_SUBST(SAVEDIR) -AC_ARG_ENABLE([wizardmode],[AC_HELP_STRING([--enable-wizardmode], [enable availability of wizard mode @<:@default=no@:>@])],[],[]) +AC_ARG_ENABLE([wizardmode],[AS_HELP_STRING([--enable-wizardmode],[enable availability of wizard mode @<:@default=no@:>@])],[],[]) AC_MSG_CHECKING([if wizard mode is enabled]) if test "x$enable_wizardmode" = "xno" ; then AC_MSG_RESULT([no]) @@ -130,7 +128,7 @@ AC_MSG_RESULT([yes]) fi -AC_ARG_ENABLE([limitscore],[AC_HELP_STRING([--enable-limitscore], [limit scores to one per class per uid @<:@default=no@:>@])],[],[]) +AC_ARG_ENABLE([limitscore],[AS_HELP_STRING([--enable-limitscore],[limit scores to one per class per uid @<:@default=no@:>@])],[],[]) AC_MSG_CHECKING([if limiting scores]) if test "x$enable_limitscore" = "xno" ; then AC_MSG_RESULT([no]) @@ -141,7 +139,7 @@ AC_MSG_RESULT([yes]) fi -AC_ARG_ENABLE([maxload],[AC_HELP_STRING([--enable-maxload], [enable maxload @<:@default=no@:>@])],[],[]) +AC_ARG_ENABLE([maxload],[AS_HELP_STRING([--enable-maxload],[enable maxload @<:@default=no@:>@])],[],[]) AC_MSG_CHECKING([runtime execution limit (maximum system load average)]) if test "x$enable_maxload" = "xyes" ; then AC_DEFINE([MAXLOAD], [100], [Define if maxload feature should be enabled]) @@ -155,7 +153,7 @@ AC_MSG_RESULT([$enable_maxload]) fi -AC_ARG_ENABLE([maxusers],[AC_HELP_STRING([--enable-maxusers], [enable maxuser @<:@default=no@:>@])],[],[]) +AC_ARG_ENABLE([maxusers],[AS_HELP_STRING([--enable-maxusers],[enable maxuser @<:@default=no@:>@])],[],[]) AC_MSG_CHECKING([runtime execution limit (maximum online system users)]) if test "x$enable_maxusers" = "xyes" ; then AC_DEFINE([MAXUSERS], [100], [Define if maxusers feature should be enabled])
--- a/arogue7/acinclude.m4 Tue May 04 21:03:47 2021 -0400 +++ b/arogue7/acinclude.m4 Tue May 11 22:30:03 2021 -0400 @@ -6,14 +6,10 @@ then AC_CACHE_CHECK([for working curses], mp_cv_curses, [LIBS="$LIBS -lcurses" - AC_TRY_LINK( - [#include <curses.h>], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_curses=yes, mp_cv_curses=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_curses=yes],[mp_cv_curses=no])]) if test "$mp_cv_curses" = yes then AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested]) - #AC_DEFINE(HAVE_CURSES_H) CURSES_LIB="-lcurses" fi fi @@ -21,10 +17,7 @@ then AC_CACHE_CHECK([for working ncurses], mp_cv_ncurses, [LIBS="$mp_save_LIBS -lncurses" - AC_TRY_LINK( - [#include <ncurses.h>], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_ncurses=yes, mp_cv_ncurses=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ncurses.h>]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_ncurses=yes],[mp_cv_ncurses=no])]) if test "$mp_cv_ncurses" = yes then AC_DEFINE(HAVE_NCURSES_H, 1, [Define to 1 if libncurses is requested]) @@ -35,10 +28,7 @@ then AC_CACHE_CHECK([for working pdcurses], mp_cv_pdcurses, [LIBS="$mp_save_LIBS -lpdcurses" - AC_TRY_LINK( - [#include <curses.h>], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_pdcurses=yes, mp_cv_pdcurses=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_pdcurses=yes],[mp_cv_pdcurses=no])]) if test "$mp_cv_pdcurses" = yes then AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested]) @@ -49,10 +39,7 @@ then AC_CACHE_CHECK([for working pdcur], mp_cv_pdcur, [LIBS="$mp_save_LIBS -lpdcur" - AC_TRY_LINK( - [#include <curses.h>], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_pdcur=yes, mp_cv_pdcur=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_pdcur=yes],[mp_cv_pdcur=no])]) if test "$mp_cv_pdcur" = yes then AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested]) @@ -63,10 +50,7 @@ then AC_CACHE_CHECK([for working peer pdcurses], mp_cv_lpdcurses, [LIBS="$mp_save_LIBS ../pdcurses/pdcurses.a" - AC_TRY_LINK( - [#include "../pdcurses/curses.h"], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_lpdcurses=yes, mp_cv_lpdcurses=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "../pdcurses/curses.h"]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_lpdcurses=yes],[mp_cv_lpdcurses=no])]) if test "$mp_cv_lpdcurses" = yes then AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested]) @@ -76,12 +60,10 @@ fi AC_CACHE_CHECK([for ESCDELAY variable], [mc_cv_ncurses_escdelay], - [AC_TRY_LINK([], [ + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ extern int ESCDELAY; ESCDELAY = 0; - ], - [mc_cv_ncurses_escdelay=yes], - [mc_cv_ncurses_escdelay=no]) + ]])],[mc_cv_ncurses_escdelay=yes],[mc_cv_ncurses_escdelay=no]) ]) if test "$mc_cv_ncurses_escdelay" = yes; then AC_DEFINE(HAVE_ESCDELAY, 1,
--- a/arogue7/configure.ac Tue May 04 21:03:47 2021 -0400 +++ b/arogue7/configure.ac Tue May 11 22:30:03 2021 -0400 @@ -1,8 +1,8 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_PREREQ(2.56) -AC_INIT([ARogue],[7.7.1], [yendor@rogueforge.net], [arogue7]) +AC_PREREQ([2.69]) +AC_INIT([Advanced Rogue],[7.7.1],[elwin@sdf.org],[arogue7]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([Makefile]) @@ -21,7 +21,6 @@ AC_FUNC_FORK AC_PROG_GCC_TRADITIONAL AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK -AC_TYPE_SIGNAL AC_CHECK_FUNCS([erasechar killchar alarm getpass memset setenv strchr _spawnl spawnl getpwuid loadav strerror setgid setuid getuid getgid]) AC_PROG_INSTALL @@ -48,11 +47,11 @@ AC_SUBST(DOCS_NROFF) AC_SUBST(DOCS_NONE) -AC_ARG_WITH(program-name, AC_HELP_STRING([--with-program-name=NAME],[alternate executable name]),[progname="$withval" ], [progname="arogue7"] ) +AC_ARG_WITH(program-name, AS_HELP_STRING([--with-program-name=NAME],[alternate executable name]),[progname="$withval" ], [progname="arogue7"] ) PROGRAM=$progname AC_SUBST(PROGRAM) -AC_ARG_ENABLE(setgid, AC_HELP_STRING([--enable-setgid=NAME],[install executable as setgid with group ownership of NAME @<:@default=no@:>@]),[],[]) +AC_ARG_ENABLE(setgid, AS_HELP_STRING([--enable-setgid=NAME],[install executable as setgid with group ownership of NAME @<:@default=no@:>@]),[],[]) AC_MSG_CHECKING([if using setgid execute bit]) if test "x$enable_setgid" = "xno" ; then GROUPOWNER= @@ -73,7 +72,7 @@ AC_SUBST(GROUPOWNER) -AC_ARG_ENABLE([scorefile],[AC_HELP_STRING([--enable-scorefile=SCOREFILE], [enable scoreboard with given filename])],[],[]) +AC_ARG_ENABLE([scorefile],[AS_HELP_STRING([--enable-scorefile=SCOREFILE],[enable scoreboard with given filename])],[],[]) AC_MSG_CHECKING([for scoreboard file]) if test "x$enable_scorefile" = "xno" ; then SCOREFILE= @@ -94,7 +93,7 @@ AC_SUBST(SCOREFILE) -AC_ARG_ENABLE([logfile],[AC_HELP_STRING([--enable-logfile=LOGFILE], [enable logfile with given filename])],[],[]) +AC_ARG_ENABLE([logfile],[AS_HELP_STRING([--enable-logfile=LOGFILE],[enable logfile with given filename])],[],[]) AC_MSG_CHECKING([for log file]) if test "x$enable_logfile" = "xno" ; then LOGFILE= @@ -115,7 +114,7 @@ AC_SUBST(LOGFILE) -AC_ARG_ENABLE([savedir],[AC_HELP_STRING([--enable-savedir=SAVEDIR], [enable systemwide location for saved games])],[],[enable_savedir="no"]) +AC_ARG_ENABLE([savedir],[AS_HELP_STRING([--enable-savedir=SAVEDIR],[enable systemwide location for saved games])],[],[enable_savedir="no"]) AC_MSG_CHECKING([for save directory]) if test "x$enable_savedir" = "xno" ; then SAVEDIR= @@ -138,7 +137,7 @@ AC_SUBST(SAVEDIR) -AC_ARG_ENABLE([wizardmode],[AC_HELP_STRING([--enable-wizardmode], [enable availability of wizard mode @<:@default=no@:>@])],[],[]) +AC_ARG_ENABLE([wizardmode],[AS_HELP_STRING([--enable-wizardmode],[enable availability of wizard mode @<:@default=no@:>@])],[],[]) AC_MSG_CHECKING([if wizard mode is enabled]) if test "x$enable_wizardmode" = "xno" ; then AC_MSG_RESULT([no]) @@ -149,7 +148,7 @@ AC_MSG_RESULT([yes]) fi -AC_ARG_ENABLE([limitscore],[AC_HELP_STRING([--enable-limitscore], [limit scores to one per class per uid @<:@default=no@:>@])],[],[]) +AC_ARG_ENABLE([limitscore],[AS_HELP_STRING([--enable-limitscore],[limit scores to one per class per uid @<:@default=no@:>@])],[],[]) AC_MSG_CHECKING([if limiting scores]) if test "x$enable_limitscore" = "xno" ; then AC_MSG_RESULT([no]) @@ -160,7 +159,7 @@ AC_MSG_RESULT([yes]) fi -AC_ARG_ENABLE([maxusers],[AC_HELP_STRING([--enable-maxusers], [enable maxuser @<:@default=no@:>@])],[],[]) +AC_ARG_ENABLE([maxusers],[AS_HELP_STRING([--enable-maxusers],[enable maxuser @<:@default=no@:>@])],[],[]) AC_MSG_CHECKING([runtime execution limit (maximum online system users)]) if test "x$enable_maxusers" = "xyes" ; then AC_DEFINE([MAXUSERS], [100], [Define if maxusers feature should be enabled])
--- a/install-sh Tue May 04 21:03:47 2021 -0400 +++ b/install-sh Tue May 11 22:30:03 2021 -0400 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2013-12-25.23; # UTC +scriptversion=2018-03-11.20; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -271,15 +271,18 @@ fi dst=$dst_arg - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. + # If destination is a directory, append the input filename. if test -d "$dst"; then if test "$is_target_a_directory" = never; then echo "$0: $dst_arg: Is a directory" >&2 exit 1 fi dstdir=$dst - dst=$dstdir/`basename "$src"` + dstbase=`basename "$src"` + case $dst in + */) dst=$dst$dstbase;; + *) dst=$dst/$dstbase;; + esac dstdir_status=0 else dstdir=`dirname "$dst"` @@ -288,6 +291,11 @@ fi fi + case $dstdir in + */) dstdirslash=$dstdir;; + *) dstdirslash=$dstdir/;; + esac + obsolete_mkdir_used=false if test $dstdir_status != 0; then @@ -324,34 +332,43 @@ # is incompatible with FreeBSD 'install' when (umask & 300) != 0. ;; *) + # Note that $RANDOM variable is not portable (e.g. dash); Use it + # here however when possible just to lower collision chance. tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + + trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 + # Because "mkdir -p" follows existing symlinks and we likely work + # directly in world-writeable /tmp, make sure that the '$tmpdir' + # directory is successfully created first before we actually test + # 'mkdir -p' feature. if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 then if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` case $ls_ld_tmpdir in d????-?r-*) different_mode=700;; d????-?--*) different_mode=755;; *) false;; esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" } } then posix_mkdir=: fi - rmdir "$tmpdir/d" "$tmpdir" + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" else # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null fi trap '' 0;; esac;; @@ -427,14 +444,25 @@ else # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ + dsttmp=${dstdirslash}_inst.$$_ + rmtmp=${dstdirslash}_rm.$$_ # Trap to clean up those temp files at exit. trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + (umask $cp_umask && + { test -z "$stripcmd" || { + # Create $dsttmp read-write so that cp doesn't create it read-only, + # which would cause strip to fail. + if test -z "$doit"; then + : >"$dsttmp" # No need to fork-exec 'touch'. + else + $doit touch "$dsttmp" + fi + } + } && + $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. # @@ -493,9 +521,9 @@ done # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End:
--- a/rogue3/acinclude.m4 Tue May 04 21:03:47 2021 -0400 +++ b/rogue3/acinclude.m4 Tue May 11 22:30:03 2021 -0400 @@ -6,14 +6,10 @@ then AC_CACHE_CHECK([for working curses], mp_cv_curses, [LIBS="$LIBS -lcurses" - AC_TRY_LINK( - [#include <curses.h>], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_curses=yes, mp_cv_curses=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_curses=yes],[mp_cv_curses=no])]) if test "$mp_cv_curses" = yes then AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested]) - #AC_DEFINE(HAVE_CURSES_H) CURSES_LIB="-lcurses" fi fi @@ -21,10 +17,7 @@ then AC_CACHE_CHECK([for working ncurses], mp_cv_ncurses, [LIBS="$mp_save_LIBS -lncurses" - AC_TRY_LINK( - [#include <ncurses.h>], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_ncurses=yes, mp_cv_ncurses=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ncurses.h>]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_ncurses=yes],[mp_cv_ncurses=no])]) if test "$mp_cv_ncurses" = yes then AC_DEFINE(HAVE_NCURSES_H, 1, [Define to 1 if libncurses is requested]) @@ -35,10 +28,7 @@ then AC_CACHE_CHECK([for working pdcurses], mp_cv_pdcurses, [LIBS="$mp_save_LIBS -lpdcurses" - AC_TRY_LINK( - [#include <curses.h>], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_pdcurses=yes, mp_cv_pdcurses=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_pdcurses=yes],[mp_cv_pdcurses=no])]) if test "$mp_cv_pdcurses" = yes then AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested]) @@ -49,10 +39,7 @@ then AC_CACHE_CHECK([for working pdcur], mp_cv_pdcur, [LIBS="$mp_save_LIBS -lpdcur" - AC_TRY_LINK( - [#include <curses.h>], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_pdcur=yes, mp_cv_pdcur=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_pdcur=yes],[mp_cv_pdcur=no])]) if test "$mp_cv_pdcur" = yes then AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested]) @@ -63,10 +50,7 @@ then AC_CACHE_CHECK([for working peer pdcurses], mp_cv_lpdcurses, [LIBS="$mp_save_LIBS ../pdcurses/pdcurses.a" - AC_TRY_LINK( - [#include "../pdcurses/curses.h"], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_lpdcurses=yes, mp_cv_lpdcurses=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "../pdcurses/curses.h"]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_lpdcurses=yes],[mp_cv_lpdcurses=no])]) if test "$mp_cv_lpdcurses" = yes then AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested]) @@ -76,12 +60,10 @@ fi AC_CACHE_CHECK([for ESCDELAY variable], [mc_cv_ncurses_escdelay], - [AC_TRY_LINK([], [ + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ extern int ESCDELAY; ESCDELAY = 0; - ], - [mc_cv_ncurses_escdelay=yes], - [mc_cv_ncurses_escdelay=no]) + ]])],[mc_cv_ncurses_escdelay=yes],[mc_cv_ncurses_escdelay=no]) ]) if test "$mc_cv_ncurses_escdelay" = yes; then AC_DEFINE(HAVE_ESCDELAY, 1,
--- a/rogue3/configure.ac Tue May 04 21:03:47 2021 -0400 +++ b/rogue3/configure.ac Tue May 11 22:30:03 2021 -0400 @@ -1,8 +1,8 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_PREREQ(2.56) -AC_INIT([Rogue],[3.6.4], [yendor@rogueforge.net], [rogue3]) +AC_PREREQ([2.69]) +AC_INIT([Rogue],[3.6.4],[elwin@sdf.org],[rogue3]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([Makefile rogue.6 rogue.r]) @@ -13,8 +13,6 @@ # Checks for header files. AC_HEADER_STDC AC_CHECK_HEADERS([arpa/inet.h pwd.h errno.h fcntl.h limits.h nlist.h stdlib.h string.h sys/ioctl.h termios.h unistd.h utmp.h utmpx.h term.h ncurses/term.h process.h]) -# WARN: the sources often don't include the headers when needed. That is one -# reason why adding "-Wall" to CFLAGS produces 1246 lines of messages. # Checks for typedefs, structures, and compiler characteristics. AC_TYPE_UID_T @@ -25,7 +23,6 @@ AC_PROG_GCC_TRADITIONAL AC_FUNC_LSTAT AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK -AC_TYPE_SIGNAL AC_FUNC_STAT AC_FUNC_VPRINTF AC_CHECK_FUNCS([erasechar killchar alarm getpass memset setenv strchr nlist _spawnl spawnl getpwuid loadav getloadavg strerror setgid setuid getuid getgid]) @@ -55,11 +52,11 @@ AC_SUBST(DOCS_NROFF) AC_SUBST(DOCS_NONE) -AC_ARG_WITH(program-name, AC_HELP_STRING([--with-program-name=NAME],[alternate executable name]),[progname="$withval" ], [progname="rogue3"] ) +AC_ARG_WITH(program-name, AS_HELP_STRING([--with-program-name=NAME],[alternate executable name]),[progname="$withval" ], [progname="rogue3"] ) PROGRAM=$progname AC_SUBST(PROGRAM) -AC_ARG_ENABLE(setgid, AC_HELP_STRING([--enable-setgid=NAME],[install executable as setgid with group ownership of NAME @<:@default=no@:>@]),[],[]) +AC_ARG_ENABLE(setgid, AS_HELP_STRING([--enable-setgid=NAME],[install executable as setgid with group ownership of NAME @<:@default=no@:>@]),[],[]) AC_MSG_CHECKING([if using setgid execute bit]) if test "x$enable_setgid" = "xno" ; then GROUPOWNER= @@ -80,7 +77,7 @@ AC_SUBST(GROUPOWNER) -AC_ARG_ENABLE([scorefile],[AC_HELP_STRING([--enable-scorefile=SCOREFILE], [enable scoreboard with given filename])],[],[]) +AC_ARG_ENABLE([scorefile],[AS_HELP_STRING([--enable-scorefile=SCOREFILE],[enable scoreboard with given filename])],[],[]) AC_MSG_CHECKING([for scoreboard file]) if test "x$enable_scorefile" = "xno" ; then SCOREFILE= @@ -101,7 +98,7 @@ AC_SUBST(SCOREFILE) -AC_ARG_ENABLE([logfile],[AC_HELP_STRING([--enable-logfile=LOGFILE], [enable logfile with given filename])],[],[]) +AC_ARG_ENABLE([logfile],[AS_HELP_STRING([--enable-logfile=LOGFILE],[enable logfile with given filename])],[],[]) AC_MSG_CHECKING([for log file]) if test "x$enable_logfile" = "xno" ; then LOGFILE= @@ -122,7 +119,7 @@ AC_SUBST(LOGFILE) -AC_ARG_ENABLE([savedir],[AC_HELP_STRING([--enable-savedir=SAVEDIR], [enable systemwide location for saved games])],[],[enable_savedir="no"]) +AC_ARG_ENABLE([savedir],[AS_HELP_STRING([--enable-savedir=SAVEDIR],[enable systemwide location for saved games])],[],[enable_savedir="no"]) AC_MSG_CHECKING([for save directory]) if test "x$enable_savedir" = "xno" ; then SAVEDIR= @@ -145,7 +142,7 @@ AC_SUBST(SAVEDIR) -AC_ARG_ENABLE([wizardmode],[AC_HELP_STRING([--enable-wizardmode], [enable availability of wizard mode @<:@default=no@:>@])],[],[]) +AC_ARG_ENABLE([wizardmode],[AS_HELP_STRING([--enable-wizardmode],[enable availability of wizard mode @<:@default=no@:>@])],[],[]) AC_MSG_CHECKING([if wizard mode is enabled]) if test "x$enable_wizardmode" = "xno" ; then AC_MSG_RESULT([no]) @@ -156,7 +153,7 @@ AC_MSG_RESULT([yes]) fi -AC_ARG_ENABLE([maxload],[AC_HELP_STRING([--enable-maxload], [enable maxload @<:@default=no@:>@])],[],[]) +AC_ARG_ENABLE([maxload],[AS_HELP_STRING([--enable-maxload],[enable maxload @<:@default=no@:>@])],[],[]) AC_MSG_CHECKING([runtime execution limit (maximum system load average)]) if test "x$enable_maxload" = "xyes" ; then AC_DEFINE([MAXLOAD], [100], [Define if maxload feature should be enabled]) @@ -170,7 +167,7 @@ AC_MSG_RESULT([$enable_maxload]) fi -AC_ARG_ENABLE([maxusers],[AC_HELP_STRING([--enable-maxusers], [enable maxuser @<:@default=no@:>@])],[],[]) +AC_ARG_ENABLE([maxusers],[AS_HELP_STRING([--enable-maxusers],[enable maxuser @<:@default=no@:>@])],[],[]) AC_MSG_CHECKING([runtime execution limit (maximum online system users)]) if test "x$enable_maxusers" = "xyes" ; then AC_DEFINE([MAXUSERS], [100], [Define if maxusers feature should be enabled])
--- a/rogue4/acinclude.m4 Tue May 04 21:03:47 2021 -0400 +++ b/rogue4/acinclude.m4 Tue May 11 22:30:03 2021 -0400 @@ -6,14 +6,10 @@ then AC_CACHE_CHECK([for working curses], mp_cv_curses, [LIBS="$LIBS -lcurses" - AC_TRY_LINK( - [#include <curses.h>], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_curses=yes, mp_cv_curses=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_curses=yes],[mp_cv_curses=no])]) if test "$mp_cv_curses" = yes then AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested]) - #AC_DEFINE(HAVE_CURSES_H) CURSES_LIB="-lcurses" fi fi @@ -21,10 +17,7 @@ then AC_CACHE_CHECK([for working ncurses], mp_cv_ncurses, [LIBS="$mp_save_LIBS -lncurses" - AC_TRY_LINK( - [#include <ncurses.h>], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_ncurses=yes, mp_cv_ncurses=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ncurses.h>]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_ncurses=yes],[mp_cv_ncurses=no])]) if test "$mp_cv_ncurses" = yes then AC_DEFINE(HAVE_NCURSES_H, 1, [Define to 1 if libncurses is requested]) @@ -35,10 +28,7 @@ then AC_CACHE_CHECK([for working pdcurses], mp_cv_pdcurses, [LIBS="$mp_save_LIBS -lpdcurses" - AC_TRY_LINK( - [#include <curses.h>], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_pdcurses=yes, mp_cv_pdcurses=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_pdcurses=yes],[mp_cv_pdcurses=no])]) if test "$mp_cv_pdcurses" = yes then AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested]) @@ -49,10 +39,7 @@ then AC_CACHE_CHECK([for working pdcur], mp_cv_pdcur, [LIBS="$mp_save_LIBS -lpdcur" - AC_TRY_LINK( - [#include <curses.h>], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_pdcur=yes, mp_cv_pdcur=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_pdcur=yes],[mp_cv_pdcur=no])]) if test "$mp_cv_pdcur" = yes then AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested]) @@ -63,10 +50,7 @@ then AC_CACHE_CHECK([for working peer pdcurses], mp_cv_lpdcurses, [LIBS="$mp_save_LIBS ../pdcurses/pdcurses.a" - AC_TRY_LINK( - [#include "../pdcurses/curses.h"], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_lpdcurses=yes, mp_cv_lpdcurses=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "../pdcurses/curses.h"]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_lpdcurses=yes],[mp_cv_lpdcurses=no])]) if test "$mp_cv_lpdcurses" = yes then AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested]) @@ -76,12 +60,10 @@ fi AC_CACHE_CHECK([for ESCDELAY variable], [mc_cv_ncurses_escdelay], - [AC_TRY_LINK([], [ + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ extern int ESCDELAY; ESCDELAY = 0; - ], - [mc_cv_ncurses_escdelay=yes], - [mc_cv_ncurses_escdelay=no]) + ]])],[mc_cv_ncurses_escdelay=yes],[mc_cv_ncurses_escdelay=no]) ]) if test "$mc_cv_ncurses_escdelay" = yes; then AC_DEFINE(HAVE_ESCDELAY, 1,
--- a/rogue4/configure.ac Tue May 04 21:03:47 2021 -0400 +++ b/rogue4/configure.ac Tue May 11 22:30:03 2021 -0400 @@ -1,8 +1,8 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_PREREQ(2.56) -AC_INIT([Rogue],[5.2.2], [yendor@rogueforge.net], [rogue4]) +AC_PREREQ([2.69]) +AC_INIT([Rogue],[5.2.2],[elwin@sdf.org],[rogue4]) AC_CONFIG_SRCDIR([armor.c]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([Makefile rogue.6 rogue.me]) @@ -24,7 +24,6 @@ AC_PROG_GCC_TRADITIONAL AC_FUNC_LSTAT AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK -AC_TYPE_SIGNAL AC_FUNC_STAT AC_FUNC_VPRINTF AC_CHECK_FUNCS([erasechar killchar alarm getpass memset setenv strchr nlist _spawnl spawnl getpwuid loadav getloadavg strerror setgid setuid getuid getgid]) @@ -54,11 +53,11 @@ AC_SUBST(DOCS_NROFF) AC_SUBST(DOCS_NONE) -AC_ARG_WITH(program-name, AC_HELP_STRING([--with-program-name=NAME],[alternate executable name]),[progname="$withval" ], [progname="rogue4"] ) +AC_ARG_WITH(program-name, AS_HELP_STRING([--with-program-name=NAME],[alternate executable name]),[progname="$withval" ], [progname="rogue4"] ) PROGRAM=$progname AC_SUBST(PROGRAM) -AC_ARG_ENABLE(setgid, AC_HELP_STRING([--enable-setgid=NAME],[install executable as setgid with group ownership of NAME @<:@default=no@:>@]),[],[]) +AC_ARG_ENABLE(setgid, AS_HELP_STRING([--enable-setgid=NAME],[install executable as setgid with group ownership of NAME @<:@default=no@:>@]),[],[]) AC_MSG_CHECKING([if using setgid execute bit]) if test "x$enable_setgid" = "xno" ; then GROUPOWNER= @@ -79,7 +78,7 @@ AC_SUBST(GROUPOWNER) -AC_ARG_ENABLE([scorefile],[AC_HELP_STRING([--enable-scorefile=SCOREFILE], [enable scoreboard with given filename])],[],[]) +AC_ARG_ENABLE([scorefile],[AS_HELP_STRING([--enable-scorefile=SCOREFILE],[enable scoreboard with given filename])],[],[]) AC_MSG_CHECKING([for scoreboard file]) if test "x$enable_scorefile" = "xno" ; then SCOREFILE= @@ -100,7 +99,7 @@ AC_SUBST(SCOREFILE) -AC_ARG_ENABLE([logfile],[AC_HELP_STRING([--enable-logfile=LOGFILE], [enable logfile with given filename])],[],[]) +AC_ARG_ENABLE([logfile],[AS_HELP_STRING([--enable-logfile=LOGFILE],[enable logfile with given filename])],[],[]) AC_MSG_CHECKING([for log file]) if test "x$enable_logfile" = "xno" ; then LOGFILE= @@ -121,7 +120,7 @@ AC_SUBST(LOGFILE) -AC_ARG_ENABLE([lockfile],[AC_HELP_STRING([--enable-lockfile=LOCKFILE], [enable scoreboard lockfile with given filename])],[],[]) +AC_ARG_ENABLE([lockfile],[AS_HELP_STRING([--enable-lockfile=LOCKFILE],[enable scoreboard lockfile with given filename])],[],[]) AC_MSG_CHECKING([for scoreboard lockfile file]) if test "x$enable_lockfile" = "xno" ; then LOCKFILE= @@ -142,7 +141,7 @@ AC_SUBST(LOCKFILE) -AC_ARG_ENABLE([savedir],[AC_HELP_STRING([--enable-savedir=SAVEDIR], [enable systemwide location for saved games])],[],[enable_savedir="no"]) +AC_ARG_ENABLE([savedir],[AS_HELP_STRING([--enable-savedir=SAVEDIR],[enable systemwide location for saved games])],[],[enable_savedir="no"]) AC_MSG_CHECKING([for save directory]) if test "x$enable_savedir" = "xno" ; then SAVEDIR= @@ -165,7 +164,7 @@ AC_SUBST(SAVEDIR) -AC_ARG_ENABLE([wizardmode],[AC_HELP_STRING([--enable-wizardmode], [enable availability of wizard mode @<:@default=no@:>@])],[],[]) +AC_ARG_ENABLE([wizardmode],[AS_HELP_STRING([--enable-wizardmode],[enable availability of wizard mode @<:@default=no@:>@])],[],[]) AC_MSG_CHECKING([if wizard mode is enabled]) if test "x$enable_wizardmode" = "xno" ; then AC_MSG_RESULT([no]) @@ -179,7 +178,7 @@ AC_MSG_RESULT([yes]) fi -AC_ARG_ENABLE([checktime],[AC_HELP_STRING([--enable-checktime], [enable checktime @<:@default=no@:>@])],[],[]) +AC_ARG_ENABLE([checktime],[AS_HELP_STRING([--enable-checktime],[enable checktime @<:@default=no@:>@])],[],[]) AC_MSG_CHECKING([if checktime is enabled]) if test "x$enable_checktime" = "xyes" ; then AC_DEFINE([CHECKTIME], [1], [Define if checktime feature should be enabled]) @@ -188,7 +187,7 @@ AC_MSG_RESULT([no]) fi -AC_ARG_ENABLE([maxload],[AC_HELP_STRING([--enable-maxload], [enable maxload @<:@default=no@:>@])],[],[]) +AC_ARG_ENABLE([maxload],[AS_HELP_STRING([--enable-maxload],[enable maxload @<:@default=no@:>@])],[],[]) AC_MSG_CHECKING([runtime execution limit (maximum system load average)]) if test "x$enable_maxload" = "xyes" ; then AC_DEFINE([MAXLOAD], [100], [Define if maxload feature should be enabled]) @@ -202,7 +201,7 @@ AC_MSG_RESULT([$enable_maxload]) fi -AC_ARG_ENABLE([maxusers],[AC_HELP_STRING([--enable-maxusers], [enable maxuser @<:@default=no@:>@])],[],[]) +AC_ARG_ENABLE([maxusers],[AS_HELP_STRING([--enable-maxusers],[enable maxuser @<:@default=no@:>@])],[],[]) AC_MSG_CHECKING([runtime execution limit (maximum online system users)]) if test "x$enable_maxusers" = "xyes" ; then AC_DEFINE([MAXUSERS], [100], [Define if maxusers feature should be enabled])
--- a/rogue5/acinclude.m4 Tue May 04 21:03:47 2021 -0400 +++ b/rogue5/acinclude.m4 Tue May 11 22:30:03 2021 -0400 @@ -6,14 +6,10 @@ then AC_CACHE_CHECK([for working curses], mp_cv_curses, [LIBS="$LIBS -lcurses" - AC_TRY_LINK( - [#include <curses.h>], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_curses=yes, mp_cv_curses=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_curses=yes],[mp_cv_curses=no])]) if test "$mp_cv_curses" = yes then AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested]) - #AC_DEFINE(HAVE_CURSES_H) CURSES_LIB="-lcurses" fi fi @@ -21,10 +17,7 @@ then AC_CACHE_CHECK([for working ncurses], mp_cv_ncurses, [LIBS="$mp_save_LIBS -lncurses" - AC_TRY_LINK( - [#include <ncurses.h>], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_ncurses=yes, mp_cv_ncurses=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ncurses.h>]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_ncurses=yes],[mp_cv_ncurses=no])]) if test "$mp_cv_ncurses" = yes then AC_DEFINE(HAVE_NCURSES_H, 1, [Define to 1 if libncurses is requested]) @@ -35,10 +28,7 @@ then AC_CACHE_CHECK([for working pdcurses], mp_cv_pdcurses, [LIBS="$mp_save_LIBS -lpdcurses" - AC_TRY_LINK( - [#include <curses.h>], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_pdcurses=yes, mp_cv_pdcurses=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_pdcurses=yes],[mp_cv_pdcurses=no])]) if test "$mp_cv_pdcurses" = yes then AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested]) @@ -49,10 +39,7 @@ then AC_CACHE_CHECK([for working pdcur], mp_cv_pdcur, [LIBS="$mp_save_LIBS -lpdcur" - AC_TRY_LINK( - [#include <curses.h>], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_pdcur=yes, mp_cv_pdcur=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_pdcur=yes],[mp_cv_pdcur=no])]) if test "$mp_cv_pdcur" = yes then AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested]) @@ -63,10 +50,7 @@ then AC_CACHE_CHECK([for working peer pdcurses], mp_cv_lpdcurses, [LIBS="$mp_save_LIBS ../pdcurses/pdcurses.a" - AC_TRY_LINK( - [#include "../pdcurses/curses.h"], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_lpdcurses=yes, mp_cv_lpdcurses=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "../pdcurses/curses.h"]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_lpdcurses=yes],[mp_cv_lpdcurses=no])]) if test "$mp_cv_lpdcurses" = yes then AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested]) @@ -76,12 +60,10 @@ fi AC_CACHE_CHECK([for ESCDELAY variable], [mc_cv_ncurses_escdelay], - [AC_TRY_LINK([], [ + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ extern int ESCDELAY; ESCDELAY = 0; - ], - [mc_cv_ncurses_escdelay=yes], - [mc_cv_ncurses_escdelay=no]) + ]])],[mc_cv_ncurses_escdelay=yes],[mc_cv_ncurses_escdelay=no]) ]) if test "$mc_cv_ncurses_escdelay" = yes; then AC_DEFINE(HAVE_ESCDELAY, 1,
--- a/rogue5/configure.ac Tue May 04 21:03:47 2021 -0400 +++ b/rogue5/configure.ac Tue May 11 22:30:03 2021 -0400 @@ -1,8 +1,8 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_PREREQ(2.56) -AC_INIT([Rogue],[5.4.5], [yendor@rogueforge.net], [rogue5]) +AC_PREREQ([2.69]) +AC_INIT([Rogue],[5.4.5],[elwin@sdf.org],[rogue5]) AC_CONFIG_SRCDIR([armor.c]) AC_CONFIG_HEADER([config.h]) AC_CONFIG_FILES([Makefile rogue.6 rogue.me rogue.html]) @@ -29,7 +29,6 @@ AC_PROG_GCC_TRADITIONAL AC_FUNC_LSTAT AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK -AC_TYPE_SIGNAL AC_FUNC_STAT AC_FUNC_VPRINTF AC_CHECK_FUNCS([erasechar killchar alarm getpass memset setenv strchr nlist _spawnl spawnl getpwuid loadav getloadavg strerror setresgid setregid setgid setresuid setreuid setuid getuid getgid]) @@ -57,11 +56,11 @@ AC_SUBST(DOCS_NROFF) AC_SUBST(DOCS_NONE) -AC_ARG_WITH(program-name, AC_HELP_STRING([--with-program-name=NAME],[alternate executable name]),[progname="$withval" ], [progname="rogue5"] ) +AC_ARG_WITH(program-name, AS_HELP_STRING([--with-program-name=NAME],[alternate executable name]),[progname="$withval" ], [progname="rogue5"] ) PROGRAM=$progname AC_SUBST(PROGRAM) -AC_ARG_ENABLE(setgid, AC_HELP_STRING([--enable-setgid=NAME],[install executable as setgid with group ownership of NAME @<:@default=no@:>@]),[],[]) +AC_ARG_ENABLE(setgid, AS_HELP_STRING([--enable-setgid=NAME],[install executable as setgid with group ownership of NAME @<:@default=no@:>@]),[],[]) AC_MSG_CHECKING([if using setgid execute bit]) if test "x$enable_setgid" = "xno" ; then GROUPOWNER= @@ -82,7 +81,7 @@ AC_SUBST(GROUPOWNER) -AC_ARG_ENABLE([scorefile],[AC_HELP_STRING([--enable-scorefile=SCOREFILE], [enable scoreboard with given filename])],[],[]) +AC_ARG_ENABLE([scorefile],[AS_HELP_STRING([--enable-scorefile=SCOREFILE],[enable scoreboard with given filename])],[],[]) AC_MSG_CHECKING([for scoreboard file]) if test "x$enable_scorefile" = "xno" ; then SCOREFILE= @@ -103,7 +102,7 @@ AC_SUBST(SCOREFILE) -AC_ARG_ENABLE([logfile],[AC_HELP_STRING([--enable-logfile=LOGFILE], [enable logfile with given filename])],[],[]) +AC_ARG_ENABLE([logfile],[AS_HELP_STRING([--enable-logfile=LOGFILE],[enable logfile with given filename])],[],[]) AC_MSG_CHECKING([for log file]) if test "x$enable_logfile" = "xno" ; then LOGFILE= @@ -124,7 +123,7 @@ AC_SUBST(LOGFILE) -AC_ARG_ENABLE([lockfile],[AC_HELP_STRING([--enable-lockfile=LOCKFILE], [enable scoreboard lockfile with given filename])],[],[]) +AC_ARG_ENABLE([lockfile],[AS_HELP_STRING([--enable-lockfile=LOCKFILE],[enable scoreboard lockfile with given filename])],[],[]) AC_MSG_CHECKING([for scoreboard lockfile file]) if test "x$enable_lockfile" = "xno" ; then LOCKFILE= @@ -145,7 +144,7 @@ AC_SUBST(LOCKFILE) -AC_ARG_ENABLE([savedir],[AC_HELP_STRING([--enable-savedir=SAVEDIR], [enable systemwide location for saved games])],[],[enable_savedir="no"]) +AC_ARG_ENABLE([savedir],[AS_HELP_STRING([--enable-savedir=SAVEDIR],[enable systemwide location for saved games])],[],[enable_savedir="no"]) AC_MSG_CHECKING([for save directory]) if test "x$enable_savedir" = "xno" ; then SAVEDIR= @@ -168,7 +167,7 @@ AC_SUBST(SAVEDIR) -AC_ARG_ENABLE([wizardmode],[AC_HELP_STRING([--enable-wizardmode], [enable availability of wizard mode @<:@default=no@:>@])],[],[]) +AC_ARG_ENABLE([wizardmode],[AS_HELP_STRING([--enable-wizardmode],[enable availability of wizard mode @<:@default=no@:>@])],[],[]) AC_MSG_CHECKING([if wizard mode is enabled]) if test "x$enable_wizardmode" = "xno" ; then AC_MSG_RESULT([no]) @@ -182,7 +181,7 @@ AC_MSG_RESULT([yes]) fi -AC_ARG_ENABLE([allscores],[AC_HELP_STRING([--enable-allscores], [enable scoreboard to show top scores, not just top players @<:@default=yes@:>@])],[],[enable_allscores=yes]) +AC_ARG_ENABLE([allscores],[AS_HELP_STRING([--enable-allscores],[enable scoreboard to show top scores, not just top players @<:@default=yes@:>@])],[],[enable_allscores=yes]) AC_MSG_CHECKING([if allscores is enabled]) if test "x$enable_allscores" = "xyes" ; then AC_DEFINE([ALLSCORES], [1], [Define if scorefile is top scores, not top players]) @@ -191,7 +190,7 @@ AC_MSG_RESULT([no]) fi -AC_ARG_ENABLE([checktime],[AC_HELP_STRING([--enable-checktime], [enable checktime @<:@default=no@:>@])],[],[]) +AC_ARG_ENABLE([checktime],[AS_HELP_STRING([--enable-checktime],[enable checktime @<:@default=no@:>@])],[],[]) AC_MSG_CHECKING([if checktime is enabled]) if test "x$enable_checktime" = "xyes" ; then AC_DEFINE([CHECKTIME], [1], [Define if checktime feature should be enabled]) @@ -200,7 +199,7 @@ AC_MSG_RESULT([no]) fi -AC_ARG_ENABLE([maxload],[AC_HELP_STRING([--enable-maxload], [enable maxload @<:@default=no@:>@])],[],[]) +AC_ARG_ENABLE([maxload],[AS_HELP_STRING([--enable-maxload],[enable maxload @<:@default=no@:>@])],[],[]) AC_MSG_CHECKING([runtime execution limit (maximum system load average)]) if test "x$enable_maxload" = "xyes" ; then AC_DEFINE([MAXLOAD], [100], [Define if maxload feature should be enabled]) @@ -214,7 +213,7 @@ AC_MSG_RESULT([$enable_maxload]) fi -AC_ARG_ENABLE([maxusers],[AC_HELP_STRING([--enable-maxusers], [enable maxuser @<:@default=no@:>@])],[],[]) +AC_ARG_ENABLE([maxusers],[AS_HELP_STRING([--enable-maxusers],[enable maxuser @<:@default=no@:>@])],[],[]) AC_MSG_CHECKING([runtime execution limit (maximum online system users)]) if test "x$enable_maxusers" = "xyes" ; then AC_DEFINE([MAXUSERS], [100], [Define if maxusers feature should be enabled]) @@ -228,7 +227,7 @@ AC_MSG_RESULT([$enable_maxusers]) fi -AC_ARG_ENABLE([numscores],[AC_HELP_STRING([--enable-numscores], [number of scores to store in scoreboard @<:@default=10@:>@])],[],[]) +AC_ARG_ENABLE([numscores],[AS_HELP_STRING([--enable-numscores],[number of scores to store in scoreboard @<:@default=10@:>@])],[],[]) AC_MSG_CHECKING([what the number of scores to store in scoreboard is]) if test "x$numscores" = "xyes" ; then AC_DEFINE([NUMSCORES], [10], [number of scores to store in scoreboard]) @@ -244,7 +243,7 @@ AC_MSG_RESULT([$enable_numscores]) fi -AC_ARG_ENABLE([numname],[AC_HELP_STRING([--enable-numname], [word for number of scores to store in scoreboard @<:@default=Ten@:>@])],[],[]) +AC_ARG_ENABLE([numname],[AS_HELP_STRING([--enable-numname],[word for number of scores to store in scoreboard @<:@default=Ten@:>@])],[],[]) AC_MSG_CHECKING([word for the number of scores to store in scoreboard is]) if test "x$enable_numname" = "xyes" ; then AC_DEFINE([NUMNAME], ["Ten"], [word for the number of scores to store in scoreboard]) @@ -260,7 +259,7 @@ AC_MSG_RESULT([$enable_numname]) fi -AC_ARG_ENABLE([loadav],[AC_HELP_STRING([--enable-loadav=NAMELIST], [use program's load average function (unlikely to work) @<:@default=no@:>@])],[],[]) +AC_ARG_ENABLE([loadav],[AS_HELP_STRING([--enable-loadav=NAMELIST],[use program's load average function (unlikely to work) @<:@default=no@:>@])],[],[]) AC_MSG_CHECKING([whether to use program's built in load average function]) if test "x$enable_loadav" = "xyes" ; then AC_DEFINE([LOADAV], [], [define if we should use program's load average function instead of system]) @@ -276,7 +275,7 @@ AC_MSG_RESULT([$enable_loadav]) fi -AC_ARG_ENABLE([ucount],[AC_HELP_STRING([--enable-ucount=UTMPFILE], [use program's own function to count users (unlikely to work) @<:@default=no@:>@])],[],[]) +AC_ARG_ENABLE([ucount],[AS_HELP_STRING([--enable-ucount=UTMPFILE],[use program's own function to count users (unlikely to work) @<:@default=no@:>@])],[],[]) AC_MSG_CHECKING([whether to use program's built in user counting function]) if test "x$enable_ucount" = "xyes" ; then AC_DEFINE([UCOUNT], [], [define if we should use program's user counting function instead of system's])
--- a/srogue/acinclude.m4 Tue May 04 21:03:47 2021 -0400 +++ b/srogue/acinclude.m4 Tue May 11 22:30:03 2021 -0400 @@ -6,14 +6,10 @@ then AC_CACHE_CHECK([for working curses], mp_cv_curses, [LIBS="$LIBS -lcurses" - AC_TRY_LINK( - [#include <curses.h>], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_curses=yes, mp_cv_curses=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_curses=yes],[mp_cv_curses=no])]) if test "$mp_cv_curses" = yes then AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested]) - #AC_DEFINE(HAVE_CURSES_H) CURSES_LIB="-lcurses" fi fi @@ -21,10 +17,7 @@ then AC_CACHE_CHECK([for working ncurses], mp_cv_ncurses, [LIBS="$mp_save_LIBS -lncurses" - AC_TRY_LINK( - [#include <ncurses.h>], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_ncurses=yes, mp_cv_ncurses=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ncurses.h>]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_ncurses=yes],[mp_cv_ncurses=no])]) if test "$mp_cv_ncurses" = yes then AC_DEFINE(HAVE_NCURSES_H, 1, [Define to 1 if libncurses is requested]) @@ -35,10 +28,7 @@ then AC_CACHE_CHECK([for working pdcurses], mp_cv_pdcurses, [LIBS="$mp_save_LIBS -lpdcurses" - AC_TRY_LINK( - [#include <curses.h>], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_pdcurses=yes, mp_cv_pdcurses=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_pdcurses=yes],[mp_cv_pdcurses=no])]) if test "$mp_cv_pdcurses" = yes then AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested]) @@ -49,10 +39,7 @@ then AC_CACHE_CHECK([for working pdcur], mp_cv_pdcur, [LIBS="$mp_save_LIBS -lpdcur" - AC_TRY_LINK( - [#include <curses.h>], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_pdcur=yes, mp_cv_pdcur=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_pdcur=yes],[mp_cv_pdcur=no])]) if test "$mp_cv_pdcur" = yes then AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested]) @@ -63,10 +50,7 @@ then AC_CACHE_CHECK([for working peer pdcurses], mp_cv_lpdcurses, [LIBS="$mp_save_LIBS ../pdcurses/pdcurses.a" - AC_TRY_LINK( - [#include "../pdcurses/curses.h"], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_lpdcurses=yes, mp_cv_lpdcurses=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "../pdcurses/curses.h"]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_lpdcurses=yes],[mp_cv_lpdcurses=no])]) if test "$mp_cv_lpdcurses" = yes then AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested]) @@ -76,12 +60,10 @@ fi AC_CACHE_CHECK([for ESCDELAY variable], [mc_cv_ncurses_escdelay], - [AC_TRY_LINK([], [ + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ extern int ESCDELAY; ESCDELAY = 0; - ], - [mc_cv_ncurses_escdelay=yes], - [mc_cv_ncurses_escdelay=no]) + ]])],[mc_cv_ncurses_escdelay=yes],[mc_cv_ncurses_escdelay=no]) ]) if test "$mc_cv_ncurses_escdelay" = yes; then AC_DEFINE(HAVE_ESCDELAY, 1,
--- a/srogue/configure.ac Tue May 04 21:03:47 2021 -0400 +++ b/srogue/configure.ac Tue May 11 22:30:03 2021 -0400 @@ -1,8 +1,8 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_PREREQ(2.56) -AC_INIT([SRogue],[9.0], [yendor@rogueforge.net], [srogue]) +AC_PREREQ([2.69]) +AC_INIT([Super-Rogue],[9.0],[elwin@sdf.org],[srogue]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([Makefile]) @@ -21,7 +21,6 @@ # Checks for library functions. AC_FUNC_FORK AC_PROG_GCC_TRADITIONAL -AC_TYPE_SIGNAL AC_FUNC_STAT AC_FUNC_VPRINTF AC_CHECK_FUNCS([erasechar killchar alarm getpass memset setenv strchr nlist _spawnl spawnl getpwuid loadav getloadavg strerror setgid setuid getuid getgid lrand48 random srand48 srandom]) @@ -50,11 +49,11 @@ AC_SUBST(DOCS_NROFF) AC_SUBST(DOCS_NONE) -AC_ARG_WITH(program-name, AC_HELP_STRING([--with-program-name=NAME],[alternate executable name]),[progname="$withval" ], [progname="srogue"] ) +AC_ARG_WITH(program-name, AS_HELP_STRING([--with-program-name=NAME],[alternate executable name]),[progname="$withval" ], [progname="srogue"] ) PROGRAM=$progname AC_SUBST(PROGRAM) -AC_ARG_ENABLE(setgid, AC_HELP_STRING([--enable-setgid=NAME],[install executable as setgid with group ownership of NAME @<:@default=no@:>@]),[],[]) +AC_ARG_ENABLE(setgid, AS_HELP_STRING([--enable-setgid=NAME],[install executable as setgid with group ownership of NAME @<:@default=no@:>@]),[],[]) AC_MSG_CHECKING([if using setgid execute bit]) if test "x$enable_setgid" = "xno" ; then GROUPOWNER= @@ -75,7 +74,7 @@ AC_SUBST(GROUPOWNER) -AC_ARG_ENABLE([scorefile],[AC_HELP_STRING([--enable-scorefile=SCOREFILE], [enable scoreboard with given filename])],[],[]) +AC_ARG_ENABLE([scorefile],[AS_HELP_STRING([--enable-scorefile=SCOREFILE],[enable scoreboard with given filename])],[],[]) AC_MSG_CHECKING([for scoreboard file]) if test "x$enable_scorefile" = "xno" ; then SCOREFILE= @@ -96,7 +95,7 @@ AC_SUBST(SCOREFILE) -AC_ARG_ENABLE([logfile],[AC_HELP_STRING([--enable-logfile=LOGFILE], [enable logfile with given filename])],[],[]) +AC_ARG_ENABLE([logfile],[AS_HELP_STRING([--enable-logfile=LOGFILE],[enable logfile with given filename])],[],[]) AC_MSG_CHECKING([for log file]) if test "x$enable_logfile" = "xno" ; then LOGFILE= @@ -117,7 +116,7 @@ AC_SUBST(LOGFILE) -AC_ARG_ENABLE([savedir],[AC_HELP_STRING([--enable-savedir=SAVEDIR], [enable systemwide location for saved games])],[],[enable_savedir="no"]) +AC_ARG_ENABLE([savedir],[AS_HELP_STRING([--enable-savedir=SAVEDIR],[enable systemwide location for saved games])],[],[enable_savedir="no"]) AC_MSG_CHECKING([for save directory]) if test "x$enable_savedir" = "xno" ; then SAVEDIR= @@ -140,7 +139,7 @@ AC_SUBST(SAVEDIR) -AC_ARG_ENABLE([wizardmode],[AC_HELP_STRING([--enable-wizardmode], [enable availability of wizard mode @<:@default=no@:>@])],[],[]) +AC_ARG_ENABLE([wizardmode],[AS_HELP_STRING([--enable-wizardmode],[enable availability of wizard mode @<:@default=no@:>@])],[],[]) AC_MSG_CHECKING([if wizard mode is enabled]) if test "x$enable_wizardmode" = "xno" ; then AC_MSG_RESULT([no])
--- a/urogue/acinclude.m4 Tue May 04 21:03:47 2021 -0400 +++ b/urogue/acinclude.m4 Tue May 11 22:30:03 2021 -0400 @@ -6,14 +6,10 @@ then AC_CACHE_CHECK([for working curses], mp_cv_curses, [LIBS="$LIBS -lcurses" - AC_TRY_LINK( - [#include <curses.h>], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_curses=yes, mp_cv_curses=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_curses=yes],[mp_cv_curses=no])]) if test "$mp_cv_curses" = yes then AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested]) - #AC_DEFINE(HAVE_CURSES_H) CURSES_LIB="-lcurses" fi fi @@ -21,10 +17,7 @@ then AC_CACHE_CHECK([for working ncurses], mp_cv_ncurses, [LIBS="$mp_save_LIBS -lncurses" - AC_TRY_LINK( - [#include <ncurses.h>], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_ncurses=yes, mp_cv_ncurses=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ncurses.h>]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_ncurses=yes],[mp_cv_ncurses=no])]) if test "$mp_cv_ncurses" = yes then AC_DEFINE(HAVE_NCURSES_H, 1, [Define to 1 if libncurses is requested]) @@ -35,10 +28,7 @@ then AC_CACHE_CHECK([for working pdcurses], mp_cv_pdcurses, [LIBS="$mp_save_LIBS -lpdcurses" - AC_TRY_LINK( - [#include <curses.h>], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_pdcurses=yes, mp_cv_pdcurses=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_pdcurses=yes],[mp_cv_pdcurses=no])]) if test "$mp_cv_pdcurses" = yes then AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested]) @@ -49,10 +39,7 @@ then AC_CACHE_CHECK([for working pdcur], mp_cv_pdcur, [LIBS="$mp_save_LIBS -lpdcur" - AC_TRY_LINK( - [#include <curses.h>], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_pdcur=yes, mp_cv_pdcur=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_pdcur=yes],[mp_cv_pdcur=no])]) if test "$mp_cv_pdcur" = yes then AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested]) @@ -63,10 +50,7 @@ then AC_CACHE_CHECK([for working peer pdcurses], mp_cv_lpdcurses, [LIBS="$mp_save_LIBS ../pdcurses/pdcurses.a" - AC_TRY_LINK( - [#include "../pdcurses/curses.h"], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_lpdcurses=yes, mp_cv_lpdcurses=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "../pdcurses/curses.h"]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_lpdcurses=yes],[mp_cv_lpdcurses=no])]) if test "$mp_cv_lpdcurses" = yes then AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested]) @@ -76,12 +60,10 @@ fi AC_CACHE_CHECK([for ESCDELAY variable], [mc_cv_ncurses_escdelay], - [AC_TRY_LINK([], [ + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ extern int ESCDELAY; ESCDELAY = 0; - ], - [mc_cv_ncurses_escdelay=yes], - [mc_cv_ncurses_escdelay=no]) + ]])],[mc_cv_ncurses_escdelay=yes],[mc_cv_ncurses_escdelay=no]) ]) if test "$mc_cv_ncurses_escdelay" = yes; then AC_DEFINE(HAVE_ESCDELAY, 1,
--- a/urogue/configure.ac Tue May 04 21:03:47 2021 -0400 +++ b/urogue/configure.ac Tue May 11 22:30:03 2021 -0400 @@ -1,8 +1,8 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_PREREQ(2.56) -AC_INIT([UltraRogue],[1.07], [yendor@rogueforge.net], [urogue]) +AC_PREREQ([2.69]) +AC_INIT([UltraRogue],[1.07],[elwin@sdf.org],[urogue]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([Makefile]) @@ -23,7 +23,6 @@ AC_PROG_GCC_TRADITIONAL AC_FUNC_LSTAT AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK -AC_TYPE_SIGNAL AC_FUNC_STAT AC_FUNC_VPRINTF AC_CHECK_FUNCS([erasechar killchar alarm getpass memset setenv strchr nlist _spawnl spawnl getpwuid loadav getloadavg strerror setgid setuid getuid getgid]) @@ -52,11 +51,11 @@ AC_SUBST(DOCS_NROFF) AC_SUBST(DOCS_NONE) -AC_ARG_WITH(program-name, AC_HELP_STRING([--with-program-name=NAME],[alternate executable name]),[progname="$withval" ], [progname="urogue"] ) +AC_ARG_WITH(program-name, AS_HELP_STRING([--with-program-name=NAME],[alternate executable name]),[progname="$withval" ], [progname="urogue"] ) PROGRAM=$progname AC_SUBST(PROGRAM) -AC_ARG_ENABLE(setgid, AC_HELP_STRING([--enable-setgid=NAME],[install executable as setgid with group ownership of NAME @<:@default=no@:>@]),[],[]) +AC_ARG_ENABLE(setgid, AS_HELP_STRING([--enable-setgid=NAME],[install executable as setgid with group ownership of NAME @<:@default=no@:>@]),[],[]) AC_MSG_CHECKING([if using setgid execute bit]) if test "x$enable_setgid" = "xno" ; then GROUPOWNER= @@ -77,7 +76,7 @@ AC_SUBST(GROUPOWNER) -AC_ARG_ENABLE([scorefile],[AC_HELP_STRING([--enable-scorefile=SCOREFILE], [enable scoreboard with given filename])],[],[]) +AC_ARG_ENABLE([scorefile],[AS_HELP_STRING([--enable-scorefile=SCOREFILE],[enable scoreboard with given filename])],[],[]) AC_MSG_CHECKING([for scoreboard file]) if test "x$enable_scorefile" = "xno" ; then SCOREFILE= @@ -98,7 +97,7 @@ AC_SUBST(SCOREFILE) -AC_ARG_ENABLE([logfile],[AC_HELP_STRING([--enable-logfile=LOGFILE], [enable logfile with given filename])],[],[]) +AC_ARG_ENABLE([logfile],[AS_HELP_STRING([--enable-logfile=LOGFILE],[enable logfile with given filename])],[],[]) AC_MSG_CHECKING([for log file]) if test "x$enable_logfile" = "xno" ; then LOGFILE= @@ -119,7 +118,7 @@ AC_SUBST(LOGFILE) -AC_ARG_ENABLE([savedir],[AC_HELP_STRING([--enable-savedir=SAVEDIR], [enable systemwide location for saved games])],[],[enable_savedir="no"]) +AC_ARG_ENABLE([savedir],[AS_HELP_STRING([--enable-savedir=SAVEDIR],[enable systemwide location for saved games])],[],[enable_savedir="no"]) AC_MSG_CHECKING([for save directory]) if test "x$enable_savedir" = "xno" ; then SAVEDIR= @@ -142,7 +141,7 @@ AC_SUBST(SAVEDIR) -AC_ARG_ENABLE([chardir],[AC_HELP_STRING([--enable-chardir=CHARDIR], [enable systemwide location for character files])],[],[enable_chardir="no"]) +AC_ARG_ENABLE([chardir],[AS_HELP_STRING([--enable-chardir=CHARDIR],[enable systemwide location for character files])],[],[enable_chardir="no"]) AC_MSG_CHECKING([for character directory]) if test "x$enable_chardir" = "xno" ; then CHARDIR= @@ -165,7 +164,7 @@ AC_SUBST(CHARDIR) -AC_ARG_ENABLE([wizardmode],[AC_HELP_STRING([--enable-wizardmode], [enable availability of wizard mode @<:@default=no@:>@])],[],[]) +AC_ARG_ENABLE([wizardmode],[AS_HELP_STRING([--enable-wizardmode],[enable availability of wizard mode @<:@default=no@:>@])],[],[]) AC_MSG_CHECKING([if wizard mode is enabled]) if test "x$enable_wizardmode" = "xno" ; then AC_MSG_RESULT([no]) @@ -176,7 +175,7 @@ AC_MSG_RESULT([yes]) fi -AC_ARG_ENABLE([memdebug],[AC_HELP_STRING([--enable-memdebug], [enable built-in memory checking @<:@default=no@:>@])],[],[]) +AC_ARG_ENABLE([memdebug],[AS_HELP_STRING([--enable-memdebug],[enable built-in memory checking @<:@default=no@:>@])],[],[]) AC_MSG_CHECKING([if memory checking is enabled]) if test "x$enable_memdebug" = "xno" ; then AC_MSG_RESULT([no])
--- a/xrogue/acinclude.m4 Tue May 04 21:03:47 2021 -0400 +++ b/xrogue/acinclude.m4 Tue May 11 22:30:03 2021 -0400 @@ -6,14 +6,10 @@ then AC_CACHE_CHECK([for working curses], mp_cv_curses, [LIBS="$LIBS -lcurses" - AC_TRY_LINK( - [#include <curses.h>], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_curses=yes, mp_cv_curses=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_curses=yes],[mp_cv_curses=no])]) if test "$mp_cv_curses" = yes then AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested]) - #AC_DEFINE(HAVE_CURSES_H) CURSES_LIB="-lcurses" fi fi @@ -21,10 +17,7 @@ then AC_CACHE_CHECK([for working ncurses], mp_cv_ncurses, [LIBS="$mp_save_LIBS -lncurses" - AC_TRY_LINK( - [#include <ncurses.h>], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_ncurses=yes, mp_cv_ncurses=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ncurses.h>]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_ncurses=yes],[mp_cv_ncurses=no])]) if test "$mp_cv_ncurses" = yes then AC_DEFINE(HAVE_NCURSES_H, 1, [Define to 1 if libncurses is requested]) @@ -35,10 +28,7 @@ then AC_CACHE_CHECK([for working pdcurses], mp_cv_pdcurses, [LIBS="$mp_save_LIBS -lpdcurses" - AC_TRY_LINK( - [#include <curses.h>], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_pdcurses=yes, mp_cv_pdcurses=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_pdcurses=yes],[mp_cv_pdcurses=no])]) if test "$mp_cv_pdcurses" = yes then AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested]) @@ -49,10 +39,7 @@ then AC_CACHE_CHECK([for working pdcur], mp_cv_pdcur, [LIBS="$mp_save_LIBS -lpdcur" - AC_TRY_LINK( - [#include <curses.h>], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_pdcur=yes, mp_cv_pdcur=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_pdcur=yes],[mp_cv_pdcur=no])]) if test "$mp_cv_pdcur" = yes then AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested]) @@ -63,10 +50,7 @@ then AC_CACHE_CHECK([for working peer pdcurses], mp_cv_lpdcurses, [LIBS="$mp_save_LIBS ../pdcurses/pdcurses.a" - AC_TRY_LINK( - [#include "../pdcurses/curses.h"], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - mp_cv_lpdcurses=yes, mp_cv_lpdcurses=no)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "../pdcurses/curses.h"]], [[chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ]])],[mp_cv_lpdcurses=yes],[mp_cv_lpdcurses=no])]) if test "$mp_cv_lpdcurses" = yes then AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested]) @@ -76,12 +60,10 @@ fi AC_CACHE_CHECK([for ESCDELAY variable], [mc_cv_ncurses_escdelay], - [AC_TRY_LINK([], [ + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ extern int ESCDELAY; ESCDELAY = 0; - ], - [mc_cv_ncurses_escdelay=yes], - [mc_cv_ncurses_escdelay=no]) + ]])],[mc_cv_ncurses_escdelay=yes],[mc_cv_ncurses_escdelay=no]) ]) if test "$mc_cv_ncurses_escdelay" = yes; then AC_DEFINE(HAVE_ESCDELAY, 1,
--- a/xrogue/configure.ac Tue May 04 21:03:47 2021 -0400 +++ b/xrogue/configure.ac Tue May 11 22:30:03 2021 -0400 @@ -1,8 +1,8 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_PREREQ(2.56) -AC_INIT([XRogue],[8.0.3], [yendor@rogueforge.net], [xrogue]) +AC_PREREQ([2.69]) +AC_INIT([XRogue],[8.0.3],[elwin@sdf.org],[xrogue]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([Makefile]) @@ -21,15 +21,14 @@ AC_FUNC_FORK AC_PROG_GCC_TRADITIONAL AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK -AC_TYPE_SIGNAL AC_CHECK_FUNCS([erasechar killchar alarm getpass memset setenv strchr _spawnl spawnl getpwuid loadav strerror setgid setuid getuid getgid]) AC_PROG_INSTALL -AC_ARG_WITH(program-name, AC_HELP_STRING([--with-program-name=NAME],[alternate executable name]),[progname="$withval" ], [progname="xrogue"] ) +AC_ARG_WITH(program-name, AS_HELP_STRING([--with-program-name=NAME],[alternate executable name]),[progname="$withval" ], [progname="xrogue"] ) PROGRAM=$progname AC_SUBST(PROGRAM) -AC_ARG_ENABLE(setgid, AC_HELP_STRING([--enable-setgid=NAME],[install executable as setgid with group ownership of NAME @<:@default=no@:>@]),[],[]) +AC_ARG_ENABLE(setgid, AS_HELP_STRING([--enable-setgid=NAME],[install executable as setgid with group ownership of NAME @<:@default=no@:>@]),[],[]) AC_MSG_CHECKING([if using setgid execute bit]) if test "x$enable_setgid" = "xno" ; then GROUPOWNER= @@ -50,7 +49,7 @@ AC_SUBST(GROUPOWNER) -AC_ARG_ENABLE([scorefile],[AC_HELP_STRING([--enable-scorefile=SCOREFILE], [enable scoreboard with given filename])],[],[]) +AC_ARG_ENABLE([scorefile],[AS_HELP_STRING([--enable-scorefile=SCOREFILE],[enable scoreboard with given filename])],[],[]) AC_MSG_CHECKING([for scoreboard file]) if test "x$enable_scorefile" = "xno" ; then SCOREFILE= @@ -71,7 +70,7 @@ AC_SUBST(SCOREFILE) -AC_ARG_ENABLE([logfile],[AC_HELP_STRING([--enable-logfile=LOGFILE], [enable logfile with given filename])],[],[]) +AC_ARG_ENABLE([logfile],[AS_HELP_STRING([--enable-logfile=LOGFILE],[enable logfile with given filename])],[],[]) AC_MSG_CHECKING([for log file]) if test "x$enable_logfile" = "xno" ; then LOGFILE= @@ -92,7 +91,7 @@ AC_SUBST(LOGFILE) -AC_ARG_ENABLE([savedir],[AC_HELP_STRING([--enable-savedir=SAVEDIR], [enable systemwide location for saved games])],[],[enable_savedir="no"]) +AC_ARG_ENABLE([savedir],[AS_HELP_STRING([--enable-savedir=SAVEDIR],[enable systemwide location for saved games])],[],[enable_savedir="no"]) AC_MSG_CHECKING([for save directory]) if test "x$enable_savedir" = "xno" ; then SAVEDIR= @@ -115,7 +114,7 @@ AC_SUBST(SAVEDIR) -AC_ARG_ENABLE([wizardmode],[AC_HELP_STRING([--enable-wizardmode], [enable availability of wizard mode @<:@default=no@:>@])],[],[]) +AC_ARG_ENABLE([wizardmode],[AS_HELP_STRING([--enable-wizardmode],[enable availability of wizard mode @<:@default=no@:>@])],[],[]) AC_MSG_CHECKING([if wizard mode is enabled]) if test "x$enable_wizardmode" = "xno" ; then AC_MSG_RESULT([no]) @@ -126,7 +125,7 @@ AC_MSG_RESULT([yes]) fi -AC_ARG_ENABLE([limitscore],[AC_HELP_STRING([--enable-limitscore], [limit scores to one per class per uid @<:@default=no@:>@])],[],[]) +AC_ARG_ENABLE([limitscore],[AS_HELP_STRING([--enable-limitscore],[limit scores to one per class per uid @<:@default=no@:>@])],[],[]) AC_MSG_CHECKING([if limiting scores]) if test "x$enable_limitscore" = "xno" ; then AC_MSG_RESULT([no])