snapshot of project "lynx", label v2-7-1ac_0-68

author: Thomas E. Dickey <dickey@invisible-island.net> 1997-09-18 12:25:58 -0400
committer: Thomas E. Dickey <dickey@invisible-island.net> 1997-09-18 12:25:58 -0400
commit: d2e46bbfcbedb43938b866f4ad9e8bf1d4084b7c (patch)
tree: 9f98081fe52ddab37286a6208c66d3e7f14f216b
parent: dc9e683bddf52e0720f5e74e3349533c9ee9f97a (diff)
download: lynx-snapshots-d2e46bbfcbedb43938b866f4ad9e8bf1d4084b7c.tar.gz
28 files changed, 892 insertions, 637 deletions
diff --git a/.Lynx.prcs_aux b/.Lynx.prcs_aux
index e4185c2d..a127414d 100644
--- a/.Lynx.prcs_aux
+++ b/.Lynx.prcs_aux
@@ -9,7 +9,7 @@
 (CHANGES2-3 18114 856833014 h/46_CHANGES2-3 1.1)
 (CHANGES2-4 48390 856833014 h/45_CHANGES2-4 1.1)
 (WWW/Library/freebsd/Makefile 600 856833014 f/10_Makefile 1.1)
-(lynx_help/Lynx_users_guide.html 116641 870708759 e/14_Lynx_users 1.8.1.1.1.1.1.1.1.2.1.2)
+(lynx_help/Lynx_users_guide.html 116641 874389655 e/14_Lynx_users 1.8.1.1.1.1.1.1.1.2.1.3)
 (CHANGES2-5 93256 856833014 h/44_CHANGES2-5 1.1)
 (src/LYMail.h 475 860064663 c/43_LYMail.h 1.2)
 (lynx_help/keystroke_commands/cookie_help.html 2652 856833014 e/15_cookie_hel 1.1)
@@ -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 13007 873901913 10_configure. 1.14)
-(makefile.in 8172 872001662 8_makefile.i 1.1.1.12)
+(configure.in 12734 874539253 10_configure. 1.15)
+(makefile.in 8238 874539253 8_makefile.i 1.1.1.13)
 (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)
@@ -95,12 +95,12 @@
 (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 13496 871141740 e/4_HTAlert.c 1.1.2.1.1.2)
-(src/LYUtils.c 135318 874030712 d/27_LYUtils.c 1.1.4.1.2.2.1.1.1.1.1.1.1.1.4.2.1.1.1.3)
-(src/LYCharUtils.c 75203 873828926 c/22_LYCharUtil 1.2.1.1.2.1.2.2.1.2.1.1.1.2.1.1.1.1.1.1.2.3.1.6)
+(src/LYUtils.c 137004 874539253 d/27_LYUtils.c 1.1.4.1.2.2.1.1.1.1.1.1.1.1.4.2.1.1.1.5)
+(src/LYCharUtils.c 75183 874539253 c/22_LYCharUtil 1.2.1.1.2.1.2.2.1.2.1.1.1.2.1.1.1.1.1.1.2.3.1.7)
 (PROBLEMS 7324 868157008 h/35_PROBLEMS 1.3)
 (src/LYSearch.h 326 861212923 d/28_LYSearch.h 1.2)
 (WWW/Library/next/Makefile 992 856833014 f/16_Makefile 1.1)
-(src/LYCgi.c 15504 873901913 c/28_LYCgi.c 1.1.1.5)
+(src/LYCgi.c 15502 874539253 c/28_LYCgi.c 1.1.1.6)
 (utils/lpansi/lpansi.c 4570 856833014 b/49_lpansi.c 1.1)
 (src/chrtrans/iso09_uni.tbl 857 856925688 i/11_iso09_uni. 1.2)
 (src/HTAlert.h 3353 871141740 d/1_HTAlert.h 1.2.1.2)
@@ -118,7 +118,7 @@
 (utils/inews/Makefile 1484 857398594 c/9_Makefile 1.1.1.1)
 (WWW/Library/Implementation/HTChunk.h 3543 856833014 g/26_HTChunk.h 1.1)
 (src/ucxolb.opt 28 856833014 c/36_ucxolb.opt 1.1)
-(lynx_help/keystroke_commands/option_help.html 15911 869904256 e/23_option_hel 1.7)
+(lynx_help/keystroke_commands/option_help.html 15911 874389655 e/23_option_hel 1.8)
 (lynx_help/keystroke_commands/bookmark_help.html 891 856833014 e/27_bookmark_h 1.1)
 (src/LYList.c 7927 873383193 d/3_LYList.c 1.1.3.2.1.1.1.4)
 (src/LYHistory.h 623 856833014 d/11_LYHistory. 1.1)
@@ -126,7 +126,7 @@
 (src/chrtrans/README.tables 2959 868451907 b/23_README.tab 1.1)
 (WWW/Library/Implementation/HTStyle.c 8994 860475643 h/5_HTStyle.c 1.3)
 (samples/jumpsUnix.html 3328 856833014 e/8_jumpsUnix. 1.1)
-(WWW/Library/Implementation/HTMLGen.c 14389 874030712 h/9_HTMLGen.c 1.1.2.4)
+(WWW/Library/Implementation/HTMLGen.c 14383 874539253 h/9_HTMLGen.c 1.1.2.5)
 (WWW/Library/Implementation/HTStream.h 1802 856833014 g/21_HTStream.h 1.1)
 (src/chrtrans/viscii_uni.tbl 4573 873651850 b/0_viscii_uni 1.1)
 (src/chrtrans/build-header.com 932 868567209 c/0_build-head 1.1)
@@ -142,7 +142,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 871141740 g/18_HTStyle.h 1.1.1.2)
-(CHANGES.new 132265 874030712 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.24)
+(CHANGES.new 133901 874539253 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.28)
 (WWW/Library/Implementation/HTMLGen.h 753 856833014 g/22_HTMLGen.h 1.1)
 (WWW/Library/Implementation/HTFormat.h 11480 871654647 g/13_HTFormat.h 1.3)
 (WWW/Library/Implementation/HTUU.h 964 856833014 f/43_HTUU.h 1.1)
@@ -193,11 +193,11 @@
 (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 32901 873901913 12_aclocal.m4 1.18)
+(aclocal.m4 35309 874539253 12_aclocal.m4 1.20)
 (WWW/Library/Implementation/patchlevel.h 959 856833014 f/34_patchlevel 1.1)
 (userdefs.h 56784 873901913 c/10_userdefs.h 1.1.2.1.1.1.1.1.1.1.2.1.1.1.1.1.1.2.1.3)
 (TCPWARE.announce 1352 856833014 h/31_TCPWARE.an 1.1)
-(WWW/Library/Implementation/HTMLDTD.c 63231 874030712 h/26_HTMLDTD.c 1.1.2.8)
+(WWW/Library/Implementation/HTMLDTD.c 63155 874539253 h/26_HTMLDTD.c 1.1.2.10)
 (WWW/Library/Implementation/HTAssoc.c 1736 856833014 g/39_HTAssoc.c 1.1)
 (WWW/Library/sun4/Makefile 578 856833014 f/11_Makefile 1.1)
 (WWW/Library/vax_ultrix/Makefile 678 856833014 f/8_Makefile 1.1)
@@ -209,7 +209,7 @@
 (VMSPrint.com 616 856833014 h/30_VMSPrint.c 1.1)
 (WWW/Library/netbsd/Makefile 613 856833014 f/0_Makefile 1.1)
 (WWW/Library/Implementation/UCAux.h 1084 873651850 f/0_UCAux.h 1.2)
-(WWW/Library/Implementation/HTMLDTD.h 28558 873828926 g/27_HTMLDTD.h 1.1.2.6)
+(WWW/Library/Implementation/HTMLDTD.h 28548 874539253 g/27_HTMLDTD.h 1.1.2.7)
 (WWW/Library/Implementation/HTAssoc.h 1096 856833014 f/45_HTAssoc.h 1.1)
 (src/Makefile 2466 873651850 d/29_Makefile 1.1.4.1.2.4)
 (WWW/Library/Implementation/HTAAUtil.c 15696 856833014 g/47_HTAAUtil.c 1.1)
@@ -217,11 +217,11 @@
 (WWW/Library/osf/Makefile 388 856833014 f/7_Makefile 1.1)
 (src/LYMainLoop.h 101 860064663 d/19_LYMainLoop 1.2)
 (build-slang.com 9442 868451907 e/39_build-slan 1.2)
-(WWW/Library/unix/makefile.in 1329 872001662 16_makefile.i 1.5)
+(WWW/Library/unix/makefile.in 1329 874539253 16_makefile.i 1.6)
 (samples/lynx.com 2192 856833014 e/10_lynx.com 1.1)
 (src/chrtrans/README.format 3551 860516309 i/5_README.for 1.2)
 (src/HTFont.h 438 871016304 d/0_HTFont.h 1.2)
-(src/LYStrings.c 35932 873651850 d/36_LYStrings. 1.1.3.3.2.8)
+(src/LYStrings.c 36219 874171801 d/36_LYStrings. 1.1.3.3.2.9)
 (src/LYCharSets.c 110574 868567209 c/45_LYCharSets 1.1.1.1.1.2)
 (WWW/Library/Implementation/Makefile 15116 856833014 f/40_Makefile 1.1)
 (WWW/Library/Implementation/HTDOS.c 1855 860588360 28_HTDOS.C 1.1)
@@ -231,7 +231,7 @@
 (WWW/Library/Implementation/HTAAUtil.h 12046 856833014 g/2_HTAAUtil.h 1.1)
 (src/LYEdit.c 4287 868567209 d/50_LYEdit.c 1.1.2.1.1.2)
 (utils/inews/clientlib.c 11163 856833014 c/5_clientlib. 1.1)
-(src/HTML.c 217154 873831756 e/2_HTML.c 1.1.4.1.1.1.1.2.1.4.1.2.1.3.1.2.1.2.2.2.1.4)
+(src/HTML.c 215334 874539253 e/2_HTML.c 1.1.4.1.1.1.1.2.1.4.1.2.1.3.1.2.1.2.2.2.1.5)
 (lynx_help/keystroke_commands/movement_help.html 1795 856833014 e/24_movement_h 1.1)
 (src/LYStrings.h 4977 873651850 d/20_LYStrings. 1.1.1.5)
 (WWW/Library/sun3/Makefile 636 856833014 f/12_Makefile 1.1)
@@ -240,24 +240,24 @@
 (CHANGES 58482 860264978 h/47_CHANGES 1.2)
 (WWW/Library/Implementation/HTWAIS.c 29769 862857695 h/22_HTWAIS.c 1.1.1.1)
 (install.sh 4771 858077955 9_install.sh 1.1)
-(WWW/Library/Implementation/SGML.c 75309 874030712 h/12_SGML.c 1.1.1.1.1.1.2.4.1.7)
+(WWW/Library/Implementation/SGML.c 75324 874539253 h/12_SGML.c 1.1.1.1.1.1.2.4.1.9)
 (WWW/Library/Implementation/HTRules.c 11040 856833014 h/1_HTRules.c 1.1)
 (src/LYShowInfo.h 316 856833014 c/39_LYShowInfo 1.1)
 (src/LYEdit.h 134 856833014 d/16_LYEdit.h 1.1)
 (utils/inews/clientlib.h 230 856833014 c/4_clientlib. 1.1)
 (src/HTML.h 6067 873828926 c/48_HTML.h 1.1.2.2.2.1.1.1.1.5)
-(src/LYStyle.c 9090 864519259 36_LYStyle.c 1.6)
+(src/LYStyle.c 9096 874539253 36_LYStyle.c 1.7)
 (newfiles.chartrans 1399 873651850 b/0_newfiles.chartrans 1.5)
 (WWW/Library/Implementation/HTParse.c 20852 860064663 h/18_HTParse.c 1.3)
 (src/HTFWriter.c 35073 873831756 d/2_HTFWriter. 1.1.3.1.3.1.1.1.1.1.3.1.1.8)
 (WWW/Library/Implementation/HTWAIS.h 1554 856833014 g/4_HTWAIS.h 1.1)
 (WWW/Library/unix_x/Makefile 15482 856833014 f/1_Makefile 1.1)
-(WWW/Library/Implementation/SGML.h 8815 868567209 g/29_SGML.h 1.1.2.2)
+(WWW/Library/Implementation/SGML.h 8810 874539253 g/29_SGML.h 1.1.2.3)
 (WWW/Library/Implementation/HTRules.h 4105 856833014 g/14_HTRules.h 1.1)
 (lynx.cfg 77771 873831756 e/32_lynx.cfg 1.2.1.2.1.1.2.1.1.2.1.3.1.5)
 (src/HTInit.c 31186 873828926 e/3_HTInit.c 1.1.4.1.3.1.1.4)
 (WWW/Library/snake/Makefile 649 856833014 f/13_Makefile 1.1)
-(src/LYStyle.h 676 864519259 b/5_LYStyle.h 1.2)
+(src/LYStyle.h 682 874539253 b/5_LYStyle.h 1.3)
 (WWW/Library/Implementation/UCDefs.h 2687 873651850 e/0_UCDefs.h 1.2)
 (test/tabtest.html 1412 856833014 c/11_tabtest.ht 1.1)
 (SOCKETSHR.announce 1704 856833014 h/32_SOCKETSHR. 1.1)
@@ -272,11 +272,11 @@
 (WWW/Library/Implementation/HTVMS_WaisProt.c 70622 856833014 f/32_HTVMS_Wais 1.1)
 (src/cmu_tcp.opt 34 856833014 d/14_cmu_tcp.op 1.1)
 (WWW/Library/ptx/Makefile 626 856833014 e/51_Makefile 1.1)
-(src/chrtrans/makefile.in 2886 873651850 18_makefile.i 1.7)
+(src/chrtrans/makefile.in 2741 874539253 18_makefile.i 1.8)
 (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 39958 874030712 d/51_LYCurses.c 1.1.5.1.1.1.1.1.1.8)
+(src/LYCurses.c 39987 874539253 d/51_LYCurses.c 1.1.5.1.1.1.1.1.1.9)
 (WWW/Library/Implementation/HTInit.h 657 873828926 g/12_HTInit.h 1.2)
 (WWW/Library/Implementation/HTAAServ.h 4950 856833014 g/1_HTAAServ.h 1.1)
 (WWW/Library/mips/Makefile 663 856833014 f/3_Makefile 1.1)
@@ -307,7 +307,7 @@
 (src/win_tcp.opt 36 856833014 c/33_win_tcp.op 1.1)
 (config.guess 20446 862326975 31_config.gue 1.2)
 (src/LYHash.c 981 868224571 35_LYHash.c 1.3)
-(config.hin 4240 873901913 11_config.hin 1.14)
+(config.hin 4280 874539253 11_config.hin 1.16)
 (FM.announce 3655 856833014 h/40_FM.announc 1.1)
 (src/chrtrans/cp1251_uni.tbl 6144 871141740 b/0_cp1251_uni 1.2)
 (src/LYHash.h 791 868224571 34_LYHash.h 1.4)
@@ -317,7 +317,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 190305 873901913 13_configure 1.18)
+(configure 193746 874539253 13_configure 1.20)
 (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)
@@ -331,17 +331,17 @@
 (WWW/Library/Implementation/HTWriter.c 3883 856833014 h/21_HTWriter.c 1.1)
 (lynx_help/keystroke_commands/visited_help.html 1401 856833014 e/16_visited_he 1.1)
 (WWW/Library/Implementation/crypt_util.c 25993 856833014 f/37_crypt_util 1.1)
-(src/LYLocal.c 58294 873901913 d/46_LYLocal.c 1.2.3.1.3.8)
+(src/LYLocal.c 58445 874539253 d/46_LYLocal.c 1.2.3.1.3.10)
 (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 8765 873901913 15_CHANGES.co 1.1.1.12)
+(CHANGES.configure 9809 874539253 15_CHANGES.co 1.1.1.14)
 (INSTALLATION 19916 873651850 h/38_INSTALLATI 1.2)
 (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)
 (src/LYLocal.h 2561 856833014 c/37_LYLocal.h 1.1)
 (src/chrtrans/iso07_uni.tbl 1791 856925688 i/13_iso07_uni. 1.2)
 (src/LYOptions.c 74505 873383193 d/41_LYOptions. 1.1.2.1.1.1.1.1.1.3.1.5)
-(WWW/Library/Implementation/HTNews.c 70815 871707027 h/25_HTNews.c 1.1.2.1.1.3)
+(WWW/Library/Implementation/HTNews.c 70630 874539253 h/25_HTNews.c 1.1.2.1.1.4)
 (WWW/Library/Implementation/HTVMS_WaisUI.h 21281 856833014 f/26_HTVMS_Wais 1.1)
 (src/LYNews.c 11698 873383193 d/42_LYNews.c 1.2.4.1.1.1.2.4)
 (WWW/Library/rs6000/Makefile 610 856833014 f/15_Makefile 1.1)
@@ -357,9 +357,9 @@
 (src/UCdomap.c 46858 873651850 b/14_UCdomap.c 1.3.1.3)
 (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)
+(WWW/Library/Implementation/HTFinger.c 11422 874539253 f/24_HTFinger.c 1.2)
 (src/chrtrans/iso08_uni.tbl 1667 873651850 b/32_iso08_uni. 1.3)
-(src/makefile.in 3370 873651850 17_makefile.i 1.11)
+(src/makefile.in 3469 874539253 17_makefile.i 1.12)
 (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)
@@ -377,7 +377,7 @@
 (WWW/Library/Implementation/HTFWriter.c 7487 856833014 h/10_HTFWriter. 1.1)
 (src/LYEditmap.c 5899 856833014 c/23_LYEditmap. 1.1)
 (src/LYForms.c 36862 873383193 d/49_LYForms.c 1.1.4.1.2.1.1.1.1.7)
-(WWW/Library/Implementation/HTGopher.c 53261 860064663 g/48_HTGopher.c 1.3)
+(WWW/Library/Implementation/HTGopher.c 53197 874539253 g/48_HTGopher.c 1.4)
 (src/LYClean.h 390 869443761 d/24_LYClean.h 1.1.2.1)
 (WWW/Library/Implementation/HTGroup.c 18502 856833014 g/42_HTGroup.c 1.1)
 (WWW/Library/Implementation/HTHistory.h 2830 856833014 g/10_HTHistory. 1.1)
diff --git a/CHANGES.configure b/CHANGES.configure
index a9261de1..48c23106 100644
--- a/CHANGES.configure
+++ b/CHANGES.configure
@@ -1,6 +1,24 @@
+97-09-17
+--------
+* Undo misleading/incorrect use of 'const' in HTML.c, and associated
+  modules. - TD
+* merge symbols 'has_color' and 'lynx_has_color' to simplify ifdef's,
+  and correct a problem building color-style configuration. - TD
+* add configure symbol for ifdef'ing presence of waitpid, which
+  was stopping build on HP-UX. - TD
+* correct the symbol that is defined by CF_SIZECHANGE test, noted
+  by failure to build SCO version after making an include for
+  <sys/ioctl.h> ifdef'd according to configure test. - TD
+* corrected check for broken (pre-1.9.9g) ncurses versions so that
+  they can build with color support. - TD
+* cache state of CF_NETLIBS so that rerunning configure will yield
+  the same results for network libraries. - TD
+* Add configure test for HP-UX -lHcurses library. - TD
+* Minor adjustments to names of configure-script variables, to make
+  them the same as other programs (e.g., tin-unoff). - TD
 97-09-12
 --------
-* Correct mismatch/omission of HAVE_TYPE_UNION_WAIT symbol from
+* Correct mismatch/omission of HAVE_TYPE_UNIONWAIT symbol from
   change for wait vs waitpid. - TD
 97-09-10
 --------
diff --git a/CHANGES.new b/CHANGES.new
index 6a2720ed..83a1516d 100644
--- a/CHANGES.new
+++ b/CHANGES.new
@@ -10,6 +10,23 @@ README.configure), and miscellaneous other changes.  Note that the 2.7 ->
 2.7.1 changes (which are listed at the beginning of the current CHANGES
 file) are duplicated here. - KW]
 
+97-09-17
+* Undo misleading/incorrect use of 'const' in HTML.c, and associated
+  modules. - TD
+* merge symbols 'has_color' and 'lynx_has_color' to simplify ifdef's,
+  and correct a problem building color-style configuration. - TD
+* add configure symbol for ifdef'ing presence of waitpid, which
+  was stopping build on HP-UX. - TD
+* correct the symbol that is defined by CF_SIZECHANGE test, noted
+  by failure to build SCO version after making an include for
+  <sys/ioctl.h> ifdef'd according to configure test. - TD
+* corrected check for broken (pre-1.9.9g) ncurses versions so that
+  they can build with color support. - TD
+* cache state of CF_NETLIBS so that rerunning configure will yield
+  the same results for network libraries. - TD
+* Add configure test for HP-UX -lHcurses library. - TD
+* Minor adjustments to names of configure-script variables, to make
+  them the same as other programs (e.g., tin-unoff). - TD
 97-09-15
 * Recover from bad sequence "<=" in SGML.c by outputting those characters
   litterally. - KW
@@ -24,7 +41,7 @@ file) are duplicated here. - KW]
 * Changes in LYStrings.c to enable keypad() processing for non-NCURSES
   if HAVE_KEYPAD is defined. - KW
 97-09-12
-* Correct mismatch/omission of HAVE_TYPE_UNION_WAIT symbol from
+* Correct mismatch/omission of HAVE_TYPE_UNIONWAIT symbol from
   change for wait vs waitpid. - TD
 97-09-11
 * Tweaks in HTMLGen.c for display of special characters and line breaking
diff --git a/Lynx.prj b/Lynx.prj
index 0ade3964..f738744c 100644
--- a/Lynx.prj
+++ b/Lynx.prj
@@ -1,13 +1,16 @@
 ;; -*- Lisp -*-
 (Created-By-Prcs-Version 1 2 0)
 (Project-Description "PRCS Project for The Lynx browser")
-(Project-Version Lynx 2.7.1ac-0 64)
-(Parent-Version Lynx 2.7.1ac-0 63)
+(Project-Version Lynx 2.7.1ac-0 68)
+(Parent-Version Lynx 2.7.1ac-0 67)
 
-(Version-Log "&#173 recognition, HTMLDTD.c small mods, HTMLGen.c mods, no more underlining of non-current links")
+(Version-Log "misc configure script fixes.  rebuilt on all of the platforms I've got
+(Linux, Solaris, SunOS, IRIX, CLIX, SCO, AIX, HP-UX).  Probably will work
+_now_ on HP-UX 10.x
+")
 (New-Version-Log "")
-(Checkin-Time "Thu, 11 Sep 1997 20:18:32 -0600")
-(Checkin-Login kweide)
+(Checkin-Time "Wed, 17 Sep 1997 17:34:13 -0600")
+(Checkin-Login dickey)
 (Populate-Ignore ("\\.o$" "\\.a$" "~$" "^a.out$" "^core$"
                   "\\.dvi$" "\\.aux$" "^\\..*_aux$" "\\.log"
                   "\\.zip$" "^obsolete" "/obsolete"
@@ -57,7 +60,7 @@
   (src/LYTraversal.c (Lynx/c/25_LYTraversa 1.1.2.6 644))
   (src/LYList.h (Lynx/c/26_LYList.h 1.2 644))
   (src/LYCgi.h (Lynx/c/27_LYCgi.h 1.1 644))
-  (src/LYCgi.c (Lynx/c/28_LYCgi.c 1.1.1.5 644))
+  (src/LYCgi.c (Lynx/c/28_LYCgi.c 1.1.1.6 644))
   (src/LYJump.h (Lynx/c/29_LYJump.h 1.2 644))
   (src/HTNestedList.h (Lynx/c/30_HTNestedLi 1.1 644))
   (src/LYLeaks.c (Lynx/c/31_LYLeaks.c 1.1.1.4 644))
@@ -117,7 +120,7 @@
   (src/GridText.h (Lynx/d/33_GridText.h 1.1.1.1.1.3.1.1.1.1.1.1.1.2 644))
   (src/LYUtils.h (Lynx/d/34_LYUtils.h 1.1.2.4 644))
   (src/LYUpload.c (Lynx/d/35_LYUpload.c 1.1.4.1.3.1.1.1.1.5 644))
-  (src/LYStrings.c (Lynx/d/36_LYStrings. 1.1.3.3.2.8 644))
+  (src/LYStrings.c (Lynx/d/36_LYStrings. 1.1.3.3.2.9 644))
   (src/LYShowInfo.c (Lynx/d/37_LYShowInfo 1.1.2.1.5.1.1.1.2.4 644))
   (src/LYSearch.c (Lynx/d/38_LYSearch.c 1.2.2.5 644))
   (src/LYReadCFG.c (Lynx/d/39_LYReadCFG. 1.1.1.1.3.2.3.1.1.2.1.7 644))
@@ -127,7 +130,7 @@
   (src/LYMainLoop.c (Lynx/d/43_LYMainLoop 1.2.4.2.2.1.2.6.1.2.1.1.1.1.1.1.1.1.1.1.1.3.1.1.1.5 644))
   (src/LYMain.c (Lynx/d/44_LYMain.c 1.1.2.1.1.1.1.1.1.2.2.1.1.1.1.1.1.1.1.1.1.1.1.3.1.6 644))
   (src/LYMail.c (Lynx/d/45_LYMail.c 1.1.1.1.1.1.3.1.1.1.2.5 644))
-  (src/LYLocal.c (Lynx/d/46_LYLocal.c 1.2.3.1.3.8 644))
+  (src/LYLocal.c (Lynx/d/46_LYLocal.c 1.2.3.1.3.10 644))
   (src/LYJump.c (Lynx/d/47_LYJump.c 1.3 644))
   (src/LYGetFile.c (Lynx/d/48_LYGetFile. 1.5.2.3.2.1.1.1.1.1.1.1.1.1.1.2.1.2 644))
   (src/LYForms.c (Lynx/d/49_LYForms.c 1.1.4.1.2.1.1.1.1.7 644))
@@ -135,7 +138,7 @@
   
   (src/LYClean.c (Lynx/e/0_LYClean.c 1.1.4.1.1.4 644))
   (src/LYBookmark.c (Lynx/e/1_LYBookmark 1.1.2.1.1.8 644))
-  (src/HTML.c (Lynx/e/2_HTML.c 1.1.4.1.1.1.1.2.1.4.1.2.1.3.1.2.1.2.2.2.1.4 644))
+  (src/HTML.c (Lynx/e/2_HTML.c 1.1.4.1.1.1.1.2.1.4.1.2.1.3.1.2.1.2.2.2.1.5 644))
   (src/HTInit.c (Lynx/e/3_HTInit.c 1.1.4.1.3.1.1.4 644))
   (src/HTAlert.c (Lynx/e/4_HTAlert.c 1.1.2.1.1.2 644))
   (src/GridText.c (Lynx/e/5_GridText.c 1.1.3.1.1.1.1.1.1.2.2.2.1.2.1.2.1.1.1.1.1.1.1.1.1.3.1.4 644))
@@ -147,7 +150,7 @@
   (samples/mailcap (Lynx/e/11_mailcap 1.2 644))
   (samples/lynx.cfg (Lynx/e/12_lynx.cfg 1.2.1.2.1.1.2.1.1.1.1.1.1.3.1.5 644))
   (lynx_help/lynx_url_support.html (Lynx/e/13_lynx_url_s 1.2 644))
-  (lynx_help/Lynx_users_guide.html (Lynx/e/14_Lynx_users 1.8.1.1.1.1.1.1.1.2.1.2 644))
+  (lynx_help/Lynx_users_guide.html (Lynx/e/14_Lynx_users 1.8.1.1.1.1.1.1.1.2.1.3 644))
   (lynx_help/keystroke_commands/cookie_help.html (Lynx/e/15_cookie_hel 1.1 644))
   (lynx_help/keystroke_commands/visited_help.html (Lynx/e/16_visited_he 1.1 644))
   (lynx_help/keystroke_commands/edit_help.html (Lynx/e/17_edit_help. 1.1 644))
@@ -156,7 +159,7 @@
   (lynx_help/keystroke_commands/scrolling_help.html (Lynx/e/20_scrolling_ 1.1 644))
   (lynx_help/keystroke_commands/print_help.html (Lynx/e/21_print_help 1.1 644))
   (lynx_help/keystroke_commands/other_help.html (Lynx/e/22_other_help 1.4 644))
-  (lynx_help/keystroke_commands/option_help.html (Lynx/e/23_option_hel 1.7 644))
+  (lynx_help/keystroke_commands/option_help.html (Lynx/e/23_option_hel 1.8 644))
   (lynx_help/keystroke_commands/movement_help.html (Lynx/e/24_movement_h 1.1 644))
   (lynx_help/keystroke_commands/history_help.html (Lynx/e/25_history_he 1.1 644))
   (lynx_help/keystroke_commands/gopher_types_help.html (Lynx/e/26_gopher_typ 1.1 644))
@@ -209,7 +212,7 @@
   (WWW/Library/vms/libmake.com (Lynx/f/21_libmake.co 1.1 644))
   (WWW/Library/vms/descrip.mms (Lynx/f/22_descrip.mm 1.1 644))
   (WWW/Library/Implementation/HTFinger.h (Lynx/f/23_HTFinger.h 1.1 644))
-  (WWW/Library/Implementation/HTFinger.c (Lynx/f/24_HTFinger.c 1.1 644))
+  (WWW/Library/Implementation/HTFinger.c (Lynx/f/24_HTFinger.c 1.2 644))
   (WWW/Library/Implementation/LYexit.h (Lynx/f/25_LYexit.h 1.1.1.2 644))
   (WWW/Library/Implementation/HTVMS_WaisUI.h (Lynx/f/26_HTVMS_Wais 1.1 644))
   (WWW/Library/Implementation/HTVMS_WaisUI.c (Lynx/f/27_HTVMS_Wais 1.1 644))
@@ -264,9 +267,9 @@
   (WWW/Library/Implementation/HTWriter.h (Lynx/g/24_HTWriter.h 1.1 644))
   (WWW/Library/Implementation/HTPlain.h (Lynx/g/25_HTPlain.h 1.1 644))
   (WWW/Library/Implementation/HTChunk.h (Lynx/g/26_HTChunk.h 1.1 644))
-  (WWW/Library/Implementation/HTMLDTD.h (Lynx/g/27_HTMLDTD.h 1.1.2.6 644))
+  (WWW/Library/Implementation/HTMLDTD.h (Lynx/g/27_HTMLDTD.h 1.1.2.7 644))
   (WWW/Library/Implementation/HTML.h (Lynx/g/28_HTML.h 1.1.2.2.1.1.1.1.1.1.1.3 644))
-  (WWW/Library/Implementation/SGML.h (Lynx/g/29_SGML.h 1.1.2.2 644))
+  (WWW/Library/Implementation/SGML.h (Lynx/g/29_SGML.h 1.1.2.3 644))
   (WWW/Library/Implementation/HTTCP.h (Lynx/g/30_HTTCP.h 1.3 644))
   (WWW/Library/Implementation/HTFTP.h (Lynx/g/31_HTFTP.h 1.1 644))
   (WWW/Library/Implementation/HTBTree.h (Lynx/g/32_HTBTree.h 1.1 644))
@@ -285,7 +288,7 @@
   (WWW/Library/Implementation/HTAABrow.c (Lynx/g/45_HTAABrow.c 1.2.1.2 644))
   (WWW/Library/Implementation/HTAAServ.c (Lynx/g/46_HTAAServ.c 1.1 644))
   (WWW/Library/Implementation/HTAAUtil.c (Lynx/g/47_HTAAUtil.c 1.1 644))
-  (WWW/Library/Implementation/HTGopher.c (Lynx/g/48_HTGopher.c 1.3 644))
+  (WWW/Library/Implementation/HTGopher.c (Lynx/g/48_HTGopher.c 1.4 644))
   (WWW/Library/Implementation/HTHistory.c (Lynx/g/49_HTHistory. 1.1 644))
   (WWW/Library/Implementation/HTMIME.c (Lynx/g/50_HTMIME.c 1.1.2.2.1.1.1.1.1.4 644))
   (WWW/Library/Implementation/HTInit.c (Lynx/g/51_HTInit.c 1.1 644))
@@ -298,10 +301,10 @@
   (WWW/Library/Implementation/HTAnchor.c (Lynx/h/6_HTAnchor.c 1.1.4.2.1.4 644))
   (WWW/Library/Implementation/HTAtom.c (Lynx/h/7_HTAtom.c 1.1.2.1 644))
   (WWW/Library/Implementation/HTChunk.c (Lynx/h/8_HTChunk.c 1.1 644))
-  (WWW/Library/Implementation/HTMLGen.c (Lynx/h/9_HTMLGen.c 1.1.2.4 644))
+  (WWW/Library/Implementation/HTMLGen.c (Lynx/h/9_HTMLGen.c 1.1.2.5 644))
   (WWW/Library/Implementation/HTFWriter.c (Lynx/h/10_HTFWriter. 1.1 644))
   (WWW/Library/Implementation/HTPlain.c (Lynx/h/11_HTPlain.c 1.1.2.3 644))
-  (WWW/Library/Implementation/SGML.c (Lynx/h/12_SGML.c 1.1.1.1.1.1.2.4.1.7 644))
+  (WWW/Library/Implementation/SGML.c (Lynx/h/12_SGML.c 1.1.1.1.1.1.2.4.1.9 644))
   (WWW/Library/Implementation/HTTCP.c (Lynx/h/13_HTTCP.c 1.2.3.1.1.1.1.1.1.2 644))
   (WWW/Library/Implementation/HTFTP.c (Lynx/h/14_HTFTP.c 1.6 644))
   (WWW/Library/Implementation/HTBTree.c (Lynx/h/15_HTBTree.c 1.1 644))
@@ -314,8 +317,8 @@
   (WWW/Library/Implementation/HTWAIS.c (Lynx/h/22_HTWAIS.c 1.1.1.1 644))
   (WWW/Library/Implementation/HTVMSUtils.c (Lynx/h/23_HTVMSUtils 1.2 644))
   (WWW/Library/Implementation/HTTelnet.c (Lynx/h/24_HTTelnet.c 1.5 644))
-  (WWW/Library/Implementation/HTNews.c (Lynx/h/25_HTNews.c 1.1.2.1.1.3 644))  
-  (WWW/Library/Implementation/HTMLDTD.c (Lynx/h/26_HTMLDTD.c 1.1.2.8 644))
+  (WWW/Library/Implementation/HTNews.c (Lynx/h/25_HTNews.c 1.1.2.1.1.4 644))  
+  (WWW/Library/Implementation/HTMLDTD.c (Lynx/h/26_HTMLDTD.c 1.1.2.10 644))
   (WWW/Library/Implementation/HTFile.c (Lynx/h/27_HTFile.c 1.1.3.1.1.8 644))
   (WWW/Library/Implementation/HTAuth.c (Lynx/h/28_HTAuth.c 1.1 644))
   (VMSWAIS.announce (Lynx/h/29_VMSWAIS.an 1.1 644))
@@ -390,19 +393,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.24 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.28 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.12 644))
+  (makefile.in (Lynx/8_makefile.i 1.1.1.13 644))
   (install.sh (Lynx/9_install.sh 1.1 755))
-  (configure.in (Lynx/10_configure. 1.14 644))
-  (config.hin (Lynx/11_config.hin 1.14 644))
-  (aclocal.m4 (Lynx/12_aclocal.m4 1.18 644))
-  (configure (Lynx/13_configure 1.18 755))
+  (configure.in (Lynx/10_configure. 1.15 644))
+  (config.hin (Lynx/11_config.hin 1.16 644))
+  (aclocal.m4 (Lynx/12_aclocal.m4 1.20 644))
+  (configure (Lynx/13_configure 1.20 755))
   (README.configure (Lynx/14_README.con 1.7 644))
-  (CHANGES.configure (Lynx/15_CHANGES.co 1.1.1.12 644))
+  (CHANGES.configure (Lynx/15_CHANGES.co 1.1.1.14 644))
 
 ;; Files added by populate at Wed, 09 Apr 1997 06:18:01 -0600:
 
@@ -411,9 +414,9 @@
   (WWW/Library/Implementation/HTDOS.c (Lynx/28_HTDOS.C 1.1 644))
 
 
-  (WWW/Library/unix/makefile.in (Lynx/16_makefile.i 1.5 644))
-  (src/makefile.in (Lynx/17_makefile.i 1.11 644))
-  (src/chrtrans/makefile.in (Lynx/18_makefile.i 1.7 644))
+  (WWW/Library/unix/makefile.in (Lynx/16_makefile.i 1.6 644))
+  (src/makefile.in (Lynx/17_makefile.i 1.12 644))
+  (src/chrtrans/makefile.in (Lynx/18_makefile.i 1.8 644))
 
   (src/chrtrans/koi8r_uni.tbl (Lynx/b/29_koi8r_uni. 1.2.1.1 644))
   (src/chrtrans/def7_uni.tbl (Lynx/25_def7_uni.t 1.4 644))
@@ -431,17 +434,17 @@
   (src/AttrList.h (Lynx/33_AttrList.h 1.3 644))
   (src/LYHash.h (Lynx/34_LYHash.h 1.4 644))
   (src/LYHash.c (Lynx/35_LYHash.c 1.3 644))
-  (src/LYStyle.c (Lynx/36_LYStyle.c 1.6 644))
+  (src/LYStyle.c (Lynx/36_LYStyle.c 1.7 644))
   (styles/lynx.lss (Lynx/37_lynx.lss 1.1 644))
-  (src/LYStyle.h (Lynx/b/5_LYStyle.h 1.2 644))
+  (src/LYStyle.h (Lynx/b/5_LYStyle.h 1.3 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.1.1.1.1.8 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.1.2.3.1.6 644))
+  (src/LYCurses.c (Lynx/d/51_LYCurses.c 1.1.5.1.1.1.1.1.1.9 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.1.2.3.1.7 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.2.1.1.1.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.2.1.1.1.5 644))
 
 
   (src/chrtrans/build-chrtrans.com (Lynx/b/22_build-chrt 1.5 644))
@@ -460,13 +463,5 @@
 
   (src/chrtrans/viscii_uni.tbl (Lynx/b/0_viscii_uni 1.1 644))
 )
-(Merge-Parents
-  (2.7.1fm-0.52 incomplete
-    (src/LYUtils.c src/LYUtils.c src/LYUtils.c m) 
-  )
-  (2.7.1fm-0.52 complete
-    (src/LYGetFile.c src/LYGetFile.c src/LYGetFile.c n) (WWW/Library/Implementation/tcp.h WWW/Library/Implementation/tcp.h WWW/Library/Implementation/tcp.h m)
-    (() Makefile Makefile n) (() FOTEMODS FOTEMODS n)
-    (() 00README 00README n) (src/chrtrans/makeuctb.c src/chrtrans/makeuctb.c src/chrtrans/makeuctb.c m))
-)
+(Merge-Parents)
 (New-Merge-Parents)
diff --git a/WWW/Library/Implementation/HTFinger.c b/WWW/Library/Implementation/HTFinger.c
index d00b57cb..4c3c4e94 100644
--- a/WWW/Library/Implementation/HTFinger.c
+++ b/WWW/Library/Implementation/HTFinger.c
@@ -79,19 +79,18 @@ PRIVATE BOOL initialize NOARGS
 /*	Start anchor element
 **	--------------------
 */
-PRIVATE void start_anchor ARGS1(CONST char *,  href)
+PRIVATE void start_anchor ARGS1(char *,  href)
 {
     BOOL		present[HTML_A_ATTRIBUTES];
-    CONST char*		value[HTML_A_ATTRIBUTES];
+    char*		value[HTML_A_ATTRIBUTES];
     
     {
     	int i;
     	for(i=0; i<HTML_A_ATTRIBUTES; i++)
 	    present[i] = (i==HTML_A_HREF);
     }
-    ((CONST char **)value)[HTML_A_HREF] = href;
-    (*targetClass.start_element)(target, HTML_A, present,
-    				 (CONST char **)value, 0);
+    value[HTML_A_HREF] = href;
+    (*targetClass.start_element)(target, HTML_A, present, value, 0);
 
 }
 
diff --git a/WWW/Library/Implementation/HTGopher.c b/WWW/Library/Implementation/HTGopher.c
index 46ed05f4..dd1a4662 100644
--- a/WWW/Library/Implementation/HTGopher.c
+++ b/WWW/Library/Implementation/HTGopher.c
@@ -185,23 +185,22 @@ PUBLIC BOOLEAN HT_Is_Gopher_URL=FALSE;
 PRIVATE void write_anchor ARGS2(CONST char *,text, CONST char *,addr)
 {
     BOOL present[HTML_A_ATTRIBUTES];
-    CONST char * value[HTML_A_ATTRIBUTES];
+    char * value[HTML_A_ATTRIBUTES];
     
     int i;
     
     for (i = 0; i < HTML_A_ATTRIBUTES; i++)
         present[i] = 0;
     present[HTML_A_HREF] = YES;
-    ((CONST char **)value)[HTML_A_HREF] = addr;
+    value[HTML_A_HREF] = addr;
     present[HTML_A_TITLE] = YES;
-    ((CONST char **)value)[HTML_A_TITLE] = text;
+    value[HTML_A_TITLE] = text;
 
     if(TRACE)
 	fprintf(stderr,"HTGopher: adding URL: %s\n",addr);
     
     HT_Is_Gopher_URL = TRUE;  /* tell HTML.c that this is a Gopher URL */
-    (*targetClass.start_element)(target, HTML_A, present,
-    				 (CONST char **)value, 0);
+    (*targetClass.start_element)(target, HTML_A, present, value, 0);
 	    
     PUTS(text);
     END(HTML_A);
diff --git a/WWW/Library/Implementation/HTMLDTD.c b/WWW/Library/Implementation/HTMLDTD.c
index 7eb1d86b..3f6df848 100644
--- a/WWW/Library/Implementation/HTMLDTD.c
+++ b/WWW/Library/Implementation/HTMLDTD.c
@@ -1780,11 +1780,11 @@ struct _HTStructured {
 
 PUBLIC void HTStartAnchor ARGS3(
 	HTStructured *,		obj,
-	CONST char *,		name,
-	CONST char *,		href)
+	char *,			name,
+	char *,			href)
 {
     BOOL		present[HTML_A_ATTRIBUTES];
-    CONST char * 	value[HTML_A_ATTRIBUTES];
+    char * 		value[HTML_A_ATTRIBUTES];
     int i;
 
     for (i = 0; i < HTML_A_ATTRIBUTES; i++)
@@ -1792,11 +1792,11 @@ PUBLIC void HTStartAnchor ARGS3(
 
     if (name && *name) {
     	present[HTML_A_NAME] = YES;
-	value[HTML_A_NAME] = (CONST char *)name;
+	value[HTML_A_NAME] = name;
     }
     if (href) {
         present[HTML_A_HREF] = YES;
-        value[HTML_A_HREF] = (CONST char *)href;
+        value[HTML_A_HREF] = href;
     }
 
     (*obj->isa->start_element)(obj, HTML_A, present, value, 0);
@@ -1808,7 +1808,7 @@ PUBLIC void HTStartIsIndex ARGS3(
 	CONST char *,		href)
 {
     BOOL		present[HTML_ISINDEX_ATTRIBUTES];
-    CONST char * 	value[HTML_ISINDEX_ATTRIBUTES];
+    char * 		value[HTML_ISINDEX_ATTRIBUTES];
     int i;
 
     for (i = 0; i < HTML_ISINDEX_ATTRIBUTES; i++)
@@ -1816,11 +1816,11 @@ PUBLIC void HTStartIsIndex ARGS3(
 
     if (prompt && *prompt) {
     	present[HTML_ISINDEX_PROMPT] = YES;
-	value[HTML_ISINDEX_PROMPT] = (CONST char *)prompt;
+	value[HTML_ISINDEX_PROMPT] = prompt;
     }
     if (href) {
         present[HTML_ISINDEX_HREF] = YES;
-        value[HTML_ISINDEX_HREF] = (CONST char *)href;
+        value[HTML_ISINDEX_HREF] = href;
     }
 
     (*obj->isa->start_element)(obj, HTML_ISINDEX , present, value, 0);
diff --git a/WWW/Library/Implementation/HTMLDTD.h b/WWW/Library/Implementation/HTMLDTD.h
index f1688ffc..45ed9a36 100644
--- a/WWW/Library/Implementation/HTMLDTD.h
+++ b/WWW/Library/Implementation/HTMLDTD.h
@@ -962,8 +962,8 @@ Start anchor element
  */
 extern void HTStartAnchor PARAMS((
                 HTStructured * targetstream,
-                CONST char *    name,
-                CONST char *    href));
+                char *    	name,
+                char *    	href));
 
 /*
 
diff --git a/WWW/Library/Implementation/HTMLGen.c b/WWW/Library/Implementation/HTMLGen.c
index 9a1efaf5..3b593d06 100644
--- a/WWW/Library/Implementation/HTMLGen.c
+++ b/WWW/Library/Implementation/HTMLGen.c
@@ -258,7 +258,7 @@ PRIVATE void HTMLGen_start_element ARGS5(
 	HTStructured *, 	me,
 	int,			element_number,
 	CONST BOOL*,	 	present,
-	CONST char **,		value,
+	char **,		value,
 	char **,		insert)
 {
     int i;
diff --git a/WWW/Library/Implementation/HTNews.c b/WWW/Library/Implementation/HTNews.c
index bcf2993e..1fce965d 100644
--- a/WWW/Library/Implementation/HTNews.c
+++ b/WWW/Library/Implementation/HTNews.c
@@ -627,38 +627,36 @@ PRIVATE char * author_address ARGS1(char *,email)
 /*	Start anchor element
 **	--------------------
 */
-PRIVATE void start_anchor ARGS1(CONST char *,  href)
+PRIVATE void start_anchor ARGS1(char *,  href)
 {
     BOOL		present[HTML_A_ATTRIBUTES];
-    CONST char*		value[HTML_A_ATTRIBUTES];
+    char*		value[HTML_A_ATTRIBUTES];
     
     {
     	int i;
     	for(i=0; i < HTML_A_ATTRIBUTES; i++)
 	    present[i] = (i == HTML_A_HREF);
     }
-    ((CONST char **)value)[HTML_A_HREF] = href;
-    (*targetClass.start_element)(target, HTML_A , present,
-    				 (CONST char **)value, 0);
+    value[HTML_A_HREF] = href;
+    (*targetClass.start_element)(target, HTML_A, present, value, 0);
 }
 
 /*      Start link element
 **      ------------------
 */
-PRIVATE void start_link ARGS2(CONST char *,  href, CONST char *, rev)
+PRIVATE void start_link ARGS2(char *,  href, char *, rev)
 {
     BOOL                present[HTML_LINK_ATTRIBUTES];
-    CONST char*         value[HTML_LINK_ATTRIBUTES];
+    char*         	value[HTML_LINK_ATTRIBUTES];
    
     {
         int i;
         for(i=0; i < HTML_LINK_ATTRIBUTES; i++)
             present[i] = (i == HTML_LINK_HREF || i == HTML_LINK_REV);
     }
-    ((CONST char **)value)[HTML_LINK_HREF] = href;
-    ((CONST char **)value)[HTML_LINK_REV]  = rev;
-    (*targetClass.start_element)(target, HTML_LINK, present,
-				 (CONST char **)value, 0);
+    value[HTML_LINK_HREF] = href;
+    value[HTML_LINK_REV]  = rev;
+    (*targetClass.start_element)(target, HTML_LINK, present, value, 0);
 }
 
 /*      Start list element
@@ -667,17 +665,16 @@ PRIVATE void start_link ARGS2(CONST char *,  href, CONST char *, rev)
 PRIVATE void start_list ARGS1(int, seqnum)
 {
     BOOL                present[HTML_OL_ATTRIBUTES];
-    CONST char*         value[HTML_OL_ATTRIBUTES];
+    char*         	value[HTML_OL_ATTRIBUTES];
     char SeqNum[20];
     int i;
    
     for (i = 0; i < HTML_OL_ATTRIBUTES; i++)
         present[i] = (i == HTML_OL_SEQNUM || i == HTML_OL_START);
     sprintf(SeqNum, "%d", seqnum);
-    ((CONST char **)value)[HTML_OL_SEQNUM] = SeqNum;
-    ((CONST char **)value)[HTML_OL_START]  = SeqNum;
-    (*targetClass.start_element)(target, HTML_OL , present,
-				 (CONST char **)value, 0);
+    value[HTML_OL_SEQNUM] = SeqNum;
+    value[HTML_OL_START]  = SeqNum;
+    (*targetClass.start_element)(target, HTML_OL, present, value, 0);
 }
 
 /*	Paste in an Anchor
diff --git a/WWW/Library/Implementation/SGML.c b/WWW/Library/Implementation/SGML.c
index 0ec49ff0..139be069 100644
--- a/WWW/Library/Implementation/SGML.c
+++ b/WWW/Library/Implementation/SGML.c
@@ -810,7 +810,7 @@ PRIVATE void start_element ARGS1(
     	context->target,
 	new_tag - context->dtd->tags,
 	context->present,
-	(CONST char**) context->value,  /* coerce type for think c */
+	context->value,  /* coerce type for think c */
 	(char **)&context->include);
     if (new_tag->contents != SGML_EMPTY) {		/* i.e. tag not empty */
 	HTElement * N = (HTElement *)malloc(sizeof(HTElement));
diff --git a/WWW/Library/Implementation/SGML.h b/WWW/Library/Implementation/SGML.h
index 42524cbe..4a0fbd76 100644
--- a/WWW/Library/Implementation/SGML.h
+++ b/WWW/Library/Implementation/SGML.h
@@ -206,7 +206,7 @@ typedef struct _HTStructuredClass{
                 HTStructured*   me,
                 int             element_number,
                 CONST BOOL*     attribute_present,
-                CONST char**    attribute_value,
+                char**    	attribute_value,
 		char **		include));
                 
         void (*end_element) PARAMS((
diff --git a/WWW/Library/unix/makefile.in b/WWW/Library/unix/makefile.in
index 7f221b33..14053794 100644
--- a/WWW/Library/unix/makefile.in
+++ b/WWW/Library/unix/makefile.in
@@ -45,11 +45,11 @@ all : $(LOB)/libwww.a
 .SUFFIXES: .i .h .html
 
 .c.o:
-@SHOW_CC@
+@RULE_CC@
 	@ECHO_CC@$(CC) $(CPPOPTS) $(CFLAGS) -c $(srcdir)/$*.c
 
 .c.i:
-@SHOW_CC@
+@RULE_CC@
 	@ECHO_CC@$(CPP) -C $(CPPOPTS) $*.c >$@
 
 depend :
diff --git a/aclocal.m4 b/aclocal.m4
index 700186db..eb580790 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -34,7 +34,7 @@ done
 dnl ---------------------------------------------------------------------------
 dnl This is adapted from the macros 'fp_PROG_CC_STDC' and 'fp_C_PROTOTYPES'
 dnl in the sharutils 4.2 distribution.
-AC_DEFUN([CF_ANSI_CC],
+AC_DEFUN([CF_ANSI_CC_CHECK],
 [
 AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C)
 AC_CACHE_VAL(cf_cv_ansi_cc,[
@@ -66,12 +66,15 @@ done
 CFLAGS="$cf_save_CFLAGS"
 ])
 AC_MSG_RESULT($cf_cv_ansi_cc)
+
 if test "$cf_cv_ansi_cc" != "no"; then
 if test ".$cf_cv_ansi_cc" != ".-DCC_HAS_PROTOS"; then
 	CFLAGS="$CFLAGS $cf_cv_ansi_cc"
+else
+	AC_DEFINE(CC_HAS_PROTOS)
 fi
 fi
-])
+])dnl
 dnl ---------------------------------------------------------------------------
 dnl Check for existence of alternate-character-set support in curses, so we
 dnl can decide to use it for box characters.
@@ -172,10 +175,15 @@ freebsd*) #(vi
 	AC_CHECK_LIB(mytinfo,tgoto,[LIBS="-lmytinfo $LIBS"])
 	;;
 *hp-hpux10.*)
+	AC_CHECK_LIB(Hcurses,initscr,[
+		# HP's header uses __HP_CURSES, but user claims _HP_CURSES.
+		LIBS="-lHcurses $LIBS"
+		CFLAGS="-D__HP_CURSES -D_HP_CURSES $CFLAGS"
+		],[
 	AC_CHECK_LIB(cur_color,initscr,[
 		LIBS="-lcur_color $LIBS"
 		CFLAGS="-I/usr/include/curses_colr $CFLAGS"
-		])
+		])])
 	;;
 esac
 if test -d /usr/5lib ; then
@@ -253,7 +261,38 @@ AC_MSG_RESULT($cf_cv_$2)
 AC_DEFINE_UNQUOTED($2,"$cf_cv_$2")
 ])
 dnl ---------------------------------------------------------------------------
+dnl You can always use "make -n" to see the actual options, but it's hard to
+dnl pick out/analyze warning messages when the compile-line is long.
+dnl
+dnl Sets:
+dnl	ECHO_LD - symbol to prefix "cc -o" lines
+dnl	RULE_CC - symbol to put before implicit "cc -c" lines (e.g., .c.o)
+dnl	SHOW_CC - symbol to put before explicit "cc -c" lines
+dnl	ECHO_CC - symbol to put before any "cc" line
 dnl
+AC_DEFUN([CF_DISABLE_ECHO],[
+AC_MSG_CHECKING(if you want to see long compiling messages)
+CF_ARG_DISABLE(echo,
+	[  --disable-echo          test: display \"compiling\" commands],
+	[
+    ECHO_LD='@echo linking [$]@;'
+    RULE_CC='	@echo compiling [$]<'
+    SHOW_CC='	@echo compiling [$]@'
+    ECHO_CC='@'
+],[
+    ECHO_LD=''
+    RULE_CC='# compiling'
+    SHOW_CC='# compiling'
+    ECHO_CC=''
+])
+AC_MSG_RESULT($enableval)
+AC_SUBST(ECHO_LD)
+AC_SUBST(RULE_CC)
+AC_SUBST(SHOW_CC)
+AC_SUBST(ECHO_CC)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl Check if 'errno' is declared in <errno.h>
 AC_DEFUN([CF_ERRNO],
 [
 AC_MSG_CHECKING([for errno external decl])
@@ -293,9 +332,13 @@ dnl	$1 = library name
 dnl	$2 = includes
 dnl	$3 = code fragment to compile/link
 dnl	$4 = corresponding function-name
+dnl
+dnl Sets the variable "$cf_libdir" as a side-effect, so we can see if we had
+dnl to use a -L option.
 AC_DEFUN([CF_FIND_LIBRARY],
 [
 	cf_cv_have_lib_$1=no
+	cf_libdir=""
 	AC_CHECK_FUNC($4,cf_cv_have_lib_$1=yes,[
 		cf_save_LIBS="$LIBS"
 		AC_MSG_CHECKING(for $4 in -l$1)
@@ -330,12 +373,9 @@ dnl
 dnl	-Wconversion (useful in older versions of gcc, but not in gcc 2.7.x)
 dnl	-Wredundant-decls (system headers make this too noisy)
 dnl	-Wtraditional (combines too many unrelated messages, only a few useful)
+dnl	-Wwrite-strings (too noisy, but should review occasionally)
 dnl	-pedantic
 dnl
-dnl FIXME: the following are useful, but Lynx's not there yet
-dnl	-Wcast-qual
-dnl	-Wwrite-strings
-dnl
 AC_DEFUN([CF_GCC_WARNINGS],
 [EXTRA_CFLAGS=""
 if test -n "$GCC"
@@ -352,6 +392,7 @@ EOF
 	for cf_opt in \
 		Wbad-function-cast \
 		Wcast-align \
+		Wcast-qual \
 		Winline \
 		Wmissing-declarations \
 		Wmissing-prototypes \
@@ -364,11 +405,13 @@ EOF
 		if AC_TRY_EVAL(ac_compile); then
 			test -n "$verbose" && AC_MSG_RESULT(... -$cf_opt)
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+			test "$cf_opt" = Wcast-qual && EXTRA_CFLAGS="$EXTRA_CFLAGS -DXTSTRINGDEFINES"
 		fi
 	done
 	rm -f conftest*
 	CFLAGS="$cf_save_CFLAGS"
 fi
+AC_SUBST(EXTRA_CFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl Construct a search-list for a nonstandard header-file
@@ -431,33 +474,42 @@ dnl The symbol $ac_make is set in AC_MAKE_SET, as a side-effect.
 AC_DEFUN([CF_MAKE_INCLUDE],
 [
 AC_MSG_CHECKING(for style of include in makefiles)
+
 make_include_left=""
 make_include_right=""
 make_include_quote="unknown"
+
+cf_inc=head$$
+cf_dir=subd$$
+echo 'RESULT=OK' >$cf_inc
+mkdir $cf_dir
+
 for cf_include in "include" ".include" "!include"
 do
 	for cf_quote in '' '"'
 	do
-		cat >WWW/Library/unix/makefile <<CF_EOF
+		cat >$cf_dir/makefile <<CF_EOF
 SHELL=/bin/sh
-${cf_include} ${cf_quote}../../Library/Implementation/Version.make${cf_quote}
+${cf_include} ${cf_quote}../$cf_inc${cf_quote}
 all :
-	@echo 'cf_make_include=OK'
+	@echo 'cf_make_include=\$(RESULT)'
 CF_EOF
 	cf_make_include=""
-	eval `cd WWW/Library/unix && ${MAKE-make} 2>&5 | grep cf_make_include=OK`
+	eval `cd $cf_dir && ${MAKE-make} 2>&AC_FD_CC | grep cf_make_include=OK`
 	if test -n "$cf_make_include"; then
 		make_include_left="$cf_include"
 		make_include_quote="$cf_quote"
 		break
 	else
-		echo Tried 1>&5
-		cat WWW/Library/unix/makefile 1>&5
+		echo Tried 1>&AC_FD_CC
+		cat $cf_dir/makefile 1>&AC_FD_CC
 	fi
 	done
 	test -n "$cf_make_include" && break
 done
 
+rm -rf $cf_inc $cf_dir
+
 if test -z "$make_include_left" ; then
 	AC_ERROR(Your $ac_make program does not support includes)
 fi
@@ -465,16 +517,19 @@ if test ".$make_include_quote" != .unknown ; then
 	make_include_left="$make_include_left $make_include_quote"
 	make_include_right="$make_include_quote"
 fi
+
 AC_MSG_RESULT(${make_include_left}file${make_include_right})
+
 AC_SUBST(make_include_left)
 AC_SUBST(make_include_right)
-])
+])dnl
 dnl ---------------------------------------------------------------------------
 dnl Check for pre-1.9.9g ncurses (among other problems, the most obvious is
 dnl that color combinations don't work).
 AC_DEFUN([CF_NCURSES_BROKEN],
 [
-if test "$cf_cv_ncurses_version" = yes ; then
+AC_MSG_CHECKING(for obsolete/broken version of ncurses)
+if test "$cf_cv_ncurses_version" != no ; then
 AC_CACHE_VAL(cf_cv_ncurses_broken,[
 AC_TRY_COMPILE([
 #include <$cf_cv_ncurses_header>],[
@@ -487,6 +542,7 @@ AC_TRY_COMPILE([
 	[cf_cv_ncurses_broken=no],
 	[cf_cv_ncurses_broken=yes])
 ])
+AC_MSG_RESULT($cf_cv_ncurses_broken=yes)
 if test "$cf_cv_ncurses_broken" = yes ; then
 	AC_MSG_WARN(hmm... you should get an up-to-date version of ncurses)
 	AC_DEFINE(NCURSES_BROKEN)
@@ -512,8 +568,17 @@ AC_DEFUN([CF_NCURSES_CPPFLAGS],
 [
 AC_MSG_CHECKING(for ncurses header file)
 AC_CACHE_VAL(cf_cv_ncurses_header,[
-	AC_TRY_COMPILE([#include <curses.h>],
-	[printf("%s\n", NCURSES_VERSION)],
+	AC_TRY_COMPILE([#include <curses.h>],[
+#ifdef NCURSES_VERSION
+printf("%s\n", NCURSES_VERSION);
+#else
+#ifdef __NCURSES_H
+printf("maybe 1.8.7\n");
+#else
+make an error
+#endif
+#endif
+	],
 	[cf_cv_ncurses_header=predefined],[
 	CF_HEADER_PATH(cf_search,ncurses)
 	test -n "$verbose" && echo
@@ -637,28 +702,34 @@ dnl	-lnsl -lsocket
 dnl	-lsocket
 dnl	-lbsd
 AC_DEFUN([CF_NETLIBS],[
-NETLIBS=""
-#
+cf_test_netlibs=no
+AC_MSG_CHECKING(for network libraries)
+AC_CACHE_VAL(cf_cv_netlibs,[
+AC_MSG_RESULT(working...)
+cf_cv_netlibs=""
+cf_test_netlibs=yes
 AC_CHECK_FUNCS(gethostname,,[
-	CF_RECHECK_FUNC(gethostname,nsl,NETLIBS,[
-		CF_RECHECK_FUNC(gethostname,socket,NETLIBS)])])
+	CF_RECHECK_FUNC(gethostname,nsl,cf_cv_netlibs,[
+		CF_RECHECK_FUNC(gethostname,socket,cf_cv_netlibs)])])
 #
 # FIXME:  sequent needs this library (i.e., -lsocket -linet -lnsl), but
 # I don't know the entrypoints - 97/7/22 TD
-AC_HAVE_LIBRARY(inet,NETLIBS="-linet $NETLIBS")
+AC_HAVE_LIBRARY(inet,cf_cv_netlibs="-linet $cf_cv_netlibs")
 #
 if test "$ac_cv_func_lsocket" != no ; then
 AC_CHECK_FUNCS(socket,,[
-	CF_RECHECK_FUNC(socket,socket,NETLIBS,[
-		CF_RECHECK_FUNC(socket,bsd,NETLIBS)])])
+	CF_RECHECK_FUNC(socket,socket,cf_cv_netlibs,[
+		CF_RECHECK_FUNC(socket,bsd,cf_cv_netlibs)])])
 fi
 #
 AC_CHECK_FUNCS(gethostbyname,,[
-	CF_RECHECK_FUNC(gethostbyname,nsl,NETLIBS)])
+	CF_RECHECK_FUNC(gethostbyname,nsl,cf_cv_netlibs)])
 #
 AC_CHECK_FUNCS(strcasecmp,,[
-	CF_RECHECK_FUNC(strcasecmp,resolv,NETLIBS)])
-LIBS="$LIBS $NETLIBS"
+	CF_RECHECK_FUNC(strcasecmp,resolv,cf_cv_netlibs)])
+])
+LIBS="$LIBS $cf_cv_netlibs"
+test $cf_test_netlibs = no && echo "$cf_cv_netlibs" >&AC_FD_MSG
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl Check for the symbol NGROUPS
@@ -832,7 +903,8 @@ do
 
 	CFLAGS="$cf_save_CFLAGS"
 	if test "$cf_cv_sizechange" = yes ; then
-		test -n "$cf_opts" && AC_DEFINE($cf_opts)
+		echo "size-change succeeded ($cf_opts)" >&AC_FD_MSG
+		test -n "$cf_opts" && AC_DEFINE_UNQUOTED($cf_opts)
 		break
 	fi
 done
@@ -918,7 +990,18 @@ AC_CACHE_VAL(cf_cv_dcl_sys_errlist,[
     [cf_cv_dcl_sys_errlist=yes],
     [cf_cv_dcl_sys_errlist=no])])
 AC_MSG_RESULT($cf_cv_dcl_sys_errlist)
-test $cf_cv_dcl_sys_errlist = no && AC_DEFINE(DECL_SYS_ERRLIST)
+
+# It's possible (for near-UNIX clones) that sys_errlist doesn't exist
+if test $cf_cv_dcl_sys_errlist = no ; then
+    AC_DEFINE(DECL_SYS_ERRLIST)
+    AC_MSG_CHECKING([existence of sys_errlist])
+    AC_CACHE_VAL(cf_cv_have_sys_errlist,[
+        AC_TRY_LINK([#include <errno.h>],
+            [char *c = (char *) *sys_errlist],
+            [cf_cv_have_sys_errlist=yes],
+            [cf_cv_have_sys_errlist=no])])
+    AC_MSG_RESULT($cf_cv_have_sys_errlist)
+fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_DEFUN([CF_SYSTEM_MAIL_FLAGS], 
@@ -1024,7 +1107,7 @@ AC_CACHE_VAL(cf_cv_type_unionwait,[
 	[cf_cv_type_unionwait=yes],
 	[cf_cv_type_unionwait=no])])
 AC_MSG_RESULT($cf_cv_type_unionwait)
-test $cf_cv_type_unionwait = yes && AC_DEFINE(HAVE_TYPE_UNION_WAIT)
+test $cf_cv_type_unionwait = yes && AC_DEFINE(HAVE_TYPE_UNIONWAIT)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_DEFUN([CF_UTMP],
diff --git a/config.hin b/config.hin
index decb8a91..b6431d54 100644
--- a/config.hin
+++ b/config.hin
@@ -36,20 +36,22 @@
 #undef HAVE_SYS_DIR_H		/* defined by AC_HEADER_DIRENT */
 #undef HAVE_SYS_FCNTL_H		/* have <sys/fcntl.h> */
 #undef HAVE_SYS_FILIO_H		/* have <sys/filio.h> */
+#undef HAVE_SYS_IOCTL_H		/* have <sys/ioctl.h> */
 #undef HAVE_SYS_NDIR_H		/* defined by AC_HEADER_DIRENT */
 #undef HAVE_TERMIOS_H		/* have <termios.h> */
 #undef HAVE_TTYTYPE
-#undef HAVE_TYPE_UNION_WAIT	/* CF_UNION_WAIT */
+#undef HAVE_TYPE_UNIONWAIT	/* CF_UNION_WAIT */
 #undef HAVE_UNISTD_H		/* have <unistd.h> */
 #undef HAVE_UTMP
+#undef HAVE_WAITPID
 #undef IGNORE_CTRL_C		/* FIXME: make tests? */
 #undef INSTALL_ARGS		/* CF_PATH_PROG(install) */
 #undef INSTALL_PATH		/* CF_PATH_PROG(install) */
 #undef LINUX			/* FIXME: make tests? */
 #undef LOCALE			/* for locale support */
 #undef LONG_LIST		/* CF_ARG_DISABLE(long-list) */
-#undef LY_FIND_LEAKS		/* configure --disable-leaks */
 #undef LYNX_CFG_FILE		/* CF_WITH_PATH(cfg-file) */
+#undef LY_FIND_LEAKS		/* configure --disable-leaks */
 #undef MKDIR_PATH		/* CF_PATH_PROG(mkdir) */
 #undef MV_PATH			/* CF_PATH_PROG(mv) */
 #undef NCURSES			/* defined for ncurses support */
@@ -69,7 +71,6 @@
 #undef STDC_HEADERS
 #undef SYSTEM_MAIL		/* CF_DEFINE_PROG */
 #undef SYSTEM_MAIL_FLAGS	/* defined by CF_SYSTEM_MAIL_FLAGS */
-#undef SYS_IOCTL_H		/* have <sys/ioctl.h> */
 #undef TAR_PATH			/* CF_PATH_PROG(tar) */
 #undef TERMIO_AND_TERMIOS	/* termio.h and termios.h combo bug */
 #undef TOUCH_PATH		/* CF_PATH_PROG(touch) */
@@ -91,14 +92,12 @@
 /* FIXME:DGUX */
 /* FIXME:DGUX_OLD */
 /* FIXME:EXEC_LINKS */
+/* FIXME:EXEC_SCRIPTS */
 /* FIXME:HP_TERMINAL */
-/* FIXME:ISC */
 /* FIXME:NOPORT */
-/* FIXME:NO_CPU_LIMIT */
 /* FIXME:NSL_FORK */
 /* FIXME:POSIX_JC */
 /* FIXME:REVERSE_CLEAR_SCREEN_PROBLEM */
-/* FIXME:SGI */
 /* FIXME:SHORTENED_RBIND */
 /* FIXME:SNAKE */
 /* FIXME:SOCKS */
diff --git a/configure b/configure
index 3240af4b..b6a15e96 100755
--- a/configure
+++ b/configure
@@ -15,7 +15,7 @@ ac_default_prefix=/usr/local
 ac_help="$ac_help
 Development Options:"
 ac_help="$ac_help
-  --disable-echo          display \"compiling\" commands (default: on)"
+  --disable-echo          test: display \"compiling\" commands (default: on)"
 ac_help="$ac_help
   --enable-find-leaks     logic for testing memory leaks (default: off)"
 ac_help="$ac_help
@@ -912,33 +912,42 @@ fi
 
 echo $ac_n "checking for style of include in makefiles""... $ac_c" 1>&6
 echo "configure:915: checking for style of include in makefiles" >&5
+
 make_include_left=""
 make_include_right=""
 make_include_quote="unknown"
+
+cf_inc=head$$
+cf_dir=subd$$
+echo 'RESULT=OK' >$cf_inc
+mkdir $cf_dir
+
 for cf_include in "include" ".include" "!include"
 do
 	for cf_quote in '' '"'
 	do
-		cat >WWW/Library/unix/makefile <<CF_EOF
+		cat >$cf_dir/makefile <<CF_EOF
 SHELL=/bin/sh
-${cf_include} ${cf_quote}../../Library/Implementation/Version.make${cf_quote}
+${cf_include} ${cf_quote}../$cf_inc${cf_quote}
 all :
-	@echo 'cf_make_include=OK'
+	@echo 'cf_make_include=\$(RESULT)'
 CF_EOF
 	cf_make_include=""
-	eval `cd WWW/Library/unix && ${MAKE-make} 2>&5 | grep cf_make_include=OK`
+	eval `cd $cf_dir && ${MAKE-make} 2>&5 | grep cf_make_include=OK`
 	if test -n "$cf_make_include"; then
 		make_include_left="$cf_include"
 		make_include_quote="$cf_quote"
 		break
 	else
 		echo Tried 1>&5
-		cat WWW/Library/unix/makefile 1>&5
+		cat $cf_dir/makefile 1>&5
 	fi
 	done
 	test -n "$cf_make_include" && break
 done
 
+rm -rf $cf_inc $cf_dir
+
 if test -z "$make_include_left" ; then
 	{ echo "configure: error: Your $ac_make program does not support includes" 1>&2; exit 1; }
 fi
@@ -946,10 +955,12 @@ if test ".$make_include_quote" != .unknown ; then
 	make_include_left="$make_include_left $make_include_quote"
 	make_include_right="$make_include_quote"
 fi
+
 echo "$ac_t""${make_include_left}file${make_include_right}" 1>&6
 
 
 
+
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -961,7 +972,7 @@ echo "$ac_t""${make_include_left}file${make_include_right}" 1>&6
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:965: checking for a BSD compatible install" >&5
+echo "configure:976: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1015,7 +1026,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1019: checking for $ac_word" >&5
+echo "configure:1030: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LINT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1047,23 +1058,36 @@ done
 
 
 
+
 echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6
-echo "configure:1052: checking if you want to see long compiling messages" >&5
+echo "configure:1064: 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"
   test "$enableval" != no && enableval=yes
   if test "$enableval" != "yes" ; then
+    
+    ECHO_LD='@echo linking $@;'
+    RULE_CC='	@echo compiling $<'
     SHOW_CC='	@echo compiling $@'
-    ECHO_CC='@' 
+    ECHO_CC='@'
+ 
   else
+    
+    ECHO_LD=''
+    RULE_CC='# compiling'
     SHOW_CC='# compiling'
     ECHO_CC=''
+
   fi
 else
   enableval=yes 
-  SHOW_CC='# compiling'
+  
+    ECHO_LD=''
+    RULE_CC='# compiling'
+    SHOW_CC='# compiling'
     ECHO_CC=''
+
   
 fi
 
@@ -1071,8 +1095,11 @@ echo "$ac_t""$enableval" 1>&6
 
 
 
+
+
+
 echo $ac_n "checking if you want to check memory-leaks""... $ac_c" 1>&6
-echo "configure:1076: checking if you want to check memory-leaks" >&5
+echo "configure:1103: 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"
@@ -1095,7 +1122,7 @@ EOF
 
 
 echo $ac_n "checking if you want to enable debug-code""... $ac_c" 1>&6
-echo "configure:1099: checking if you want to enable debug-code" >&5
+echo "configure:1126: 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"
@@ -1139,7 +1166,7 @@ fi
 if test -n "$GCC"
 then
 echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6
-echo "configure:1143: checking if you want to turn on gcc warnings" >&5
+echo "configure:1170: 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"
@@ -1162,16 +1189,17 @@ then
 if test -n "$GCC"
 then
 		cat > conftest.$ac_ext <<EOF
-#line 1166 "configure"
+#line 1193 "configure"
 int main(int argc, char *argv[]) { return argv[argc-1] == 0; }
 EOF
 		echo "checking for gcc warning options" 1>&6
-echo "configure:1170: checking for gcc warning options" >&5
+echo "configure:1197: checking for gcc warning options" >&5
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="-W -Wall"
 	for cf_opt in \
 		Wbad-function-cast \
 		Wcast-align \
+		Wcast-qual \
 		Winline \
 		Wmissing-declarations \
 		Wmissing-prototypes \
@@ -1181,15 +1209,17 @@ echo "configure:1170: checking for gcc warning options" >&5
 		Wstrict-prototypes
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo configure:1185: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+		if { (eval echo configure:1213: \"$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"
+			test "$cf_opt" = Wcast-qual && EXTRA_CFLAGS="$EXTRA_CFLAGS -DXTSTRINGDEFINES"
 		fi
 	done
 	rm -f conftest*
 	CFLAGS="$cf_save_CFLAGS"
 fi
 
+
 fi
 fi
 
@@ -1197,7 +1227,7 @@ fi
 
 
 echo $ac_n "checking if you want full utility pathnames""... $ac_c" 1>&6
-echo "configure:1201: checking if you want full utility pathnames" >&5
+echo "configure:1231: checking if you want full utility pathnames" >&5
 # Check whether --enable-full-paths or --disable-full-paths was given.
 if test "${enable_full_paths+set}" = set; then
   enableval="$enable_full_paths"
@@ -1217,7 +1247,7 @@ echo "$ac_t""$with_full_paths" 1>&6
 
 
 echo $ac_n "checking for system mailer""... $ac_c" 1>&6
-echo "configure:1221: checking for system mailer" >&5
+echo "configure:1251: checking for system mailer" >&5
 if eval "test \"`echo '$''{'cf_cv_SYSTEM_MAIL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1244,7 +1274,7 @@ EOF
 
 
 echo $ac_n "checking system mail flags""... $ac_c" 1>&6
-echo "configure:1248: checking system mail flags" >&5
+echo "configure:1278: checking system mail flags" >&5
 if eval "test \"`echo '$''{'cf_cv_system_mail_flags'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1272,7 +1302,7 @@ if test "$with_full_paths" = yes ; then
 	# Extract the first word of "chmod", so it can be a program name with args.
 set dummy chmod; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1276: checking for $ac_word" >&5
+echo "configure:1306: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_CHMOD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1303,7 +1333,7 @@ fi
 
 else
 	echo $ac_n "checking for chmod""... $ac_c" 1>&6
-echo "configure:1307: checking for chmod" >&5
+echo "configure:1337: checking for chmod" >&5
 	echo "$ac_t""$CHMOD" 1>&6
 fi
 
@@ -1337,7 +1367,7 @@ if test "$with_full_paths" = yes ; then
 	# Extract the first word of "compress", so it can be a program name with args.
 set dummy compress; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1341: checking for $ac_word" >&5
+echo "configure:1371: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_COMPRESS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1368,7 +1398,7 @@ fi
 
 else
 	echo $ac_n "checking for compress""... $ac_c" 1>&6
-echo "configure:1372: checking for compress" >&5
+echo "configure:1402: checking for compress" >&5
 	echo "$ac_t""$COMPRESS" 1>&6
 fi
 
@@ -1402,7 +1432,7 @@ if test "$with_full_paths" = yes ; then
 	# Extract the first word of "cp", so it can be a program name with args.
 set dummy cp; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1406: checking for $ac_word" >&5
+echo "configure:1436: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_COPY'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1433,7 +1463,7 @@ fi
 
 else
 	echo $ac_n "checking for cp""... $ac_c" 1>&6
-echo "configure:1437: checking for cp" >&5
+echo "configure:1467: checking for cp" >&5
 	echo "$ac_t""$COPY" 1>&6
 fi
 
@@ -1467,7 +1497,7 @@ if test "$with_full_paths" = yes ; then
 	# Extract the first word of "gzip", so it can be a program name with args.
 set dummy gzip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1471: checking for $ac_word" >&5
+echo "configure:1501: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GZIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1498,7 +1528,7 @@ fi
 
 else
 	echo $ac_n "checking for gzip""... $ac_c" 1>&6
-echo "configure:1502: checking for gzip" >&5
+echo "configure:1532: checking for gzip" >&5
 	echo "$ac_t""$GZIP" 1>&6
 fi
 
@@ -1532,7 +1562,7 @@ if test "$with_full_paths" = yes ; then
 	# Extract the first word of "install", so it can be a program name with args.
 set dummy install; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1536: checking for $ac_word" >&5
+echo "configure:1566: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_INSTALL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1563,7 +1593,7 @@ fi
 
 else
 	echo $ac_n "checking for install""... $ac_c" 1>&6
-echo "configure:1567: checking for install" >&5
+echo "configure:1597: checking for install" >&5
 	echo "$ac_t""$INSTALL" 1>&6
 fi
 
@@ -1597,7 +1627,7 @@ if test "$with_full_paths" = yes ; then
 	# Extract the first word of "mkdir", so it can be a program name with args.
 set dummy mkdir; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1601: checking for $ac_word" >&5
+echo "configure:1631: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MKDIR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1628,7 +1658,7 @@ fi
 
 else
 	echo $ac_n "checking for mkdir""... $ac_c" 1>&6
-echo "configure:1632: checking for mkdir" >&5
+echo "configure:1662: checking for mkdir" >&5
 	echo "$ac_t""$MKDIR" 1>&6
 fi
 
@@ -1662,7 +1692,7 @@ if test "$with_full_paths" = yes ; then
 	# Extract the first word of "mv", so it can be a program name with args.
 set dummy mv; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1666: checking for $ac_word" >&5
+echo "configure:1696: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MV'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1693,7 +1723,7 @@ fi
 
 else
 	echo $ac_n "checking for mv""... $ac_c" 1>&6
-echo "configure:1697: checking for mv" >&5
+echo "configure:1727: checking for mv" >&5
 	echo "$ac_t""$MV" 1>&6
 fi
 
@@ -1727,7 +1757,7 @@ if test "$with_full_paths" = yes ; then
 	# Extract the first word of "rm", so it can be a program name with args.
 set dummy rm; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1731: checking for $ac_word" >&5
+echo "configure:1761: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_RM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1758,7 +1788,7 @@ fi
 
 else
 	echo $ac_n "checking for rm""... $ac_c" 1>&6
-echo "configure:1762: checking for rm" >&5
+echo "configure:1792: checking for rm" >&5
 	echo "$ac_t""$RM" 1>&6
 fi
 
@@ -1792,7 +1822,7 @@ if test "$with_full_paths" = yes ; then
 	# Extract the first word of "tar", so it can be a program name with args.
 set dummy tar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1796: checking for $ac_word" >&5
+echo "configure:1826: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_TAR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1823,7 +1853,7 @@ fi
 
 else
 	echo $ac_n "checking for tar""... $ac_c" 1>&6
-echo "configure:1827: checking for tar" >&5
+echo "configure:1857: checking for tar" >&5
 	echo "$ac_t""$TAR" 1>&6
 fi
 
@@ -1857,7 +1887,7 @@ if test "$with_full_paths" = yes ; then
 	# Extract the first word of "touch", so it can be a program name with args.
 set dummy touch; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1861: checking for $ac_word" >&5
+echo "configure:1891: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_TOUCH'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1888,7 +1918,7 @@ fi
 
 else
 	echo $ac_n "checking for touch""... $ac_c" 1>&6
-echo "configure:1892: checking for touch" >&5
+echo "configure:1922: checking for touch" >&5
 	echo "$ac_t""$TOUCH" 1>&6
 fi
 
@@ -1922,7 +1952,7 @@ if test "$with_full_paths" = yes ; then
 	# Extract the first word of "gunzip", so it can be a program name with args.
 set dummy gunzip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1926: checking for $ac_word" >&5
+echo "configure:1956: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_UNCOMPRESS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1953,7 +1983,7 @@ fi
 
 else
 	echo $ac_n "checking for gunzip""... $ac_c" 1>&6
-echo "configure:1957: checking for gunzip" >&5
+echo "configure:1987: checking for gunzip" >&5
 	echo "$ac_t""$UNCOMPRESS" 1>&6
 fi
 
@@ -1987,7 +2017,7 @@ if test "$with_full_paths" = yes ; then
 	# Extract the first word of "unzip", so it can be a program name with args.
 set dummy unzip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1991: checking for $ac_word" >&5
+echo "configure:2021: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_UNZIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2018,7 +2048,7 @@ fi
 
 else
 	echo $ac_n "checking for unzip""... $ac_c" 1>&6
-echo "configure:2022: checking for unzip" >&5
+echo "configure:2052: checking for unzip" >&5
 	echo "$ac_t""$UNZIP" 1>&6
 fi
 
@@ -2052,7 +2082,7 @@ if test "$with_full_paths" = yes ; then
 	# Extract the first word of "uudecode", so it can be a program name with args.
 set dummy uudecode; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2056: checking for $ac_word" >&5
+echo "configure:2086: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_UUDECODE'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2083,7 +2113,7 @@ fi
 
 else
 	echo $ac_n "checking for uudecode""... $ac_c" 1>&6
-echo "configure:2087: checking for uudecode" >&5
+echo "configure:2117: checking for uudecode" >&5
 	echo "$ac_t""$UUDECODE" 1>&6
 fi
 
@@ -2117,7 +2147,7 @@ if test "$with_full_paths" = yes ; then
 	# Extract the first word of "zcat", so it can be a program name with args.
 set dummy zcat; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2121: checking for $ac_word" >&5
+echo "configure:2151: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_ZCAT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2148,7 +2178,7 @@ fi
 
 else
 	echo $ac_n "checking for zcat""... $ac_c" 1>&6
-echo "configure:2152: checking for zcat" >&5
+echo "configure:2182: checking for zcat" >&5
 	echo "$ac_t""$ZCAT" 1>&6
 fi
 
@@ -2182,7 +2212,7 @@ if test "$with_full_paths" = yes ; then
 	# Extract the first word of "zip", so it can be a program name with args.
 set dummy zip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2186: checking for $ac_word" >&5
+echo "configure:2216: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_ZIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2213,7 +2243,7 @@ fi
 
 else
 	echo $ac_n "checking for zip""... $ac_c" 1>&6
-echo "configure:2217: checking for zip" >&5
+echo "configure:2247: checking for zip" >&5
 	echo "$ac_t""$ZIP" 1>&6
 fi
 
@@ -2251,7 +2281,7 @@ EOF
 if test -z "$GCC" ; then
 	
 echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
-echo "configure:2255: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "configure:2285: checking for ${CC-cc} option to accept ANSI C" >&5
 if eval "test \"`echo '$''{'cf_cv_ansi_cc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2269,7 +2299,7 @@ for cf_arg in "-DCC_HAS_PROTOS" "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" -Xc
 do
 	CFLAGS="$cf_save_CFLAGS $cf_arg"
 	cat > conftest.$ac_ext <<EOF
-#line 2273 "configure"
+#line 2303 "configure"
 #include "confdefs.h"
 
 #ifndef CC_HAS_PROTOS
@@ -2285,7 +2315,7 @@ int main() {
 	struct s2 {int (*f) (double a);};
 ; return 0; }
 EOF
-if { (eval echo configure:2289: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ansi_cc="$cf_arg"; break
 else
@@ -2299,20 +2329,26 @@ CFLAGS="$cf_save_CFLAGS"
 fi
 
 echo "$ac_t""$cf_cv_ansi_cc" 1>&6
+
 if test "$cf_cv_ansi_cc" != "no"; then
 if test ".$cf_cv_ansi_cc" != ".-DCC_HAS_PROTOS"; then
 	CFLAGS="$CFLAGS $cf_cv_ansi_cc"
+else
+	cat >> confdefs.h <<\EOF
+#define CC_HAS_PROTOS 1
+EOF
+
 fi
 fi
 
 fi
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:2311: checking for working const" >&5
+echo "configure:2347: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2316 "configure"
+#line 2352 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2361,7 +2397,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:2365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2401: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -2401,7 +2437,7 @@ clix*)
 	# contributed by Alex Matulich (matuli_a@marlin.navsea.navy.mil) also
 	# references -lmalloc and -lbsd.
 	echo $ac_n "checking for strcmp in -lc_s""... $ac_c" 1>&6
-echo "configure:2405: checking for strcmp in -lc_s" >&5
+echo "configure:2441: checking for strcmp in -lc_s" >&5
 ac_lib_var=`echo c_s'_'strcmp | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2409,7 +2445,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lc_s  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2413 "configure"
+#line 2449 "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
@@ -2420,7 +2456,7 @@ int main() {
 strcmp()
 ; return 0; }
 EOF
-if { (eval echo configure:2424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2460: \"$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
@@ -2498,7 +2534,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2502: checking for $ac_word" >&5
+echo "configure:2538: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2542,17 +2578,17 @@ sony-newsos*)
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2546: checking for $ac_hdr" >&5
+echo "configure:2582: 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 2551 "configure"
+#line 2587 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2556: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2592: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2596,17 +2632,17 @@ ultrix*)
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2600: checking for $ac_hdr" >&5
+echo "configure:2636: 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 2605 "configure"
+#line 2641 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2610: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2646: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2637,17 +2673,25 @@ esac
 
 
 
-NETLIBS=""
-#
+cf_test_netlibs=no
+echo $ac_n "checking for network libraries""... $ac_c" 1>&6
+echo "configure:2679: checking for network libraries" >&5
+if eval "test \"`echo '$''{'cf_cv_netlibs'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+echo "$ac_t""working..." 1>&6
+cf_cv_netlibs=""
+cf_test_netlibs=yes
 for ac_func in gethostname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2646: checking for $ac_func" >&5
+echo "configure:2690: 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 2651 "configure"
+#line 2695 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2670,7 +2714,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2693,15 +2737,15 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6
-echo "configure:2697: checking for gethostname in -lnsl" >&5
+echo "configure:2741: checking for gethostname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostname | 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="-lnsl $NETLIBS $LIBS"
+LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2705 "configure"
+#line 2749 "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
@@ -2712,7 +2756,7 @@ int main() {
 gethostname()
 ; return 0; }
 EOF
-if { (eval echo configure:2716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2760: \"$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
@@ -2736,7 +2780,7 @@ cf_tr_func=`echo gethostname | tr 'a-z' 'A-Z'`
 EOF
 
 	ac_cv_func_gethostname=yes
-	NETLIBS="-lnsl $NETLIBS"
+	cf_cv_netlibs="-lnsl $cf_cv_netlibs"
 else
   echo "$ac_t""no" 1>&6
 
@@ -2745,15 +2789,15 @@ else
 	
 		
 echo $ac_n "checking for gethostname in -lsocket""... $ac_c" 1>&6
-echo "configure:2749: checking for gethostname in -lsocket" >&5
+echo "configure:2793: checking for gethostname in -lsocket" >&5
 ac_lib_var=`echo socket'_'gethostname | 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="-lsocket $NETLIBS $LIBS"
+LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2757 "configure"
+#line 2801 "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
@@ -2764,7 +2808,7 @@ int main() {
 gethostname()
 ; return 0; }
 EOF
-if { (eval echo configure:2768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2812: \"$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
@@ -2788,7 +2832,7 @@ cf_tr_func=`echo gethostname | tr 'a-z' 'A-Z'`
 EOF
 
 	ac_cv_func_gethostname=yes
-	NETLIBS="-lsocket $NETLIBS"
+	cf_cv_netlibs="-lsocket $cf_cv_netlibs"
 else
   echo "$ac_t""no" 1>&6
 
@@ -2808,21 +2852,21 @@ done
 # FIXME:  sequent needs this library (i.e., -lsocket -linet -lnsl), but
 # I don't know the entrypoints - 97/7/22 TD
 echo $ac_n "checking for -linet""... $ac_c" 1>&6
-echo "configure:2812: checking for -linet" >&5
+echo "configure:2856: checking for -linet" >&5
 if eval "test \"`echo '$''{'ac_cv_lib_inet'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-linet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2819 "configure"
+#line 2863 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:2826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_lib_inet=yes
 else
@@ -2837,7 +2881,7 @@ LIBS="$ac_save_LIBS"
 fi
 echo "$ac_t""$ac_cv_lib_inet" 1>&6
 if test "$ac_cv_lib_inet" = yes; then
-  NETLIBS="-linet $NETLIBS"
+  cf_cv_netlibs="-linet $cf_cv_netlibs"
 fi
 
 #
@@ -2845,12 +2889,12 @@ if test "$ac_cv_func_lsocket" != no ; then
 for ac_func in socket
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2849: checking for $ac_func" >&5
+echo "configure:2893: 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 2854 "configure"
+#line 2898 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2873,7 +2917,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2896,15 +2940,15 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:2900: checking for socket in -lsocket" >&5
+echo "configure:2944: checking for socket in -lsocket" >&5
 ac_lib_var=`echo socket'_'socket | 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="-lsocket $NETLIBS $LIBS"
+LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2908 "configure"
+#line 2952 "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
@@ -2915,7 +2959,7 @@ int main() {
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:2919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2963: \"$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
@@ -2939,7 +2983,7 @@ cf_tr_func=`echo socket | tr 'a-z' 'A-Z'`
 EOF
 
 	ac_cv_func_socket=yes
-	NETLIBS="-lsocket $NETLIBS"
+	cf_cv_netlibs="-lsocket $cf_cv_netlibs"
 else
   echo "$ac_t""no" 1>&6
 
@@ -2948,15 +2992,15 @@ else
 	
 		
 echo $ac_n "checking for socket in -lbsd""... $ac_c" 1>&6
-echo "configure:2952: checking for socket in -lbsd" >&5
+echo "configure:2996: checking for socket in -lbsd" >&5
 ac_lib_var=`echo bsd'_'socket | 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="-lbsd $NETLIBS $LIBS"
+LIBS="-lbsd $cf_cv_netlibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2960 "configure"
+#line 3004 "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
@@ -2967,7 +3011,7 @@ int main() {
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:2971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3015: \"$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
@@ -2991,7 +3035,7 @@ cf_tr_func=`echo socket | tr 'a-z' 'A-Z'`
 EOF
 
 	ac_cv_func_socket=yes
-	NETLIBS="-lbsd $NETLIBS"
+	cf_cv_netlibs="-lbsd $cf_cv_netlibs"
 else
   echo "$ac_t""no" 1>&6
 
@@ -3012,12 +3056,12 @@ fi
 for ac_func in gethostbyname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3016: checking for $ac_func" >&5
+echo "configure:3060: 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 3021 "configure"
+#line 3065 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3040,7 +3084,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3063,15 +3107,15 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:3067: checking for gethostbyname in -lnsl" >&5
+echo "configure:3111: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | 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="-lnsl $NETLIBS $LIBS"
+LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3075 "configure"
+#line 3119 "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
@@ -3082,7 +3126,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:3086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3130: \"$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
@@ -3106,7 +3150,7 @@ cf_tr_func=`echo gethostbyname | tr 'a-z' 'A-Z'`
 EOF
 
 	ac_cv_func_gethostbyname=yes
-	NETLIBS="-lnsl $NETLIBS"
+	cf_cv_netlibs="-lnsl $cf_cv_netlibs"
 else
   echo "$ac_t""no" 1>&6
 
@@ -3123,12 +3167,12 @@ done
 for ac_func in strcasecmp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3127: checking for $ac_func" >&5
+echo "configure:3171: 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 3132 "configure"
+#line 3176 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3151,7 +3195,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3174,15 +3218,15 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for strcasecmp in -lresolv""... $ac_c" 1>&6
-echo "configure:3178: checking for strcasecmp in -lresolv" >&5
+echo "configure:3222: checking for strcasecmp in -lresolv" >&5
 ac_lib_var=`echo resolv'_'strcasecmp | 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="-lresolv $NETLIBS $LIBS"
+LIBS="-lresolv $cf_cv_netlibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3186 "configure"
+#line 3230 "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
@@ -3193,7 +3237,7 @@ int main() {
 strcasecmp()
 ; return 0; }
 EOF
-if { (eval echo configure:3197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3241: \"$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
@@ -3217,7 +3261,7 @@ cf_tr_func=`echo strcasecmp | tr 'a-z' 'A-Z'`
 EOF
 
 	ac_cv_func_strcasecmp=yes
-	NETLIBS="-lresolv $NETLIBS"
+	cf_cv_netlibs="-lresolv $cf_cv_netlibs"
 else
   echo "$ac_t""no" 1>&6
 
@@ -3230,11 +3274,15 @@ fi
 fi
 done
 
-LIBS="$LIBS $NETLIBS"
+
+fi
+
+LIBS="$LIBS $cf_cv_netlibs"
+test $cf_test_netlibs = no && echo "$cf_cv_netlibs" >&6
 
 
 echo $ac_n "checking for screen type""... $ac_c" 1>&6
-echo "configure:3238: checking for screen type" >&5
+echo "configure:3286: checking for screen type" >&5
 if eval "test \"`echo '$''{'cf_cv_screen'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3265,12 +3313,12 @@ curses)
 	fi
 	
 echo $ac_n "checking for initscr""... $ac_c" 1>&6
-echo "configure:3269: checking for initscr" >&5
+echo "configure:3317: 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 3274 "configure"
+#line 3322 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr(); below.  */
@@ -3293,7 +3341,7 @@ initscr();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_initscr=yes"
 else
@@ -3314,7 +3362,7 @@ else
 case $host_os in #(vi
 freebsd*) #(vi
 	echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6
-echo "configure:3318: checking for tgoto in -lmytinfo" >&5
+echo "configure:3366: 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
@@ -3322,7 +3370,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lmytinfo  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3326 "configure"
+#line 3374 "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
@@ -3333,7 +3381,7 @@ int main() {
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:3337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3385: \"$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
@@ -3355,8 +3403,51 @@ fi
 
 	;;
 *hp-hpux10.*)
+	echo $ac_n "checking for initscr in -lHcurses""... $ac_c" 1>&6
+echo "configure:3408: checking for initscr in -lHcurses" >&5
+ac_lib_var=`echo Hcurses'_'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="-lHcurses  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 3416 "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:3427: \"$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
+  
+		# HP's header uses __HP_CURSES, but user claims _HP_CURSES.
+		LIBS="-lHcurses $LIBS"
+		CFLAGS="-D__HP_CURSES -D_HP_CURSES $CFLAGS"
+		
+else
+  echo "$ac_t""no" 1>&6
+
 	echo $ac_n "checking for initscr in -lcur_color""... $ac_c" 1>&6
-echo "configure:3360: checking for initscr in -lcur_color" >&5
+echo "configure:3451: checking for initscr in -lcur_color" >&5
 ac_lib_var=`echo cur_color'_'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
@@ -3364,7 +3455,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcur_color  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3368 "configure"
+#line 3459 "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
@@ -3375,7 +3466,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:3379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3470: \"$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
@@ -3398,6 +3489,8 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
+fi
+
 	;;
 esac
 if test -d /usr/5lib ; then
@@ -3412,12 +3505,12 @@ fi
 
 cf_save_LIBS="$LIBS"
 echo $ac_n "checking for tgoto""... $ac_c" 1>&6
-echo "configure:3416: checking for tgoto" >&5
+echo "configure:3509: 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 3421 "configure"
+#line 3514 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char tgoto(); below.  */
@@ -3440,7 +3533,7 @@ tgoto();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_tgoto=yes"
 else
@@ -3456,7 +3549,7 @@ 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:3460: checking for initscr in -lcurses" >&5
+echo "configure:3553: 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
@@ -3464,7 +3557,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3468 "configure"
+#line 3561 "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
@@ -3475,7 +3568,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:3479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3572: \"$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
@@ -3509,7 +3602,7 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
-echo "configure:3513: checking for tgoto in -ltermcap" >&5
+echo "configure:3606: 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
@@ -3517,7 +3610,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3521 "configure"
+#line 3614 "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
@@ -3528,7 +3621,7 @@ int main() {
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:3532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3625: \"$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
@@ -3546,7 +3639,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:3550: checking for initscr in -lcurses" >&5
+echo "configure:3643: 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
@@ -3554,7 +3647,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3558 "configure"
+#line 3651 "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
@@ -3565,7 +3658,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:3569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3662: \"$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
@@ -3592,7 +3685,7 @@ else
   echo "$ac_t""no" 1>&6
 
 		echo $ac_n "checking for initscr in -lcursesX""... $ac_c" 1>&6
-echo "configure:3596: checking for initscr in -lcursesX" >&5
+echo "configure:3689: 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
@@ -3600,7 +3693,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcursesX  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3604 "configure"
+#line 3697 "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
@@ -3611,7 +3704,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:3615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3708: \"$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
@@ -3638,7 +3731,7 @@ else
   echo "$ac_t""no" 1>&6
 
 			echo $ac_n "checking for initscr in -ljcurses""... $ac_c" 1>&6
-echo "configure:3642: checking for initscr in -ljcurses" >&5
+echo "configure:3735: 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
@@ -3646,7 +3739,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ljcurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3650 "configure"
+#line 3743 "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
@@ -3657,7 +3750,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:3661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3754: \"$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
@@ -3695,7 +3788,7 @@ else
   echo "$ac_t""no" 1>&6
 
 	echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6
-echo "configure:3699: checking for initscr in -lcurses" >&5
+echo "configure:3792: 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
@@ -3703,7 +3796,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3707 "configure"
+#line 3800 "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
@@ -3714,7 +3807,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:3718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3811: \"$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
@@ -3753,14 +3846,14 @@ fi
 
 	
 echo $ac_n "checking for curses performance tradeoff""... $ac_c" 1>&6
-echo "configure:3757: checking for curses performance tradeoff" >&5
+echo "configure:3850: 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 3764 "configure"
+#line 3857 "configure"
 #include "confdefs.h"
 
 #include <$cf_cv_ncurses_header>
@@ -3774,11 +3867,11 @@ int main() {
 	
 ; return 0; }
 EOF
-if { (eval echo configure:3778: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3871: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 	cat > conftest.$ac_ext <<EOF
-#line 3782 "configure"
+#line 3875 "configure"
 #include "confdefs.h"
 
 #define CURS_PERFORMANCE
@@ -3793,7 +3886,7 @@ int main() {
 	
 ; return 0; }
 EOF
-if { (eval echo configure:3797: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3890: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_curs_performance=yes
 else
@@ -3818,20 +3911,30 @@ EOF
 ncurses)
 	
 echo $ac_n "checking for ncurses header file""... $ac_c" 1>&6
-echo "configure:3822: checking for ncurses header file" >&5
+echo "configure:3915: 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 3828 "configure"
+#line 3921 "configure"
 #include "confdefs.h"
 #include <curses.h>
 int main() {
-printf("%s\n", NCURSES_VERSION)
+
+#ifdef NCURSES_VERSION
+printf("%s\n", NCURSES_VERSION);
+#else
+#ifdef __NCURSES_H
+printf("maybe 1.8.7\n");
+#else
+make an error
+#endif
+#endif
+	
 ; return 0; }
 EOF
-if { (eval echo configure:3835: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3938: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ncurses_header=predefined
 else
@@ -3924,7 +4027,7 @@ esac
 
 cf_ncurses_LIBS=""
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:3928: checking for Gpm_Open in -lgpm" >&5
+echo "configure:4031: 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
@@ -3932,7 +4035,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lgpm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3936 "configure"
+#line 4039 "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
@@ -3943,7 +4046,7 @@ int main() {
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:3947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4050: \"$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
@@ -3959,7 +4062,7 @@ fi
 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:3963: checking for initscr in -lgpm" >&5
+echo "configure:4066: 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
@@ -3967,7 +4070,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lgpm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3971 "configure"
+#line 4074 "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
@@ -3978,7 +4081,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:3982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4085: \"$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
@@ -4016,7 +4119,7 @@ freebsd*)
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
 	echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6
-echo "configure:4020: checking for tgoto in -lmytinfo" >&5
+echo "configure:4123: 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
@@ -4024,7 +4127,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lmytinfo  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4028 "configure"
+#line 4131 "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
@@ -4035,7 +4138,7 @@ int main() {
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:4039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4142: \"$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
@@ -4061,13 +4164,14 @@ esac
 LIBS="$cf_ncurses_LIBS $LIBS"
 
 	cf_cv_have_lib_ncurses=no
+	cf_libdir=""
 	echo $ac_n "checking for initscr""... $ac_c" 1>&6
-echo "configure:4066: checking for initscr" >&5
+echo "configure:4170: 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 4071 "configure"
+#line 4175 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr(); below.  */
@@ -4090,7 +4194,7 @@ initscr();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_initscr=yes"
 else
@@ -4110,17 +4214,17 @@ else
 
 		cf_save_LIBS="$LIBS"
 		echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6
-echo "configure:4114: checking for initscr in -lncurses" >&5
+echo "configure:4218: checking for initscr in -lncurses" >&5
 		LIBS="-lncurses $LIBS"
 		cat > conftest.$ac_ext <<EOF
-#line 4117 "configure"
+#line 4221 "configure"
 #include "confdefs.h"
 #include <$cf_cv_ncurses_header>
 int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:4124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 cf_cv_have_lib_ncurses=yes
@@ -4147,17 +4251,17 @@ test "$prefix" != /usr           && cf_search="$cf_search /usr/lib /usr/lib/ncur
 			for cf_libdir in $cf_search
 			do
 				echo $ac_n "checking for -lncurses in $cf_libdir""... $ac_c" 1>&6
-echo "configure:4151: checking for -lncurses in $cf_libdir" >&5
+echo "configure:4255: checking for -lncurses in $cf_libdir" >&5
 				LIBS="-L$cf_libdir -lncurses $cf_save_LIBS"
 				cat > conftest.$ac_ext <<EOF
-#line 4154 "configure"
+#line 4258 "configure"
 #include "confdefs.h"
 #include <$cf_cv_ncurses_header>
 int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:4161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 		 cf_cv_have_lib_ncurses=yes
@@ -4184,7 +4288,7 @@ fi
 
 if test -n "$cf_ncurses_LIBS" ; then
 	echo $ac_n "checking if we can link ncurses without $cf_ncurses_LIBS""... $ac_c" 1>&6
-echo "configure:4188: checking if we can link ncurses without $cf_ncurses_LIBS" >&5
+echo "configure:4292: checking if we can link ncurses without $cf_ncurses_LIBS" >&5
 	cf_ncurses_SAVE="$LIBS"
 	for p in $cf_ncurses_LIBS ; do
 		q=`echo $LIBS | sed -e 's/'$p' //' -e 's/'$p'$//'`
@@ -4193,14 +4297,14 @@ echo "configure:4188: checking if we can link ncurses without $cf_ncurses_LIBS"
 		fi
 	done
 	cat > conftest.$ac_ext <<EOF
-#line 4197 "configure"
+#line 4301 "configure"
 #include "confdefs.h"
 #include <$cf_cv_ncurses_header>
 int main() {
 initscr(); tgoto((char *)0, 0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:4204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -4224,7 +4328,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:4228: checking for tigetstr in -ltermlib" >&5
+echo "configure:4332: 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
@@ -4232,7 +4336,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ltermlib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4236 "configure"
+#line 4340 "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
@@ -4243,7 +4347,7 @@ int main() {
 tigetstr()
 ; return 0; }
 EOF
-if { (eval echo configure:4247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4351: \"$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
@@ -4266,7 +4370,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:4270: checking for tgoto in -ltermlib" >&5
+echo "configure:4374: 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
@@ -4274,7 +4378,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ltermlib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4278 "configure"
+#line 4382 "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
@@ -4285,7 +4389,7 @@ int main() {
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:4289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4393: \"$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
@@ -4309,7 +4413,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:4313: checking for initscr in -lcurses" >&5
+echo "configure:4417: 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
@@ -4317,7 +4421,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4321 "configure"
+#line 4425 "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
@@ -4328,7 +4432,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:4332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4436: \"$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
@@ -4349,7 +4453,7 @@ else
 fi
 
 	echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
-echo "configure:4353: checking for tgoto in -ltermcap" >&5
+echo "configure:4457: 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
@@ -4357,7 +4461,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4361 "configure"
+#line 4465 "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
@@ -4368,7 +4472,7 @@ int main() {
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:4372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4476: \"$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
@@ -4391,7 +4495,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:4395: checking for tgoto in -ltermcap" >&5
+echo "configure:4499: 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
@@ -4399,7 +4503,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4403 "configure"
+#line 4507 "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
@@ -4410,7 +4514,7 @@ int main() {
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:4414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4518: \"$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
@@ -4433,7 +4537,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:4437: checking for tgoto in -lncurses" >&5
+echo "configure:4541: 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
@@ -4441,7 +4545,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lncurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4445 "configure"
+#line 4549 "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
@@ -4452,7 +4556,7 @@ int main() {
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:4456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4560: \"$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
@@ -4482,20 +4586,20 @@ fi
 
 	
 echo $ac_n "checking for slang header file""... $ac_c" 1>&6
-echo "configure:4486: checking for slang header file" >&5
+echo "configure:4590: 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 4492 "configure"
+#line 4596 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int main() {
 printf("%s\n", SLANG_VERSION)
 ; return 0; }
 EOF
-if { (eval echo configure:4499: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4603: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_slang_header=predefined
 else
@@ -4572,12 +4676,12 @@ esac
 
 	
 echo $ac_n "checking for acos""... $ac_c" 1>&6
-echo "configure:4576: checking for acos" >&5
+echo "configure:4680: checking for acos" >&5
 if eval "test \"`echo '$''{'ac_cv_func_acos'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4581 "configure"
+#line 4685 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char acos(); below.  */
@@ -4600,7 +4704,7 @@ acos();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_acos=yes"
 else
@@ -4619,7 +4723,7 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for acos in -lm""... $ac_c" 1>&6
-echo "configure:4623: checking for acos in -lm" >&5
+echo "configure:4727: checking for acos in -lm" >&5
 ac_lib_var=`echo m'_'acos | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4627,7 +4731,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm $LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4631 "configure"
+#line 4735 "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
@@ -4638,7 +4742,7 @@ int main() {
 acos()
 ; return 0; }
 EOF
-if { (eval echo configure:4642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4746: \"$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
@@ -4676,13 +4780,14 @@ fi
 
 
 	cf_cv_have_lib_slang=no
+	cf_libdir=""
 	echo $ac_n "checking for SLtt_get_screen_size""... $ac_c" 1>&6
-echo "configure:4681: checking for SLtt_get_screen_size" >&5
+echo "configure:4786: 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 4686 "configure"
+#line 4791 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char SLtt_get_screen_size(); below.  */
@@ -4705,7 +4810,7 @@ SLtt_get_screen_size();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4814: \"$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
@@ -4725,17 +4830,17 @@ else
 
 		cf_save_LIBS="$LIBS"
 		echo $ac_n "checking for SLtt_get_screen_size in -lslang""... $ac_c" 1>&6
-echo "configure:4729: checking for SLtt_get_screen_size in -lslang" >&5
+echo "configure:4834: checking for SLtt_get_screen_size in -lslang" >&5
 		LIBS="-lslang $LIBS"
 		cat > conftest.$ac_ext <<EOF
-#line 4732 "configure"
+#line 4837 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int main() {
 SLtt_get_screen_size()
 ; return 0; }
 EOF
-if { (eval echo configure:4739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 cf_cv_have_lib_slang=yes
@@ -4762,17 +4867,17 @@ test "$prefix" != /usr           && cf_search="$cf_search /usr/lib /usr/lib/slan
 			for cf_libdir in $cf_search
 			do
 				echo $ac_n "checking for -lslang in $cf_libdir""... $ac_c" 1>&6
-echo "configure:4766: checking for -lslang in $cf_libdir" >&5
+echo "configure:4871: checking for -lslang in $cf_libdir" >&5
 				LIBS="-L$cf_libdir -lslang $cf_save_LIBS"
 				cat > conftest.$ac_ext <<EOF
-#line 4769 "configure"
+#line 4874 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int main() {
 SLtt_get_screen_size()
 ; return 0; }
 EOF
-if { (eval echo configure:4776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 		 cf_cv_have_lib_slang=yes
@@ -4831,12 +4936,12 @@ EOF
 
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:4835: checking for ANSI C header files" >&5
+echo "configure:4940: 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 4840 "configure"
+#line 4945 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -4844,7 +4949,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4848: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4953: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4861,7 +4966,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 4865 "configure"
+#line 4970 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -4879,7 +4984,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 4883 "configure"
+#line 4988 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -4900,7 +5005,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 4904 "configure"
+#line 5009 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -4911,7 +5016,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:4915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -4935,12 +5040,12 @@ EOF
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:4939: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:5044: 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 4944 "configure"
+#line 5049 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -4949,7 +5054,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:4953: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -4974,12 +5079,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:4978: checking for $ac_hdr that defines DIR" >&5
+echo "configure:5083: 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 4983 "configure"
+#line 5088 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -4987,7 +5092,7 @@ int main() {
 DIR *dirp = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:4991: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5096: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else
@@ -5012,7 +5117,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:5016: checking for opendir in -ldir" >&5
+echo "configure:5121: 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
@@ -5020,7 +5125,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5024 "configure"
+#line 5129 "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
@@ -5031,7 +5136,7 @@ int main() {
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:5035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5140: \"$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
@@ -5053,7 +5158,7 @@ fi
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:5057: checking for opendir in -lx" >&5
+echo "configure:5162: 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
@@ -5061,7 +5166,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5065 "configure"
+#line 5170 "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
@@ -5072,7 +5177,7 @@ int main() {
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:5076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5181: \"$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
@@ -5112,17 +5217,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:5116: checking for $ac_hdr" >&5
+echo "configure:5221: 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 5121 "configure"
+#line 5226 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5126: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5231: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5150,13 +5255,13 @@ done
 
 
 echo $ac_n "checking termio.h and termios.h""... $ac_c" 1>&6
-echo "configure:5154: checking termio.h and termios.h" >&5
+echo "configure:5259: 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 5160 "configure"
+#line 5265 "configure"
 #include "confdefs.h"
 
 #if HAVE_TERMIO_H
@@ -5169,7 +5274,7 @@ int main() {
 putchar (0x0a)
 ; return 0; }
 EOF
-if { (eval echo configure:5173: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5278: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_termio_and_termios=yes
 else
@@ -5189,13 +5294,13 @@ EOF
 
 
 echo $ac_n "checking for union wait""... $ac_c" 1>&6
-echo "configure:5193: checking for union wait" >&5
+echo "configure:5298: checking for union wait" >&5
 if eval "test \"`echo '$''{'cf_cv_type_unionwait'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 5199 "configure"
+#line 5304 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -5210,7 +5315,7 @@ int main() {
 union wait x
 ; return 0; }
 EOF
-if { (eval echo configure:5214: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_type_unionwait=yes
 else
@@ -5224,19 +5329,19 @@ fi
 
 echo "$ac_t""$cf_cv_type_unionwait" 1>&6
 test $cf_cv_type_unionwait = yes && cat >> confdefs.h <<\EOF
-#define HAVE_TYPE_UNION_WAIT 1
+#define HAVE_TYPE_UNIONWAIT 1
 EOF
 
 
 
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:5235: checking for pid_t" >&5
+echo "configure:5340: 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 5240 "configure"
+#line 5345 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -5265,17 +5370,17 @@ fi
 
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:5269: checking for vfork.h" >&5
+echo "configure:5374: 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 5274 "configure"
+#line 5379 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5384: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5300,18 +5405,18 @@ else
 fi
 
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:5304: checking for working vfork" >&5
+echo "configure:5409: 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:5310: checking for vfork" >&5
+echo "configure:5415: 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 5315 "configure"
+#line 5420 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vfork(); below.  */
@@ -5334,7 +5439,7 @@ vfork();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_vfork=yes"
 else
@@ -5355,7 +5460,7 @@ fi
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 5359 "configure"
+#line 5464 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -5450,7 +5555,7 @@ main() {
   }
 }
 EOF
-if { (eval echo configure:5454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5559: \"$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
@@ -5474,20 +5579,20 @@ fi
 
 
 echo $ac_n "checking for broken/missing definition of remove""... $ac_c" 1>&6
-echo "configure:5478: checking for broken/missing definition of remove" >&5
+echo "configure:5583: 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 5484 "configure"
+#line 5589 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 remove("dummy")
 ; return 0; }
 EOF
-if { (eval echo configure:5491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   cf_cv_baddef_remove=no
 else
@@ -5495,7 +5600,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 5499 "configure"
+#line 5604 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int __unlink(name) { return unlink(name); } 
@@ -5503,7 +5608,7 @@ int main() {
 remove("dummy")
 ; return 0; }
 EOF
-if { (eval echo configure:5507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   cf_cv_baddef_remove=yes
 else
@@ -5534,12 +5639,12 @@ for ac_func in \
 
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5538: checking for $ac_func" >&5
+echo "configure:5643: 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 5543 "configure"
+#line 5648 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5562,7 +5667,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5590,13 +5695,13 @@ done
 
 
 echo $ac_n "checking if TRUE/FALSE are defined""... $ac_c" 1>&6
-echo "configure:5594: checking if TRUE/FALSE are defined" >&5
+echo "configure:5699: 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 5600 "configure"
+#line 5705 "configure"
 #include "confdefs.h"
 
 #include <$cf_cv_ncurses_header>
@@ -5605,7 +5710,7 @@ int main() {
 int x = TRUE, y = FALSE
 ; return 0; }
 EOF
-if { (eval echo configure:5609: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5714: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_bool_defs=yes
 else
@@ -5631,13 +5736,13 @@ fi
 
 
 echo $ac_n "checking for errno external decl""... $ac_c" 1>&6
-echo "configure:5635: checking for errno external decl" >&5
+echo "configure:5740: 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 5641 "configure"
+#line 5746 "configure"
 #include "confdefs.h"
 
 #include <errno.h>
@@ -5645,7 +5750,7 @@ int main() {
 int x = errno
 ; return 0; }
 EOF
-if { (eval echo configure:5649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5754: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_extern_errno=yes
 else
@@ -5665,20 +5770,20 @@ EOF
 
 
 echo $ac_n "checking for setlocale()""... $ac_c" 1>&6
-echo "configure:5669: checking for setlocale()" >&5
+echo "configure:5774: 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 5675 "configure"
+#line 5780 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 setlocale(LC_ALL, "")
 ; return 0; }
 EOF
-if { (eval echo configure:5682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   cf_cv_locale=yes
 else
@@ -5699,13 +5804,13 @@ EOF
 
 
 echo $ac_n "checking if NGROUPS is defined""... $ac_c" 1>&6
-echo "configure:5703: checking if NGROUPS is defined" >&5
+echo "configure:5808: 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 5709 "configure"
+#line 5814 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -5719,7 +5824,7 @@ int main() {
 int x = NGROUPS
 ; return 0; }
 EOF
-if { (eval echo configure:5723: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5828: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ngroups=yes
 else
@@ -5727,7 +5832,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 5731 "configure"
+#line 5836 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -5741,7 +5846,7 @@ int main() {
 int x = NGROUPS_MAX
 ; return 0; }
 EOF
-if { (eval echo configure:5745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5850: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ngroups=NGROUPS_MAX
 else
@@ -5772,13 +5877,13 @@ fi
 
 
 echo $ac_n "checking declaration of sys_errlist""... $ac_c" 1>&6
-echo "configure:5776: checking declaration of sys_errlist" >&5
+echo "configure:5881: 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 5782 "configure"
+#line 5887 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -5788,7 +5893,7 @@ int main() {
 char *c = (char *) *sys_errlist
 ; return 0; }
 EOF
-if { (eval echo configure:5792: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5897: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_dcl_sys_errlist=yes
 else
@@ -5801,20 +5906,51 @@ rm -f conftest*
 fi
 
 echo "$ac_t""$cf_cv_dcl_sys_errlist" 1>&6
-test $cf_cv_dcl_sys_errlist = no && cat >> confdefs.h <<\EOF
+
+# It's possible (for near-UNIX clones) that sys_errlist doesn't exist
+if test $cf_cv_dcl_sys_errlist = no ; then
+    cat >> confdefs.h <<\EOF
 #define DECL_SYS_ERRLIST 1
 EOF
 
+    echo $ac_n "checking existence of sys_errlist""... $ac_c" 1>&6
+echo "configure:5918: checking existence of sys_errlist" >&5
+    if eval "test \"`echo '$''{'cf_cv_have_sys_errlist'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+        cat > conftest.$ac_ext <<EOF
+#line 5924 "configure"
+#include "confdefs.h"
+#include <errno.h>
+int main() {
+char *c = (char *) *sys_errlist
+; return 0; }
+EOF
+if { (eval echo configure:5931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  cf_cv_have_sys_errlist=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cf_cv_have_sys_errlist=no
+fi
+rm -f conftest*
+fi
+
+    echo "$ac_t""$cf_cv_have_sys_errlist" 1>&6
+fi
 
 
 echo $ac_n "checking if struct utmp is declared""... $ac_c" 1>&6
-echo "configure:5812: checking if struct utmp is declared" >&5
+echo "configure:5948: 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 5818 "configure"
+#line 5954 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -5823,7 +5959,7 @@ int main() {
 struct utmp x; char *y = &x.ut_host[0]
 ; return 0; }
 EOF
-if { (eval echo configure:5827: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_have_utmp=yes
 else
@@ -5831,14 +5967,14 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 5835 "configure"
+#line 5971 "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:5842: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5978: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_have_utmp=utmpx
 else
@@ -5869,13 +6005,13 @@ EOF
 if test $cf_cv_screen != slang ; then
 	
 echo $ac_n "checking if curses supports alternate-character set""... $ac_c" 1>&6
-echo "configure:5873: checking if curses supports alternate-character set" >&5
+echo "configure:6009: 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 5879 "configure"
+#line 6015 "configure"
 #include "confdefs.h"
 
 #include <$cf_cv_ncurses_header>
@@ -5884,7 +6020,7 @@ int main() {
 chtype x = acs_map['l']; acs_map['m'] = 0
 ; return 0; }
 EOF
-if { (eval echo configure:5888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   cf_cv_alt_char_set=yes
 else
@@ -5904,13 +6040,13 @@ EOF
 
 	
 echo $ac_n "checking if curses supports fancy attributes""... $ac_c" 1>&6
-echo "configure:5908: checking if curses supports fancy attributes" >&5
+echo "configure:6044: 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 5914 "configure"
+#line 6050 "configure"
 #include "confdefs.h"
 
 #include <$cf_cv_ncurses_header>
@@ -5923,7 +6059,7 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
 	
 ; return 0; }
 EOF
-if { (eval echo configure:5927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   cf_cv_fancy_curses=yes
 else
@@ -5943,7 +6079,7 @@ EOF
 
 
 	echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
-echo "configure:5947: checking for ncurses version" >&5
+echo "configure:6083: 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
@@ -5960,7 +6096,7 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo configure:5964: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
+	{ (eval echo configure:6100: \"$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"
@@ -5971,13 +6107,15 @@ fi
 echo "$ac_t""$cf_cv_ncurses_version" 1>&6
 
 	
-if test "$cf_cv_ncurses_version" = yes ; then
+echo $ac_n "checking for obsolete/broken version of ncurses""... $ac_c" 1>&6
+echo "configure:6112: checking for obsolete/broken version of ncurses" >&5
+if test "$cf_cv_ncurses_version" != no ; then
 if eval "test \"`echo '$''{'cf_cv_ncurses_broken'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 5981 "configure"
+#line 6119 "configure"
 #include "confdefs.h"
 
 #include <$cf_cv_ncurses_header>
@@ -5991,7 +6129,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5995: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6133: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ncurses_broken=no
 else
@@ -6004,6 +6142,7 @@ rm -f conftest*
 
 fi
 
+echo "$ac_t""$cf_cv_ncurses_broken=yes" 1>&6
 if test "$cf_cv_ncurses_broken" = yes ; then
 	echo "configure: warning: hmm... you should get an up-to-date version of ncurses" 1>&2
 	cat >> confdefs.h <<\EOF
@@ -6015,13 +6154,13 @@ fi
 
 	
 echo $ac_n "checking if curses supports color attributes""... $ac_c" 1>&6
-echo "configure:6019: checking if curses supports color attributes" >&5
+echo "configure:6158: 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 6025 "configure"
+#line 6164 "configure"
 #include "confdefs.h"
 
 #include <$cf_cv_ncurses_header>
@@ -6036,7 +6175,7 @@ chtype x = COLOR_BLUE;
 	
 ; return 0; }
 EOF
-if { (eval echo configure:6040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   cf_cv_color_curses=yes
 else
@@ -6063,7 +6202,7 @@ fi
 
 	
 echo $ac_n "checking declaration of size-change""... $ac_c" 1>&6
-echo "configure:6067: checking declaration of size-change" >&5
+echo "configure:6206: 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
@@ -6077,7 +6216,7 @@ do
     CFLAGS="$cf_save_CFLAGS"
     test -n "$cf_opts" && CFLAGS="$CFLAGS -D$cf_opts"
     cat > conftest.$ac_ext <<EOF
-#line 6081 "configure"
+#line 6220 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if HAVE_TERMIOS_H
@@ -6112,7 +6251,7 @@ int main() {
 	
 ; return 0; }
 EOF
-if { (eval echo configure:6116: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6255: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_sizechange=yes
 else
@@ -6125,7 +6264,8 @@ rm -f conftest*
 
 	CFLAGS="$cf_save_CFLAGS"
 	if test "$cf_cv_sizechange" = yes ; then
-		test -n "$cf_opts" && cat >> confdefs.h <<\EOF
+		echo "size-change succeeded ($cf_opts)" >&6
+		test -n "$cf_opts" && cat >> confdefs.h <<EOF
 #define $cf_opts 1
 EOF
 
@@ -6143,20 +6283,20 @@ EOF
 
 	
 echo $ac_n "checking if ttytype is declared in curses library""... $ac_c" 1>&6
-echo "configure:6147: checking if ttytype is declared in curses library" >&5
+echo "configure:6287: 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 6153 "configure"
+#line 6293 "configure"
 #include "confdefs.h"
 #include <$cf_cv_ncurses_header>
 int main() {
 char *x = &ttytype[1]; *x = 1
 ; return 0; }
 EOF
-if { (eval echo configure:6160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   cf_cv_have_ttytype=yes
 else
@@ -6181,12 +6321,12 @@ EOF
 	
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6185: checking for $ac_func" >&5
+echo "configure:6325: 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 6190 "configure"
+#line 6330 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6209,7 +6349,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6242,7 +6382,7 @@ fi
 
 
 echo $ac_n "checking if character-translation code should be used""... $ac_c" 1>&6
-echo "configure:6246: checking if character-translation code should be used" >&5
+echo "configure:6386: checking if character-translation code should be used" >&5
 # Check whether --enable-char-trans or --disable-char-trans was given.
 if test "${enable_char_trans+set}" = set; then
   enableval="$enable_char_trans"
@@ -6270,7 +6410,7 @@ EOF
 fi
 
 echo $ac_n "checking if color-style code should be used""... $ac_c" 1>&6
-echo "configure:6274: checking if color-style code should be used" >&5
+echo "configure:6414: checking if color-style code should be used" >&5
 # Check whether --enable-color-style or --disable-color-style was given.
 if test "${enable_color_style+set}" = set; then
   enableval="$enable_color_style"
@@ -6322,7 +6462,7 @@ EOF
 esac
 
 echo $ac_n "checking if you want to use zlib for decompression of some gzip files""... $ac_c" 1>&6
-echo "configure:6326: checking if you want to use zlib for decompression of some gzip files" >&5
+echo "configure:6466: checking if you want to use zlib for decompression of some gzip files" >&5
 # Check whether --with-zlib or --without-zlib was given.
 if test "${with_zlib+set}" = set; then
   withval="$with_zlib"
@@ -6336,13 +6476,14 @@ echo "$ac_t""$use_zlib" 1>&6
 if test ".$use_zlib" != ".no" ; then
 	
 	cf_cv_have_lib_z=no
+	cf_libdir=""
 	echo $ac_n "checking for gzopen""... $ac_c" 1>&6
-echo "configure:6341: checking for gzopen" >&5
+echo "configure:6482: checking for gzopen" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gzopen'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6346 "configure"
+#line 6487 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gzopen(); below.  */
@@ -6365,7 +6506,7 @@ gzopen();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_gzopen=yes"
 else
@@ -6385,17 +6526,17 @@ else
 
 		cf_save_LIBS="$LIBS"
 		echo $ac_n "checking for gzopen in -lz""... $ac_c" 1>&6
-echo "configure:6389: checking for gzopen in -lz" >&5
+echo "configure:6530: checking for gzopen in -lz" >&5
 		LIBS="-lz $LIBS"
 		cat > conftest.$ac_ext <<EOF
-#line 6392 "configure"
+#line 6533 "configure"
 #include "confdefs.h"
 #include <zlib.h>
 int main() {
 gzopen("name","mode")
 ; return 0; }
 EOF
-if { (eval echo configure:6399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 cf_cv_have_lib_z=yes
@@ -6422,17 +6563,17 @@ test "$prefix" != /usr           && cf_search="$cf_search /usr/lib /usr/lib/z"
 			for cf_libdir in $cf_search
 			do
 				echo $ac_n "checking for -lz in $cf_libdir""... $ac_c" 1>&6
-echo "configure:6426: checking for -lz in $cf_libdir" >&5
+echo "configure:6567: checking for -lz in $cf_libdir" >&5
 				LIBS="-L$cf_libdir -lz $cf_save_LIBS"
 				cat > conftest.$ac_ext <<EOF
-#line 6429 "configure"
+#line 6570 "configure"
 #include "confdefs.h"
 #include <zlib.h>
 int main() {
 gzopen("name","mode")
 ; return 0; }
 EOF
-if { (eval echo configure:6436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 		 cf_cv_have_lib_z=yes
@@ -6468,7 +6609,7 @@ fi
 # 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:6472: checking if directory-editor code should be used" >&5
+echo "configure:6613: checking if directory-editor code should be used" >&5
 # Check whether --enable-dired or --disable-dired was given.
 if test "${enable_dired+set}" = set; then
   enableval="$enable_dired"
@@ -6493,7 +6634,7 @@ EOF
 
 
 	echo $ac_n "checking if you wish to allow extracting from archives via DirEd""... $ac_c" 1>&6
-echo "configure:6497: checking if you wish to allow extracting from archives via DirEd" >&5
+echo "configure:6638: 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"
@@ -6511,7 +6652,7 @@ 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:6515: checking if you wish to allow users to redefine DirEd keys" >&5
+echo "configure:6656: 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"
@@ -6536,7 +6677,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:6540: checking if you wish to allow permissions commands via DirEd" >&5
+echo "configure:6681: 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"
@@ -6561,7 +6702,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:6565: checking if you wish to allow executable-permission commands via DirEd" >&5
+echo "configure:6706: 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"
@@ -6579,7 +6720,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:6583: checking if you wish to allow \"tar\" commands from DirEd" >&5
+echo "configure:6724: 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"
@@ -6604,7 +6745,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:6608: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
+echo "configure:6749: 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"
@@ -6629,7 +6770,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:6633: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
+echo "configure:6774: 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"
@@ -6654,7 +6795,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:6658: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
+echo "configure:6799: 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"
@@ -6680,7 +6821,7 @@ fi
 fi
 
 echo $ac_n "checking if you want long-directory listings""... $ac_c" 1>&6
-echo "configure:6684: checking if you want long-directory listings" >&5
+echo "configure:6825: 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"
@@ -6705,7 +6846,7 @@ fi
 echo "$ac_t""$enableval" 1>&6
 
 echo $ac_n "checking if parent-directory references are permitted""... $ac_c" 1>&6
-echo "configure:6709: checking if parent-directory references are permitted" >&5
+echo "configure:6850: 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"
@@ -6873,8 +7014,11 @@ s%@make_include_right@%$make_include_right%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
 s%@LINT@%$LINT%g
+s%@ECHO_LD@%$ECHO_LD%g
+s%@RULE_CC@%$RULE_CC%g
 s%@SHOW_CC@%$SHOW_CC%g
 s%@ECHO_CC@%$ECHO_CC%g
+s%@EXTRA_CFLAGS@%$EXTRA_CFLAGS%g
 s%@CHMOD@%$CHMOD%g
 s%@COMPRESS@%$COMPRESS%g
 s%@COPY@%$COPY%g
diff --git a/configure.in b/configure.in
index bd56accd..d0dd1b23 100644
--- a/configure.in
+++ b/configure.in
@@ -29,16 +29,7 @@ dnl --------------------------------------------------------------------------
 CF_HELP_MESSAGE(
 Development Options:)
 
-AC_MSG_CHECKING(if you want to see long compiling messages)
-CF_ARG_DISABLE(echo,
-	[  --disable-echo          display \"compiling\" commands],
-	[SHOW_CC='	@echo compiling $@'
-    ECHO_CC='@'],
-	[SHOW_CC='# compiling'
-    ECHO_CC=''])
-AC_MSG_RESULT($enableval)
-AC_SUBST(SHOW_CC)
-AC_SUBST(ECHO_CC)
+CF_DISABLE_ECHO
 
 AC_MSG_CHECKING(if you want to check memory-leaks)
 CF_ARG_ENABLE(find-leaks,
@@ -134,7 +125,7 @@ dnl If we're able to run this script, this is true!
 AC_DEFINE(UNIX)
 
 if test -z "$GCC" ; then
-	CF_ANSI_CC
+	CF_ANSI_CC_CHECK
 fi
 AC_C_CONST
 
diff --git a/makefile.in b/makefile.in
index 3ee36f94..46e6e071 100644
--- a/makefile.in
+++ b/makefile.in
@@ -8,11 +8,16 @@ srcdir		= @srcdir@
 VPATH		= $(srcdir)
 
 CC		= @CC@
-CPPOPTS		= @DEFS@ @CPPFLAGS@
-CFLAGS		= $(CPPOPTS) @CFLAGS@
+CFLAGS		= @CFLAGS@
+DEFS		= @DEFS@
+CPPFLAGS	= @CPPFLAGS@
 
 LIBS		= @LIBS@
 
+INSTALL		= @INSTALL@
+INSTALL_PROGRAM	= @INSTALL_PROGRAM@
+INSTALL_DATA	= @INSTALL_DATA@
+
 ##this is the name of the directory the lynx source code is in.
 ##(e.g. lynx2-7-1, not the full path)
 lynxdir= lynx2-7-1
@@ -30,8 +35,8 @@ mandir= @mandir@/man1
 ## Where you want the lynx.cfg file installed
 libdir= @libdir@
 
-installbin= @INSTALL@ -c -s -m 755
-installdoc= @INSTALL@ -c -m 444
+installbin= @INSTALL_PROGRAM@ -c -s -m 755
+installdoc= @INSTALL_DATA@ -c -m 444
 
 ##set the relative location of the WWW library Implementation directory,
 ##from this directory
@@ -127,17 +132,17 @@ SITE_DEFS = # Your defines here
 # -DUSE_ZLIB       To use some functions from zlib library if you have it.
 #
 # if you are linking to freeWAIS-0.202 or older, you should define this
-# in MCFLAGS (SITE_DEFS)
+# in SITE_DEFS
 #
 # -DDECLARE_WAIS_LOGFILES
 #
 # if you have the reverse clear screen problem of some SUN4 systems you
-# should define this in MCFLAGS (SITE_DEFS)
+# should define this in SITE_DEFS
 #
 # -DREVERSE_CLEAR_SCREEN_PROBLEM
 #
 # if you have an SVR4 system with the "type any key" problem, try defining
-# this in LYFLAGS (SITE_LYDEFS) and MCFLAGS (SITE_DEFS)
+# this in LYFLAGS (SITE_LYDEFS) and SITE_DEFS
 #
 # -DSVR4_BSDSELECT
 #
@@ -147,7 +152,7 @@ SITE_DEFS = # Your defines here
 # -DDGUX_OLD
 #
 # if you would like logging of client requests via syslog(), you should
-# define this in MCFLAGS (SITE_DEFS)
+# define this in SITE_DEFS
 #
 # -DSYSLOG_REQUESTED_URLS
 #
@@ -158,7 +163,7 @@ all:
 	cd WWW/Library/unix && $(MAKE) CC="$(CC)" \
 		LYFLAGS="$(SITE_LYDEFS)"
 	cd src && $(MAKE) all CC="$(CC)" \
-		MCFLAGS="" \
+		CFLAGS="$(CFLAGS)" \
 		LIBS="$(LIBS) $(RESOLVLIB) $(WAISLIB) $(SOCKSLIB) $(SITE_LIBS)" \
 		SITE_DEFS="$(SITE_DEFS)" \
 		WWWINC=$(WWWINC) \
diff --git a/src/HTML.c b/src/HTML.c
index 1c59d7a5..ebe3162e 100644
--- a/src/HTML.c
+++ b/src/HTML.c
@@ -519,6 +519,9 @@ char prevailing_class[TEMPSTRINGSIZE];
     char myHash[128];
     int hcode;
 #endif
+
+#define CHECK_ID(code) LYCheckForID(me, present, (CONST char **)value, (int)code)
+
 /*	Start Element
 **	-------------
 */
@@ -526,7 +529,7 @@ PRIVATE void HTML_start_element ARGS5(
 	HTStructured *, 	me,
 	int,			element_number,
 	CONST BOOL*,	 	present,
-	CONST char **,		value,
+	char **,		value,
 	char **,		include)
 {
     char *alt_string = NULL;
@@ -636,7 +639,7 @@ PRIVATE void HTML_start_element ARGS5(
 	    char *base = NULL;
 	    char *related = NULL;
 
-	    StrAllocCopy(base, (char *)value[HTML_BASE_HREF]);
+	    StrAllocCopy(base, value[HTML_BASE_HREF]);
 	    if (!(url_type = LYLegitimizeHREF(me, (char**)&base,
 	    				      TRUE, TRUE))) {
 	        if (TRACE)
@@ -1155,7 +1158,7 @@ PRIVATE void HTML_start_element ARGS5(
     case HTML_BODY:
 	if (!me->text)
 	    UPDATE_STYLE;
-	LYCheckForID(me, present, value, (int)HTML_BODY_ID);
+	CHECK_ID(HTML_BODY_ID);
 	if (HText_hasToolbar(me->text))
 	    HText_appendParagraph(me->text);
 	break;
@@ -1223,7 +1226,7 @@ PRIVATE void HTML_start_element ARGS5(
 	        HText_appendCharacter(me->text, LY_UNDERLINE_END_CHAR);
 	    HTML_put_character(me, ' ');
 	    me->in_word = NO;
-	    LYCheckForID(me, present, value, (int)HTML_FRAME_ID);
+	    CHECK_ID(HTML_FRAME_ID);
 	    HText_beginAnchor(me->text, me->inUnderline, me->CurrentA);
 	    if (me->inBoldH == FALSE)
 		HText_appendCharacter(me->text, LY_BOLD_START_CHAR);
@@ -1234,7 +1237,7 @@ PRIVATE void HTML_start_element ARGS5(
 	    HText_endAnchor(me->text, 0);
 	    LYEnsureSingleSpace(me);
 	} else {
-	    LYCheckForID(me, present, value, (int)HTML_FRAME_ID);
+	    CHECK_ID(HTML_FRAME_ID);
 	}
 	FREE(id_string);
 	break;
@@ -1303,7 +1306,7 @@ PRIVATE void HTML_start_element ARGS5(
 	        HText_appendCharacter(me->text, LY_UNDERLINE_END_CHAR);
 	    HTML_put_character(me, ' ');
 	    me->in_word = NO;
-	    LYCheckForID(me, present, value, (int)HTML_IFRAME_ID);
+	    CHECK_ID(HTML_IFRAME_ID);
 	    HText_beginAnchor(me->text, me->inUnderline, me->CurrentA);
 	    if (me->inBoldH == FALSE)
 		HText_appendCharacter(me->text, LY_BOLD_START_CHAR);
@@ -1314,7 +1317,7 @@ PRIVATE void HTML_start_element ARGS5(
 	    HText_endAnchor(me->text, 0);
 	    LYEnsureSingleSpace(me);
 	} else {
-	    LYCheckForID(me, present, value, (int)HTML_IFRAME_ID);
+	    CHECK_ID(HTML_IFRAME_ID);
 	}
 	FREE(id_string);
 	break;
@@ -1335,7 +1338,7 @@ PRIVATE void HTML_start_element ARGS5(
 	    HText_endAnchor(me->text, 0);
 	    HText_setToolbar(me->text);
 	}
-	LYCheckForID(me, present, value, (int)HTML_GEN_ID);
+	CHECK_ID(HTML_GEN_ID);
 	break;
 
     case HTML_CENTER:
@@ -1376,7 +1379,7 @@ PRIVATE void HTML_start_element ARGS5(
 	    UPDATE_STYLE;
 	    me->current_default_alignment = styles[HTML_DLEFT]->alignment;
 	}
-	LYCheckForID(me, present, value, (int)HTML_DIV_ID);
+	CHECK_ID(HTML_DIV_ID);
 	break;
 
     case HTML_H1:
@@ -1433,7 +1436,7 @@ PRIVATE void HTML_start_element ARGS5(
 		me->in_word = NO;
 		me->inP = FALSE;
 	    }
-	    LYCheckForID(me, present, value, (int)HTML_H_ID);
+	    CHECK_ID(HTML_H_ID);
 	    break;
 	}
 
@@ -1460,7 +1463,7 @@ PRIVATE void HTML_start_element ARGS5(
     	    change_paragraph_style(me, styles[ElementNumber]);
 	}
 	UPDATE_STYLE;
-	LYCheckForID(me, present, value, (int)HTML_H_ID);
+	CHECK_ID(HTML_H_ID);
 	    
 	if ((bold_headers == TRUE ||
 	     (ElementNumber == HTML_H1 && bold_H1 == TRUE)) &&
@@ -1542,7 +1545,7 @@ PRIVATE void HTML_start_element ARGS5(
 	        me->sp->style->alignment = HT_LEFT;
 	}
 
-	LYCheckForID(me, present, value, (int)HTML_P_ID);
+	CHECK_ID(HTML_P_ID);
 
 	/*
 	 *  Mark that we are starting a new paragraph
@@ -1555,7 +1558,7 @@ PRIVATE void HTML_start_element ARGS5(
 
     case HTML_BR:
         UPDATE_STYLE;
-	LYCheckForID(me, present, value, (int)HTML_GEN_ID);
+	CHECK_ID(HTML_GEN_ID);
 	if ((LYCollapseBRs == FALSE) ||
 	    HText_LastLineSize(me->text, FALSE)) {
 	    HText_setLastChar(me->text, ' ');  /* absorb white space */
@@ -1567,14 +1570,14 @@ PRIVATE void HTML_start_element ARGS5(
 
     case HTML_WBR:
         UPDATE_STYLE;
-	LYCheckForID(me, present, value, (int)HTML_GEN_ID);
+	CHECK_ID(HTML_GEN_ID);
 	HText_setBreakPoint(me->text);
 	break;
 
     case HTML_HY:
     case HTML_SHY:
         UPDATE_STYLE;
-	LYCheckForID(me, present, value, (int)HTML_GEN_ID);
+	CHECK_ID(HTML_GEN_ID);
 	HText_appendCharacter(me->text, LY_SOFT_HYPHEN);
 	break;
 
@@ -1601,7 +1604,7 @@ PRIVATE void HTML_start_element ARGS5(
 	    /*
 	     *  Add an ID link if needed. - FM
 	     */
-	    LYCheckForID(me, present, value, (int)HTML_HR_ID);
+	    CHECK_ID(HTML_HR_ID);
 
            /*
 	    *  Center lines within the current margins, if
@@ -1820,7 +1823,7 @@ PRIVATE void HTML_start_element ARGS5(
     case HTML_STRONG:
 	UPDATE_STYLE;
 	me->Underline_Level++;
-	LYCheckForID(me, present, value, (int)HTML_GEN_ID);
+	CHECK_ID(HTML_GEN_ID);
 	/*
 	 *  Ignore this if inside of a bold anchor or header.
 	 *  Can't display both underline and bold at same time.
@@ -1857,7 +1860,7 @@ PRIVATE void HTML_start_element ARGS5(
     case HTML_VAR:
         if (!me->text)
 	    UPDATE_STYLE;
-	LYCheckForID(me, present, value, (int)HTML_GEN_ID);
+	CHECK_ID(HTML_GEN_ID);
 	break; /* ignore */
 
     case HTML_DEL:
@@ -1865,7 +1868,7 @@ PRIVATE void HTML_start_element ARGS5(
     case HTML_STRIKE:
         if (!me->text)
 	    UPDATE_STYLE;
-	LYCheckForID(me, present, value, (int)HTML_GEN_ID);
+	CHECK_ID(HTML_GEN_ID);
 	if (me->inUnderline == FALSE)
 	    HText_appendCharacter(me->text, LY_UNDERLINE_START_CHAR);
 	HTML_put_string(me, "[DEL:");
@@ -1878,7 +1881,7 @@ PRIVATE void HTML_start_element ARGS5(
     case HTML_INS:
         if (!me->text)
 	    UPDATE_STYLE;
-	LYCheckForID(me, present, value, (int)HTML_GEN_ID);
+	CHECK_ID(HTML_GEN_ID);
 	if (me->inUnderline == FALSE)
 	    HText_appendCharacter(me->text, LY_UNDERLINE_START_CHAR);
 	HTML_put_string(me, "[INS:");
@@ -1891,7 +1894,7 @@ PRIVATE void HTML_start_element ARGS5(
     case HTML_Q:
 	if (!me->text)
 	    UPDATE_STYLE;
-	LYCheckForID(me, present, value, (int)HTML_GEN_ID);
+	CHECK_ID(HTML_GEN_ID);
         /*
 	 *  Should check LANG and/or DIR attributes, and the
 	 *  me->node_anchor->charset and/or yet to be added
@@ -1916,7 +1919,7 @@ PRIVATE void HTML_start_element ARGS5(
     case HTML_PLAINTEXT:
 	change_paragraph_style(me, styles[ElementNumber]);
 	UPDATE_STYLE;
-	LYCheckForID(me, present, value, (int)HTML_GEN_ID);
+	CHECK_ID(HTML_GEN_ID);
     	if (me->comment_end)
     	    HText_appendText(me->text, me->comment_end);
 	break;
@@ -1927,7 +1930,7 @@ PRIVATE void HTML_start_element ARGS5(
 	UPDATE_STYLE;
 	if (me->sp->tag_number == ElementNumber)
 	    LYEnsureDoubleSpace(me);
-	LYCheckForID(me, present, value, (int)HTML_BQ_ID);
+	CHECK_ID(HTML_BQ_ID);
 	break;
 
     case HTML_NOTE:
@@ -1935,7 +1938,7 @@ PRIVATE void HTML_start_element ARGS5(
 	UPDATE_STYLE;
 	if (me->sp->tag_number == ElementNumber)
 	    LYEnsureDoubleSpace(me);
-	LYCheckForID(me, present, value, (int)HTML_NOTE_ID);
+	CHECK_ID(HTML_NOTE_ID);
 	{
 	    char *note = NULL;
 
@@ -1979,7 +1982,7 @@ PRIVATE void HTML_start_element ARGS5(
 	UPDATE_STYLE;
 	if (me->sp->tag_number == ElementNumber)
 	    LYEnsureDoubleSpace(me);
-	LYCheckForID(me, present, value, (int)HTML_ADDRESS_ID);
+	CHECK_ID(HTML_ADDRESS_ID);
 	break;
 
     case HTML_DL:
@@ -1998,7 +2001,7 @@ PRIVATE void HTML_start_element ARGS5(
 		 : styles[(HTML_DL1 - 1) + me->List_Nesting_Level]);
 	}
 	UPDATE_STYLE;	  /* update to the new style */
-	LYCheckForID(me, present, value, (int)HTML_DL_ID);
+	CHECK_ID(HTML_DL_ID);
 	break;
 	
     case HTML_DLC:
@@ -2014,13 +2017,13 @@ PRIVATE void HTML_start_element ARGS5(
                             styles[(HTML_DLC1 - 1) + me->List_Nesting_Level]);
         }
 	UPDATE_STYLE;	  /* update to the new style */
-	LYCheckForID(me, present, value, (int)HTML_DL_ID);
+	CHECK_ID(HTML_DL_ID);
         break;
 
     case HTML_DT:
 	if (!me->text)
 	    UPDATE_STYLE;
-	LYCheckForID(me, present, value, (int)HTML_GEN_ID);
+	CHECK_ID(HTML_GEN_ID);
         if (!me->style_change) {
 	    HText_appendParagraph(me->text);
 	    me->in_word = NO;
@@ -2032,7 +2035,7 @@ PRIVATE void HTML_start_element ARGS5(
     case HTML_DD:
 	if (!me->text)
 	    UPDATE_STYLE;
-	LYCheckForID(me, present, value, (int)HTML_GEN_ID);
+	CHECK_ID(HTML_GEN_ID);
 	HText_setLastChar(me->text, ' ');  /* absorb white space */
         if (!me->style_change)  {
 	    if (HText_LastLineSize(me->text, FALSE))
@@ -2150,7 +2153,7 @@ PRIVATE void HTML_start_element ARGS5(
 		          styles[HTML_OL1 + me->List_Nesting_Level - 1]);
 	}
 	UPDATE_STYLE;  /* update to the new style */
-	LYCheckForID(me, present, value, (int)HTML_OL_ID);
+	CHECK_ID(HTML_OL_ID);
 	break;
 
     case HTML_UL:
@@ -2192,7 +2195,7 @@ PRIVATE void HTML_start_element ARGS5(
 	    }
 	}
 	UPDATE_STYLE;  /* update to the new style */
-	LYCheckForID(me, present, value, (int)HTML_UL_ID);
+	CHECK_ID(HTML_UL_ID);
 	break;
 
     case HTML_MENU:
@@ -2210,13 +2213,13 @@ PRIVATE void HTML_start_element ARGS5(
 		          styles[HTML_MENU1 + me->List_Nesting_Level - 1]);
 	}
 	UPDATE_STYLE;  /* update to the new style */
-	LYCheckForID(me, present, value, (int)HTML_UL_ID);
+	CHECK_ID(HTML_UL_ID);
 	break;
 	
     case HTML_LH:
         UPDATE_STYLE;  /* update to the new style */
 	HText_appendParagraph(me->text);
-	LYCheckForID(me, present, value, (int)HTML_GEN_ID);
+	CHECK_ID(HTML_GEN_ID);
 	HTML_put_character(me, HT_NON_BREAK_SPACE);
 	HText_setLastChar(me->text, ' ');
 	me->in_word = NO;
@@ -2227,7 +2230,7 @@ PRIVATE void HTML_start_element ARGS5(
         UPDATE_STYLE;  /* update to the new style */
 	HText_appendParagraph(me->text);
 	me->sp->style->alignment = HT_LEFT;
-	LYCheckForID(me, present, value, (int)HTML_LI_ID);
+	CHECK_ID(HTML_LI_ID);
 	if (me->sp[0].tag_number == HTML_OL) {
 	    char number_string[20];
 	    int counter, seqnum;
@@ -2369,7 +2372,7 @@ PRIVATE void HTML_start_element ARGS5(
     case HTML_SPAN:
 	if (!me->text)
 	    UPDATE_STYLE;
-	LYCheckForID(me, present, value, (int)HTML_GEN_ID);
+	CHECK_ID(HTML_GEN_ID);
         /*
 	 *  Should check LANG and/or DIR attributes, and the
 	 *  me->node_anchor->charset and/or yet to be added
@@ -2380,7 +2383,7 @@ PRIVATE void HTML_start_element ARGS5(
     case HTML_BDO:
 	if (!me->text)
 	    UPDATE_STYLE;
-	LYCheckForID(me, present, value, (int)HTML_GEN_ID);
+	CHECK_ID(HTML_GEN_ID);
         /*
 	 *  Should check DIR (and LANG) attributes, and the
 	 *  me->node_anchor->charset and/or yet to be added
@@ -2391,7 +2394,7 @@ PRIVATE void HTML_start_element ARGS5(
     case HTML_SPOT:
 	if (!me->text)
 	    UPDATE_STYLE;
-	LYCheckForID(me, present, value, (int)HTML_GEN_ID);
+	CHECK_ID(HTML_GEN_ID);
 	break;
 
     case HTML_FN:
@@ -2399,7 +2402,7 @@ PRIVATE void HTML_start_element ARGS5(
 	UPDATE_STYLE;
 	if (me->sp->tag_number == ElementNumber)
 	    LYEnsureDoubleSpace(me);
-	LYCheckForID(me, present, value, (int)HTML_FN_ID);
+	CHECK_ID(HTML_FN_ID);
 	if (me->inUnderline == FALSE)
 	    HText_appendCharacter(me->text, LY_UNDERLINE_START_CHAR);
 	HTML_put_string(me, "FOOTNOTE:");
@@ -3259,7 +3262,7 @@ PRIVATE void HTML_start_element ARGS5(
 	break;
 
     case HTML_BODYTEXT:
-        LYCheckForID(me, present, value, (int)HTML_BODYTEXT_ID);
+        CHECK_ID(HTML_BODYTEXT_ID);
         /*
 	 *  We may need to look at this someday to deal with
 	 *  OBJECTs optimally, but just ignore it for now. - FM
@@ -3267,7 +3270,7 @@ PRIVATE void HTML_start_element ARGS5(
 	break;
 
     case HTML_TEXTFLOW:
-        LYCheckForID(me, present, value, (int)HTML_BODYTEXT_ID);
+        CHECK_ID(HTML_BODYTEXT_ID);
         /*
 	 *  We may need to look at this someday to deal with
 	 *  APPLETs optimally, but just ignore it for now. - FM
@@ -3291,7 +3294,7 @@ PRIVATE void HTML_start_element ARGS5(
 	    me->inFIGwithP = FALSE;
 	    HTML_put_character(me, ' ');  /* space char may be ignored */
 	}
-	LYCheckForID(me, present, value, (int)HTML_FIG_ID);
+	CHECK_ID(HTML_FIG_ID);
 	me->in_word = NO;
 	me->inP = FALSE;
 
@@ -3880,7 +3883,7 @@ PRIVATE void HTML_start_element ARGS5(
 	LYEnsureDoubleSpace(me);
 	LYResetParagraphAlignment(me);
 	me->inCREDIT = TRUE;
-	LYCheckForID(me, present, value, (int)HTML_CREDIT_ID);
+	CHECK_ID(HTML_CREDIT_ID);
 	if (me->inUnderline == FALSE)
 	    HText_appendCharacter(me->text, LY_UNDERLINE_START_CHAR);
 	HTML_put_string(me, "CREDIT:");
@@ -3913,7 +3916,7 @@ PRIVATE void HTML_start_element ARGS5(
 	LYEnsureDoubleSpace(me);
 	LYResetParagraphAlignment(me);
 	me->inCAPTION = TRUE;
-	LYCheckForID(me, present, value, (int)HTML_CAPTION_ID);
+	CHECK_ID(HTML_CAPTION_ID);
 	if (me->inUnderline == FALSE)
 	    HText_appendCharacter(me->text, LY_UNDERLINE_START_CHAR);
 	HTML_put_string(me, "CAPTION:");
@@ -4080,7 +4083,7 @@ PRIVATE void HTML_start_element ARGS5(
 	    FREE(enctype);
 	    FREE(title);
 	}
-	LYCheckForID(me, present, value, (int)HTML_FORM_ID);
+	CHECK_ID(HTML_FORM_ID);
 	break;
 
     case HTML_FIELDSET:
@@ -4088,7 +4091,7 @@ PRIVATE void HTML_start_element ARGS5(
 	    UPDATE_STYLE;
 	LYEnsureDoubleSpace(me);
 	LYResetParagraphAlignment(me);
-        LYCheckForID(me, present, value, (int)HTML_FIELDSET_ID);
+        CHECK_ID(HTML_FIELDSET_ID);
         break;
 
     case HTML_LEGEND:
@@ -4096,15 +4099,15 @@ PRIVATE void HTML_start_element ARGS5(
 	    UPDATE_STYLE;
 	LYEnsureDoubleSpace(me);
 	LYResetParagraphAlignment(me);
-        LYCheckForID(me, present, value, (int)HTML_LEGEND_ID);
+        CHECK_ID(HTML_LEGEND_ID);
         break;
 
     case HTML_LABEL:
-        LYCheckForID(me, present, value, (int)HTML_LABEL_ID);
+        CHECK_ID(HTML_LABEL_ID);
         break;
 
     case HTML_KEYGEN:
-        LYCheckForID(me, present, value, (int)HTML_KEYGEN_ID);
+        CHECK_ID(HTML_KEYGEN_ID);
         break;
 
     case HTML_BUTTON:
@@ -4122,12 +4125,12 @@ PRIVATE void HTML_start_element ARGS5(
 	    UPDATE_STYLE;
 	    if ((present && present[HTML_BUTTON_TYPE] &&
 	         value[HTML_BUTTON_TYPE]) &&
-		(!strcasecomp((char *)value[HTML_BUTTON_TYPE], "submit") ||
-		 !strcasecomp((char *)value[HTML_BUTTON_TYPE], "reset"))) {
+		(!strcasecomp(value[HTML_BUTTON_TYPE], "submit") ||
+		 !strcasecomp(value[HTML_BUTTON_TYPE], "reset"))) {
 	        /*
 		 *  It's a button for submitting or resetting a form. - FM
 		 */
-		I.type = (char *)value[HTML_BUTTON_TYPE];
+		I.type = value[HTML_BUTTON_TYPE];
 	    } else {
 	        /*
 		 *  Ugh, it's a button for a script. - FM
@@ -4175,7 +4178,7 @@ PRIVATE void HTML_start_element ARGS5(
 	    HTML_put_character(me, '(');
 
 	    if (present && present[HTML_BUTTON_NAME] && value[HTML_BUTTON_NAME])
-		I.name = (char *)value[HTML_BUTTON_NAME];
+		I.name = value[HTML_BUTTON_NAME];
 	    else
 	        I.name = "";
 
@@ -4184,16 +4187,15 @@ PRIVATE void HTML_start_element ARGS5(
 	        /*
 		 *  Convert any HTML entities or decimal escaping. - FM
 		 */
-		int CurrentCharSet = current_char_set;
 		int len;
 
 		me->UsePlainSpace = TRUE;
 		if (current_char_set) {
 		    LYExpandString((char **)&value[HTML_BUTTON_VALUE]);
 		}
-	        LYUnEscapeEntities((char *)value[HTML_BUTTON_VALUE],
+	        LYUnEscapeEntities(value[HTML_BUTTON_VALUE],
 				   me->UsePlainSpace, me->HiddenValue);
-		I.value = (char *)value[HTML_BUTTON_VALUE];
+		I.value = value[HTML_BUTTON_VALUE];
 		/*
 		 *  Convert any newlines or tabs to spaces,
 		 *  and trim any lead or trailing spaces. - FM
@@ -4212,17 +4214,17 @@ PRIVATE void HTML_start_element ARGS5(
 
 	    if (present && present[HTML_BUTTON_CLASS] && /* Not yet used. */
 	        value[HTML_BUTTON_CLASS] && *value[HTML_BUTTON_CLASS])
-		I.class = (char *)value[HTML_BUTTON_CLASS];
+		I.class = value[HTML_BUTTON_CLASS];
 
 	    if (present && present[HTML_BUTTON_ID] &&
 	        value[HTML_BUTTON_ID] && *value[HTML_BUTTON_ID]) {
-		I.id = (char *)value[HTML_BUTTON_ID];
-		LYCheckForID(me, present, value, (int)HTML_BUTTON_ID);
+		I.id = value[HTML_BUTTON_ID];
+		CHECK_ID(HTML_BUTTON_ID);
 	    }
 
 	    if (present && present[HTML_BUTTON_LANG] && /* Not yet used. */
 	        value[HTML_BUTTON_LANG] && *value[HTML_BUTTON_LANG])
-		I.lang = (char *)value[HTML_BUTTON_LANG];
+		I.lang = value[HTML_BUTTON_LANG];
 
 	    chars = HText_beginInput(me->text, me->inUnderline, &I);
 	    /*
@@ -4325,13 +4327,13 @@ PRIVATE void HTML_start_element ARGS5(
 	     */
 	    if (present && present[HTML_INPUT_TYPE] &&
 	        value[HTML_INPUT_TYPE] && *value[HTML_INPUT_TYPE]) {
-		I.type = (char *)value[HTML_INPUT_TYPE];
+		I.type = value[HTML_INPUT_TYPE];
 
 		if (!strcasecomp(I.type, "range")) {
 		    if (present[HTML_INPUT_MIN])
-		        I.min = (char *)value[HTML_INPUT_MIN];
+		        I.min = value[HTML_INPUT_MIN];
 		    if (present[HTML_INPUT_MAX])
-		        I.max = (char *)value[HTML_INPUT_MAX];
+		        I.max = value[HTML_INPUT_MAX];
 		    /*
 		     *  Not yet implemented.
 		     */
@@ -4344,7 +4346,7 @@ PRIVATE void HTML_start_element ARGS5(
 
 		} else if (!strcasecomp(I.type, "file")) {
 		    if (present[HTML_INPUT_ACCEPT])
-		        I.accept = (char *)value[HTML_INPUT_ACCEPT];
+		        I.accept = value[HTML_INPUT_ACCEPT];
 		    /*
 		     *  Not yet implemented.
 		     */
@@ -4408,7 +4410,7 @@ PRIVATE void HTML_start_element ARGS5(
 	     *  Handle the INPUT as for a FORM. - FM
 	     */
 	    if (present && present[HTML_INPUT_NAME] && value[HTML_INPUT_NAME])
-		I.name = (char *)value[HTML_INPUT_NAME];
+		I.name = value[HTML_INPUT_NAME];
 	    else
 	        I.name = "";
 	    if ((present && present[HTML_INPUT_ALT] &&
@@ -4429,7 +4431,7 @@ PRIVATE void HTML_start_element ARGS5(
 	        present && present[HTML_INPUT_SRC] &&
 	        value[HTML_INPUT_SRC] && *value[HTML_INPUT_SRC] &&
 		I.type && !strcasecomp(I.type, "image")) {
-		StrAllocCopy(href, (char *)value[HTML_INPUT_SRC]);
+		StrAllocCopy(href, value[HTML_INPUT_SRC]);
 		/*
 		 *  We have a TYPE="image" with a non-zero-length SRC
 		 *  attribute and want clickable images.  Make the
@@ -4511,12 +4513,12 @@ PRIVATE void HTML_start_element ARGS5(
 			    (char **)&value[HTML_INPUT_ALT] :
 			    (char **)&value[HTML_INPUT_VALUE]));
 	        LYUnEscapeEntities(((UseALTasVALUE == TRUE) ?
-			      (char *)value[HTML_INPUT_ALT] :
-			      (char *)value[HTML_INPUT_VALUE]),
+			      value[HTML_INPUT_ALT] :
+			      value[HTML_INPUT_VALUE]),
 				   me->UsePlainSpace, me->HiddenValue);
 		I.value = ((UseALTasVALUE == TRUE) ?
-		     (char *)value[HTML_INPUT_ALT] :
-		     (char *)value[HTML_INPUT_VALUE]);
+		     value[HTML_INPUT_ALT] :
+		     value[HTML_INPUT_VALUE]);
 		if (me->UsePlainSpace == TRUE) {
 		    /*
 		     *  Convert any newlines or tabs to spaces,
@@ -4553,39 +4555,39 @@ PRIVATE void HTML_start_element ARGS5(
 		I.checked = YES;
 	    if (present && present[HTML_INPUT_SIZE] &&
 	        value[HTML_INPUT_SIZE] && *value[HTML_INPUT_SIZE])
-		I.size = (char *)value[HTML_INPUT_SIZE];
+		I.size = value[HTML_INPUT_SIZE];
 	    if (present && present[HTML_INPUT_MAXLENGTH] &&
 	        value[HTML_INPUT_MAXLENGTH] && *value[HTML_INPUT_MAXLENGTH])
-		I.maxlength = (char *)value[HTML_INPUT_MAXLENGTH];
+		I.maxlength = value[HTML_INPUT_MAXLENGTH];
 	    if (present && present[HTML_INPUT_DISABLED])
 		I.disabled = YES;
 
 	    if (present && present[HTML_INPUT_ALIGN] && /* Not yet used. */
 	        value[HTML_INPUT_ALIGN] && *value[HTML_INPUT_ALIGN])
-		I.align = (char *)value[HTML_INPUT_ALIGN];
+		I.align = value[HTML_INPUT_ALIGN];
 	    if (present && present[HTML_INPUT_CLASS] && /* Not yet used. */
 	        value[HTML_INPUT_CLASS] && *value[HTML_INPUT_CLASS])
-		I.class = (char *)value[HTML_INPUT_CLASS];
+		I.class = value[HTML_INPUT_CLASS];
 	    if (present && present[HTML_INPUT_ERROR] && /* Not yet used. */
 	        value[HTML_INPUT_ERROR] && *value[HTML_INPUT_ERROR])
-		I.error = (char *)value[HTML_INPUT_ERROR];
+		I.error = value[HTML_INPUT_ERROR];
 	    if (present && present[HTML_INPUT_HEIGHT] && /* Not yet used. */
 	        value[HTML_INPUT_HEIGHT] && *value[HTML_INPUT_HEIGHT])
-		I.height = (char *)value[HTML_INPUT_HEIGHT];
+		I.height = value[HTML_INPUT_HEIGHT];
 	    if (present && present[HTML_INPUT_WIDTH] && /* Not yet used. */
 	        value[HTML_INPUT_WIDTH] && *value[HTML_INPUT_WIDTH])
-		I.width = (char *)value[HTML_INPUT_WIDTH];
+		I.width = value[HTML_INPUT_WIDTH];
 	    if (present && present[HTML_INPUT_ID] &&
 	        value[HTML_INPUT_ID] && *value[HTML_INPUT_ID]) {
-		I.id = (char *)value[HTML_INPUT_ID];
-		LYCheckForID(me, present, value, (int)HTML_INPUT_ID);
+		I.id = value[HTML_INPUT_ID];
+		CHECK_ID(HTML_INPUT_ID);
 	    }
 	    if (present && present[HTML_INPUT_LANG] && /* Not yet used. */
 	        value[HTML_INPUT_LANG] && *value[HTML_INPUT_LANG])
-		I.lang = (char *)value[HTML_INPUT_LANG];
+		I.lang = value[HTML_INPUT_LANG];
 	    if (present && present[HTML_INPUT_MD] && /* Not yet used. */
 	        value[HTML_INPUT_MD] && *value[HTML_INPUT_MD])
-		I.md = (char *)value[HTML_INPUT_MD];
+		I.md = value[HTML_INPUT_MD];
 
 	    chars = HText_beginInput(me->text, me->inUnderline, &I);
 	    /*
@@ -4875,7 +4877,7 @@ PRIVATE void HTML_start_element ARGS5(
 		if (TRACE)
 		    fprintf(stderr,
 		    	    "HTML: Ignoring SIZE=\"%s\" for SELECT.\n",
-		    	    (char *)value[HTML_SELECT_SIZE]);
+		    	    value[HTML_SELECT_SIZE]);
 #endif /* NOTDEFINED */
 	    }
 
@@ -4907,7 +4909,7 @@ PRIVATE void HTML_start_element ARGS5(
 		me->in_word = NO;
 	    }
 
-	    LYCheckForID(me, present, value, (int)HTML_SELECT_ID);
+	    CHECK_ID(HTML_SELECT_ID);
 
 	    HText_beginSelect(name, multiple, size);
 	    FREE(name);
@@ -5014,7 +5016,7 @@ PRIVATE void HTML_start_element ARGS5(
 			LYUseDefaultRawMode = TRUE;
 			HTMLSetCharacterHandling(current_char_set);
 		    }
-	            LYUnEscapeEntities((char *)value[HTML_OPTION_VALUE],
+	            LYUnEscapeEntities(value[HTML_OPTION_VALUE],
 		    		       me->UsePlainSpace, me->HiddenValue);
 		    if (CurrentCharSet) {
 		        current_char_set = CurrentCharSet;
@@ -5024,7 +5026,7 @@ PRIVATE void HTML_start_element ARGS5(
 			HTCJK = CurrentHTCJK;
 		    }
 
-		    I.value = (char *)value[HTML_OPTION_VALUE];
+		    I.value = value[HTML_OPTION_VALUE];
 		}
 
 	        if (me->select_disabled ||
@@ -5040,7 +5042,7 @@ PRIVATE void HTML_start_element ARGS5(
 				    (HTLinkType*)0)) != NULL) {	   /* Type */
 			HText_beginAnchor(me->text, me->inUnderline, ID_A);
 			HText_endAnchor(me->text, 0);
-		        I.id = (char *)value[HTML_OPTION_ID];
+		        I.id = value[HTML_OPTION_ID];
 		    }
 		}
 
@@ -5151,7 +5153,7 @@ PRIVATE void HTML_start_element ARGS5(
 	    UPDATE_STYLE;
 	    me->current_default_alignment = styles[HTML_DLEFT]->alignment;
 	}
-	LYCheckForID(me, present, value, (int)HTML_TABLE_ID);
+	CHECK_ID(HTML_TABLE_ID);
 	break;
 
     case HTML_TR:
@@ -5189,7 +5191,7 @@ PRIVATE void HTML_start_element ARGS5(
 	        me->sp->style->alignment = HT_LEFT;
 	}
 
-	LYCheckForID(me, present, value, (int)HTML_TR_ID);
+	CHECK_ID(HTML_TR_ID);
 	me->inP = FALSE;
         break;
 
@@ -5200,7 +5202,7 @@ PRIVATE void HTML_start_element ARGS5(
 	 *  Not yet implemented.  Just check for an ID link. - FM
 	 */
         UPDATE_STYLE;
-	LYCheckForID(me, present, value, (int)HTML_TR_ID);
+	CHECK_ID(HTML_TR_ID);
         break;
     
     case HTML_COL:
@@ -5209,12 +5211,12 @@ PRIVATE void HTML_start_element ARGS5(
 	 *  Not yet implemented.  Just check for an ID link. - FM
 	 */
         UPDATE_STYLE;
-	LYCheckForID(me, present, value, (int)HTML_COL_ID);
+	CHECK_ID(HTML_COL_ID);
         break;
     
     case HTML_TH:
         UPDATE_STYLE;
-	LYCheckForID(me, present, value, (int)HTML_TD_ID);
+	CHECK_ID(HTML_TD_ID);
         /*
 	 *  Not yet implemented.  Just add a collapsible space and break. - FM
 	 */
@@ -5224,7 +5226,7 @@ PRIVATE void HTML_start_element ARGS5(
 
     case HTML_TD:
         UPDATE_STYLE;
-	LYCheckForID(me, present, value, (int)HTML_TD_ID);
+	CHECK_ID(HTML_TD_ID);
         /*
 	 *  Not yet implemented.  Just add a collapsible space and break. - FM
 	 */
@@ -5240,7 +5242,7 @@ PRIVATE void HTML_start_element ARGS5(
 	if (!me->text)
 	    UPDATE_STYLE;
 	HTChunkClear(&me->math);
-	LYCheckForID(me, present, value, (int)HTML_GEN_ID);
+	CHECK_ID(HTML_GEN_ID);
 	break;
 
     default:
@@ -5326,6 +5328,8 @@ PRIVATE void HTML_start_element ARGS5(
 #endif /* USE_COLOR_STYLE */
 }
 
+#undef CHECK_ID  /* LYCheckForID() */
+
 /*		End Element
 **		-----------
 **
diff --git a/src/LYCgi.c b/src/LYCgi.c
index 3e825502..44a85bd4 100644
--- a/src/LYCgi.c
+++ b/src/LYCgi.c
@@ -289,7 +289,7 @@ PRIVATE int LYLoadCGI ARGS4(
 	int fd1[2], fd2[2];
 	char buf[1024];
 	pid_t pid;
-#if HAVE_TYPE_UNION_WAIT && !HAVE_WAITPID
+#if HAVE_TYPE_UNIONWAIT && !HAVE_WAITPID
 	union wait wstatus;
 #else
 	int wstatus;
@@ -376,7 +376,7 @@ PRIVATE int LYLoadCGI ARGS4(
 		    
 		    (*target->isa->put_block)(target, buf, chars);
 		}
-#if HAVE_TYPE_UNION_WAIT && !HAVE_WAITPID
+#if HAVE_TYPE_UNIONWAIT && !HAVE_WAITPID
 		while (wait(&wstatus) != pid)
 		    ; /* do nothing */
 #else
diff --git a/src/LYCharUtils.c b/src/LYCharUtils.c
index 678bbab8..d7729cf4 100644
--- a/src/LYCharUtils.c
+++ b/src/LYCharUtils.c
@@ -2778,7 +2778,7 @@ PUBLIC void LYCheckForContentBase ARGS1(
 {
     char *cp = NULL;
     BOOL present[HTML_BASE_ATTRIBUTES];
-    CONST char *value[HTML_BASE_ATTRIBUTES];
+    char *value[HTML_BASE_ATTRIBUTES];
     int i;
 
     if (!(me && me->node_anchor))
@@ -2831,7 +2831,7 @@ PUBLIC void LYCheckForContentBase ARGS1(
     for (i = 0; i < HTML_BASE_ATTRIBUTES; i++)
 	 present[i] = NO;
     present[HTML_BASE_HREF] = YES;
-    value[HTML_BASE_HREF] = (CONST char *)cp;
+    value[HTML_BASE_HREF] = cp;
     (*me->isa->start_element)(me, HTML_BASE, present, value, 0);
     FREE(cp);
 }
diff --git a/src/LYCurses.c b/src/LYCurses.c
index e4a7718a..f609100e 100644
--- a/src/LYCurses.c
+++ b/src/LYCurses.c
@@ -35,7 +35,10 @@ extern int _NOSHARE(COLS);
 #ifdef USE_COLOR_STYLE
 #include "AttrList.h"
 #include "LYHash.h"
-int has_color = 0;
+#endif
+
+#if defined(COLOR_CURSES)
+int lynx_uses_color = 0;
 #endif
 
 /*
@@ -208,7 +211,7 @@ PRIVATE int LYAttrset ARGS3(WINDOW*,win,int,color,int,mono)
 {
 	if (TRACE)
 		fprintf(stderr, "CSS:LYAttrset (%d, %d)\n", color, mono);
-	if (has_color && LYShowColor >= SHOW_COLOR_ON && color > -1)
+	if (lynx_uses_color && LYShowColor >= SHOW_COLOR_ON && color > -1)
 	{
 		wattrset(win,color);
 #if 0
@@ -360,7 +363,6 @@ void attribute ARGS2(int,style,int,dir)
  * special case of initialization before 'initscr()' is called.
  * 1997/1/19 - T.E.Dickey <dickey@clark.net>
  */
-PRIVATE int lynx_uses_color;
 PRIVATE int lynx_called_initscr;
 
 PRIVATE struct {
@@ -702,8 +704,8 @@ PUBLIC void start_curses NOARGS
 #endif
 
 #ifdef USE_COLOR_STYLE
-	has_color = has_colors();
-	if (has_color)
+	lynx_uses_color = has_colors();
+	if (lynx_uses_color)
 		start_color();
 	parse_userstyles();
 #endif
diff --git a/src/LYLocal.c b/src/LYLocal.c
index 98f29ce4..a458ebe5 100644
--- a/src/LYLocal.c
+++ b/src/LYLocal.c
@@ -2205,7 +2205,7 @@ PUBLIC int LYExecv ARGS3(
     int rc;
     char tmpbuf[512];
     pid_t pid;
-#if HAVE_TYPE_UNION_WAIT && !HAVE_WAITPID
+#if HAVE_TYPE_UNIONWAIT && !HAVE_WAITPID
     union wait wstatus;
 #else
     int wstatus;
@@ -2224,7 +2224,7 @@ PUBLIC int LYExecv ARGS3(
 	    execv(path, argv);
 	    exit(-1);	/* execv failed, give wait() something to look at */
 	default:  /* parent */
-#if HAVE_TYPE_UNION_WAIT && !HAVE_WAITPID
+#if HAVE_TYPE_UNIONWAIT && !HAVE_WAITPID
 	    while (wait(&wstatus) != pid)
 		; /* do nothing */
 #else
diff --git a/src/LYStyle.c b/src/LYStyle.c
index dd4d12fd..0d9d0724 100644
--- a/src/LYStyle.c
+++ b/src/LYStyle.c
@@ -1,6 +1,6 @@
 /* character level styles for Lynx
  * (c) 1996 Rob Partington -- donated to the Lyncei (if they want it :-)
- * $Id: LYStyle.c,v 1.1 1997/05/25 00:14:19 tom Exp $
+ * $Id: LYStyle.c,v 1.2 1997/09/17 23:34:13 tom Exp $
  */
 #include "HTUtils.h"
 #include "HTML.h"
@@ -123,7 +123,7 @@ PRIVATE void parse_attributes ARGS5(char*,mono,char*,fg,char*,bg,int,style,char*
   * If we have colour, and space to create a new colour attribute,
   * and we have a valid colour description, then add this style
   */
- if (has_color && colorPairs < COLOR_PAIRS-1 && fA!=-1)
+ if (lynx_uses_color && colorPairs < COLOR_PAIRS-1 && fA!=-1)
  {
 	colorPairs++;
 	init_pair(colorPairs, fA, bA);
diff --git a/src/LYStyle.h b/src/LYStyle.h
index cfc4ae69..02eab3d9 100644
--- a/src/LYStyle.h
+++ b/src/LYStyle.h
@@ -12,7 +12,7 @@ extern CONST SGML_dtd HTML_dtd;
 extern HTCharStyle displayStyles[DSTYLE_ELEMENTS];
 
 /* Can we do colour? - RP */
-extern int has_color;
+extern int lynx_uses_color;
 
 /* Set all the buckets in the hash table to be empty */
 extern void style_initialiseHashTable NOPARAMS;
diff --git a/src/LYUtils.c b/src/LYUtils.c
index 388d6adb..a4b5225a 100644
--- a/src/LYUtils.c
+++ b/src/LYUtils.c
@@ -1892,7 +1892,7 @@ 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
+		wbkgdset(stdscr, (lynx_uses_color
 			? hashStyles[a].color
 			: hashStyles[a].mono) | ' ');
 		clrtoeol();
@@ -2754,9 +2754,9 @@ PUBLIC BOOLEAN inlocaldomain NOARGS
 ** This bit of code catches window size change signals
 **/
 
-#if !defined(VMS) && !defined(ISC) && !defined(DOSPATH)
+#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
-#endif /* !VMS && !ISC */
+#endif
 
 /* For systems that have both, but both can't be included, duh */
 #ifdef TERMIO_AND_TERMIOS
diff --git a/src/chrtrans/makefile.in b/src/chrtrans/makefile.in
index a15d5da7..0122ecf1 100644
--- a/src/chrtrans/makefile.in
+++ b/src/chrtrans/makefile.in
@@ -14,12 +14,12 @@ VPATH		= $(srcdir)
 
 WWWINC		= WWW/Library/Implementation
 SITE_DEFS	= # FIXME: set in parent makefile
-MCFLAGS		= # FIXME: set in parent makefile
 
 CC		= @CC@
 CPP		= @CPP@
-CPPOPTS		= @DEFS@ @CPPFLAGS@ -I.. -I../.. -I../../$(WWWINC) $(MCFLAGS)
-CFLAGS		= $(CPPOPTS) @CFLAGS@
+CFLAGS		= @CFLAGS@
+CPP_OPTS	= @DEFS@ @CPPFLAGS@ -I.. -I../.. -I../../$(WWWINC) $(SITE_DEFS)
+CC_OPTS		= $(CPP_OPTS) $(CFLAGS)
 
 #
 # This file contains the font map for the default (hardware) font
@@ -31,8 +31,6 @@ FONTMAP_INC = iso01_uni.h# default, if not set by recursive call
 
 ### fastdep: $(FONTMAP_INC)
 
-### MCFLAGS=-g -DUNIX -DLINUX -DNO_KEYPAD -DNO_TTYTYPE -DEXP_CHARTRANS -I.. -I../../WWW/Library/Implementation -I../..
-
 CHRTR=
 
 TABLES= $(CHRTR)iso02_uni.h \
@@ -65,17 +63,17 @@ default: $(FONTMAP_INC)
 tables: $(TABLES)
 
 makeuctb: makeuctb.c UCkd.h
-	$(CC) $(CFLAGS) -o makeuctb makeuctb.c
+	$(CC) $(CC_OPTS) -o makeuctb makeuctb.c
 
 .SUFFIXES : .tbl .i
 
 .c.o:
-@SHOW_CC@
-	@ECHO_CC@$(CC) $(CPPOPTS) $(CFLAGS) -c $(srcdir)/$*.c
+@RULE_CC@
+	@ECHO_CC@$(CC) $(CC_OPTS) -c $(srcdir)/$*.c
 
 .c.i:
-@SHOW_CC@
-	@ECHO_CC@$(CPP) -C $(CPPOPTS) $*.c >$@
+@RULE_CC@
+	@ECHO_CC@$(CPP) -C $(CPP_OPTS) $*.c >$@
 
 .tbl.h:
 	./makeuctb $*.tbl > $@
@@ -115,6 +113,6 @@ distclean: clean
 	rm -f core *.bak *.sav *~ *.h_old
 
 depend :
-	makedepend -fmakefile -- $(CFLAGS) -- $(C_SRC)
+	makedepend -fmakefile -- $(CPP_OPTS) -- $(C_SRC)
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/makefile.in b/src/makefile.in
index d42883b9..e1f35c23 100644
--- a/src/makefile.in
+++ b/src/makefile.in
@@ -8,7 +8,17 @@ exec_prefix	= @exec_prefix@
 srcdir		= @srcdir@
 VPATH		= $(srcdir)
 
-MCFLAGS		= # FIXME: set in parent makefile
+# Symbols which the configure script can set in each makefile:
+CC		= @CC@
+CPP		= @CPP@
+CFLAGS		= @CFLAGS@
+DEFS		= @DEFS@
+CPPFLAGS	= @CPPFLAGS@
+
+LIBS		= @LIBS@ $(RESOLVLIB) $(WAISLIB) $(SOCKSLIB) $(SITE_LIBS)
+LDFLAGS		= @LDFLAGS@
+
+# Symbols inherited from the top-level makefile
 RESOLVLIB	= # FIXME: set in parent makefile
 SITE_DEFS	= # FIXME: set in parent makefile
 SITE_LIBS	= # FIXME: set in parent makefile
@@ -18,17 +28,12 @@ WAISLIB		= # FIXME: set in parent makefile
 WWWINC		= WWW/Library/Implementation
 WWWLIB		= ../WWW/Library/unix/libwww.a
 
-CC		= @CC@
-CPP		= @CPP@
-CPPOPTS		= @DEFS@ @CPPFLAGS@ -I.. -I../$(WWWINC) $(MCFLAGS) $(SITE_DEFS)
-CFLAGS		= $(CPPOPTS) @CFLAGS@
+CPP_OPTS	= $(DEFS) $(CPPFLAGS) -I.. -I../$(WWWINC) $(SITE_DEFS)
+CC_OPTS		= $(CPP_OPTS) $(CFLAGS)
 
 LINT		= @LINT@
 LINTOPTS	=
 
-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 \
@@ -47,16 +52,16 @@ all: lynx
 .SUFFIXES : .i
 
 .c.o:
-@SHOW_CC@
-	@ECHO_CC@$(CC) $(CFLAGS) -c $(srcdir)/$*.c
+@RULE_CC@
+	@ECHO_CC@$(CC) $(CC_OPTS) -c $(srcdir)/$*.c
 
 .c.i:
-@SHOW_CC@
-	@ECHO_CC@$(CPP) -C $(CPPOPTS) $*.c >$@
+@RULE_CC@
+	@ECHO_CC@$(CPP) -C $(CPP_OPTS) $*.c >$@
 
 lynx:   message @EXTRA_DEPS@ $(OBJS) $(WWWLIB)
 	@echo "Linking and creating Lynx executable"
-	$(CC) $(CFLAGS) $(LDFLAGS) -o lynx  $(OBJS) $(WWWLIB) $(LIBS)
+	$(CC) $(CC_OPTS) $(LDFLAGS) -o lynx  $(OBJS) $(WWWLIB) $(LIBS)
 	@echo "Copying Lynx executable into top-level directory"
 	cp lynx ..
 	@echo "Welcome to Lynx!"
@@ -66,12 +71,11 @@ message:
 
 do_chartrans_stuff:
 	-cd chrtrans && $(MAKE) \
-		MCFLAGS="$(MCFLAGS)" \
 		SITE_DEFS="$(SITE_DEFS)" \
 		CC="$(CC)" tables
 
 lint:
-	$(LINT) $(LINTOPTS) $(CPPOPTS) *.c  > ../lint.out
+	$(LINT) $(LINTOPTS) $(CPP_OPTS) *.c  > ../lint.out
 
 clean:
 	rm -f lynx core *.[ob] *.bak
@@ -133,6 +137,6 @@ UCAux.o : UCAux.c $(CMN)UCAux.h $(CMN)UCDefs.h
 LYCookie.o: ../userdefs.h
 
 depend :
-	makedepend -fmakefile -- $(CFLAGS) -- $(C_SRC)
+	makedepend -fmakefile -- $(CC_OPTS) -- $(C_SRC)
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
author	Thomas E. Dickey <dickey@invisible-island.net>	1997-09-18 12:25:58 -0400
committer	Thomas E. Dickey <dickey@invisible-island.net>	1997-09-18 12:25:58 -0400
commit	d2e46bbfcbedb43938b866f4ad9e8bf1d4084b7c (patch)
tree	9f98081fe52ddab37286a6208c66d3e7f14f216b
parent	dc9e683bddf52e0720f5e74e3349533c9ee9f97a (diff)
download	lynx-snapshots-d2e46bbfcbedb43938b866f4ad9e8bf1d4084b7c.tar.gz