warden/early-roguelike
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update the Autoconf files.

Browse source 
These are mostly automatic updates for obsolete macros.
This commit is contained in:
John "Elwin" Edwards 2021-05-11 22:30:03 -04:00
parent 06cad9ee1e
commit 6a654fbe69
17 changed files with 187 additions and 314 deletions
Download patch file Download diff file Expand all files Collapse all files

32
urogue/acinclude.m4
View file

@ -6,14 +6,10 @@ AC_DEFUN([MP_WITH_CURSES],
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 @@ AC_DEFUN([MP_WITH_CURSES],
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 @@ AC_DEFUN([MP_WITH_CURSES],
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 @@ AC_DEFUN([MP_WITH_CURSES],
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 @@ AC_DEFUN([MP_WITH_CURSES],
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 @@ AC_DEFUN([MP_WITH_CURSES],
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,

21
urogue/configure.ac
View file

@ -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_FUNC_FORK
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_GROFF)
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 @@ fi
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 @@ fi
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 @@ fi
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 @@ fi
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 @@ fi
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_DEFINE([WIZARD], [], [Define to include wizard mode])
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])