# HG changeset patch # User John "Elwin" Edwards # Date 1377965887 25200 # Node ID dfeed24bb6163a1528b6d55f81f9373cda51e964 # Parent ea71ef31d9be6fa325adc0b3b66ecb879a091513 arogue5: port to autoconf. 'configure' and 'make install' now work. There may be problems with hard-to-test features like MAXLOAD. diff -r ea71ef31d9be -r dfeed24bb616 arogue5/Makefile --- a/arogue5/Makefile Wed Aug 28 18:54:35 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,203 +0,0 @@ -# -# Makefile for rogue -# -# Advanced Rogue -# Copyright (C) 1984, 1985 Michael Morgan, Ken Dalka and AT&T -# All rights reserved. -# -# Based on "Rogue: Exploring the Dungeons of Doom" -# Copyright (C) 1980, 1981 Michael Toy, Ken Arnold and Glenn Wichman -# All rights reserved. -# -# See the file LICENSE.TXT for full copyright and licensing information. -# - -DISTNAME=arogue5.8.2 -PROGRAM=arogue5 - -O=o - -HDRS = rogue.h mach_dep.h network.h -OBJS1 = chase.$(O) command.$(O) daemon.$(O) daemons.$(O) encumb.$(O) \ - fight.$(O) init.$(O) io.$(O) list.$(O) main.$(O) maze.$(O) mdport.$(O)\ - misc.$(O) monsters.$(O) move.$(O) new_level.$(O) options.$(O) \ - outside.$(O) -OBJS2 = pack.$(O) passages.$(O) player.$(O) potions.$(O) rings.$(O) rip.$(O) \ - rogue.$(O) rooms.$(O) save.$(O) scrolls.$(O) state.$(O) sticks.$(O) \ - things.$(O) trader.$(O) util.$(O) vers.$(O) weapons.$(O) wear.$(O) \ - wizard.$(O) xcrypt.$(O) -OBJS = $(OBJS1) $(OBJS2) -CFILES= \ - vers.c chase.c command.c daemon.c daemons.c encumb.c \ - fight.c init.c io.c list.c main.c maze.c mdport.c misc.c monsters.c \ - move.c new_level.c options.c outside.c pack.c passages.c player.c \ - potions.c rings.c rip.c rogue.c \ - rooms.c save.c scrolls.c state.c sticks.c things.c trader.c util.c \ - weapons.c wear.c wizard.c xcrypt.c - -MISC= Makefile LICENSE.TXT arogue58.sln arogue58.vcproj -DOCS= arogue58.doc arogue58.html - -CC = gcc -CFLAGS= -g -CRLIB = -lcurses -RM = rm -f -TAR = tar -.SUFFIXES: .obj - -.c.obj: - $(CC) $(CFLAGS) /c $*.c - -$(PROGRAM): $(OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(CRLIB) -o $@ - -tags: $(HDRS) $(CFILES) - ctags -u $? - ed - tags < :ctfix - sort tags -o tags - -lint: - lint -hxbc $(CFILES) $(CRLIB) > linterrs - -clean: - $(RM) $(OBJS1) - $(RM) $(OBJS2) - $(RM) core a.exe a.out a.exe.stackdump $(PROGRAM) $(PROGRAM).exe $(PROGRAM).tar $(PROGRAM).tar.gz $(PROGRAM).zip - -count: - wc -l $(HDRS) $(CFILES) - -realcount: - cc -E $(CFILES) | ssp - | wc -l - -update: - ar uv .SAVE $(CFILES) $(HDRS) $(MISC) - -dist: - @mkdir dist - cp $(CFILES) $(HDRS) $(MISC) dist - -dist.src: - make clean - tar cf $(DISTNAME)-src.tar $(CFILES) $(HDRS) $(MISC) $(DOCS) - gzip -f $(DISTNAME)-src.tar - -dist.irix: - make clean - make CC=cc CFLAGS="-woff 1116 -O3" $(PROGRAM) - tar cf $(DISTNAME)-irix.tar $(PROGRAM) LICENSE.TXT $(DOCS) - gzip -f $(DISTNAME)-irix.tar - -dist.aix: - make clean - make CC=xlc CFLAGS="-qmaxmem=16768 -O3 -qstrict" $(PROGRAM) - tar cf $(DISTNAME)-aix.tar $(PROGRAM) LICENSE.TXT $(DOCS) - gzip -f $(DISTNAME)-aix.tar - -debug.linux: - make clean - make CFLAGS="-g -DWIZARD" $(PROGRAM) - -dist.linux: - make clean - make $(PROGRAM) - tar cf $(DISTNAME)-linux.tar $(PROGRAM) LICENSE.TXT $(DOCS) - gzip -f $(DISTNAME)-linux.tar - -debug.interix: - make clean - make CFLAGS="-g3 -DWIZARD" $(PROGRAM) - -dist.interix: - make clean - make $(PROGRAM) - tar cf $(DISTNAME)-interix.tar $(PROGRAM) LICENSE.TXT $(DOCS) - gzip -f $(DISTNAME)-interix.tar - -debug.cygwin: - make clean - make CFLAGS="-g3 -DWIZARD" $(PROGRAM) - -dist.cygwin: - make clean - make CRLIB="-static -lcurses" $(PROGRAM) - tar cf $(DISTNAME)-cygwin.tar $(PROGRAM).exe LICENSE.TXT $(DOCS) - gzip -f $(DISTNAME)-cygwin.tar - -# -# Use MINGW32-MAKE to build this target -# -dist.mingw32: - @$(MAKE) --no-print-directory RM="cmd /c del" clean - @$(MAKE) --no-print-directory CRLIB="-lpdcurses" $(PROGRAM) - cmd /c del $(DISTNAME)-mingw32.zip - zip $(DISTNAME)-mingw32.zip $(PROGRAM).exe LICENSE.TXT $(DOCS) - -dist.msys: - @$(MAKE) --no-print-directory clean - @$(MAKE) --no-print-directory CRLIB="-lcurses" $(PROGRAM) - tar cf $(DISTNAME)-msys.tar $(PROGRAM).exe LICENSE.TXT $(DOCS) - gzip -f $(DISTNAME)-msys.tar - -debug.djgpp: - make clean - make CFGLAGS="-g3 -DWIZARD" LDFLAGS="-L$(DJDIR)/LIB" CRLIB="-lpdcurses" $(PROGRAM) - -dist.djgpp: - make clean - make LDFLAGS="-L$(DJDIR)/LIB" CRLIB="-lpdcurses" $(PROGRAM) - rm -f $(DISTNAME)-djgpp.zip - zip $(DISTNAME)-djgpp.zip $(PROGRAM).exe LICENSE.TXT $(DOCS) - -# -# Use NMAKE to build this target -# - -debug.win32: - nmake O="obj" RM="-del" clean - nmake O="obj" CC="CL" CRLIB="..\pdcurses\pdcurses.lib shfolder.lib user32.lib Advapi32.lib" CFLAGS="-DWIZARD -nologo -I..\pdcurses -Ox -wd4033 -wd4716" $(PROGRAM) - -dist.win32: - nmake O="obj" RM="-del" clean - nmake O="obj" CC="CL" CRLIB="..\pdcurses\pdcurses.lib shfolder.lib user32.lib Advapi32.lib" CFLAGS="-nologo -I..\pdcurses -Ox -wd4033 -wd4716" $(PROGRAM) - -del $(DISTNAME)-win32.zip - zip $(DISTNAME)-win32.zip $(PROGRAM).exe LICENSE.TXT $(DOCS) - -vers.$(O): vers.c rogue.h -chase.$(O): chase.c rogue.h -command.$(O): command.c rogue.h -daemon.$(O): daemon.c rogue.h -daemons.$(O): daemons.c rogue.h -encumb.$(O): encumb.c rogue.h -fight.$(O): fight.c rogue.h -init.$(O): init.c rogue.h -io.$(O): io.c rogue.h -list.$(O): list.c rogue.h -main.$(O): main.c rogue.h -maze.$(O): maze.c rogue.h -misc.$(O): misc.c rogue.h -monsters.$(O): monsters.c rogue.h -move.$(O): move.c rogue.h -new_level.$(O): new_level.c rogue.h -options.$(O): options.c rogue.h -outside.$(O): outside.c rogue.h -pack.$(O): pack.c rogue.h -passages.$(O): passages.c rogue.h -player.$(O): player.c rogue.h -potions.$(O): potions.c rogue.h -rings.$(O): rings.c rogue.h -rip.$(O): rip.c rogue.h -rogue.$(O): rogue.c rogue.h -rooms.$(O): rooms.c rogue.h -save.$(O): save.c rogue.h -scrolls.$(O): scrolls.c rogue.h -state.$(O): state.c rogue.h -sticks.$(O): sticks.c rogue.h -things.$(O): things.c rogue.h -trader.$(O): trader.c rogue.h -util.$(O): util.c rogue.h -weapons.$(O): weapons.c rogue.h -wear.$(O): wear.c rogue.h -wizard.$(O): wizard.c rogue.h -xcrypt.$(O): xcrypt.c - diff -r ea71ef31d9be -r dfeed24bb616 arogue5/Makefile.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/arogue5/Makefile.in Sat Aug 31 09:18:07 2013 -0700 @@ -0,0 +1,249 @@ +# +# Makefile for rogue +# +# Advanced Rogue +# Copyright (C) 1984, 1985 Michael Morgan, Ken Dalka and AT&T +# All rights reserved. +# +# Based on "Rogue: Exploring the Dungeons of Doom" +# Copyright (C) 1980, 1981 Michael Toy, Ken Arnold and Glenn Wichman +# All rights reserved. +# +# See the file LICENSE.TXT for full copyright and licensing information. +# + +DISTNAME=@PACKAGE_TARNAME@@PACKAGE_VERSION@ +PACKAGE_TARNAME=@PACKAGE_TARNAME@-@PACKAGE_VERSION@ +PROGRAM=@PROGRAM@ + +SCOREFILE=@SCOREFILE@ +LOGFILE=@LOGFILE@ +SAVEDIR=@SAVEDIR@ +GROUPOWNER=@GROUPOWNER@ + +DESTDIR= +prefix=@prefix@ +exec_prefix=@exec_prefix@ +datarootdir=@datarootdir@ +bindir=@bindir@ +docdir=@docdir@ + +O=o + +HDRS = rogue.h mach_dep.h network.h +OBJS1 = chase.$(O) command.$(O) daemon.$(O) daemons.$(O) encumb.$(O) \ + fight.$(O) init.$(O) io.$(O) list.$(O) main.$(O) maze.$(O) mdport.$(O)\ + misc.$(O) monsters.$(O) move.$(O) new_level.$(O) options.$(O) \ + outside.$(O) +OBJS2 = pack.$(O) passages.$(O) player.$(O) potions.$(O) rings.$(O) rip.$(O) \ + rogue.$(O) rooms.$(O) save.$(O) scrolls.$(O) state.$(O) sticks.$(O) \ + things.$(O) trader.$(O) util.$(O) vers.$(O) weapons.$(O) wear.$(O) \ + wizard.$(O) xcrypt.$(O) +OBJS = $(OBJS1) $(OBJS2) +CFILES= \ + vers.c chase.c command.c daemon.c daemons.c encumb.c \ + fight.c init.c io.c list.c main.c maze.c mdport.c misc.c monsters.c \ + move.c new_level.c options.c outside.c pack.c passages.c player.c \ + potions.c rings.c rip.c rogue.c \ + rooms.c save.c scrolls.c state.c sticks.c things.c trader.c util.c \ + weapons.c wear.c wizard.c xcrypt.c + +MISC= Makefile LICENSE.TXT arogue58.sln arogue58.vcproj +DOCS= arogue58.doc arogue58.html + +CC = gcc +CPPFLAGS =@DEFS@ +CFLAGS= -g +CRLIB = -lcurses +RM = rm -f +TAR = tar +INSTALL=@INSTALL@ +.SUFFIXES: .obj + +.c.obj: + $(CC) $(CFLAGS) /c $*.c + +$(PROGRAM): $(OBJS) + $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(CRLIB) -o $@ + +tags: $(HDRS) $(CFILES) + ctags -u $? + ed - tags < :ctfix + sort tags -o tags + +lint: + lint -hxbc $(CFILES) $(CRLIB) > linterrs + +install: $(PROGRAM) + -touch test + -if test ! -f $(DESTDIR)$(SCOREFILE) ; \ + then $(INSTALL) -m 0664 test $(DESTDIR)$(SCOREFILE) ; fi + -if test "x$(LOGFILE)" != "x" && test ! -f $(DESTDIR)$(LOGFILE) ; then \ + $(INSTALL) -m 0664 test $(DESTDIR)$(LOGFILE) ; fi + -if test "x$(SAVEDIR)" != "x" && test ! -d $(DESTDIR)$(SAVEDIR) ; then \ + mkdir -p $(DESTDIR)$(SAVEDIR) ; fi + -$(INSTALL) -m 0755 $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM) + -if test "x$(GROUPOWNER)" != "x" ; then \ + chgrp $(GROUPOWNER) $(DESTDIR)$(SCOREFILE) ; \ + chgrp $(GROUPOWNER) $(DESTDIR)$(LOGFILE) ; \ + chgrp $(GROUPOWNER) $(DESTDIR)$(bindir)/$(PROGRAM) ; \ + chgrp $(GROUPOWNER) $(DESTDIR)$(SAVEDIR) ; \ + chmod 02755 $(DESTDIR)$(bindir)/$(PROGRAM) ; \ + chmod 0464 $(DESTDIR)$(SCOREFILE) ; \ + chmod 0464 $(DESTDIR)$(LOGFILE) ; \ + chmod 0775 $(DESTDIR)$(SAVEDIR) ; \ + fi + -if test ! -d $(DESTDIR)$(docdir) ; \ + then mkdir -p $(DESTDIR)$(docdir) ; fi + -$(INSTALL) -m 0644 LICENSE.TXT $(DESTDIR)$(docdir)/LICENSE.TXT + -$(INSTALL) -m 0644 $(DOCS) $(DESTDIR)$(docdir) + -$(RM) test + +uninstall: + -$(RM) $(DESTDIR)$(bindir)/$(PROGRAM) + -$(RM) -r $(DESTDIR)$(docdir) + +reinstall: uninstall install + +clean: + $(RM) $(OBJS1) + $(RM) $(OBJS2) + $(RM) core a.exe a.out a.exe.stackdump $(PROGRAM) $(PROGRAM).exe $(PROGRAM).tar $(PROGRAM).tar.gz $(PROGRAM).zip + +count: + wc -l $(HDRS) $(CFILES) + +realcount: + cc -E $(CFILES) | ssp - | wc -l + +update: + ar uv .SAVE $(CFILES) $(HDRS) $(MISC) + +dist: + @mkdir dist + cp $(CFILES) $(HDRS) $(MISC) dist + +dist.src: + make clean + tar cf $(DISTNAME)-src.tar $(CFILES) $(HDRS) $(MISC) $(DOCS) + gzip -f $(DISTNAME)-src.tar + +dist.irix: + make clean + make CC=cc CFLAGS="-woff 1116 -O3" $(PROGRAM) + tar cf $(DISTNAME)-irix.tar $(PROGRAM) LICENSE.TXT $(DOCS) + gzip -f $(DISTNAME)-irix.tar + +dist.aix: + make clean + make CC=xlc CFLAGS="-qmaxmem=16768 -O3 -qstrict" $(PROGRAM) + tar cf $(DISTNAME)-aix.tar $(PROGRAM) LICENSE.TXT $(DOCS) + gzip -f $(DISTNAME)-aix.tar + +debug.linux: + make clean + make CFLAGS="-g -DWIZARD" $(PROGRAM) + +dist.linux: + make clean + make $(PROGRAM) + tar cf $(DISTNAME)-linux.tar $(PROGRAM) LICENSE.TXT $(DOCS) + gzip -f $(DISTNAME)-linux.tar + +debug.interix: + make clean + make CFLAGS="-g3 -DWIZARD" $(PROGRAM) + +dist.interix: + make clean + make $(PROGRAM) + tar cf $(DISTNAME)-interix.tar $(PROGRAM) LICENSE.TXT $(DOCS) + gzip -f $(DISTNAME)-interix.tar + +debug.cygwin: + make clean + make CFLAGS="-g3 -DWIZARD" $(PROGRAM) + +dist.cygwin: + make clean + make CRLIB="-static -lcurses" $(PROGRAM) + tar cf $(DISTNAME)-cygwin.tar $(PROGRAM).exe LICENSE.TXT $(DOCS) + gzip -f $(DISTNAME)-cygwin.tar + +# +# Use MINGW32-MAKE to build this target +# +dist.mingw32: + @$(MAKE) --no-print-directory RM="cmd /c del" clean + @$(MAKE) --no-print-directory CRLIB="-lpdcurses" $(PROGRAM) + cmd /c del $(DISTNAME)-mingw32.zip + zip $(DISTNAME)-mingw32.zip $(PROGRAM).exe LICENSE.TXT $(DOCS) + +dist.msys: + @$(MAKE) --no-print-directory clean + @$(MAKE) --no-print-directory CRLIB="-lcurses" $(PROGRAM) + tar cf $(DISTNAME)-msys.tar $(PROGRAM).exe LICENSE.TXT $(DOCS) + gzip -f $(DISTNAME)-msys.tar + +debug.djgpp: + make clean + make CFGLAGS="-g3 -DWIZARD" LDFLAGS="-L$(DJDIR)/LIB" CRLIB="-lpdcurses" $(PROGRAM) + +dist.djgpp: + make clean + make LDFLAGS="-L$(DJDIR)/LIB" CRLIB="-lpdcurses" $(PROGRAM) + rm -f $(DISTNAME)-djgpp.zip + zip $(DISTNAME)-djgpp.zip $(PROGRAM).exe LICENSE.TXT $(DOCS) + +# +# Use NMAKE to build this target +# + +debug.win32: + nmake O="obj" RM="-del" clean + nmake O="obj" CC="CL" CRLIB="..\pdcurses\pdcurses.lib shfolder.lib user32.lib Advapi32.lib" CFLAGS="-DWIZARD -nologo -I..\pdcurses -Ox -wd4033 -wd4716" $(PROGRAM) + +dist.win32: + nmake O="obj" RM="-del" clean + nmake O="obj" CC="CL" CRLIB="..\pdcurses\pdcurses.lib shfolder.lib user32.lib Advapi32.lib" CFLAGS="-nologo -I..\pdcurses -Ox -wd4033 -wd4716" $(PROGRAM) + -del $(DISTNAME)-win32.zip + zip $(DISTNAME)-win32.zip $(PROGRAM).exe LICENSE.TXT $(DOCS) + +vers.$(O): vers.c rogue.h +chase.$(O): chase.c rogue.h +command.$(O): command.c rogue.h +daemon.$(O): daemon.c rogue.h +daemons.$(O): daemons.c rogue.h +encumb.$(O): encumb.c rogue.h +fight.$(O): fight.c rogue.h +init.$(O): init.c rogue.h +io.$(O): io.c rogue.h +list.$(O): list.c rogue.h +main.$(O): main.c rogue.h +maze.$(O): maze.c rogue.h +misc.$(O): misc.c rogue.h +monsters.$(O): monsters.c rogue.h +move.$(O): move.c rogue.h +new_level.$(O): new_level.c rogue.h +options.$(O): options.c rogue.h +outside.$(O): outside.c rogue.h +pack.$(O): pack.c rogue.h +passages.$(O): passages.c rogue.h +player.$(O): player.c rogue.h +potions.$(O): potions.c rogue.h +rings.$(O): rings.c rogue.h +rip.$(O): rip.c rogue.h +rogue.$(O): rogue.c rogue.h +rooms.$(O): rooms.c rogue.h +save.$(O): save.c rogue.h +scrolls.$(O): scrolls.c rogue.h +state.$(O): state.c rogue.h +sticks.$(O): sticks.c rogue.h +things.$(O): things.c rogue.h +trader.$(O): trader.c rogue.h +util.$(O): util.c rogue.h +weapons.$(O): weapons.c rogue.h +wear.$(O): wear.c rogue.h +wizard.$(O): wizard.c rogue.h +xcrypt.$(O): xcrypt.c + diff -r ea71ef31d9be -r dfeed24bb616 arogue5/acinclude.m4 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/arogue5/acinclude.m4 Sat Aug 31 09:18:07 2013 -0700 @@ -0,0 +1,122 @@ +AC_DEFUN([MP_WITH_CURSES], + [AC_ARG_WITH(ncurses, [ --with-ncurses Force the use of ncurses over curses],,) + mp_save_LIBS="$LIBS" + CURSES_LIB="" + if test "$with_ncurses" != yes + then + AC_CACHE_CHECK([for working curses], mp_cv_curses, + [LIBS="$LIBS -lcurses" + AC_TRY_LINK( + [#include ], + [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 + if test ! "$CURSES_LIB" + then + AC_CACHE_CHECK([for working ncurses], mp_cv_ncurses, + [LIBS="$mp_save_LIBS -lncurses" + AC_TRY_LINK( + [#include ], + [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]) + CURSES_LIB="-lncurses" + fi + fi + if test ! "$CURSES_LIB" + then + AC_CACHE_CHECK([for working pdcurses], mp_cv_pdcurses, + [LIBS="$mp_save_LIBS -lpdcurses" + AC_TRY_LINK( + [#include ], + [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]) + CURSES_LIB="-lpdcurses" + fi + fi + if test ! "$CURSES_LIB" + then + AC_CACHE_CHECK([for working pdcur], mp_cv_pdcur, + [LIBS="$mp_save_LIBS -lpdcur" + AC_TRY_LINK( + [#include ], + [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]) + CURSES_LIB="-lpdcur" + fi + fi + if test ! "$CURSES_LIB" + 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)]) + if test "$mp_cv_lpdcurses" = yes + then + AC_DEFINE(HAVE_CURSES_H, 1, [Define to 1 if libcurses is requested]) + CURSES_LIB="../pdcurses/pdcurses.a" + RF_ADDTO(CPPFLAGS,"-I../pdcurses") + fi + fi + AC_CACHE_CHECK([for ESCDELAY variable], + [mc_cv_ncurses_escdelay], + [AC_TRY_LINK([], [ + extern int ESCDELAY; + ESCDELAY = 0; + ], + [mc_cv_ncurses_escdelay=yes], + [mc_cv_ncurses_escdelay=no]) + ]) + if test "$mc_cv_ncurses_escdelay" = yes; then + AC_DEFINE(HAVE_ESCDELAY, 1, + [Define if ncurses has ESCDELAY variable]) + fi + if test ! "$CURSES_LIB" ; then + LIBS="$mp_save_LIBS" + fi +])dnl + +dnl +dnl RF_ADDTO(variable, value) +dnl +dnl Add value to variable +dnl +AC_DEFUN([RF_ADDTO],[ + if test "x$$1" = "x"; then + test "x$silent" != "xyes" && echo " setting $1 to \"$2\"" + $1="$2" + else + apr_addto_bugger="$2" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $$1; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to $1" + $1="$$1 $i" + fi + done + fi +])dnl + + diff -r ea71ef31d9be -r dfeed24bb616 arogue5/command.c --- a/arogue5/command.c Wed Aug 28 18:54:35 2013 -0700 +++ b/arogue5/command.c Sat Aug 31 09:18:07 2013 -0700 @@ -18,8 +18,8 @@ #include #include #include +#include "rogue.h" #include "mach_dep.h" -#include "rogue.h" /* * command: diff -r ea71ef31d9be -r dfeed24bb616 arogue5/configure.ac --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/arogue5/configure.ac Sat Aug 31 09:18:07 2013 -0700 @@ -0,0 +1,181 @@ +# -*- Autoconf -*- +# Process this file with autoconf to produce a configure script. + +AC_PREREQ(2.56) +AC_INIT([ARogue],[5.8.2], [yendor@rogueforge.net]) +AC_CONFIG_HEADERS([config.h]) +# May not be needed for the documentation +AC_CONFIG_FILES([Makefile]) + +# Checks for programs. +AC_PROG_CC +# Checks for libraries. +MP_WITH_CURSES +# Checks for header files. +AC_HEADER_STDC +AC_CHECK_HEADERS([pwd.h errno.h fcntl.h limits.h nlist.h stdlib.h string.h sys/ioctl.h termios.h unistd.h utmp.h term.h ncurses/term.h process.h]) + +# Checks for typedefs, structures, and compiler characteristics. +AC_TYPE_SIZE_T +AC_STRUCT_TM +# Checks for library functions. +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]) +AC_PROG_INSTALL + +AC_ARG_WITH(program-name, AC_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_MSG_CHECKING([if using setgid execute bit]) +if test "x$enable_setgid" = "xno" ; then +GROUPOWNER= +elif test "x$enable_setgid" = "xyes" ; then +GROUPOWNER=games +elif test "x$enable_setgid" = "x" ; then +GROUPOWNER= +else +GROUPOWNER=$enable_setgid +fi + +if test "x$GROUPOWNER" != "x" ; then +AC_DEFINE_UNQUOTED([GROUPOWNER],[$GROUPOWNER], [Define to group owner of setgid executable]) +AC_MSG_RESULT([$GROUPOWNER]) +else +AC_MSG_RESULT([no]) +fi + +AC_SUBST(GROUPOWNER) + +AC_ARG_ENABLE([scorefile],[AC_HELP_STRING([--enable-scorefile=SCOREFILE], [enable scoreboard with given filename])],[],[]) +AC_MSG_CHECKING([for scoreboard file]) +if test "x$enable_scorefile" = "xno" ; then +SCOREFILE= +elif test "x$enable_scorefile" = "xyes" ; then +SCOREFILE=$progname.scr +elif test "x$enable_scorefile" = "x" ; then +SCOREFILE=$progname.scr +else +SCOREFILE=$enable_scorefile +fi + +if test "x$SCOREFILE" != "x" ; then +AC_DEFINE_UNQUOTED([SCOREFILE], ["$SCOREFILE"], [Define to file to use for scoreboard]) +AC_MSG_RESULT([$SCOREFILE]) +else +AC_MSG_RESULT([disabled]) +fi + +AC_SUBST(SCOREFILE) + +AC_ARG_ENABLE([logfile],[AC_HELP_STRING([--enable-logfile=LOGFILE], [enable logfile with given filename])],[],[]) +AC_MSG_CHECKING([for log file]) +if test "x$enable_logfile" = "xno" ; then +LOGFILE= +elif test "x$enable_logfile" = "xyes" ; then +LOGFILE=$progname.log +elif test "x$enable_logfile" = "x" ; then +LOGFILE=$progname.log +else +LOGFILE=$enable_logfile +fi + +if test "x$LOGFILE" != "x" ; then +AC_DEFINE_UNQUOTED([LOGFILE], ["$LOGFILE"], [Define to file to use for log]) +AC_MSG_RESULT([$LOGFILE]) +else +AC_MSG_RESULT([disabled]) +fi + +AC_SUBST(LOGFILE) + +AC_ARG_ENABLE([savedir],[AC_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= +elif test "x$enable_savedir" = "xyes" -o "x$enable_savedir" = "x"; then + if text "x$GROUPOWNER" != "x"; then + SAVEDIR="/var/local/games/roguelike/${progname}save/" + else + SAVEDIR="$progname/" + fi +else +SAVEDIR="$enable_savedir" +fi + +if test "x$SAVEDIR" != "x" ; then +AC_DEFINE_UNQUOTED([SAVEDIR], ["$SAVEDIR"], [Define to systemwide directory for storing saved games]) +AC_MSG_RESULT([$SAVEDIR]) +else +AC_MSG_RESULT([disabled]) +fi + +AC_SUBST(SAVEDIR) + +AC_ARG_ENABLE([wizardmode],[AC_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]) +elif test "x$enable_wizardmode" = "x" ; then +AC_MSG_RESULT([no]) +else +AC_DEFINE([WIZARD], [], [Define to include wizard mode]) +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_MSG_CHECKING([if limiting scores]) +if test "x$enable_limitscore" = "xno" ; then +AC_MSG_RESULT([no]) +elif test "x$enable_limitscore" = "x" ; then +AC_MSG_RESULT([no]) +else +AC_DEFINE([LIMITSCORE], [], [Define to limit scores to one per class per uid]) +AC_MSG_RESULT([yes]) +fi + +AC_ARG_ENABLE([maxload],[AC_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]) +AC_MSG_RESULT([100]) +elif test "x$enable_maxload" = "x" ; then +AC_MSG_RESULT([unlimited]) +elif test "x$enable_maxload" = "xno" ; then +AC_MSG_RESULT([unlimited]) +else +AC_DEFINE_UNQUOTED([MAXLOAD], [$enable_maxload], [Define if maxload feature should be enabled]) +AC_MSG_RESULT([$enable_maxload]) +fi + +AC_ARG_ENABLE([maxusers],[AC_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]) +AC_MSG_RESULT([100]) +elif test "x$enable_maxusers" = "x" ; then +AC_MSG_RESULT([unlimited]) +elif test "x$enable_maxload" = "xno" ; then +AC_MSG_RESULT([unlimited]) +else +AC_DEFINE_UNQUOTED([MAXLOAD], [$enable_maxusers], [Define if maxusers feature should be enabled]) +AC_MSG_RESULT([$enable_maxusers]) +fi + +AC_MSG_CHECKING([whether to docdir is defined]) +if test "x$docdir" = "x" ; then +AC_MSG_RESULT([docdir undefined]) +docdir=\${datadir}/doc/\${PACKAGE_TARNAME} +AC_SUBST(docdir) +else +AC_MSG_RESULT([docdir defined]) +fi + +AC_OUTPUT diff -r ea71ef31d9be -r dfeed24bb616 arogue5/install-sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/arogue5/install-sh Sat Aug 31 09:18:07 2013 -0700 @@ -0,0 +1,527 @@ +#!/bin/sh +# install - install a program, script, or datafile + +scriptversion=2011-11-20.07; # UTC + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. +# +# Calling this script install-sh is preferred over install.sh, to prevent +# 'make' implicit rules from creating a file called install from it +# when there is no Makefile. +# +# This script is compatible with the BSD install script, but was written +# from scratch. + +nl=' +' +IFS=" "" $nl" + +# set DOITPROG to echo to test this script + +# Don't use :- since 4.3BSD and earlier shells don't like it. +doit=${DOITPROG-} +if test -z "$doit"; then + doit_exec=exec +else + doit_exec=$doit +fi + +# Put in absolute file names if you don't have them in your path; +# or use environment vars. + +chgrpprog=${CHGRPPROG-chgrp} +chmodprog=${CHMODPROG-chmod} +chownprog=${CHOWNPROG-chown} +cmpprog=${CMPPROG-cmp} +cpprog=${CPPROG-cp} +mkdirprog=${MKDIRPROG-mkdir} +mvprog=${MVPROG-mv} +rmprog=${RMPROG-rm} +stripprog=${STRIPPROG-strip} + +posix_glob='?' +initialize_posix_glob=' + test "$posix_glob" != "?" || { + if (set -f) 2>/dev/null; then + posix_glob= + else + posix_glob=: + fi + } +' + +posix_mkdir= + +# Desired mode of installed file. +mode=0755 + +chgrpcmd= +chmodcmd=$chmodprog +chowncmd= +mvcmd=$mvprog +rmcmd="$rmprog -f" +stripcmd= + +src= +dst= +dir_arg= +dst_arg= + +copy_on_change=false +no_target_directory= + +usage="\ +Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: + --help display this help and exit. + --version display version info and exit. + + -c (ignored) + -C install only if different (preserve the last data modification time) + -d create directories instead of installing files. + -g GROUP $chgrpprog installed files to GROUP. + -m MODE $chmodprog installed files to MODE. + -o USER $chownprog installed files to USER. + -s $stripprog installed files. + -t DIRECTORY install into DIRECTORY. + -T report an error if DSTFILE is a directory. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG + RMPROG STRIPPROG +" + +while test $# -ne 0; do + case $1 in + -c) ;; + + -C) copy_on_change=true;; + + -d) dir_arg=true;; + + -g) chgrpcmd="$chgrpprog $2" + shift;; + + --help) echo "$usage"; exit $?;; + + -m) mode=$2 + case $mode in + *' '* | *' '* | *' +'* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; + + -o) chowncmd="$chownprog $2" + shift;; + + -s) stripcmd=$stripprog;; + + -t) dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; + + -T) no_target_directory=true;; + + --version) echo "$0 $scriptversion"; exit $?;; + + --) shift + break;; + + -*) echo "$0: invalid option: $1" >&2 + exit 1;; + + *) break;; + esac + shift +done + +if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then + # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dst_arg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dst_arg" + shift # fnord + fi + shift # arg + dst_arg=$arg + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + done +fi + +if test $# -eq 0; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call 'install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi + +if test -z "$dir_arg"; then + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 + + # Set umask so as not to create temps with too-generous modes. + # However, 'strip' requires both read and write access to temps. + case $mode in + # Optimize common cases. + *644) cp_umask=133;; + *755) cp_umask=22;; + + *[0-7]) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw='% 200' + fi + cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; + *) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw=,u+rw + fi + cp_umask=$mode$u_plus_rw;; + esac +fi + +for src +do + # Protect names problematic for 'test' and other utilities. + case $src in + -* | [=\(\)!]) src=./$src;; + esac + + if test -n "$dir_arg"; then + dst=$src + dstdir=$dst + test -d "$dstdir" + dstdir_status=$? + else + + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dst_arg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + dst=$dst_arg + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 + fi + dstdir=$dst + dst=$dstdir/`basename "$src"` + dstdir_status=0 + else + # Prefer dirname, but fall back on a substitute if dirname fails. + dstdir=` + (dirname "$dst") 2>/dev/null || + expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$dst" : 'X\(//\)[^/]' \| \ + X"$dst" : 'X\(//\)$' \| \ + X"$dst" : 'X\(/\)' \| . 2>/dev/null || + echo X"$dst" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q' + ` + + test -d "$dstdir" + dstdir_status=$? + fi + fi + + obsolete_mkdir_used=false + + if test $dstdir_status != 0; then + case $posix_mkdir in + '') + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/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"` + 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"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; + esac + + if + $posix_mkdir && ( + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + ) + then : + else + + # The umask is ridiculous, or mkdir does not conform to POSIX, + # or it failed possibly due to a race condition. Create the + # directory the slow way, step by step, checking for races as we go. + + case $dstdir in + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; + esac + + eval "$initialize_posix_glob" + + oIFS=$IFS + IFS=/ + $posix_glob set -f + set fnord $dstdir + shift + $posix_glob set +f + IFS=$oIFS + + prefixes= + + for d + do + test X"$d" = X && continue + + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ + done + + if test -n "$prefixes"; then + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true + fi + fi + fi + + if test -n "$dir_arg"; then + { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && + { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || + test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 + else + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_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") && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && + { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && + { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && + + # If -C, don't bother to copy if it wouldn't change the file. + if $copy_on_change && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + + eval "$initialize_posix_glob" && + $posix_glob set -f && + set X $old && old=:$2:$4:$5:$6 && + set X $new && new=:$2:$4:$5:$6 && + $posix_glob set +f && + + test "$old" = "$new" && + $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 + then + rm -f "$dsttmp" + else + # Rename the file to the real destination. + $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || + + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + { + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" + } + fi || exit 1 + + trap '' 0 + fi +done + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -r ea71ef31d9be -r dfeed24bb616 arogue5/mach_dep.h --- a/arogue5/mach_dep.h Wed Aug 28 18:54:35 2013 -0700 +++ b/arogue5/mach_dep.h Sat Aug 31 09:18:07 2013 -0700 @@ -13,29 +13,43 @@ */ /* + * Things that get set in config.h have been #if 0'd out. You should only + * need to set them here if you don't use configure and want to enable those + * features. + */ + +/* * define that the wizard commands exist */ +#if 0 #undef WIZARD /*1*/ +#endif /* * define if you want to limit scores to one per class per userid */ +#if 0 #undef LIMITSCORE +#endif /* * where scorefile should live */ +#if 0 #define SCOREFILE "/var/local/games/roguelike/arogue5.scr" #define LOGFILE "/var/local/games/roguelike/arogue5.log" #define SAVEDIR "/var/local/games/roguelike/arogue5save/" +#endif /* * Variables for checking to make sure the system isn't too loaded * for people to play */ +#if 0 #undef MAXUSERS /*40*/ /* max number of users for this game */ #undef MAXLOAD /*40*/ /* 10 * max 15 minute load average */ +#endif #undef CHECKTIME /*15*/ /* number of minutes between load checks */ /* if not defined checks are only on startup */ diff -r ea71ef31d9be -r dfeed24bb616 arogue5/rogue.h --- a/arogue5/rogue.h Wed Aug 28 18:54:35 2013 -0700 +++ b/arogue5/rogue.h Sat Aug 31 09:18:07 2013 -0700 @@ -12,6 +12,10 @@ * See the file LICENSE.TXT for full copyright and licensing information. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #define reg register /* register abbr. */ #define NOOP(x) (x += 0) #define CCHAR(x) ( (char) (x & A_CHARTEXT) )