about summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.Lynx.prcs_aux26
-rw-r--r--CHANGES.configure16
-rw-r--r--CHANGES.new22
-rw-r--r--Lynx.prj35
-rw-r--r--README.configure35
-rw-r--r--WWW/Library/Implementation/UCMap.h8
-rw-r--r--aclocal.m432
-rwxr-xr-xconfigure599
-rw-r--r--configure.in12
-rw-r--r--makefile.in49
-rw-r--r--src/LYCurses.c29
-rw-r--r--src/LYCurses.h17
-rw-r--r--src/LYUtils.c6
-rw-r--r--src/makefile.in21
14 files changed, 585 insertions, 322 deletions
diff --git a/.Lynx.prcs_aux b/.Lynx.prcs_aux
index 20149403..1dab2948 100644
--- a/.Lynx.prcs_aux
+++ b/.Lynx.prcs_aux
@@ -34,8 +34,8 @@
 (build.com 8386 868451907 e/38_build.com 1.2)
 (lynx_help/lynx_url_support.html 28106 862290745 e/13_lynx_url_s 1.2)
 (lynx_help/keystroke_commands/follow_help.html 7617 868266973 43_follow_hel 1.1.1.1.1.2)
-(configure.in 11498 870050175 10_configure. 1.10)
-(makefile.in 7125 870050175 8_makefile.i 1.1.1.9)
+(configure.in 11493 870983973 10_configure. 1.11)
+(makefile.in 7951 870983973 8_makefile.i 1.1.1.10)
 (src/LYDownload.h 315 856833014 c/46_LYDownload 1.1)
 (src/chrtrans/cp1252_uni.tbl 10789 856856948 h/51_cp1252_uni 1.1)
 (utils/inews/config.h-dist 13461 856833014 b/51_config.h-d 1.1)
@@ -46,7 +46,7 @@
 (src/LYGetFile.c 35566 870708759 d/48_LYGetFile. 1.5.2.3.2.1.1.1.1.1.1.1.1.2)
 (src/chrtrans/iso05_uni.tbl 1865 856925688 i/8_iso05_uni. 1.2)
 (src/chrtrans/mnem_suni.tbl 24067 856856948 h/50_mnem_suni. 1.1)
-(README.configure 6720 870050175 14_README.con 1.5)
+(README.configure 7299 870983973 14_README.con 1.6)
 (src/UCAuto.c 7083 868451907 b/17_UCAuto.c 1.1)
 (src/LYTraversal.c 4554 869619703 c/25_LYTraversa 1.1.2.4)
 (WWW/Makefile 203 856833014 e/44_Makefile 1.1)
@@ -94,7 +94,7 @@
 (WWW/Library/Implementation/ufc-crypt.h 2491 856833014 f/33_ufc-crypt. 1.1)
 (src/socketshr_tcp.opt 16 856833014 d/9_socketshr_ 1.1)
 (src/HTAlert.c 12383 869443761 e/4_HTAlert.c 1.1.2.3)
-(src/LYUtils.c 133041 870159729 d/27_LYUtils.c 1.1.4.1.2.2.1.1.1.1.1.1.1.1.4.3)
+(src/LYUtils.c 133061 870983973 d/27_LYUtils.c 1.1.4.1.2.2.1.1.1.1.1.1.1.1.4.4)
 (src/LYCharUtils.c 74496 869929579 c/22_LYCharUtil 1.2.1.1.2.1.2.2.1.2.1.1.1.2.1.1.1.1.1.3)
 (PROBLEMS 7324 868157008 h/35_PROBLEMS 1.3)
 (src/LYSearch.h 326 861212923 d/28_LYSearch.h 1.2)
@@ -140,7 +140,7 @@
 (src/chrtrans/cp1250_uni.tbl 10813 856856948 h/48_cp1250_uni 1.1)
 (src/decc.opt 58 856833014 d/13_decc.opt 1.1)
 (WWW/Library/Implementation/HTStyle.h 6777 870708759 g/18_HTStyle.h 1.2)
-(CHANGES.new 112505 870960374 6_CHANGES.ne 1.18.1.4.1.1.2.1.1.2.2.2.1.2.1.1.1.1.1.4.2.7.1.3.1.4.1.9)
+(CHANGES.new 113714 870983973 6_CHANGES.ne 1.18.1.4.1.1.2.1.1.2.2.2.1.2.1.1.1.1.1.4.2.7.1.3.1.4.1.10)
 (WWW/Library/Implementation/HTMLGen.h 753 856833014 g/22_HTMLGen.h 1.1)
 (WWW/Library/Implementation/HTFormat.h 10965 870159729 g/13_HTFormat.h 1.2)
 (WWW/Library/Implementation/HTUU.h 964 856833014 f/43_HTUU.h 1.1)
@@ -191,7 +191,7 @@
 (src/descrip.mms 5045 868451907 e/6_descrip.mm 1.2)
 (src/LYSignal.h 300 856833014 d/23_LYSignal.h 1.1)
 (lynx_help/keystroke_commands/other_help.html 6511 868266973 e/22_other_help 1.4)
-(aclocal.m4 27576 870050175 12_aclocal.m4 1.12)
+(aclocal.m4 28080 870983973 12_aclocal.m4 1.13)
 (WWW/Library/Implementation/patchlevel.h 959 856833014 f/34_patchlevel 1.1)
 (userdefs.h 56140 870708759 c/10_userdefs.h 1.1.2.1.1.1.1.1.1.1.2.1.1.1.1.1.1.3)
 (TCPWARE.announce 1352 856833014 h/31_TCPWARE.an 1.1)
@@ -274,13 +274,13 @@
 (WWW/Library/Implementation/HTAuth.c 5776 856833014 h/28_HTAuth.c 1.1)
 (lynx.hlp 14941 870708759 e/31_lynx.hlp 1.10.1.2)
 (src/HTSaveToFile.h 554 856833014 c/50_HTSaveToFi 1.1)
-(src/LYCurses.c 39064 870960374 d/51_LYCurses.c 1.1.5.1.1.8.1.4.1.4)
+(src/LYCurses.c 39643 870983973 d/51_LYCurses.c 1.1.5.1.1.8.1.4.1.5)
 (WWW/Library/Implementation/HTInit.h 613 856833014 g/12_HTInit.h 1.1)
 (WWW/Library/Implementation/HTAAServ.h 4950 856833014 g/1_HTAAServ.h 1.1)
 (WWW/Library/mips/Makefile 663 856833014 f/3_Makefile 1.1)
 (test/iso8859-1.html 12169 856833014 c/12_iso8859-1. 1.1)
 (WWW/Library/Implementation/HTTP.c 50832 870708759 h/16_HTTP.c 1.1.1.1.1.1.1.1.1.2.1.2)
-(WWW/Library/Implementation/UCMap.h 932 868567209 i/22_UCMap.h 1.3)
+(WWW/Library/Implementation/UCMap.h 932 870983973 i/22_UCMap.h 1.4)
 (about_lynx/COPYING 17982 856833014 e/41_COPYING 1.1)
 (styles/lynx.lss 1490 862005876 37_lynx.lss 1.1)
 (README.win-386 1477 857398594 2_386-WIN.TX 1.2)
@@ -291,7 +291,7 @@
 (WWW/Library/Implementation/HTAuth.h 1791 856833014 f/47_HTAuth.h 1.1)
 (src/chrtrans/utf8_uni.tbl 936 856856948 i/7_utf8_uni.t 1.1)
 (WWW/Library/Implementation/HTTCP.c 29596 870708759 h/13_HTTCP.c 1.2.3.1.1.3)
-(src/LYCurses.h 10550 870308176 d/22_LYCurses.h 1.1.4.1.1.1.1.6)
+(src/LYCurses.h 9972 870983973 d/22_LYCurses.h 1.1.4.1.1.1.1.7)
 (descrip.mms 3765 868451907 e/37_descrip.mm 1.2)
 (WWW/Library/Implementation/HTTP.h 672 869443761 g/34_HTTP.h 1.2)
 (test/TestComment.html 2032 856833014 c/13_TestCommen 1.1)
@@ -315,7 +315,7 @@
 (WWW/Library/Implementation/HTAlert.c 3066 868157008 h/2_HTAlert.c 1.2)
 (src/vaxc.opt 54 856833014 c/34_vaxc.opt 1.1)
 (src/chrtrans/MAKEFILE.W32 1857 857398594 4_MAKEFILE.W 1.1)
-(configure 170585 870050175 13_configure 1.12)
+(configure 175163 870983973 13_configure 1.13)
 (WWW/Library/Implementation/HTPlain.h 460 856833014 g/25_HTPlain.h 1.1)
 (WWW/Library/Implementation/HTLex.c 3090 856833014 g/38_HTLex.c 1.1)
 (utils/inews/Manifest 649 856833014 c/8_Manifest 1.1)
@@ -332,7 +332,7 @@
 (src/LYLocal.c 58274 870159729 d/46_LYLocal.c 1.2.3.1.3.3)
 (src/LYJump.h 553 860064663 c/29_LYJump.h 1.2)
 (WWW/Library/Implementation/HTWriter.h 632 856833014 g/24_HTWriter.h 1.1)
-(CHANGES.configure 4600 870050175 15_CHANGES.co 1.1.1.6)
+(CHANGES.configure 5366 870983973 15_CHANGES.co 1.1.1.7)
 (INSTALLATION 18767 856833014 h/38_INSTALLATI 1.1)
 (WWW/Library/Implementation/HTVMS_WaisUI.c 60814 856833014 f/27_HTVMS_Wais 1.1)
 (utils/inews/nntp.h 2530 856833014 c/1_nntp.h 1.1)
@@ -351,13 +351,13 @@
 (src/LYOptions.h 1290 869904256 d/17_LYOptions. 1.1.2.5)
 (WWW/Library/Implementation/HTNews.h 1150 856833014 g/9_HTNews.h 1.1)
 (src/LYNews.h 240 869443761 c/42_LYNews.h 1.2)
-(CHANGES.chartrans 8129 869904256 c/0_CHANGES.chartrans 1.9.1.4.1.1.1.1.1.4)
+(CHANGES.chartrans 8128 869904256 c/0_CHANGES.chartrans 1.9.1.4.1.1.1.1.1.4)
 (src/UCdomap.c 46232 870159729 b/14_UCdomap.c 1.4)
 (WWW/Library/Implementation/HTACL.h 3535 856833014 f/48_HTACL.h 1.1)
 (IBMPC-charsets.announce 7674 856833014 h/39_IBMPC-char 1.1)
 (WWW/Library/Implementation/HTFinger.c 11475 856833014 f/24_HTFinger.c 1.1)
 (src/chrtrans/iso08_uni.tbl 1048 856856948 i/12_iso08_uni. 1.1)
-(src/makefile.in 2756 870050175 17_makefile.i 1.7)
+(src/makefile.in 3060 870983973 17_makefile.i 1.8)
 (src/UCdomap.h 1174 868567209 b/0_UCdomap.h 1.2)
 (src/chrtrans/cp437_uni.tbl 10794 860516309 i/9_cp437_uni. 1.2)
 (WWW/Library/Implementation/HTAABrow.c 36175 868266973 g/45_HTAABrow.c 1.2.1.2)
diff --git a/CHANGES.configure b/CHANGES.configure
index f1fa30b1..35b40704 100644
--- a/CHANGES.configure
+++ b/CHANGES.configure
@@ -1,3 +1,19 @@
+1997-08-07
+----------
+* Refine configure tests for acs_map, ttytype to accommodate broken linker
+  on FreeBSD 2.1.5
+* Modify README.configure to indicate the associated definitions for
+  each configure option, as suggested by Klaus Weide. - TD
+* Add -G7 option to Ultrix compiler options (request by Hynek Med
+  <xmedh02@lada.vse.cz>). - TD
+* Add include for <sys/types.h> to utmp configure test (reported by Andrey
+  A. Chernov). - TD
+* Add check for FreeBSD library mytinfo (reported by Andrey A. Chernov
+  <ache@null.net>). - TD
+* Modify ./makefile.in so that 'all', the default target, will build the
+  Lynx executable. The old 'all' target is retained as "make help". - TD
+* Modify src/makefile.in to allow development compiles within the src
+  directory. - TD
 1997-07-27
 ----------
 * Rename top-level Makefile to Makefile.old (it's obsolete) - TD
diff --git a/CHANGES.new b/CHANGES.new
index 5c262c1d..8767dc0d 100644
--- a/CHANGES.new
+++ b/CHANGES.new
@@ -11,6 +11,28 @@ README.configure), and miscellaneous other changes.  Note that the 2.7 ->
 file) are duplicated here. - KW]
 
 1997-08-07
+* Correct storage class of variables in UCMap.h, from -warn-common linker
+  option.
+* Refine configure tests for acs_map, ttytype to accommodate broken linker
+  on FreeBSD 2.1.5
+* Modify README.configure to indicate the associated definitions for
+  each configure option, as suggested by Klaus Weide. - TD
+* Correct duplicate declaration of Current_Attr, which Linux linker ignores
+  (reported by Hynek Med). - TD
+* Add -G7 option to Ultrix compiler options (request by Hynek Med
+  <xmedh02@lada.vse.cz>). - TD
+* Add include for <sys/types.h> to utmp configure test (reported by Andrey
+  A. Chernov). - TD
+* Add check for FreeBSD library mytinfo (reported by Andrey A. Chernov
+  <ache@null.net>). - TD
+* Modify ./makefile.in so that 'all', the default target, will build the
+  Lynx executable. The old 'all' target is retained as "make help". - TD
+* Modify src/makefile.in to allow development compiles within the src
+  directory. - TD
+* Mask spaces in the bkgd (background attribute) calls for color curses to
+  make the color-style code work better with SVr4 curses. - TD
+* Change workaround for 8-bit acs characters by adding to the initialization
+  a loop forcing the entries of acs_map[] to 8-bits. - TD
 * Many minor tweaks for the DJGPP version by DK - WB
 * A rename of about_lynx_dev.html to lynx_dev.html for 8.3 systems - WB
 1997-08-04
diff --git a/Lynx.prj b/Lynx.prj
index f7bf8e78..fdb2349a 100644
--- a/Lynx.prj
+++ b/Lynx.prj
@@ -1,13 +1,14 @@
 ;; -*- Lisp -*-
 (Created-By-Prcs-Version 1 2 0)
 (Project-Description "PRCS Project for The Lynx browser")
-(Project-Version Lynx 2.7.1ac-0 47)
-(Parent-Version Lynx 2.7.1ac-0 46)
+(Project-Version Lynx 2.7.1ac-0 48)
+(Parent-Version Lynx 2.7.1ac-0 47)
 
-(Version-Log "DJGPP hacks")
+(Version-Log "several minor fixes to configure script and makefiles
+")
 (New-Version-Log "")
-(Checkin-Time "Thu, 07 Aug 1997 07:26:14 -0600")
-(Checkin-Login buttles)
+(Checkin-Time "Thu, 07 Aug 1997 13:59:33 -0600")
+(Checkin-Login dickey)
 (Populate-Ignore ("\\.o$" "\\.a$" "~$" "^a.out$" "^core$"
                   "\\.dvi$" "\\.aux$" "^\\..*_aux$" "\\.log"
                   "\\.zip$" "^obsolete" "/obsolete"
@@ -103,7 +104,7 @@
   (src/LYMainLoop.h (Lynx/d/19_LYMainLoop 1.2 644))
   (src/LYStrings.h (Lynx/d/20_LYStrings. 1.1.1.4 644))
   (src/LYHistory.c (Lynx/d/21_LYHistory. 1.1.2.1.4.1.1.1.1.3 644))
-  (src/LYCurses.h (Lynx/d/22_LYCurses.h 1.1.4.1.1.1.1.6 644))
+  (src/LYCurses.h (Lynx/d/22_LYCurses.h 1.1.4.1.1.1.1.7 644))
   (src/LYSignal.h (Lynx/d/23_LYSignal.h 1.1 644))
   (src/LYClean.h (Lynx/d/24_LYClean.h 1.1.2.1 644))
   (src/LYGlobalDefs.h (Lynx/d/25_LYGlobalDe 1.1.3.1.2.1.1.1.1.1.1.2.1.4 644))
@@ -376,7 +377,7 @@
   (src/chrtrans/cp850_uni.tbl (Lynx/i/19_cp850_uni. 1.2 644))
   (src/UCdomap.c (Lynx/b/14_UCdomap.c 1.4 644))
   (WWW/Library/Implementation/UCDefs.h (Lynx/e/0_UCDefs.h 1.1 644))
-  (WWW/Library/Implementation/UCMap.h (Lynx/i/22_UCMap.h 1.3 644))
+  (WWW/Library/Implementation/UCMap.h (Lynx/i/22_UCMap.h 1.4 644))
   (WWW/Library/Implementation/UCAux.h (Lynx/f/0_UCAux.h 1.1 644))
 
   (WWW/Library/djgpp/makefile (Lynx/0_makefile 1.5 644))
@@ -390,19 +391,19 @@
 
 ;; Files added by populate at Mon, 03 Mar 1997 06:05:56 -0600:
 
-  (CHANGES.new (Lynx/6_CHANGES.ne 1.18.1.4.1.1.2.1.1.2.2.2.1.2.1.1.1.1.1.4.2.7.1.3.1.4.1.9 644))
+  (CHANGES.new (Lynx/6_CHANGES.ne 1.18.1.4.1.1.2.1.1.2.2.2.1.2.1.1.1.1.1.4.2.7.1.3.1.4.1.10 644))
 
 ;; Files added by populate at Tue, 11 Mar 1997 04:22:39 -0600:
 
   (newfiles.configure (Lynx/7_newfiles.c 1.4 644))
-  (makefile.in (Lynx/8_makefile.i 1.1.1.9 644))
+  (makefile.in (Lynx/8_makefile.i 1.1.1.10 644))
   (install.sh (Lynx/9_install.sh 1.1 755))
-  (configure.in (Lynx/10_configure. 1.10 644))
+  (configure.in (Lynx/10_configure. 1.11 644))
   (config.hin (Lynx/11_config.hin 1.10 644))
-  (aclocal.m4 (Lynx/12_aclocal.m4 1.12 644))
-  (configure (Lynx/13_configure 1.12 755))
-  (README.configure (Lynx/14_README.con 1.5 644))
-  (CHANGES.configure (Lynx/15_CHANGES.co 1.1.1.6 644))
+  (aclocal.m4 (Lynx/12_aclocal.m4 1.13 644))
+  (configure (Lynx/13_configure 1.13 755))
+  (README.configure (Lynx/14_README.con 1.6 644))
+  (CHANGES.configure (Lynx/15_CHANGES.co 1.1.1.7 644))
 
 ;; Files added by populate at Wed, 09 Apr 1997 06:18:01 -0600:
 
@@ -412,7 +413,7 @@
 
 
   (WWW/Library/unix/makefile.in (Lynx/16_makefile.i 1.4 644))
-  (src/makefile.in (Lynx/17_makefile.i 1.7 644))
+  (src/makefile.in (Lynx/17_makefile.i 1.8 644))
   (src/chrtrans/makefile.in (Lynx/18_makefile.i 1.4 644))
 
   (src/chrtrans/koi8r_uni.tbl (Lynx/24_koi8r_uni. 1.1 644))
@@ -436,12 +437,12 @@
   (src/LYStyle.h (Lynx/b/5_LYStyle.h 1.2 644))
 ;; Files added by populate at Tue, 08 Jul 1997 20:40:02 -0600:
 
-  (src/LYCurses.c (Lynx/d/51_LYCurses.c 1.1.5.1.1.8.1.4.1.4 644))
+  (src/LYCurses.c (Lynx/d/51_LYCurses.c 1.1.5.1.1.8.1.4.1.5 644))
   (src/LYCharUtils.c (Lynx/c/22_LYCharUtil 1.2.1.1.2.1.2.2.1.2.1.1.1.2.1.1.1.1.1.3 644))
 
 ;; Files added by populate at Wed, 09 Jul 1997 05:12:01 -0600:
 
-  (src/LYUtils.c (Lynx/d/27_LYUtils.c 1.1.4.1.2.2.1.1.1.1.1.1.1.1.4.3 644))
+  (src/LYUtils.c (Lynx/d/27_LYUtils.c 1.1.4.1.2.2.1.1.1.1.1.1.1.1.4.4 644))
 
 
   (src/chrtrans/build-chrtrans.com (Lynx/b/22_build-chrt 1.2 644))
diff --git a/README.configure b/README.configure
index f84b102f..b420e00d 100644
--- a/README.configure
+++ b/README.configure
@@ -64,30 +64,30 @@ Here's an alphabetical listing of the Lynx-specific options.  The actual
 order shown by the -help option is different due to the requirements of
 the script:
 
-  --disable-dired-archive
+  --disable-dired-archive		(define ARCHIVE_ONLY)
 	Use this option to prevent DirEd from extracting files from an
 	archive file,
 
-  --disable-dired-gzip
+  --disable-dired-gzip			(prevent defining OK_GZIP)
 	Use this option to prevent DirEd from using gzip and gunzip.
 
-  --disable-dired-override
+  --disable-dired-override		(prevent defining OK_OVERRIDE)
 	Lynx users can customize their keymaps by creating private
 	versions of lynx.cfg and modifying them, overriding the default
 	keymap.  Use this option to prevent DirEd keymap overriding.
 
-  --disable-dired-permit
+  --disable-dired-permit		(prevent defining OK_PERMIT)
 	Use this option to prevent DirEd from changing the permissions
 	on directories or files (i.e., from doing what the Unix chmod
 	command or the DOS attrib command does).
 
-  --disable-dired-tar
+  --disable-dired-tar			(prevent defining OK_TAR)
 	Use this option to prevent DirEd from using the tar program.
 
-  --disable-dired-uudecode
+  --disable-dired-uudecode		(prevent defining OK_UUDECODE)
 	Use this option to prevent DirEd from using uudecode.
 
-  --disable-dired-xpermit
+  --disable-dired-xpermit		(define NO_CHANGE_EXECUTE_PERMS)
 	Use this option if you do not disable out the dired-permit
 	option, but want to restrict changes of the eXecute permission
 	to directories (i.e., not allow it to be changed for files).  If
@@ -95,7 +95,7 @@ the script:
 	permission for files but not directories via the
 	"change_exec_perms" command line restriction.
 
-  --disable-dired-zip
+  --disable-dired-zip			(prevent defining OK_ZIP)
 	Use this option to prevent DirEd from using zip and unzip.
 
   --disable-echo
@@ -106,29 +106,31 @@ the script:
   	Use this option to control whether full utility pathnames are used.
 	By default, configure substitutes full pathnames.
 
-  --disable-long-list
+  --disable-long-list			(prevent defining LONG_LIST)
   	Use this option to disable long "ls -l" directory listings.
 
-  --disable-parent-dir-refs
+  --disable-parent-dir-refs		(define NO_PARENT_DIR_REFERENCE)
   	Use this option to disable "Up-to" parent-links in directory listings.
 
   --enable-debug
-  	Use this option to compile-in logic for traces/debugging.
+  	Use this option to compile-in support for debugging.
+	(The symbol DEBUG is always defined).
 
-  --enable-find-leaks
+  --enable-find-leaks			(defines LY_FIND_LEAKS)
   	Use this option to compile-in logic for testing memory leaks.
 
   --enable-warnings
   	Use this option to turn on GCC compiler warnings.
 
-  --with-char-trans
+  --with-char-trans			(defines EXP_CHARTRANS)
   	Use this option to enable optional character-translations with
 	new charsets, UTF8 mode, etc.
 
-  --with-color-style
+  --with-color-style			(define USE_COLOR_STYLE)
   	Use this option to enable optional/experimental color style.
+	(Also defines USEHASH, UNPAINT_CACHE, LINKEDSTYLES)
 
-  --with-dired
+  --with-dired				(defines DIRED_SUPPORT)
 	Use this option to enable or disable the optional
 	directory-editor.
 
@@ -158,6 +160,9 @@ the script:
 	standard locations for the associated header and library files,
 	unless you have preset the $CFLAGS and $LIBS variables.
 
+	--with-screen=ncurses		(defines NCURSES)
+	--with-screen=slang		(defines USE_SLANG)
+
 --------------------------------------------------------------------------------
 
 Environment
diff --git a/WWW/Library/Implementation/UCMap.h b/WWW/Library/Implementation/UCMap.h
index 7c615be8..de196752 100644
--- a/WWW/Library/Implementation/UCMap.h
+++ b/WWW/Library/Implementation/UCMap.h
@@ -32,10 +32,10 @@ extern int UCGetLYhndl_byMIME PARAMS((
 extern int UCGetRawUniMode_byLYhndl PARAMS((
 	int		i));
 
-PUBLIC int UCLYhndl_for_unspec;
-PUBLIC int UCLYhndl_for_unrec;
-PUBLIC int UCLYhndl_HTFile_for_unspec;
-PUBLIC int UCLYhndl_HTFile_for_unrec;
+extern int UCLYhndl_for_unspec;
+extern int UCLYhndl_for_unrec;
+extern int UCLYhndl_HTFile_for_unspec;
+extern int UCLYhndl_HTFile_for_unrec;
 
 #define UCTRANS_NOTFOUND (-4)
 
diff --git a/aclocal.m4 b/aclocal.m4
index 26f4bc1a..19eb64b6 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -79,9 +79,7 @@ AC_MSG_CHECKING([if curses supports alternate-character set])
 AC_CACHE_VAL(cf_cv_alt_char_set,[
 	AC_TRY_LINK([
 #include <$cf_cv_ncurses_header>
-	],[
-	chtype x = acs_map['l']
-	],
+	],[chtype x = acs_map['l']; acs_map['m'] = 0],
 	[cf_cv_alt_char_set=yes],  
 	[cf_cv_alt_char_set=no])])
 AC_MSG_RESULT($cf_cv_alt_char_set)
@@ -162,6 +160,11 @@ dnl Look for the curses libraries.  Older curses implementations may require
 dnl termcap/termlib to be linked as well.
 AC_DEFUN([CF_CURSES_LIBS],[
 AC_CHECK_FUNC(initscr,,[
+case $host_os in #(vi
+freebsd*)
+	AC_CHECK_LIB(mytinfo,tgoto,[LIBS="-lmytinfo $LIBS"])
+	;;
+esac
 if test -d /usr/5lib ; then
 	# SunOS 3.x or 4.x
 	CPPFLAGS="$CPPFLAGS -I/usr/5include"
@@ -170,7 +173,12 @@ if test -d /usr/5lib ; then
 # 	# Solaris 5.x
 # 	LIBS="$LIBS -L/usr/ccs/lib -R/usr/ccs/lib"
 fi
+
 cf_save_LIBS="$LIBS"
+AC_CHECK_FUNC(tgoto,[
+	AC_CHECK_LIB(curses,initscr,,[
+		AC_ERROR(cannot link curses)])
+],[
 AC_CHECK_LIB(termcap, tgoto,[
 	LIBS="-ltermcap $cf_save_LIBS"
 	AC_CHECK_LIB(curses,initscr,,[
@@ -180,6 +188,7 @@ AC_CHECK_LIB(termcap, tgoto,[
 	],[
 	AC_CHECK_LIB(curses,initscr,,[
 		AC_ERROR(cannot link curses)])])
+])
 ])])
 dnl ---------------------------------------------------------------------------
 dnl Solaris 2.x curses provides a "performance" tradeoff according to whether
@@ -488,7 +497,16 @@ AC_CHECK_LIB(gpm,Gpm_Open,[
 				[AC_ERROR(cannot link -lncurses)])])
 		AC_MSG_RESULT($cf_need_gpm)
 		])],
-	[AC_CHECK_LIB(ncurses,initscr)])
+	[AC_TRY_LINK([#include <$cf_cv_ncurses_header>],
+		[initscr()],,[
+		case $host_os in #(vi
+		freebsd*)
+			AC_CHECK_LIB(mytinfo,tgoto,[LIBS="-lmytinfo $LIBS"])
+			;;
+		esac
+		LIBS="-lncurses $LIBS"
+		AC_TRY_LINK([#include <$cf_cv_ncurses_header>],
+			[initscr()],,[AC_ERROR(cannot link -lncurses)])])])
 ])])
 dnl ---------------------------------------------------------------------------
 dnl Check for the version of ncurses, to aid in reporting bugs, etc.
@@ -870,7 +888,7 @@ AC_DEFUN([CF_TTYTYPE],
 AC_MSG_CHECKING(if ttytype is declared in curses library)
 AC_CACHE_VAL(cf_cv_have_ttytype,[
 	AC_TRY_LINK([#include <$cf_cv_ncurses_header>],
-	[char *x = &ttytype[1]],
+	[char *x = &ttytype[1]; *x = 1],
 	[cf_cv_have_ttytype=yes],
 	[cf_cv_have_ttytype=no])
 	])
@@ -891,7 +909,9 @@ AC_DEFUN([CF_UTMP],
 [
 AC_MSG_CHECKING(if struct utmp is declared)
 AC_CACHE_VAL(cf_cv_have_utmp,[
-	AC_TRY_COMPILE([#include <utmp.h>],
+	AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <utmp.h>],
 	[struct utmp x; char *y = &x.ut_host[0]],
 	[cf_cv_have_utmp=yes],
 	[AC_TRY_COMPILE([#include <utmpx.h>],
diff --git a/configure b/configure
index 6d0b4e6c..8a9f3bb9 100755
--- a/configure
+++ b/configure
@@ -24,7 +24,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --with-dired            enable optional directory-editor, DirEd (default)"
 ac_help="$ac_help
-  --disable-dired-archive DirEd: disable dearchiving commands (default: on)"
+  --disable-dired-archive  DirEd: disable dearchiving commands (default: on)"
 ac_help="$ac_help
   --disable-dired-override DirEd: disable private keymaps (default: on)"
 ac_help="$ac_help
@@ -2348,7 +2348,7 @@ sunos4*)
 	;;
 ultrix*)
 	# Increase the maximum size of functions that will be optimized.
-	test -z "$GCC" && CFLAGS="$CFLAGS -O -Olimit 600"
+	test -z "$GCC" && CFLAGS="$CFLAGS -O -Olimit 600 -G 7"
 	CFLAGS="$CFLAGS -DULTRIX" 
 	;;
 esac
@@ -2950,6 +2950,50 @@ if eval "test \"`echo '$ac_cv_func_'initscr`\" = yes"; then
 else
   echo "$ac_t""no" 1>&6
 
+case $host_os in #(vi
+freebsd*)
+	echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6
+echo "configure:2957: checking for tgoto in -lmytinfo" >&5
+ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lmytinfo  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2965 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char tgoto();
+
+int main() {
+tgoto()
+; return 0; }
+EOF
+if { (eval echo configure:2976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  LIBS="-lmytinfo $LIBS"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+	;;
+esac
 if test -d /usr/5lib ; then
 	# SunOS 3.x or 4.x
 	CPPFLAGS="$CPPFLAGS -I/usr/5include"
@@ -2958,9 +3002,107 @@ if test -d /usr/5lib ; then
 # 	# Solaris 5.x
 # 	LIBS="$LIBS -L/usr/ccs/lib -R/usr/ccs/lib"
 fi
+
 cf_save_LIBS="$LIBS"
+echo $ac_n "checking for tgoto""... $ac_c" 1>&6
+echo "configure:3009: checking for tgoto" >&5
+if eval "test \"`echo '$''{'ac_cv_func_tgoto'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 3014 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char tgoto(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char tgoto();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_tgoto) || defined (__stub___tgoto)
+choke me
+#else
+tgoto();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:3037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_func_tgoto=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_tgoto=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'tgoto`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  
+	echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6
+echo "configure:3053: checking for initscr in -lcurses" >&5
+ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lcurses  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 3061 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char initscr();
+
+int main() {
+initscr()
+; return 0; }
+EOF
+if { (eval echo configure:3072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo curses | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lcurses $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+
+		{ echo "configure: error: cannot link curses" 1>&2; exit 1; }
+fi
+
+
+else
+  echo "$ac_t""no" 1>&6
+
 echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
-echo "configure:2964: checking for tgoto in -ltermcap" >&5
+echo "configure:3106: checking for tgoto in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2968,7 +3110,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2972 "configure"
+#line 3114 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2979,7 +3121,7 @@ int main() {
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:2983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2997,7 +3139,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   
 	LIBS="-ltermcap $cf_save_LIBS"
 	echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6
-echo "configure:3001: checking for initscr in -lcurses" >&5
+echo "configure:3143: checking for initscr in -lcurses" >&5
 ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3005,7 +3147,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3009 "configure"
+#line 3151 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3016,7 +3158,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:3020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3043,7 +3185,7 @@ else
   echo "$ac_t""no" 1>&6
 
 		echo $ac_n "checking for initscr in -lcursesX""... $ac_c" 1>&6
-echo "configure:3047: checking for initscr in -lcursesX" >&5
+echo "configure:3189: checking for initscr in -lcursesX" >&5
 ac_lib_var=`echo cursesX'_'initscr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3051,7 +3193,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcursesX  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3055 "configure"
+#line 3197 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3062,7 +3204,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:3066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3089,7 +3231,7 @@ else
   echo "$ac_t""no" 1>&6
 
 			echo $ac_n "checking for initscr in -ljcurses""... $ac_c" 1>&6
-echo "configure:3093: checking for initscr in -ljcurses" >&5
+echo "configure:3235: checking for initscr in -ljcurses" >&5
 ac_lib_var=`echo jcurses'_'initscr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3097,7 +3239,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ljcurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3101 "configure"
+#line 3243 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3108,7 +3250,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:3112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3146,7 +3288,7 @@ else
   echo "$ac_t""no" 1>&6
 
 	echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6
-echo "configure:3150: checking for initscr in -lcurses" >&5
+echo "configure:3292: checking for initscr in -lcurses" >&5
 ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3154,7 +3296,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3158 "configure"
+#line 3300 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3165,7 +3307,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:3169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3199,16 +3341,19 @@ fi
 
 fi
 
+
+fi
+
 	
 echo $ac_n "checking for curses performance tradeoff""... $ac_c" 1>&6
-echo "configure:3205: checking for curses performance tradeoff" >&5
+echo "configure:3350: checking for curses performance tradeoff" >&5
 if eval "test \"`echo '$''{'cf_cv_curs_performance'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cf_cv_curs_performance=no
     cat > conftest.$ac_ext <<EOF
-#line 3212 "configure"
+#line 3357 "configure"
 #include "confdefs.h"
 
 #include <$cf_cv_ncurses_header>
@@ -3222,11 +3367,11 @@ int main() {
 	
 ; return 0; }
 EOF
-if { (eval echo configure:3226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3371: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 	cat > conftest.$ac_ext <<EOF
-#line 3230 "configure"
+#line 3375 "configure"
 #include "confdefs.h"
 
 #define CURS_PERFORMANCE
@@ -3241,7 +3386,7 @@ int main() {
 	
 ; return 0; }
 EOF
-if { (eval echo configure:3245: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3390: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_curs_performance=yes
 else
@@ -3267,20 +3412,20 @@ EOF
 ncurses)
 	
 echo $ac_n "checking for ncurses header file""... $ac_c" 1>&6
-echo "configure:3271: checking for ncurses header file" >&5
+echo "configure:3416: checking for ncurses header file" >&5
 if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 3277 "configure"
+#line 3422 "configure"
 #include "confdefs.h"
 #include <curses.h>
 int main() {
 printf("%s\n", NCURSES_VERSION)
 ; return 0; }
 EOF
-if { (eval echo configure:3284: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ncurses_header=predefined
 else
@@ -3362,12 +3507,12 @@ done
 esac
 
 	echo $ac_n "checking for initscr""... $ac_c" 1>&6
-echo "configure:3366: checking for initscr" >&5
+echo "configure:3511: checking for initscr" >&5
 if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3371 "configure"
+#line 3516 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr(); below.  */
@@ -3390,7 +3535,7 @@ initscr();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_initscr=yes"
 else
@@ -3411,7 +3556,7 @@ else
 
 cf_save_LIBS="$LIBS"
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:3415: checking for Gpm_Open in -lgpm" >&5
+echo "configure:3560: checking for Gpm_Open in -lgpm" >&5
 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3419,7 +3564,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lgpm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3423 "configure"
+#line 3568 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3430,7 +3575,7 @@ int main() {
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:3434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3447,7 +3592,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   
 	echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6
-echo "configure:3451: checking for initscr in -lgpm" >&5
+echo "configure:3596: checking for initscr in -lgpm" >&5
 ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3455,7 +3600,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lgpm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3459 "configure"
+#line 3604 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3466,7 +3611,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:3470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3484,7 +3629,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   
 		# don't try to link with gpm, since it contains curses
 		echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6
-echo "configure:3488: checking for initscr in -lncurses" >&5
+echo "configure:3633: checking for initscr in -lncurses" >&5
 ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3492,7 +3637,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lncurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3496 "configure"
+#line 3641 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3503,7 +3648,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:3507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3535,17 +3680,17 @@ else
   echo "$ac_t""no" 1>&6
 
 		echo $ac_n "checking if ncurses needs -lgpm to link""... $ac_c" 1>&6
-echo "configure:3539: checking if ncurses needs -lgpm to link" >&5
+echo "configure:3684: checking if ncurses needs -lgpm to link" >&5
 		LIBS="-lncurses $cf_save_LIBS"
 		cat > conftest.$ac_ext <<EOF
-#line 3542 "configure"
+#line 3687 "configure"
 #include "confdefs.h"
 #include <$cf_cv_ncurses_header>
 int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:3549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   cf_need_gpm=no
 else
@@ -3554,14 +3699,14 @@ else
   rm -rf conftest*
   LIBS="-lncurses -lgpm $cf_save_LIBS"
 			cat > conftest.$ac_ext <<EOF
-#line 3558 "configure"
+#line 3703 "configure"
 #include "confdefs.h"
 #include <$cf_cv_ncurses_header>
 int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:3565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   cf_need_gpm=yes
 else
@@ -3579,27 +3724,44 @@ fi
 
 else
   echo "$ac_t""no" 1>&6
-echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6
-echo "configure:3584: checking for initscr in -lncurses" >&5
-ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'`
+cat > conftest.$ac_ext <<EOF
+#line 3729 "configure"
+#include "confdefs.h"
+#include <$cf_cv_ncurses_header>
+int main() {
+initscr()
+; return 0; }
+EOF
+if { (eval echo configure:3736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  :
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+		case $host_os in #(vi
+		freebsd*)
+			echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6
+echo "configure:3746: checking for tgoto in -lmytinfo" >&5
+ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lncurses  $LIBS"
+LIBS="-lmytinfo  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3592 "configure"
+#line 3754 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char initscr();
+char tgoto();
 
 int main() {
-initscr()
+tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:3603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3614,18 +3776,33 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo ncurses | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-lncurses $LIBS"
-
+  LIBS="-lmytinfo $LIBS"
 else
   echo "$ac_t""no" 1>&6
 fi
 
+			;;
+		esac
+		LIBS="-lncurses $LIBS"
+		cat > conftest.$ac_ext <<EOF
+#line 3789 "configure"
+#include "confdefs.h"
+#include <$cf_cv_ncurses_header>
+int main() {
+initscr()
+; return 0; }
+EOF
+if { (eval echo configure:3796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  :
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  { echo "configure: error: cannot link -lncurses" 1>&2; exit 1; }
+fi
+rm -f conftest*
+fi
+rm -f conftest*
 fi
 
 
@@ -3642,7 +3819,7 @@ cf_cv_lib_termcap=none
 # HP-UX 9.x terminfo has setupterm, but no tigetstr.
 if test "$termlib" = none; then
 	echo $ac_n "checking for tigetstr in -ltermlib""... $ac_c" 1>&6
-echo "configure:3646: checking for tigetstr in -ltermlib" >&5
+echo "configure:3823: checking for tigetstr in -ltermlib" >&5
 ac_lib_var=`echo termlib'_'tigetstr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3650,7 +3827,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ltermlib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3654 "configure"
+#line 3831 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3661,7 +3838,7 @@ int main() {
 tigetstr()
 ; return 0; }
 EOF
-if { (eval echo configure:3665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3684,7 +3861,7 @@ fi
 fi
 if test "$cf_cv_lib_termcap" = none; then
 	echo $ac_n "checking for tgoto in -ltermlib""... $ac_c" 1>&6
-echo "configure:3688: checking for tgoto in -ltermlib" >&5
+echo "configure:3865: checking for tgoto in -ltermlib" >&5
 ac_lib_var=`echo termlib'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3692,7 +3869,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ltermlib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3696 "configure"
+#line 3873 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3703,7 +3880,7 @@ int main() {
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:3707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3727,7 +3904,7 @@ fi
 if test "$cf_cv_lib_termcap" = none; then
 	# allow curses library for broken AIX system.
 	echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6
-echo "configure:3731: checking for initscr in -lcurses" >&5
+echo "configure:3908: checking for initscr in -lcurses" >&5
 ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3735,7 +3912,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3739 "configure"
+#line 3916 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3746,7 +3923,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:3750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3767,7 +3944,7 @@ else
 fi
 
 	echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
-echo "configure:3771: checking for tgoto in -ltermcap" >&5
+echo "configure:3948: checking for tgoto in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3775,7 +3952,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3779 "configure"
+#line 3956 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3786,7 +3963,7 @@ int main() {
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:3790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3809,7 +3986,7 @@ fi
 fi
 if test "$cf_cv_lib_termcap" = none; then
 	echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
-echo "configure:3813: checking for tgoto in -ltermcap" >&5
+echo "configure:3990: checking for tgoto in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3817,7 +3994,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3821 "configure"
+#line 3998 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3828,7 +4005,7 @@ int main() {
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:3832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3851,7 +4028,7 @@ fi
 fi
 if test "$cf_cv_lib_termcap" = none; then
 	echo $ac_n "checking for tgoto in -lncurses""... $ac_c" 1>&6
-echo "configure:3855: checking for tgoto in -lncurses" >&5
+echo "configure:4032: checking for tgoto in -lncurses" >&5
 ac_lib_var=`echo ncurses'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3859,7 +4036,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lncurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3863 "configure"
+#line 4040 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3870,7 +4047,7 @@ int main() {
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:3874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3900,20 +4077,20 @@ fi
 
 	
 echo $ac_n "checking for slang header file""... $ac_c" 1>&6
-echo "configure:3904: checking for slang header file" >&5
+echo "configure:4081: checking for slang header file" >&5
 if eval "test \"`echo '$''{'cf_cv_slang_header'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 3910 "configure"
+#line 4087 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int main() {
 printf("%s\n", SLANG_VERSION)
 ; return 0; }
 EOF
-if { (eval echo configure:3917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_slang_header=predefined
 else
@@ -3982,12 +4159,12 @@ esac
 
 	
 	echo $ac_n "checking for SLtt_get_screen_size""... $ac_c" 1>&6
-echo "configure:3986: checking for SLtt_get_screen_size" >&5
+echo "configure:4163: checking for SLtt_get_screen_size" >&5
 if eval "test \"`echo '$''{'ac_cv_func_SLtt_get_screen_size'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3991 "configure"
+#line 4168 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char SLtt_get_screen_size(); below.  */
@@ -4010,7 +4187,7 @@ SLtt_get_screen_size();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_SLtt_get_screen_size=yes"
 else
@@ -4029,7 +4206,7 @@ else
   echo "$ac_t""no" 1>&6
 
 	echo $ac_n "checking for SLtt_get_screen_size in -lslang""... $ac_c" 1>&6
-echo "configure:4033: checking for SLtt_get_screen_size in -lslang" >&5
+echo "configure:4210: checking for SLtt_get_screen_size in -lslang" >&5
 ac_lib_var=`echo slang'_'SLtt_get_screen_size | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4037,7 +4214,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lslang "-lm" $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4041 "configure"
+#line 4218 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4048,7 +4225,7 @@ int main() {
 SLtt_get_screen_size()
 ; return 0; }
 EOF
-if { (eval echo configure:4052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4067,7 +4244,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for SLtt_get_screen_size in -lslang""... $ac_c" 1>&6
-echo "configure:4071: checking for SLtt_get_screen_size in -lslang" >&5
+echo "configure:4248: checking for SLtt_get_screen_size in -lslang" >&5
 ac_lib_var=`echo slang'_'SLtt_get_screen_size | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4075,7 +4252,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lslang "-lm" $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4079 "configure"
+#line 4256 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4086,7 +4263,7 @@ int main() {
 SLtt_get_screen_size()
 ; return 0; }
 EOF
-if { (eval echo configure:4090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4117,12 +4294,12 @@ esac
 
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:4121: checking for ANSI C header files" >&5
+echo "configure:4298: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4126 "configure"
+#line 4303 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -4130,7 +4307,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4134: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4311: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4147,7 +4324,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 4151 "configure"
+#line 4328 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -4165,7 +4342,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 4169 "configure"
+#line 4346 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -4186,7 +4363,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 4190 "configure"
+#line 4367 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -4197,7 +4374,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:4201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -4221,12 +4398,12 @@ EOF
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:4225: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:4402: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4230 "configure"
+#line 4407 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -4235,7 +4412,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:4239: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4416: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -4260,12 +4437,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:4264: checking for $ac_hdr that defines DIR" >&5
+echo "configure:4441: checking for $ac_hdr that defines DIR" >&5
 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4269 "configure"
+#line 4446 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -4273,7 +4450,7 @@ int main() {
 DIR *dirp = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:4277: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4454: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else
@@ -4298,7 +4475,7 @@ done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
 echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:4302: checking for opendir in -ldir" >&5
+echo "configure:4479: checking for opendir in -ldir" >&5
 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4306,7 +4483,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4310 "configure"
+#line 4487 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4317,7 +4494,7 @@ int main() {
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:4321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4339,7 +4516,7 @@ fi
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:4343: checking for opendir in -lx" >&5
+echo "configure:4520: checking for opendir in -lx" >&5
 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4347,7 +4524,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4351 "configure"
+#line 4528 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4358,7 +4535,7 @@ int main() {
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:4362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4396,17 +4573,17 @@ for ac_hdr in \
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4400: checking for $ac_hdr" >&5
+echo "configure:4577: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4405 "configure"
+#line 4582 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4410: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4587: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4434,13 +4611,13 @@ done
 
 
 echo $ac_n "checking termio.h and termios.h""... $ac_c" 1>&6
-echo "configure:4438: checking termio.h and termios.h" >&5
+echo "configure:4615: checking termio.h and termios.h" >&5
 if eval "test \"`echo '$''{'cf_cv_termio_and_termios'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 4444 "configure"
+#line 4621 "configure"
 #include "confdefs.h"
 
 #if HAVE_TERMIO_H
@@ -4453,7 +4630,7 @@ int main() {
 putchar (0x0a)
 ; return 0; }
 EOF
-if { (eval echo configure:4457: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_termio_and_termios=yes
 else
@@ -4474,12 +4651,12 @@ EOF
 
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:4478: checking for pid_t" >&5
+echo "configure:4655: checking for pid_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4483 "configure"
+#line 4660 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4508,17 +4685,17 @@ fi
 
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:4512: checking for vfork.h" >&5
+echo "configure:4689: checking for vfork.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4517 "configure"
+#line 4694 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4522: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4699: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4543,18 +4720,18 @@ else
 fi
 
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:4547: checking for working vfork" >&5
+echo "configure:4724: checking for working vfork" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test "$cross_compiling" = yes; then
   echo $ac_n "checking for vfork""... $ac_c" 1>&6
-echo "configure:4553: checking for vfork" >&5
+echo "configure:4730: checking for vfork" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4558 "configure"
+#line 4735 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vfork(); below.  */
@@ -4577,7 +4754,7 @@ vfork();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_vfork=yes"
 else
@@ -4598,7 +4775,7 @@ fi
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 4602 "configure"
+#line 4779 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -4693,7 +4870,7 @@ main() {
   }
 }
 EOF
-if { (eval echo configure:4697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_vfork_works=yes
 else
@@ -4717,20 +4894,20 @@ fi
 
 
 echo $ac_n "checking for broken/missing definition of remove""... $ac_c" 1>&6
-echo "configure:4721: checking for broken/missing definition of remove" >&5
+echo "configure:4898: checking for broken/missing definition of remove" >&5
 if eval "test \"`echo '$''{'cf_cv_baddef_remove'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 4727 "configure"
+#line 4904 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 remove("dummy")
 ; return 0; }
 EOF
-if { (eval echo configure:4734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   cf_cv_baddef_remove=no
 else
@@ -4738,7 +4915,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 4742 "configure"
+#line 4919 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int __unlink(name) { return unlink(name); } 
@@ -4746,7 +4923,7 @@ int main() {
 remove("dummy")
 ; return 0; }
 EOF
-if { (eval echo configure:4750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   cf_cv_baddef_remove=yes
 else
@@ -4776,12 +4953,12 @@ for ac_func in \
 
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4780: checking for $ac_func" >&5
+echo "configure:4957: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4785 "configure"
+#line 4962 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4804,7 +4981,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4832,13 +5009,13 @@ done
 
 
 echo $ac_n "checking if TRUE/FALSE are defined""... $ac_c" 1>&6
-echo "configure:4836: checking if TRUE/FALSE are defined" >&5
+echo "configure:5013: checking if TRUE/FALSE are defined" >&5
 if eval "test \"`echo '$''{'cf_cv_bool_defs'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 4842 "configure"
+#line 5019 "configure"
 #include "confdefs.h"
 
 #include <$cf_cv_ncurses_header>
@@ -4847,7 +5024,7 @@ int main() {
 int x = TRUE, y = FALSE
 ; return 0; }
 EOF
-if { (eval echo configure:4851: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5028: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_bool_defs=yes
 else
@@ -4873,13 +5050,13 @@ fi
 
 
 echo $ac_n "checking for errno external decl""... $ac_c" 1>&6
-echo "configure:4877: checking for errno external decl" >&5
+echo "configure:5054: checking for errno external decl" >&5
 if eval "test \"`echo '$''{'cf_cv_extern_errno'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 4883 "configure"
+#line 5060 "configure"
 #include "confdefs.h"
 
 #include <errno.h>
@@ -4887,7 +5064,7 @@ int main() {
 int x = errno
 ; return 0; }
 EOF
-if { (eval echo configure:4891: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5068: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_extern_errno=yes
 else
@@ -4907,20 +5084,20 @@ EOF
 
 
 echo $ac_n "checking for setlocale()""... $ac_c" 1>&6
-echo "configure:4911: checking for setlocale()" >&5
+echo "configure:5088: checking for setlocale()" >&5
 if eval "test \"`echo '$''{'cf_cv_locale'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 4917 "configure"
+#line 5094 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 setlocale(LC_ALL, "")
 ; return 0; }
 EOF
-if { (eval echo configure:4924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   cf_cv_locale=yes
 else
@@ -4941,13 +5118,13 @@ EOF
 
 
 echo $ac_n "checking if NGROUPS is defined""... $ac_c" 1>&6
-echo "configure:4945: checking if NGROUPS is defined" >&5
+echo "configure:5122: checking if NGROUPS is defined" >&5
 if eval "test \"`echo '$''{'cf_cv_ngroups'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 4951 "configure"
+#line 5128 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -4961,7 +5138,7 @@ int main() {
 int x = NGROUPS
 ; return 0; }
 EOF
-if { (eval echo configure:4965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ngroups=yes
 else
@@ -4969,7 +5146,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 4973 "configure"
+#line 5150 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -4983,7 +5160,7 @@ int main() {
 int x = NGROUPS_MAX
 ; return 0; }
 EOF
-if { (eval echo configure:4987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5164: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ngroups=NGROUPS_MAX
 else
@@ -5014,13 +5191,13 @@ fi
 
 
 echo $ac_n "checking declaration of sys_errlist""... $ac_c" 1>&6
-echo "configure:5018: checking declaration of sys_errlist" >&5
+echo "configure:5195: checking declaration of sys_errlist" >&5
 if eval "test \"`echo '$''{'cf_cv_dcl_sys_errlist'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 5024 "configure"
+#line 5201 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -5030,7 +5207,7 @@ int main() {
 char *c = (char *) *sys_errlist
 ; return 0; }
 EOF
-if { (eval echo configure:5034: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5211: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_dcl_sys_errlist=yes
 else
@@ -5050,20 +5227,22 @@ EOF
 
 
 echo $ac_n "checking if struct utmp is declared""... $ac_c" 1>&6
-echo "configure:5054: checking if struct utmp is declared" >&5
+echo "configure:5231: checking if struct utmp is declared" >&5
 if eval "test \"`echo '$''{'cf_cv_have_utmp'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 5060 "configure"
+#line 5237 "configure"
 #include "confdefs.h"
+
+#include <sys/types.h>
 #include <utmp.h>
 int main() {
 struct utmp x; char *y = &x.ut_host[0]
 ; return 0; }
 EOF
-if { (eval echo configure:5067: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_have_utmp=yes
 else
@@ -5071,14 +5250,14 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 5075 "configure"
+#line 5254 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
 int main() {
 struct utmpx x; char *y = &x.ut_host[0]
 ; return 0; }
 EOF
-if { (eval echo configure:5082: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5261: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_have_utmp=utmpx
 else
@@ -5109,24 +5288,22 @@ EOF
 if test $cf_cv_screen != slang ; then
 	
 echo $ac_n "checking if curses supports alternate-character set""... $ac_c" 1>&6
-echo "configure:5113: checking if curses supports alternate-character set" >&5
+echo "configure:5292: checking if curses supports alternate-character set" >&5
 if eval "test \"`echo '$''{'cf_cv_alt_char_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 5119 "configure"
+#line 5298 "configure"
 #include "confdefs.h"
 
 #include <$cf_cv_ncurses_header>
 	
 int main() {
-
-	chtype x = acs_map['l']
-	
+chtype x = acs_map['l']; acs_map['m'] = 0
 ; return 0; }
 EOF
-if { (eval echo configure:5130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   cf_cv_alt_char_set=yes
 else
@@ -5146,13 +5323,13 @@ EOF
 
 	
 echo $ac_n "checking if curses supports fancy attributes""... $ac_c" 1>&6
-echo "configure:5150: checking if curses supports fancy attributes" >&5
+echo "configure:5327: checking if curses supports fancy attributes" >&5
 if eval "test \"`echo '$''{'cf_cv_fancy_curses'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 5156 "configure"
+#line 5333 "configure"
 #include "confdefs.h"
 
 #include <$cf_cv_ncurses_header>
@@ -5165,7 +5342,7 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
 	
 ; return 0; }
 EOF
-if { (eval echo configure:5169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   cf_cv_fancy_curses=yes
 else
@@ -5185,7 +5362,7 @@ EOF
 
 
 	echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
-echo "configure:5189: checking for ncurses version" >&5
+echo "configure:5366: checking for ncurses version" >&5
 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5202,7 +5379,7 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo configure:5206: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
+	{ (eval echo configure:5383: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's@^[^\"]*\"@@' -e 's@\".*@@'`
 		test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
@@ -5219,7 +5396,7 @@ if eval "test \"`echo '$''{'cf_cv_ncurses_broken'+set}'`\" = set"; then
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 5223 "configure"
+#line 5400 "configure"
 #include "confdefs.h"
 
 #include <$cf_cv_ncurses_header>
@@ -5233,7 +5410,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5237: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5414: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ncurses_broken=no
 else
@@ -5257,13 +5434,13 @@ fi
 
 	
 echo $ac_n "checking if curses supports color attributes""... $ac_c" 1>&6
-echo "configure:5261: checking if curses supports color attributes" >&5
+echo "configure:5438: checking if curses supports color attributes" >&5
 if eval "test \"`echo '$''{'cf_cv_color_curses'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 5267 "configure"
+#line 5444 "configure"
 #include "confdefs.h"
 
 #include <$cf_cv_ncurses_header>
@@ -5277,7 +5454,7 @@ has_colors();
 	
 ; return 0; }
 EOF
-if { (eval echo configure:5281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   cf_cv_color_curses=yes
 else
@@ -5298,7 +5475,7 @@ EOF
 
 	
 echo $ac_n "checking declaration of size-change""... $ac_c" 1>&6
-echo "configure:5302: checking declaration of size-change" >&5
+echo "configure:5479: checking declaration of size-change" >&5
 if eval "test \"`echo '$''{'cf_cv_sizechange'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5312,7 +5489,7 @@ do
     CFLAGS="$cf_save_CFLAGS"
     test -n "$cf_opts" && CFLAGS="$CFLAGS -D$cf_opts"
     cat > conftest.$ac_ext <<EOF
-#line 5316 "configure"
+#line 5493 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if HAVE_TERMIOS_H
@@ -5347,7 +5524,7 @@ int main() {
 	
 ; return 0; }
 EOF
-if { (eval echo configure:5351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5528: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_sizechange=yes
 else
@@ -5378,20 +5555,20 @@ EOF
 
 	
 echo $ac_n "checking if ttytype is declared in curses library""... $ac_c" 1>&6
-echo "configure:5382: checking if ttytype is declared in curses library" >&5
+echo "configure:5559: checking if ttytype is declared in curses library" >&5
 if eval "test \"`echo '$''{'cf_cv_have_ttytype'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 5388 "configure"
+#line 5565 "configure"
 #include "confdefs.h"
 #include <$cf_cv_ncurses_header>
 int main() {
-char *x = &ttytype[1]
+char *x = &ttytype[1]; *x = 1
 ; return 0; }
 EOF
-if { (eval echo configure:5395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   cf_cv_have_ttytype=yes
 else
@@ -5416,12 +5593,12 @@ EOF
 	
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5420: checking for $ac_func" >&5
+echo "configure:5597: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5425 "configure"
+#line 5602 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5444,7 +5621,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5474,7 +5651,7 @@ fi
 
 
 echo $ac_n "checking if character-translation code should be used""... $ac_c" 1>&6
-echo "configure:5478: checking if character-translation code should be used" >&5
+echo "configure:5655: checking if character-translation code should be used" >&5
 if eval "test \"`echo '$''{'cf_cv_char_trans'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5500,7 +5677,7 @@ EOF
 fi
 
 echo $ac_n "checking if color-style code should be used""... $ac_c" 1>&6
-echo "configure:5504: checking if color-style code should be used" >&5
+echo "configure:5681: checking if color-style code should be used" >&5
 if eval "test \"`echo '$''{'cf_cv_color_style'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5553,7 +5730,7 @@ esac
 # All DirEd functions that were enabled on compilation can be disabled
 # or modified at run time via DIRED_MENU symbols in lynx.cfg.
 echo $ac_n "checking if directory-editor code should be used""... $ac_c" 1>&6
-echo "configure:5557: checking if directory-editor code should be used" >&5
+echo "configure:5734: checking if directory-editor code should be used" >&5
 if eval "test \"`echo '$''{'cf_cv_dired'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5575,33 +5752,26 @@ if test ".$cf_cv_dired" != ".no" ; then
 EOF
 
 
-	echo $ac_n "checking if you wish to extracting from archives via DirEd""... $ac_c" 1>&6
-echo "configure:5580: checking if you wish to extracting from archives via DirEd" >&5
+	echo $ac_n "checking if you wish to allow extracting from archives via DirEd""... $ac_c" 1>&6
+echo "configure:5757: checking if you wish to allow extracting from archives via DirEd" >&5
 	# Check whether --enable-dired-archive or --disable-dired-archive was given.
 if test "${enable_dired_archive+set}" = set; then
   enableval="$enable_dired_archive"
   test "$enableval" != no && enableval=yes
   if test "$enableval" != "yes" ; then
-    : 
-  else
     cat >> confdefs.h <<\EOF
 #define ARCHIVE_ONLY 1
 EOF
-
+ 
   fi
 else
-  enableval=yes 
-  cat >> confdefs.h <<\EOF
-#define ARCHIVE_ONLY 1
-EOF
-
-  
+  enableval=yes   
 fi
 
 	echo "$ac_t""$enableval" 1>&6
 
 	echo $ac_n "checking if you wish to allow users to redefine DirEd keys""... $ac_c" 1>&6
-echo "configure:5605: checking if you wish to allow users to redefine DirEd keys" >&5
+echo "configure:5775: checking if you wish to allow users to redefine DirEd keys" >&5
 	# Check whether --enable-dired-override or --disable-dired-override was given.
 if test "${enable_dired_override+set}" = set; then
   enableval="$enable_dired_override"
@@ -5626,7 +5796,7 @@ fi
 	echo "$ac_t""$enableval" 1>&6
 
 	echo $ac_n "checking if you wish to allow permissions commands via DirEd""... $ac_c" 1>&6
-echo "configure:5630: checking if you wish to allow permissions commands via DirEd" >&5
+echo "configure:5800: checking if you wish to allow permissions commands via DirEd" >&5
 	# Check whether --enable-dired-permit or --disable-dired-permit was given.
 if test "${enable_dired_permit+set}" = set; then
   enableval="$enable_dired_permit"
@@ -5651,7 +5821,7 @@ fi
 	echo "$ac_t""$enableval" 1>&6
 
 	echo $ac_n "checking if you wish to allow executable-permission commands via DirEd""... $ac_c" 1>&6
-echo "configure:5655: checking if you wish to allow executable-permission commands via DirEd" >&5
+echo "configure:5825: checking if you wish to allow executable-permission commands via DirEd" >&5
 	# Check whether --enable-dired-xpermit or --disable-dired-xpermit was given.
 if test "${enable_dired_xpermit+set}" = set; then
   enableval="$enable_dired_xpermit"
@@ -5669,7 +5839,7 @@ fi
 	echo "$ac_t""$enableval" 1>&6
 
 	echo $ac_n "checking if you wish to allow \"tar\" commands from DirEd""... $ac_c" 1>&6
-echo "configure:5673: checking if you wish to allow \"tar\" commands from DirEd" >&5
+echo "configure:5843: checking if you wish to allow \"tar\" commands from DirEd" >&5
 	# Check whether --enable-dired-tar or --disable-dired-tar was given.
 if test "${enable_dired_tar+set}" = set; then
   enableval="$enable_dired_tar"
@@ -5694,7 +5864,7 @@ fi
 	echo "$ac_t""$enableval" 1>&6
 
 	echo $ac_n "checking if you wish to allow \"uudecode\" commands from DirEd""... $ac_c" 1>&6
-echo "configure:5698: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
+echo "configure:5868: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
 	# Check whether --enable-dired-uudecode or --disable-dired-uudecode was given.
 if test "${enable_dired_uudecode+set}" = set; then
   enableval="$enable_dired_uudecode"
@@ -5719,7 +5889,7 @@ fi
 	echo "$ac_t""$enableval" 1>&6
 
 	echo $ac_n "checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd""... $ac_c" 1>&6
-echo "configure:5723: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
+echo "configure:5893: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
 	# Check whether --enable-dired-zip or --disable-dired-zip was given.
 if test "${enable_dired_zip+set}" = set; then
   enableval="$enable_dired_zip"
@@ -5744,7 +5914,7 @@ fi
 	echo "$ac_t""$enableval" 1>&6
 
 	echo $ac_n "checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd""... $ac_c" 1>&6
-echo "configure:5748: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
+echo "configure:5918: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
 	# Check whether --enable-dired-gzip or --disable-dired-gzip was given.
 if test "${enable_dired_gzip+set}" = set; then
   enableval="$enable_dired_gzip"
@@ -5770,7 +5940,7 @@ fi
 fi
 
 echo $ac_n "checking if you want long-directory listings""... $ac_c" 1>&6
-echo "configure:5774: checking if you want long-directory listings" >&5
+echo "configure:5944: checking if you want long-directory listings" >&5
 # Check whether --enable-long-list or --disable-long-list was given.
 if test "${enable_long_list+set}" = set; then
   enableval="$enable_long_list"
@@ -5795,7 +5965,7 @@ fi
 echo "$ac_t""$enableval" 1>&6
 
 echo $ac_n "checking if parent-directory references are permitted""... $ac_c" 1>&6
-echo "configure:5799: checking if parent-directory references are permitted" >&5
+echo "configure:5969: checking if parent-directory references are permitted" >&5
 # Check whether --enable-parent-dir-refs or --disable-parent-dir-refs was given.
 if test "${enable_parent_dir_refs+set}" = set; then
   enableval="$enable_parent_dir_refs"
@@ -5814,7 +5984,7 @@ echo "$ac_t""$enableval" 1>&6
 
 
 echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6
-echo "configure:5818: checking if you want to see long compiling messages" >&5
+echo "configure:5988: checking if you want to see long compiling messages" >&5
 # Check whether --enable-echo or --disable-echo was given.
 if test "${enable_echo+set}" = set; then
   enableval="$enable_echo"
@@ -5838,7 +6008,7 @@ echo "$ac_t""$enableval" 1>&6
 
 
 echo $ac_n "checking if you want to check memory-leaks""... $ac_c" 1>&6
-echo "configure:5842: checking if you want to check memory-leaks" >&5
+echo "configure:6012: checking if you want to check memory-leaks" >&5
 # Check whether --enable-find-leaks or --disable-find-leaks was given.
 if test "${enable_find_leaks+set}" = set; then
   enableval="$enable_find_leaks"
@@ -5861,7 +6031,7 @@ EOF
 
 
 echo $ac_n "checking if you want to enable debug-code""... $ac_c" 1>&6
-echo "configure:5865: checking if you want to enable debug-code" >&5
+echo "configure:6035: checking if you want to enable debug-code" >&5
 # Check whether --enable-debug or --disable-debug was given.
 if test "${enable_debug+set}" = set; then
   enableval="$enable_debug"
@@ -5878,19 +6048,16 @@ else
 fi
 
 echo "$ac_t""$with_debug" 1>&6
-if test "$with_debug" = "yes" ; then
-	cat >> confdefs.h <<\EOF
-#define DEBUG 1
-EOF
-
-elif test -n "$GCC" ; then
+if test "$with_debug" != "yes" ; then
+if test -n "$GCC" ; then
 	CFLAGS=`echo ${CFLAGS} | sed -e 's/-g //' -e 's/-g$//'`
 fi
+fi
 
 if test -n "$GCC"
 then
 echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6
-echo "configure:5894: checking if you want to turn on gcc warnings" >&5
+echo "configure:6061: checking if you want to turn on gcc warnings" >&5
 # Check whether --enable-warnings or --disable-warnings was given.
 if test "${enable_warnings+set}" = set; then
   enableval="$enable_warnings"
@@ -5913,11 +6080,11 @@ then
 if test -n "$GCC"
 then
 		cat > conftest.$ac_ext <<EOF
-#line 5917 "configure"
+#line 6084 "configure"
 int main(int argc, char *argv[]) { return argv[argc-1] == 0; }
 EOF
 		echo "checking for gcc warning options" 1>&6
-echo "configure:5921: checking for gcc warning options" >&5
+echo "configure:6088: checking for gcc warning options" >&5
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="-W -Wall"
 	for cf_opt in \
@@ -5932,7 +6099,7 @@ echo "configure:5921: checking for gcc warning options" >&5
 		Wstrict-prototypes
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo configure:5936: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+		if { (eval echo configure:6103: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 			test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
diff --git a/configure.in b/configure.in
index 90614c97..5991cfc7 100644
--- a/configure.in
+++ b/configure.in
@@ -148,7 +148,7 @@ sunos4*)
 	;;
 ultrix*)
 	# Increase the maximum size of functions that will be optimized.
-	test -z "$GCC" && CFLAGS="$CFLAGS -O -Olimit 600"
+	test -z "$GCC" && CFLAGS="$CFLAGS -O -Olimit 600 -G 7"
 	CFLAGS="$CFLAGS -DULTRIX" 
 	;;
 esac
@@ -313,9 +313,9 @@ AC_MSG_RESULT($cf_cv_dired)
 if test ".$cf_cv_dired" != ".no" ; then
 	AC_DEFINE(DIRED_SUPPORT)
 
-	AC_MSG_CHECKING(if you wish to extracting from archives via DirEd)
+	AC_MSG_CHECKING(if you wish to allow extracting from archives via DirEd)
 	CF_ARG_DISABLE(dired-archive,
-	[  --disable-dired-archive DirEd: disable dearchiving commands],,[AC_DEFINE(ARCHIVE_ONLY)])
+	[  --disable-dired-archive  DirEd: disable dearchiving commands],[AC_DEFINE(ARCHIVE_ONLY)])
 	AC_MSG_RESULT($enableval)
 
 	AC_MSG_CHECKING(if you wish to allow users to redefine DirEd keys)
@@ -396,11 +396,11 @@ CF_ARG_ENABLE(debug,
 	[with_debug=yes],
 	[with_debug=no])
 AC_MSG_RESULT($with_debug)
-if test "$with_debug" = "yes" ; then
-	AC_DEFINE(DEBUG)
-elif test -n "$GCC" ; then
+if test "$with_debug" != "yes" ; then
+if test -n "$GCC" ; then
 	CF_STRIP_G_OPT(CFLAGS)
 fi
+fi
 
 if test -n "$GCC"
 then
diff --git a/makefile.in b/makefile.in
index d339b8d0..285e4bff 100644
--- a/makefile.in
+++ b/makefile.in
@@ -84,16 +84,6 @@ WWWINC= WWW/Library/Implementation
 # Also be sure to check out the compilation symbols in userdefs.h
 # before building Lynx!
 
-all:
-	@echo
-	@echo "Please run make with one of the following arguments"
-	@echo "lynx       -- to make the executable, put it in this directory"
-	@echo "clean      -- removes all '.o' and 'core' files"
-	@echo "tar        -- runs clean, removes executable, and tars the whole directory"
-	@echo "compress   -- runs tar, then compresses the result"
-	@echo "zip        -- runs clean, removes executable, and zips the whole directory"
-	@echo
-
 # If you apply patches which require linking to site-specific libraries, set
 # SITE_LIBS to those libraries.
 SITE_LIBS= # Your libraries here
@@ -105,16 +95,35 @@ SITE_LYDEFS = # Your defines here
 SITE_DEFS = # Your defines here
 
 # defines include:
+# -DARCHIVE_ONLY   (see README.configure)
+# -DDIRED_SUPPORT  (see README.configure)
+# -DEXP_CHARTRANS  (see README.configure)
+# -DEXP_CHARTRANS_AUTOSWITCH also let lynx switch term mode(Linux console only)
 # -DHP_TERMINAL    For DIM workaround to REVERSE problems on HP terminals.
 # -DIGNORE_CTRL_C  Define if Control-C shouldn't exit lynx.
+# -DLINKEDSTYLES   (see README.configure)
+# -DLONG_LIST      (see README.configure)
+# -DLY_FIND_LEAKS  (see README.configure)
+# -DNCURSES        (see README.configure)
 # -DNOPORT         if you must use PASV instead of PORT for FTP
+# -DNO_CHANGE_EXECUTE_PERMS (see README.configure)
 # -DNO_CPU_LIMIT   Disables Max CPU timeout (includes CLOCKS_PER_SECOND)
-# -DNSL_FORK	   For fork-based name server lookups that can be 'z'apped.
+# -DNO_PARENT_DIR_REFERENCE (see README.configure)
+# -DNSL_FORK       For fork-based name server lookups that can be 'z'apped.
+# -DOK_GZIP        (see README.configure)
+# -DOK_OVERRIDE    (see README.configure)
+# -DOK_PERMIT      (see README.configure)
+# -DOK_TAR         (see README.configure)
+# -DOK_UUDECODE    (see README.configure)
+# -DOK_ZIP         (see README.configure)
 # -DSHORTENED_RBIND  For a SOCKSified lynx with the short version of Rbind.
-# -DSOCKS	   For making a SOCKSified lynx.
-# -DUNDERLINE_LINKS  Define if you want links underlined instead of bold.
-# -DEXP_CHARTRANS_AUTOSWITCH also let lynx switch term mode(Linux console only)
 # -DSLANG_MBCS_HACK prevent cutoff lines when using UTF8 console (slang only)
+# -DSOCKS          For making a SOCKSified lynx.
+# -DUNDERLINE_LINKS  Define if you want links underlined instead of bold.
+# -DUNPAINT_CACHE  (see README.configure)
+# -DUSEHASH        (see README.configure)
+# -DUSE_COLOR_STYLE (see README.configure)
+# -DUSE_SLANG      (see README.configure)
 #
 # if you are linking to freeWAIS-0.202 or older, you should define this
 # in MCFLAGS (SITE_DEFS)
@@ -144,7 +153,7 @@ SITE_DEFS = # Your defines here
 # for installation of local execution links, please see the file userdefs.h
 #
 # TESTED: Linux FreeBSD SunOS Solaris IRIX CLIX HP-UX AIX SCO
-lynx:
+all:
 	cd WWW/Library/unix && $(MAKE) CC="$(CC)" \
 		LYFLAGS="$(SITE_LYDEFS)"
 	cd src && $(MAKE) all CC="$(CC)" \
@@ -154,6 +163,16 @@ lynx:
 		WWWINC=$(WWWINC) \
 		WWWLIB="../WWW/Library/unix/libwww.a"
 
+help:
+	@echo
+	@echo "Please run make with one of the following arguments"
+	@echo "all        -- to make the executable, put it in this directory"
+	@echo "clean      -- removes all '.o' and 'core' files"
+	@echo "tar        -- runs clean, removes executable, and tars the whole directory"
+	@echo "compress   -- runs tar, then compresses the result"
+	@echo "zip        -- runs clean, removes executable, and zips the whole directory"
+	@echo
+
 ##Miscellaneous actions
 clean:
 	rm -f WWW/Library/*/*.[aob]
diff --git a/src/LYCurses.c b/src/LYCurses.c
index 805127cc..ffffcb1c 100644
--- a/src/LYCurses.c
+++ b/src/LYCurses.c
@@ -46,13 +46,12 @@ int has_color = 0;
 PRIVATE int dumbterm PARAMS((char *terminal));
 BOOLEAN LYCursesON = FALSE;
 
-#if USE_COLOR_TABLE || USE_SLANG
+#if USE_COLOR_TABLE || defined(USE_SLANG)
 PRIVATE int Current_Attr;
 #endif
 
 #ifdef USE_SLANG
 PUBLIC unsigned int Lynx_Color_Flags = 0;
-PRIVATE int Current_Attr;
 PUBLIC BOOLEAN FullRefresh = FALSE;
 PUBLIC int curscr = 0;
 #ifdef SLANG_MBCS_HACK
@@ -463,7 +462,7 @@ PRIVATE void lynx_map_color ARGS1(int, n)
 		lynx_color_pairs[n+m+1].bg);
 	}
 	if (n == 0 && LYShowColor >= SHOW_COLOR_ON)
-	    bkgd(COLOR_PAIR(9));
+	    bkgd(COLOR_PAIR(9) | ' ');
     }
 }
 
@@ -518,7 +517,7 @@ PRIVATE void lynx_init_colors NOARGS
 			lynx_color_pairs[n+m+1].bg);
 	    }
 	    if (n == 0 && LYShowColor >= SHOW_COLOR_ON)
-		bkgd(COLOR_PAIR(9));
+		bkgd(COLOR_PAIR(9) | ' ');
 	}
     } else if (LYShowColor != SHOW_COLOR_NEVER) {
 	LYShowColor = SHOW_COLOR_OFF;
@@ -676,6 +675,26 @@ PUBLIC void start_curses NOARGS
 #endif /* SIGTSTP */
 	    exit (-1);
 	}
+
+	/*
+	 * This is a workaround for a bug in SVr4 curses, observed on Solaris
+	 * 2.4:  if your terminal's alternate-character set contains codes in
+	 * the range 128-255, they'll be sign-extended in the acs_map[] table,
+	 * which in turn causes their values to be emitted as 255 (0xff). 
+	 * "Fix" this by forcing the table to 8-bit codes (it has to be
+	 * anyway).
+	 */
+#if defined(ALT_CHAR_SET) && !defined(NCURSES_VERSION)
+	{
+	    int n;
+	    for (n = 0; n < 128; n++)
+	    	if (acs_map[n] & 0x80) {
+	    	    acs_map[n] &= 0xff;
+	    	    acs_map[n] |= A_ALTCHARSET;
+		}
+	}
+#endif
+
 #ifdef USE_COLOR_STYLE
 	has_color = has_colors();
 	if (has_color)
@@ -760,7 +779,7 @@ PUBLIC void stop_curses NOARGS
 #ifdef DJGPP
 		  sock_exit();
 #endif
-#if defined (DOSPATH) && !defined (USE_SLANG)
+#if defined (DOSPATH) && !defined(USE_SLANG)
 	 clrscr();
 #else
 
diff --git a/src/LYCurses.h b/src/LYCurses.h
index 2c9d61c8..4a889faa 100644
--- a/src/LYCurses.h
+++ b/src/LYCurses.h
@@ -110,23 +110,6 @@ extern void LYsubwindow PARAMS((WINDOW * param));
 #define BOXHORI '*'	/* character for popup window horizontal borders */
 #endif
 
-#if defined(BROKEN_CURSES_8BIT_ACS) && defined(ALT_CHAR_SET)
-#define FIX_ACS(cht_acs) ((cht_acs & 0x80) ? ((cht_acs & 0xff) | A_ALTCHARSET) : cht_acs)
-#ifdef box
-#undef box
-#endif
-#define box(win,verch,horch) \
-	wborder(win,\
-	       FIX_ACS((verch ? verch : ACS_VLINE)),\
-	       FIX_ACS((verch ? verch : ACS_VLINE)),\
-	       FIX_ACS((horch ? horch : ACS_HLINE)),\
-	       FIX_ACS((horch ? horch : ACS_HLINE)),\
-	       FIX_ACS(ACS_ULCORNER),\
-	       FIX_ACS(ACS_URCORNER),\
-	       FIX_ACS(ACS_LLCORNER),\
-	       FIX_ACS(ACS_LRCORNER))
-#endif /* BROKEN_CURSES_8BIT_ACS */
-
 extern int LYlines;  /* replaces LINES */
 extern int LYcols;   /* replaces COLS */
 
diff --git a/src/LYUtils.c b/src/LYUtils.c
index 2777eeb2..8073ac04 100644
--- a/src/LYUtils.c
+++ b/src/LYUtils.c
@@ -1893,9 +1893,11 @@ PUBLIC void statusline ARGS1(
 		int a=(strncmp(buffer, "Alert", 5) || !hashStyles[s_alert].name ? s_status : s_alert);
 		LynxChangeStyle (a, ABS_ON, 1);
 		addstr(buffer);
-		wbkgdset(stdscr, has_color ? hashStyles[a].color : hashStyles[a].mono);
+		wbkgdset(stdscr, (has_color
+			? hashStyles[a].color
+			: hashStyles[a].mono) | ' ');
 		clrtoeol();
-		wbkgdset(stdscr, hashStyles[s_normal].color);
+		wbkgdset(stdscr, hashStyles[s_normal].color | ' ');
 		LynxChangeStyle (a, ABS_OFF, 0);
 	}
 #endif
diff --git a/src/makefile.in b/src/makefile.in
index 8b2a14db..773fb6bf 100644
--- a/src/makefile.in
+++ b/src/makefile.in
@@ -8,14 +8,23 @@ exec_prefix	= @exec_prefix@
 srcdir		= @srcdir@
 VPATH		= $(srcdir)
 
-WWWINC		= WWW/Library/Implementation
-SITE_DEFS	= # FIXME: set in parent makefile
 MCFLAGS		= # FIXME: set in parent makefile
+RESOLVLIB	= # FIXME: set in parent makefile
+SITE_DEFS	= # FIXME: set in parent makefile
+SITE_LIBS	= # FIXME: set in parent makefile
+SOCKSLIB	= # FIXME: set in parent makefile
+WAISLIB		= # FIXME: set in parent makefile
+
+WWWINC		= WWW/Library/Implementation
+WWWLIB		= ../WWW/Library/unix/libwww.a
 
 CC		= @CC@
 CPPOPTS		= @DEFS@ @CPPFLAGS@ -I.. -I../$(WWWINC) $(MCFLAGS) $(SITE_DEFS)
 CFLAGS		= $(CPPOPTS) @CFLAGS@
 
+LIBS		= @LIBS@ $(RESOLVLIB) $(WAISLIB) $(SOCKSLIB) $(SITE_LIBS)
+LDFLAGS		= @LDFLAGS@
+
 CHARTRANS_OBJS=UCdomap.o UCAux.o UCAuto.o
 OBJS=  LYClean.o LYShowInfo.o LYEdit.o LYStrings.o \
 LYMail.o HTAlert.o GridText.o LYGetFile.o \
@@ -33,7 +42,7 @@ all: lynx
 
 .c.o:
 @SHOW_CC@
-	@ECHO_CC@$(CC) $(CPPOPTS) $(CFLAGS) -c $(srcdir)/$*.c
+	@ECHO_CC@$(CC) $(CFLAGS) -c $(srcdir)/$*.c
 
 .c.i:
 @SHOW_CC@
@@ -41,8 +50,8 @@ all: lynx
 
 lynx:   message @EXTRA_DEPS@ $(OBJS) $(WWWLIB)
 	@echo "Linking and creating Lynx executable"
-	$(CC) $(CFLAGS) -o lynx  $(OBJS) $(WWWLIB) $(LIBS)
-	@echo "Copying Lynx executable into this directory"
+	$(CC) $(CFLAGS) $(LDFLAGS) -o lynx  $(OBJS) $(WWWLIB) $(LIBS)
+	@echo "Copying Lynx executable into top-level directory"
 	cp lynx ..
 	@echo "Welcome to Lynx!"
 
@@ -56,7 +65,7 @@ do_chartrans_stuff:
 		CC="$(CC)" tables
 
 lint:
-	lint $(CPPFLAGS) *.c  > ../lint.out
+	lint $(CPPOPTS) *.c  > ../lint.out
 
 clean:
 	rm -f lynx core *.[ob]
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2025-06-09 14:31:10 +0000