Mercurial > hg > early-roguelike

changeset 312:029c1f5c5588

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 @@