changeset 99:dfeed24bb616

arogue5: port to autoconf. 'configure' and 'make install' now work. There may be problems with hard-to-test features like MAXLOAD.
author John "Elwin" Edwards
date Sat, 31 Aug 2013 09:18:07 -0700
parents ea71ef31d9be
children 1e88eb1942a5
files arogue5/Makefile arogue5/Makefile.in arogue5/acinclude.m4 arogue5/command.c arogue5/configure.ac arogue5/install-sh arogue5/mach_dep.h arogue5/rogue.h
diffstat 8 files changed, 1098 insertions(+), 204 deletions(-) [+]
line wrap: on
line diff
--- 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
-
--- /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
+
--- /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 <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
+   if test ! "$CURSES_LIB"
+   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)])
+     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 <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])
+       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 <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])
+       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
+
+
--- 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 <limits.h>
 #include <ctype.h>
 #include <signal.h>
+#include "rogue.h"
 #include "mach_dep.h"
-#include "rogue.h"
 
 /*
  * command:
--- /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.