diff options
| author | Thomas E. Dickey <dickey@invisible-island.net> | 1997-08-27 10:10:45 -0400 |
|---|---|---|
| committer | Thomas E. Dickey <dickey@invisible-island.net> | 1997-08-27 10:10:45 -0400 |
| commit | 1a2ac66b7db3c229b508b9b1fb68bcc5b4a6b907 (patch) | |
| tree | 21dd6772f30f0f39b03a8db3410210b7af7bff53 | |
| parent | fbcb509d8db6255777742b09da479531108aa8d0 (diff) | |
| download | lynx-snapshots-1a2ac66b7db3c229b508b9b1fb68bcc5b4a6b907.tar.gz | |
snapshot of project "lynx", label v2-7-1ac_0-55
| -rw-r--r-- | .Lynx.prcs_aux | 123 | ||||
| -rw-r--r-- | CHANGES.configure | 20 | ||||
| -rw-r--r-- | CHANGES.new | 38 | ||||
| -rw-r--r-- | Lynx.prj | 154 | ||||
| -rw-r--r-- | WWW/Library/Implementation/HTFile.c | 15 | ||||
| -rw-r--r-- | WWW/Library/Implementation/HTTP.c | 4 | ||||
| -rw-r--r-- | WWW/Library/unix/makefile.in | 4 | ||||
| -rw-r--r-- | aclocal.m4 | 160 | ||||
| -rw-r--r-- | config.hin | 7 | ||||
| -rwxr-xr-x | configure | 1152 | ||||
| -rw-r--r-- | configure.in | 31 | ||||
| -rw-r--r-- | makefile.in | 13 | ||||
| -rw-r--r-- | src/HTFWriter.c | 9 | ||||
| -rw-r--r-- | src/HTInit.c | 4 | ||||
| -rw-r--r-- | src/LYCharUtils.c | 1676 | ||||
| -rw-r--r-- | src/LYCookie.c | 6 | ||||
| -rw-r--r-- | src/LYHistory.c | 4 | ||||
| -rw-r--r-- | src/LYNews.c | 4 | ||||
| -rw-r--r-- | src/LYUtils.c | 11 | ||||
| -rw-r--r-- | src/chrtrans/makefile.in | 6 | ||||
| -rw-r--r-- | src/makefile.in | 17 |
21 files changed, 1920 insertions, 1538 deletions
diff --git a/.Lynx.prcs_aux b/.Lynx.prcs_aux index 1dab2948..fb89b452 100644 --- a/.Lynx.prcs_aux +++ b/.Lynx.prcs_aux @@ -1,7 +1,7 @@ ;; This file is automatically generated, editing may cause PRCS to do ;; REALLY bad things. (Created-By-Prcs-Version 1 2 0) -(WWW/Library/djgpp/makefile 843 870960374 0_makefile 1.5) +(WWW/Library/djgpp/makefile 860 871777740 0_makefile 1.6) (WWW/Library/Implementation/HTList.c 6153 856833014 h/4_HTList.c 1.1) (WWW/Library/Implementation/HTGroup.h 5641 856833014 f/49_HTGroup.h 1.1) (src/tcpwareolb.opt 24 856833014 d/8_tcpwareolb 1.1) @@ -16,7 +16,7 @@ (lynx_help/keystroke_commands/xterm_help.html 1162 856833014 e/19_xterm_help 1.1) (CHANGES2-6 41847 856833014 b/0_CHANGES2-6 1.1) (WWW/Library/Implementation/HTList.h 3636 856833014 g/17_HTList.h 1.1) -(WWW/Library/Implementation/HTUtils.h 10216 870159729 g/7_HTUtils.h 1.7) +(WWW/Library/Implementation/HTUtils.h 10279 871654647 g/7_HTUtils.h 1.8) (docs/README.txt 580 856833014 e/35_README.txt 1.1) (src/LYSystem.h 211 856833014 c/38_LYSystem.h 1.1) (WWW/Library/sco/Makefile 793 856833014 f/4_Makefile 1.1) @@ -34,16 +34,16 @@ (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 11493 870983973 10_configure. 1.11) -(makefile.in 7951 870983973 8_makefile.i 1.1.1.10) +(configure.in 12096 872001662 10_configure. 1.12) +(makefile.in 8172 872001662 8_makefile.i 1.1.1.12) (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) (WWW/Library/Implementation/HTFTP.c 91171 868775901 h/14_HTFTP.c 1.6) -(src/GridText.c 188036 870960374 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.3) -(src/LYMain.c 87250 870960374 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.5) +(src/GridText.c 194637 871707027 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.3) +(src/LYMain.c 87336 871707027 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.2) (src/tcpwareshr.opt 30 856833014 d/6_tcpwareshr 1.1) -(src/LYGetFile.c 35566 870708759 d/48_LYGetFile. 1.5.2.3.2.1.1.1.1.1.1.1.1.2) +(src/LYGetFile.c 36209 871141740 d/48_LYGetFile. 1.5.2.3.2.1.1.1.1.1.1.1.1.1.1.3) (src/chrtrans/iso05_uni.tbl 1865 856925688 i/8_iso05_uni. 1.2) (src/chrtrans/mnem_suni.tbl 24067 856856948 h/50_mnem_suni. 1.1) (README.configure 7299 870983973 14_README.con 1.6) @@ -55,7 +55,7 @@ (WWW/Library/Implementation/HTAAProt.c 16206 857148169 g/40_HTAAProt.c 1.2) (WWW/Library/Implementation/HTFTP.h 1458 856833014 g/31_HTFTP.h 1.1) (WWW/Library/Implementation/crypt.c 3468 856833014 f/38_crypt.c 1.1) -(src/GridText.h 6586 868567209 d/33_GridText.h 1.1.1.1.1.3.1.1.1.1.1.2) +(src/GridText.h 6701 871141740 d/33_GridText.h 1.1.1.1.1.3.1.1.1.1.1.1.1.2) (src/LYGetFile.h 687 863136190 d/18_LYGetFile. 1.1.2.2.1.2) (utils/inews/config.h 13461 856833014 b/50_config.h 1.1) (docs/RFC-MAILCAP.txt 31538 856833014 e/34_RFC-MAILCA 1.1) @@ -68,41 +68,42 @@ (lynx_help/keystroke_commands/gopher_types_help.html 1091 856833014 e/26_gopher_typ 1.1) (WWW/Library/Implementation/HTVMSUtils.h 2354 856833014 f/39_HTVMSUtils 1.1) (src/LYExtern.c 2223 870960374 39_LYExtern.c 1.5.1.2) -(LYMessages_en.h 32688 870708759 h/37_LYMessages 1.4.1.4.1.2.1.1.1.1.1.1.3.1.1.2) +(LYMessages_en.h 32885 871141740 h/37_LYMessages 1.4.1.4.1.2.1.1.1.1.1.1.3.1.1.1.1.3) (lynx_help/keystroke_commands/keystroke_help.html 5115 868266973 e/28_keystroke_ 1.3.1.2) (WWW/Library/umaxv-m88k/Makefile 678 856833014 e/48_Makefile 1.1) (about_lynx/lynx-dev.html 2500 870960374 b/0_lynx-dev.h 1.1) (WWW/Library/Implementation/HTBTree.c 26907 856833014 h/15_HTBTree.c 1.1) -(src/LYCookie.c 70031 870708759 c/18_LYCookie.c 1.2.1.6.1.2) +(src/LYCookie.c 65031 872001662 c/18_LYCookie.c 1.2.1.6.1.1.1.3) (src/LYExtern.h 174 868719652 38_LYExtern.h 1.1.1.1) -(src/DefaultStyle.c 9513 862857695 c/51_DefaultSty 1.1.1.1) +(src/DefaultStyle.c 9413 871141740 c/51_DefaultSty 1.1.2.2) (VMSWAIS.announce 1549 856833014 h/29_VMSWAIS.an 1.1) (WWW/Copyright.txt 944 856833014 e/46_Copyright. 1.1) -(src/chrtrans/Makefile 2005 869808657 i/3_Makefile 1.8) +(src/chrtrans/Makefile 2028 871141740 i/3_Makefile 1.9) (WWW/Library/Implementation/HTBTree.h 2196 856833014 g/32_HTBTree.h 1.1) (src/LYKeymap.c 26856 864148507 d/31_LYKeymap.c 1.1.2.6.1.1) (src/LYCookie.h 537 868688257 c/17_LYCookie.h 1.2) (utils/lpansi/vmsbuild.com 1582 856833014 b/45_vmsbuild.c 1.1) +(src/chrtrans/cp866_uni.tbl 7986 871141740 c/0_cp866_uni. 1.1) (CMU.announce 1178 856833014 h/43_CMU.announ 1.1) (WWW/Library/convex/Makefile 723 856833014 f/2_Makefile 1.1) (config.sub 19236 861154810 30_config.sub 1.1) (src/AttrList.h 1306 864519259 33_AttrList.h 1.3) (src/LYKeymap.h 4048 869443761 d/30_LYKeymap.h 1.1.2.5) (src/gnuc.opt 84 856833014 d/12_gnuc.opt 1.1) -(WWW/Library/Implementation/HTML.h 5859 868346760 g/28_HTML.h 1.1.2.2.1.1.1.1.1.1.1.2) +(WWW/Library/Implementation/HTML.h 5861 871707027 g/28_HTML.h 1.1.2.2.1.1.1.1.1.1.1.3) (src/LYSearch.c 10569 868435012 d/38_LYSearch.c 1.2.2.5) (WWW/Library/Implementation/ufc-crypt.h 2491 856833014 f/33_ufc-crypt. 1.1) (src/socketshr_tcp.opt 16 856833014 d/9_socketshr_ 1.1) -(src/HTAlert.c 12383 869443761 e/4_HTAlert.c 1.1.2.3) -(src/LYUtils.c 133061 870983973 d/27_LYUtils.c 1.1.4.1.2.2.1.1.1.1.1.1.1.1.4.4) -(src/LYCharUtils.c 74496 869929579 c/22_LYCharUtil 1.2.1.1.2.1.2.2.1.2.1.1.1.2.1.1.1.1.1.3) +(src/HTAlert.c 13496 871141740 e/4_HTAlert.c 1.1.2.1.1.2) +(src/LYUtils.c 134025 872229662 d/27_LYUtils.c 1.1.4.1.2.2.1.1.1.1.1.1.1.1.4.2.1.3) +(src/LYCharUtils.c 75025 872229662 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.4) (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 11378 869443761 c/28_LYCgi.c 1.1.1.3) (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 3283 869443761 d/1_HTAlert.h 1.3) +(src/HTAlert.h 3353 871141740 d/1_HTAlert.h 1.2.1.2) (lynx_help/lynx_help_main.html 2720 870960374 e/29_lynx_help_ 1.4) (src/LYUtils.h 4016 868401363 d/34_LYUtils.h 1.1.2.3) (src/LYCharUtils.h 2338 868567209 c/19_LYCharUtil 1.1.2.3) @@ -112,7 +113,7 @@ (WWW/Library/clix/Makefile 683 856833014 e/49_Makefile 1.1) (RELEASE_STATEMENT 1212 860264978 h/33_RELEASE_ST 1.2) (utils/inews/README 2391 856833014 c/7_README 1.1) -(src/LYHistory.c 18817 869443761 d/21_LYHistory. 1.1.2.1.4.1.1.1.1.3) +(src/LYHistory.c 18821 872229662 d/21_LYHistory. 1.1.2.1.4.1.1.1.1.4) (src/chrtrans/makeuctb.c 14000 868719652 b/19_makeuctb.c 1.2) (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) @@ -129,27 +130,27 @@ (WWW/Library/Implementation/HTStream.h 1802 856833014 g/21_HTStream.h 1.1) (src/chrtrans/build-header.com 932 868567209 c/0_build-head 1.1) (src/chrtrans/iso04_uni.tbl 1858 856925688 i/15_iso04_uni. 1.2) -(WWW/Library/Implementation/HTFormat.c 22944 870708759 h/0_HTFormat.c 1.1.1.2) +(WWW/Library/Implementation/HTFormat.c 26858 871654647 h/0_HTFormat.c 1.1.1.3) (WWW/Library/Implementation/HTUU.c 7512 860064663 g/37_HTUU.c 1.2) (WWW/Library/vms/libmake.com 6288 856833014 f/21_libmake.co 1.1) -(src/chrtrans/koi8r_uni.tbl 4570 860516880 24_koi8r_uni. 1.1) +(src/chrtrans/koi8r_uni.tbl 4799 871141740 b/29_koi8r_uni. 1.2.1.1) (DESC 664 856833014 h/41_DESC 1.1) (WWW/Library/Implementation/CommonMakefile 12712 861154810 f/41_CommonMake 1.3) (src/LYVMSdef.h 562 856833014 c/16_LYVMSdef.h 1.1) (src/LYList.h 262 861212923 c/26_LYList.h 1.2) (src/chrtrans/cp1250_uni.tbl 10813 856856948 h/48_cp1250_uni 1.1) (src/decc.opt 58 856833014 d/13_decc.opt 1.1) -(WWW/Library/Implementation/HTStyle.h 6777 870708759 g/18_HTStyle.h 1.2) -(CHANGES.new 113714 870983973 6_CHANGES.ne 1.18.1.4.1.1.2.1.1.2.2.2.1.2.1.1.1.1.1.4.2.7.1.3.1.4.1.10) +(WWW/Library/Implementation/HTStyle.h 6777 871141740 g/18_HTStyle.h 1.1.1.2) +(CHANGES.new 124137 872229662 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.17) (WWW/Library/Implementation/HTMLGen.h 753 856833014 g/22_HTMLGen.h 1.1) -(WWW/Library/Implementation/HTFormat.h 10965 870159729 g/13_HTFormat.h 1.2) +(WWW/Library/Implementation/HTFormat.h 11480 871654647 g/13_HTFormat.h 1.3) (WWW/Library/Implementation/HTUU.h 964 856833014 f/43_HTUU.h 1.1) (WWW/Library/Implementation/HTWSRC.c 11119 862857695 h/20_HTWSRC.c 1.1.1.1) (src/chrtrans/UCkd.h 1425 868451907 b/20_UCkd.h 1.1) -(WWW/Library/Implementation/HTFile.c 57073 870708759 h/27_HTFile.c 1.1.3.1.1.3) +(WWW/Library/Implementation/HTFile.c 61180 872001662 h/27_HTFile.c 1.1.3.1.1.6) (src/chrtrans/mnemonic_suni.tbl 22265 868451907 b/28_mnemonic_s 1.1) (WWW/Library/vms/COPYING.LIB 25265 856833014 f/20_COPYING.LI 1.1) -(src/chrtrans/MAKEW32.BAT 830 862109152 3_MAKEW32.BA 1.3) +(src/chrtrans/MAKEW32.BAT 980 871777740 3_MAKEW32.BA 1.4) (WWW/Library/Implementation/HTWSRC.h 1320 856833014 g/3_HTWSRC.h 1.1) (WWW/Library/sgi/Makefile 683 856833014 f/14_Makefile 1.1) (WWW/Library/Implementation/HTFile.h 4772 856856948 g/33_HTFile.h 1.2) @@ -166,21 +167,21 @@ (src/LYReadCFG.c 33865 870960374 d/39_LYReadCFG. 1.1.1.1.3.2.3.1.1.2.1.5) (WWW/Library/vms/descrip.mms 9051 856833014 f/22_descrip.mm 1.1) (src/LYPrint.h 304 856833014 d/7_LYPrint.h 1.1) -(Makefile.old 46150 870708759 h/36_Makefile 1.1.1.1.1.1.1.2.3.1.3.2) +(Makefile.old 46225 871654647 h/36_Makefile 1.1.1.1.1.1.1.2.3.1.3.3) (WWW/Library/Implementation/HTAccess.c 36271 870159729 h/17_HTAccess.c 1.5.2.2) (WWW/Library/Implementation/HTTelnet.h 582 856833014 g/5_HTTelnet.h 1.1) -(WWW/Library/Implementation/HTAnchor.c 33169 870050175 h/6_HTAnchor.c 1.1.4.4) +(WWW/Library/Implementation/HTAnchor.c 33556 871141740 h/6_HTAnchor.c 1.1.4.2.1.2) (utils/inews/inews.c 7996 856833014 c/2_inews.c 1.1) (src/LYReadCFG.h 219 856833014 c/41_LYReadCFG. 1.1) (docs/README.html 686 856833014 e/36_README.htm 1.1) (src/LYrcFile.c 29647 869904256 d/15_LYrcFile.c 1.1.3.6) -(src/UCAux.c 6349 870152746 b/15_UCAux.c 1.3) +(src/UCAux.c 6379 871141740 b/15_UCAux.c 1.3.1.1) (WWW/Library/Implementation/HTAccess.h 7620 860064663 g/35_HTAccess.h 1.3) (WWW/Library/Implementation/HTAtom.c 3883 869552380 h/7_HTAtom.c 1.1.2.1) (WWW/Library/Implementation/HTAAFile.c 5620 856833014 g/44_HTAAFile.c 1.1) (WWW/Library/Implementation/HTPasswd.c 7766 856833014 g/43_HTPasswd.c 1.1) -(samples/mailcap 4771 856833014 e/11_mailcap 1.1) -(WWW/Library/Implementation/HTAnchor.h 13797 868224571 g/19_HTAnchor.h 1.1.2.6) +(samples/mailcap 4772 871016304 e/11_mailcap 1.2) +(WWW/Library/Implementation/HTAnchor.h 14096 871141740 g/19_HTAnchor.h 1.1.4.3) (src/chrtrans/iso06_uni.tbl 1204 856856948 i/14_iso06_uni. 1.1) (src/LYrcFile.h 194 856833014 d/5_LYrcFile.h 1.1) (src/LYUpload.c 8005 870708759 d/35_LYUpload.c 1.1.4.1.3.1.1.1.1.3) @@ -191,7 +192,7 @@ (src/descrip.mms 5045 868451907 e/6_descrip.mm 1.2) (src/LYSignal.h 300 856833014 d/23_LYSignal.h 1.1) (lynx_help/keystroke_commands/other_help.html 6511 868266973 e/22_other_help 1.4) -(aclocal.m4 28080 870983973 12_aclocal.m4 1.13) +(aclocal.m4 30429 872001662 12_aclocal.m4 1.14) (WWW/Library/Implementation/patchlevel.h 959 856833014 f/34_patchlevel 1.1) (userdefs.h 56140 870708759 c/10_userdefs.h 1.1.2.1.1.1.1.1.1.1.2.1.1.1.1.1.1.3) (TCPWARE.announce 1352 856833014 h/31_TCPWARE.an 1.1) @@ -202,34 +203,34 @@ (src/LYUpload.h 300 856833014 c/49_LYUpload.h 1.1) (lynx_help/keystroke_commands/edit_help.html 1409 856833014 e/17_edit_help. 1.1) (src/LYLeaks.c 14715 868401363 c/31_LYLeaks.c 1.1.1.2) -(src/LYMainLoop.c 145990 870960374 d/43_LYMainLoop 1.2.4.2.2.1.2.6.1.2.1.1.1.1.1.1.1.1.1.1.1.6) +(src/LYMainLoop.c 147956 871707027 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.2) (about_lynx/about_lynx-dev.html 2500 856833014 e/42_about_lynx 1.1) (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 1029 868451907 f/0_UCAux.h 1.1) (WWW/Library/Implementation/HTMLDTD.h 28444 869211854 g/27_HTMLDTD.h 1.1.2.5) (WWW/Library/Implementation/HTAssoc.h 1096 856833014 f/45_HTAssoc.h 1.1) -(src/Makefile 2373 869808657 d/29_Makefile 1.2.2.5) +(src/Makefile 2396 871141740 d/29_Makefile 1.2.2.6) (WWW/Library/Implementation/HTAAUtil.c 15696 856833014 g/47_HTAAUtil.c 1.1) (lynx.man 14570 870708759 e/30_lynx.man 1.5.2.6.1.2) (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 1214 870050175 16_makefile.i 1.4) +(WWW/Library/unix/makefile.in 1329 872001662 16_makefile.i 1.5) (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 856833014 d/0_HTFont.h 1.1) +(src/HTFont.h 438 871016304 d/0_HTFont.h 1.2) (src/LYStrings.c 35922 869443761 d/36_LYStrings. 1.1.3.3.2.7) (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) (utils/inews/README.NN 3051 856833014 c/6_README.NN 1.1) -(src/LYShowInfo.c 10809 870708759 d/37_LYShowInfo 1.1.2.1.2.8) +(src/LYShowInfo.c 10851 871141740 d/37_LYShowInfo 1.1.2.1.5.1.1.1.2.2) (src/chrtrans/iso01_uni.tbl 5204 860516309 i/18_iso01_uni. 1.2) (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 214930 869808657 e/2_HTML.c 1.1.4.1.1.1.1.2.1.4.1.2.1.3.1.2.1.2.2.3) +(src/HTML.c 214981 871707027 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.2) (lynx_help/keystroke_commands/movement_help.html 1795 856833014 e/24_movement_h 1.1) (src/LYStrings.h 4977 869443761 d/20_LYStrings. 1.1.1.4) (WWW/Library/sun3/Makefile 636 856833014 f/12_Makefile 1.1) @@ -243,43 +244,43 @@ (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 5902 868401363 c/48_HTML.h 1.1.2.2.2.1.1.1.1.3) +(src/HTML.h 5904 871707027 c/48_HTML.h 1.1.2.2.2.1.1.1.1.4) (src/LYStyle.c 9090 864519259 36_LYStyle.c 1.6) (newfiles.chartrans 1286 860620937 b/0_newfiles.chartrans 1.4) (WWW/Library/Implementation/HTParse.c 20852 860064663 h/18_HTParse.c 1.3) -(src/HTFWriter.c 32346 870708759 d/2_HTFWriter. 1.1.3.1.3.1.1.1.1.1.3.1.1.2) +(src/HTFWriter.c 35154 872229662 d/2_HTFWriter. 1.1.3.1.3.1.1.1.1.1.3.1.1.5) (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/HTRules.h 4105 856833014 g/14_HTRules.h 1.1) -(lynx.cfg 77266 870708759 e/32_lynx.cfg 1.2.1.2.1.1.2.1.1.2.1.4) -(src/HTInit.c 30678 864519259 e/3_HTInit.c 1.2.1.2) +(lynx.cfg 77298 871141740 e/32_lynx.cfg 1.2.1.2.1.1.2.1.1.2.1.3.1.3) +(src/HTInit.c 30874 872229662 e/3_HTInit.c 1.1.4.1.3.3) (WWW/Library/snake/Makefile 649 856833014 f/13_Makefile 1.1) (src/LYStyle.h 676 864519259 b/5_LYStyle.h 1.2) (WWW/Library/Implementation/UCDefs.h 2648 868451907 e/0_UCDefs.h 1.1) (test/tabtest.html 1412 856833014 c/11_tabtest.ht 1.1) (SOCKETSHR.announce 1704 856833014 h/32_SOCKETSHR. 1.1) (WWW/Library/Implementation/HTParse.h 4930 856833014 g/36_HTParse.h 1.1) -(src/chrtrans/build-chrtrans.com 3501 869538594 b/22_build-chrt 1.2) +(src/chrtrans/build-chrtrans.com 3573 871141740 b/22_build-chrt 1.2.1.1) (WWW/Library/Implementation/HTInit.c 9452 856833014 g/51_HTInit.c 1.1) (WWW/Library/Implementation/HTAAServ.c 18320 856833014 g/46_HTAAServ.c 1.1) (lynx_help/keystroke_commands/print_help.html 1235 856833014 e/21_print_help 1.1) (src/LYStructs.h 3277 868401363 d/26_LYStructs. 1.1.3.4) (utils/lpansi/lpansi.1 3039 856833014 b/47_lpansi.1 1.1) -(WWW/Library/Implementation/HTMIME.c 63691 870708759 g/50_HTMIME.c 1.1.2.2.1.1.1.3) +(WWW/Library/Implementation/HTMIME.c 63827 871141740 g/50_HTMIME.c 1.1.2.2.1.1.1.1.1.2) (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 2411 869808657 18_makefile.i 1.4) +(src/chrtrans/makefile.in 2562 872001662 18_makefile.i 1.6) (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 39643 870983973 d/51_LYCurses.c 1.1.5.1.1.8.1.4.1.5) +(src/LYCurses.c 39770 871707027 d/51_LYCurses.c 1.1.5.1.1.1.1.1.1.6) (WWW/Library/Implementation/HTInit.h 613 856833014 g/12_HTInit.h 1.1) (WWW/Library/Implementation/HTAAServ.h 4950 856833014 g/1_HTAAServ.h 1.1) (WWW/Library/mips/Makefile 663 856833014 f/3_Makefile 1.1) (test/iso8859-1.html 12169 856833014 c/12_iso8859-1. 1.1) -(WWW/Library/Implementation/HTTP.c 50832 870708759 h/16_HTTP.c 1.1.1.1.1.1.1.1.1.2.1.2) +(WWW/Library/Implementation/HTTP.c 53564 872229662 h/16_HTTP.c 1.1.1.1.1.1.1.1.1.2.1.1.1.5) (WWW/Library/Implementation/UCMap.h 932 870983973 i/22_UCMap.h 1.4) (about_lynx/COPYING 17982 856833014 e/41_COPYING 1.1) (styles/lynx.lss 1490 862005876 37_lynx.lss 1.1) @@ -290,12 +291,12 @@ (WWW/Library/Implementation/HTVMS_WaisProt.h 13173 856833014 f/28_HTVMS_Wais 1.1) (WWW/Library/Implementation/HTAuth.h 1791 856833014 f/47_HTAuth.h 1.1) (src/chrtrans/utf8_uni.tbl 936 856856948 i/7_utf8_uni.t 1.1) -(WWW/Library/Implementation/HTTCP.c 29596 870708759 h/13_HTTCP.c 1.2.3.1.1.3) +(WWW/Library/Implementation/HTTCP.c 30059 871707027 h/13_HTTCP.c 1.2.3.1.1.1.1.1.1.2) (src/LYCurses.h 9972 870983973 d/22_LYCurses.h 1.1.4.1.1.1.1.7) (descrip.mms 3765 868451907 e/37_descrip.mm 1.2) (WWW/Library/Implementation/HTTP.h 672 869443761 g/34_HTTP.h 1.2) (test/TestComment.html 2032 856833014 c/13_TestCommen 1.1) -(src/makefile.dos 2183 870960374 1_makefile.d 1.6) +(src/makefile.dos 2364 871863841 1_makefile.d 1.7) (WWW/Library/Implementation/HTString.h 1153 856833014 g/16_HTString.h 1.1) (WWW/Library/Implementation/Version.make 10 856833014 f/42_Version.ma 1.1) (MAKEFILE.W32 17568 862109152 5_MAKEFILE.W 1.2) @@ -305,9 +306,9 @@ (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 4113 870050175 11_config.hin 1.10) +(config.hin 4085 872001662 11_config.hin 1.11) (FM.announce 3655 856833014 h/40_FM.announc 1.1) -(src/chrtrans/cp1251_uni.tbl 6123 869537041 b/0_cp1251_uni 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) (WWW/Library/Implementation/HTPlain.c 15473 868567209 h/11_HTPlain.c 1.1.2.2) (WWW/Library/svr4/Makefile 590 856833014 f/5_Makefile 1.1) @@ -315,12 +316,12 @@ (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 175163 870983973 13_configure 1.13) +(configure 180692 872001662 13_configure 1.14) (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) (src/ucxshr.opt 28 856833014 c/35_ucxshr.opt 1.1) -(WWW/Library/Implementation/HTAlert.h 3283 868157008 g/15_HTAlert.h 1.2) +(WWW/Library/Implementation/HTAlert.h 3353 871016304 g/15_HTAlert.h 1.3) (WWW/Library/Implementation/HText.h 6874 868157008 g/6_HText.h 1.3) (lynx_help/keystroke_commands/dired_help.html 1683 856833014 e/18_dired_help 1.1) (WWW/Library/Implementation/getpass.c 1649 856833014 f/35_getpass.c 1.1) @@ -329,19 +330,19 @@ (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 58274 870159729 d/46_LYLocal.c 1.2.3.1.3.3) +(src/LYLocal.c 58339 871777740 d/46_LYLocal.c 1.2.3.1.3.4) (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 5366 870983973 15_CHANGES.co 1.1.1.7) +(CHANGES.configure 6387 872001662 15_CHANGES.co 1.1.1.8) (INSTALLATION 18767 856833014 h/38_INSTALLATI 1.1) (WWW/Library/Implementation/HTVMS_WaisUI.c 60814 856833014 f/27_HTVMS_Wais 1.1) (utils/inews/nntp.h 2530 856833014 c/1_nntp.h 1.1) (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 74522 870708759 d/41_LYOptions. 1.1.2.1.1.1.1.1.1.3.1.2) -(WWW/Library/Implementation/HTNews.c 62341 869211854 h/25_HTNews.c 1.1.2.2) +(src/LYOptions.c 74594 871777740 d/41_LYOptions. 1.1.2.1.1.1.1.1.1.3.1.3) +(WWW/Library/Implementation/HTNews.c 70815 871707027 h/25_HTNews.c 1.1.2.1.1.3) (WWW/Library/Implementation/HTVMS_WaisUI.h 21281 856833014 f/26_HTVMS_Wais 1.1) -(src/LYNews.c 11804 869619703 d/42_LYNews.c 1.7) +(src/LYNews.c 11747 872229662 d/42_LYNews.c 1.2.4.1.1.1.2.2) (WWW/Library/rs6000/Makefile 610 856833014 f/15_Makefile 1.1) (utils/lpansi/README 3202 856833014 b/48_README 1.1) (WWW/Library/Implementation/BSDI_Makefile 13904 859167360 f/31_BSDI_Makef 1.2) @@ -352,12 +353,12 @@ (WWW/Library/Implementation/HTNews.h 1150 856833014 g/9_HTNews.h 1.1) (src/LYNews.h 240 869443761 c/42_LYNews.h 1.2) (CHANGES.chartrans 8128 869904256 c/0_CHANGES.chartrans 1.9.1.4.1.1.1.1.1.4) -(src/UCdomap.c 46232 870159729 b/14_UCdomap.c 1.4) +(src/UCdomap.c 46326 871141740 b/14_UCdomap.c 1.5) (WWW/Library/Implementation/HTACL.h 3535 856833014 f/48_HTACL.h 1.1) (IBMPC-charsets.announce 7674 856833014 h/39_IBMPC-char 1.1) (WWW/Library/Implementation/HTFinger.c 11475 856833014 f/24_HTFinger.c 1.1) (src/chrtrans/iso08_uni.tbl 1048 856856948 i/12_iso08_uni. 1.1) -(src/makefile.in 3060 870983973 17_makefile.i 1.8) +(src/makefile.in 3300 872001662 17_makefile.i 1.10) (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) @@ -374,7 +375,7 @@ (newfiles.configure 272 861154810 7_newfiles.c 1.4) (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 36879 869619703 d/49_LYForms.c 1.1.4.1.2.1.1.1.1.4) +(src/LYForms.c 36945 871777740 d/49_LYForms.c 1.1.4.1.2.1.1.1.1.5) (WWW/Library/Implementation/HTGopher.c 53261 860064663 g/48_HTGopher.c 1.3) (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) @@ -389,5 +390,5 @@ (src/LYMail.c 30772 870708759 d/45_LYMail.c 1.1.1.1.1.1.3.1.1.1.2.2) (WWW/Library/solaris2/Makefile 655 856833014 f/6_Makefile 1.1) (WWW/Library/Implementation/HTGopher.h 562 856833014 g/8_HTGopher.h 1.1) -(samples/lynx.cfg 77121 870708759 e/12_lynx.cfg 1.2.1.2.1.1.2.1.1.1.1.1.1.4) +(samples/lynx.cfg 77193 871141740 e/12_lynx.cfg 1.2.1.2.1.1.2.1.1.1.1.1.1.3.1.3) (WWW/Library/duns/Makefile 15116 856833014 f/17_Makefile 1.1) diff --git a/CHANGES.configure b/CHANGES.configure index 35b40704..4864682d 100644 --- a/CHANGES.configure +++ b/CHANGES.configure @@ -1,3 +1,23 @@ +1997-08-20 +---------- +* Modify top-level install rule to depend on 'all'. - TD +* Suppress check for ANSI compiler when we are using gcc. - TD +* Use -g3 option in place of -O -g for Ultrix compiler --debug configuration + (request by Hynek Med). - TD +* Drop "-lm" library from slang configuration, since it does not seem to + be used. - TD +* Add configure --includedir and --oldincludedir values to header search + path for ncurses and slang. - TD +* Modify configure checks for ncurses and slang libraries to generate + -L options as required, using new macros CF_FIND_LIBRARY and + CF_LIBRARY_PATH. - TD +* Add substitution for CPP in src/makefile.in so that .c.i rule works. - TD +* Add configure test for lint program. - TD +* Add "make depend" target to generated makefiles. This is intended only + for use in editing/developing, since many of the header dependencies in + chrtrans are generated during the build process and cannot be determined + by makedepend in advance. - TD +* Add configure option --with-zlib. - TD 1997-08-07 ---------- * Refine configure tests for acs_map, ttytype to accommodate broken linker diff --git a/CHANGES.new b/CHANGES.new index 6af37118..44253404 100644 --- a/CHANGES.new +++ b/CHANGES.new @@ -10,9 +10,47 @@ 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] +1997-08-21 +* Tweak to LYHistory.c to better remember last position on page. - KW +* Eliminated two more MIME types (application/html and text/x-sgml) from + the Accept header generated by default by setting the q-value to 2.0, + since there are more standard alternatives for these names. - KW +* Lower maximum length for generated Accept header lines from 1000 to 252, + to accomodate an incompetent Windows HTTP server. - KW +* Changed order of some functions in LYCharUtils.c (no other change there + yet). - KW +1997-08-20 +* Modify top-level install rule to depend on 'all'. - TD +* Suppress check for ANSI compiler when we are using gcc. - TD +* Use -g3 option in place of -O -g for Ultrix compiler --debug configuration + (request by Hynek Med). - TD +* Drop "-lm" library from slang configuration, since it does not seem to + be used. - TD +* Add configure --includedir and --oldincludedir values to header search + path for ncurses and slang. - TD +* Modify configure checks for ncurses and slang libraries to generate + -L options as required, using new macros CF_FIND_LIBRARY and + CF_LIBRARY_PATH. - TD +* Add substitution for CPP in src/makefile.in so that .c.i rule works. - TD +* Add configure test for lint program. - TD +* Add "make depend" target to generated makefiles. This is intended only + for use in editing/developing, since many of the header dependencies in + chrtrans are generated during the build process and cannot be determined + by makedepend in advance. - TD +* Add configure option --with-zlib. - TD +1997-08-19 +* Tweak of highlight() in LYUtils.c to ensure that split link names with a + soft hyphen are handled identically for slang, VMS curses and Unix curses + when such links are made current. - FM +1997-08-17 +* Use 0.01 rather than 0.001 as the q value for the global wildcard in + Accept headers. - FM +* Put up correct makefile for dos port (oops) - WB 1997-08-16 * Mini tweaks for the win-dos ports. One fix for the pull down boxes and the rest mostly maintence. - WB +* Fixed a bug in LYNews.c which caused overwritting of the first three + characters in the Subject for a followup. - FM 1997-08-15 * Hack in highlight() to preserve a '-' character at the end of line within anchor text, which can result from splitting at the position diff --git a/Lynx.prj b/Lynx.prj index fdb2349a..d7352824 100644 --- a/Lynx.prj +++ b/Lynx.prj @@ -1,14 +1,13 @@ ;; -*- Lisp -*- (Created-By-Prcs-Version 1 2 0) (Project-Description "PRCS Project for The Lynx browser") -(Project-Version Lynx 2.7.1ac-0 48) -(Parent-Version Lynx 2.7.1ac-0 47) +(Project-Version Lynx 2.7.1ac-0 55) +(Parent-Version Lynx 2.7.1ac-0 51) -(Version-Log "several minor fixes to configure script and makefiles -") +(Version-Log "various tweaks.") (New-Version-Log "") -(Checkin-Time "Thu, 07 Aug 1997 13:59:33 -0600") -(Checkin-Login dickey) +(Checkin-Time "Fri, 22 Aug 1997 00:01:02 -0600") +(Checkin-Login kweide) (Populate-Ignore ("\\.o$" "\\.a$" "~$" "^a.out$" "^core$" "\\.dvi$" "\\.aux$" "^\\..*_aux$" "\\.log" "\\.zip$" "^obsolete" "/obsolete" @@ -48,7 +47,7 @@ (test/README.txt (Lynx/c/15_README.txt 1.1 644)) (src/LYVMSdef.h (Lynx/c/16_LYVMSdef.h 1.1 644)) (src/LYCookie.h (Lynx/c/17_LYCookie.h 1.2 644)) - (src/LYCookie.c (Lynx/c/18_LYCookie.c 1.2.1.6.1.2 644)) + (src/LYCookie.c (Lynx/c/18_LYCookie.c 1.2.1.6.1.1.1.3 644)) (src/LYCharUtils.h (Lynx/c/19_LYCharUtil 1.1.2.3 644)) (src/LYMap.h (Lynx/c/20_LYMap.h 1.2 644)) (src/LYMap.c (Lynx/c/21_LYMap.c 1.1.2.1.1.2.1.2.1.2 644)) @@ -78,13 +77,13 @@ (src/LYCharSets.c (Lynx/c/45_LYCharSets 1.1.1.1.1.2 644)) (src/LYDownload.h (Lynx/c/46_LYDownload 1.1 644)) (src/LYDownload.c (Lynx/c/47_LYDownload 1.1.4.1.1.3 644)) - (src/HTML.h (Lynx/c/48_HTML.h 1.1.2.2.2.1.1.1.1.3 644)) + (src/HTML.h (Lynx/c/48_HTML.h 1.1.2.2.2.1.1.1.1.4 644)) (src/LYUpload.h (Lynx/c/49_LYUpload.h 1.1 644)) (src/HTSaveToFile.h (Lynx/c/50_HTSaveToFi 1.1 644)) - (src/DefaultStyle.c (Lynx/c/51_DefaultSty 1.1.1.1 644)) - (src/HTFont.h (Lynx/d/0_HTFont.h 1.1 644)) - (src/HTAlert.h (Lynx/d/1_HTAlert.h 1.3 644)) - (src/HTFWriter.c (Lynx/d/2_HTFWriter. 1.1.3.1.3.1.1.1.1.1.3.1.1.2 644)) + (src/DefaultStyle.c (Lynx/c/51_DefaultSty 1.1.2.2 644)) + (src/HTFont.h (Lynx/d/0_HTFont.h 1.2 644)) + (src/HTAlert.h (Lynx/d/1_HTAlert.h 1.2.1.2 644)) + (src/HTFWriter.c (Lynx/d/2_HTFWriter. 1.1.3.1.3.1.1.1.1.1.3.1.1.5 644)) (src/LYList.c (Lynx/d/3_LYList.c 1.1.3.2.1.1.1.2 644)) (src/LYexit.c (Lynx/d/4_LYexit.c 1.6 644)) (src/LYrcFile.h (Lynx/d/5_LYrcFile.h 1.1 644)) @@ -103,7 +102,7 @@ (src/LYGetFile.h (Lynx/d/18_LYGetFile. 1.1.2.2.1.2 644)) (src/LYMainLoop.h (Lynx/d/19_LYMainLoop 1.2 644)) (src/LYStrings.h (Lynx/d/20_LYStrings. 1.1.1.4 644)) - (src/LYHistory.c (Lynx/d/21_LYHistory. 1.1.2.1.4.1.1.1.1.3 644)) + (src/LYHistory.c (Lynx/d/21_LYHistory. 1.1.2.1.4.1.1.1.1.4 644)) (src/LYCurses.h (Lynx/d/22_LYCurses.h 1.1.4.1.1.1.1.7 644)) (src/LYSignal.h (Lynx/d/23_LYSignal.h 1.1 644)) (src/LYClean.h (Lynx/d/24_LYClean.h 1.1.2.1 644)) @@ -111,42 +110,42 @@ (src/LYStructs.h (Lynx/d/26_LYStructs. 1.1.3.4 644)) (src/LYSearch.h (Lynx/d/28_LYSearch.h 1.2 644)) - (src/Makefile (Lynx/d/29_Makefile 1.2.2.5 644)) + (src/Makefile (Lynx/d/29_Makefile 1.2.2.6 644)) (src/LYKeymap.h (Lynx/d/30_LYKeymap.h 1.1.2.5 644)) (src/LYKeymap.c (Lynx/d/31_LYKeymap.c 1.1.2.6.1.1 644)) (src/HTForms.h (Lynx/d/32_HTForms.h 1.2 644)) - (src/GridText.h (Lynx/d/33_GridText.h 1.1.1.1.1.3.1.1.1.1.1.2 644)) + (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.3 644)) (src/LYUpload.c (Lynx/d/35_LYUpload.c 1.1.4.1.3.1.1.1.1.3 644)) (src/LYStrings.c (Lynx/d/36_LYStrings. 1.1.3.3.2.7 644)) - (src/LYShowInfo.c (Lynx/d/37_LYShowInfo 1.1.2.1.2.8 644)) + (src/LYShowInfo.c (Lynx/d/37_LYShowInfo 1.1.2.1.5.1.1.1.2.2 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.5 644)) (src/LYPrint.c (Lynx/d/40_LYPrint.c 1.1.1.1.1.1.1.1.1.1.1.3 644)) - (src/LYOptions.c (Lynx/d/41_LYOptions. 1.1.2.1.1.1.1.1.1.3.1.2 644)) - (src/LYNews.c (Lynx/d/42_LYNews.c 1.7 644)) - (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.6 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.5 644)) + (src/LYOptions.c (Lynx/d/41_LYOptions. 1.1.2.1.1.1.1.1.1.3.1.3 644)) + (src/LYNews.c (Lynx/d/42_LYNews.c 1.2.4.1.1.1.2.2 644)) + (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.2 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.2 644)) (src/LYMail.c (Lynx/d/45_LYMail.c 1.1.1.1.1.1.3.1.1.1.2.2 644)) - (src/LYLocal.c (Lynx/d/46_LYLocal.c 1.2.3.1.3.3 644)) + (src/LYLocal.c (Lynx/d/46_LYLocal.c 1.2.3.1.3.4 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.2 644)) - (src/LYForms.c (Lynx/d/49_LYForms.c 1.1.4.1.2.1.1.1.1.4 644)) + (src/LYGetFile.c (Lynx/d/48_LYGetFile. 1.5.2.3.2.1.1.1.1.1.1.1.1.1.1.3 644)) + (src/LYForms.c (Lynx/d/49_LYForms.c 1.1.4.1.2.1.1.1.1.5 644)) (src/LYEdit.c (Lynx/d/50_LYEdit.c 1.1.2.1.1.2 644)) (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.6 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.3 644)) - (src/HTInit.c (Lynx/e/3_HTInit.c 1.2.1.2 644)) - (src/HTAlert.c (Lynx/e/4_HTAlert.c 1.1.2.3 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.3 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.2 644)) + (src/HTInit.c (Lynx/e/3_HTInit.c 1.1.4.1.3.3 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.3 644)) (src/descrip.mms (Lynx/e/6_descrip.mm 1.2 644)) (samples/jumpsVMS.html (Lynx/e/7_jumpsVMS.h 1.1 644)) (samples/jumpsUnix.html (Lynx/e/8_jumpsUnix. 1.1 644)) (samples/mime.types (Lynx/e/9_mime.types 1.1 644)) (samples/lynx.com (Lynx/e/10_lynx.com 1.1 644)) - (samples/mailcap (Lynx/e/11_mailcap 1.1 644)) - (samples/lynx.cfg (Lynx/e/12_lynx.cfg 1.2.1.2.1.1.2.1.1.1.1.1.1.4 644)) + (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.3 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/keystroke_commands/cookie_help.html (Lynx/e/15_cookie_hel 1.1 644)) @@ -166,7 +165,7 @@ (lynx_help/lynx_help_main.html (Lynx/e/29_lynx_help_ 1.4 644)) (lynx.man (Lynx/e/30_lynx.man 1.5.2.6.1.2 644)) (lynx.hlp (Lynx/e/31_lynx.hlp 1.10.1.2 644)) - (lynx.cfg (Lynx/e/32_lynx.cfg 1.2.1.2.1.1.2.1.1.2.1.4 644)) + (lynx.cfg (Lynx/e/32_lynx.cfg 1.2.1.2.1.1.2.1.1.2.1.3.1.3 644)) (fixed512.com (Lynx/e/33_fixed512.c 1.1 644)) (docs/RFC-MAILCAP.txt (Lynx/e/34_RFC-MAILCA 1.1 644)) (docs/README.txt (Lynx/e/35_README.txt 1.1 644)) @@ -245,19 +244,19 @@ (WWW/Library/Implementation/HTWAIS.h (Lynx/g/4_HTWAIS.h 1.1 644)) (WWW/Library/Implementation/HTTelnet.h (Lynx/g/5_HTTelnet.h 1.1 644)) (WWW/Library/Implementation/HText.h (Lynx/g/6_HText.h 1.3 644)) - (WWW/Library/Implementation/HTUtils.h (Lynx/g/7_HTUtils.h 1.7 644)) + (WWW/Library/Implementation/HTUtils.h (Lynx/g/7_HTUtils.h 1.8 644)) (WWW/Library/Implementation/HTGopher.h (Lynx/g/8_HTGopher.h 1.1 644)) (WWW/Library/Implementation/HTNews.h (Lynx/g/9_HTNews.h 1.1 644)) (WWW/Library/Implementation/HTHistory.h (Lynx/g/10_HTHistory. 1.1 644)) (WWW/Library/Implementation/HTMIME.h (Lynx/g/11_HTMIME.h 1.2 644)) (WWW/Library/Implementation/HTInit.h (Lynx/g/12_HTInit.h 1.1 644)) - (WWW/Library/Implementation/HTFormat.h (Lynx/g/13_HTFormat.h 1.2 644)) + (WWW/Library/Implementation/HTFormat.h (Lynx/g/13_HTFormat.h 1.3 644)) (WWW/Library/Implementation/HTRules.h (Lynx/g/14_HTRules.h 1.1 644)) - (WWW/Library/Implementation/HTAlert.h (Lynx/g/15_HTAlert.h 1.2 644)) + (WWW/Library/Implementation/HTAlert.h (Lynx/g/15_HTAlert.h 1.3 644)) (WWW/Library/Implementation/HTString.h (Lynx/g/16_HTString.h 1.1 644)) (WWW/Library/Implementation/HTList.h (Lynx/g/17_HTList.h 1.1 644)) - (WWW/Library/Implementation/HTStyle.h (Lynx/g/18_HTStyle.h 1.2 644)) - (WWW/Library/Implementation/HTAnchor.h (Lynx/g/19_HTAnchor.h 1.1.2.6 644)) + (WWW/Library/Implementation/HTStyle.h (Lynx/g/18_HTStyle.h 1.1.1.2 644)) + (WWW/Library/Implementation/HTAnchor.h (Lynx/g/19_HTAnchor.h 1.1.4.3 644)) (WWW/Library/Implementation/HTAtom.h (Lynx/g/20_HTAtom.h 1.1 644)) (WWW/Library/Implementation/HTStream.h (Lynx/g/21_HTStream.h 1.1 644)) (WWW/Library/Implementation/HTMLGen.h (Lynx/g/22_HTMLGen.h 1.1 644)) @@ -266,7 +265,7 @@ (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.5 644)) - (WWW/Library/Implementation/HTML.h (Lynx/g/28_HTML.h 1.1.2.2.1.1.1.1.1.1.1.2 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/HTTCP.h (Lynx/g/30_HTTCP.h 1.3 644)) (WWW/Library/Implementation/HTFTP.h (Lynx/g/31_HTFTP.h 1.1 644)) @@ -288,25 +287,25 @@ (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/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.3 644)) + (WWW/Library/Implementation/HTMIME.c (Lynx/g/50_HTMIME.c 1.1.2.2.1.1.1.1.1.2 644)) (WWW/Library/Implementation/HTInit.c (Lynx/g/51_HTInit.c 1.1 644)) - (WWW/Library/Implementation/HTFormat.c (Lynx/h/0_HTFormat.c 1.1.1.2 644)) + (WWW/Library/Implementation/HTFormat.c (Lynx/h/0_HTFormat.c 1.1.1.3 644)) (WWW/Library/Implementation/HTRules.c (Lynx/h/1_HTRules.c 1.1 644)) (WWW/Library/Implementation/HTAlert.c (Lynx/h/2_HTAlert.c 1.2 644)) (WWW/Library/Implementation/HTString.c (Lynx/h/3_HTString.c 1.1 644)) (WWW/Library/Implementation/HTList.c (Lynx/h/4_HTList.c 1.1 644)) (WWW/Library/Implementation/HTStyle.c (Lynx/h/5_HTStyle.c 1.3 644)) - (WWW/Library/Implementation/HTAnchor.c (Lynx/h/6_HTAnchor.c 1.1.4.4 644)) + (WWW/Library/Implementation/HTAnchor.c (Lynx/h/6_HTAnchor.c 1.1.4.2.1.2 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.2 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.2 644)) (WWW/Library/Implementation/SGML.c (Lynx/h/12_SGML.c 1.1.1.1.1.1.2.4.1.4 644)) - (WWW/Library/Implementation/HTTCP.c (Lynx/h/13_HTTCP.c 1.2.3.1.1.3 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)) - (WWW/Library/Implementation/HTTP.c (Lynx/h/16_HTTP.c 1.1.1.1.1.1.1.1.1.2.1.2 644)) + (WWW/Library/Implementation/HTTP.c (Lynx/h/16_HTTP.c 1.1.1.1.1.1.1.1.1.2.1.1.1.5 644)) (WWW/Library/Implementation/HTAccess.c (Lynx/h/17_HTAccess.c 1.5.2.2 644)) (WWW/Library/Implementation/HTParse.c (Lynx/h/18_HTParse.c 1.3 644)) (WWW/Library/Implementation/tcp.h (Lynx/h/19_tcp.h 1.8 644)) @@ -315,9 +314,9 @@ (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.2 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.7 644)) - (WWW/Library/Implementation/HTFile.c (Lynx/h/27_HTFile.c 1.1.3.1.1.3 644)) + (WWW/Library/Implementation/HTFile.c (Lynx/h/27_HTFile.c 1.1.3.1.1.6 644)) (WWW/Library/Implementation/HTAuth.c (Lynx/h/28_HTAuth.c 1.1 644)) (VMSWAIS.announce (Lynx/h/29_VMSWAIS.an 1.1 644)) (VMSPrint.com (Lynx/h/30_VMSPrint.c 1.1 644)) @@ -326,8 +325,8 @@ (RELEASE_STATEMENT (Lynx/h/33_RELEASE_ST 1.2 644)) (README (Lynx/h/34_README 1.1 644)) (PROBLEMS (Lynx/h/35_PROBLEMS 1.3 644)) - (Makefile.old (Lynx/h/36_Makefile 1.1.1.1.1.1.1.2.3.1.3.2 644)) - (LYMessages_en.h (Lynx/h/37_LYMessages 1.4.1.4.1.2.1.1.1.1.1.1.3.1.1.2 644)) + (Makefile.old (Lynx/h/36_Makefile 1.1.1.1.1.1.1.2.3.1.3.3 644)) + (LYMessages_en.h (Lynx/h/37_LYMessages 1.4.1.4.1.2.1.1.1.1.1.1.3.1.1.1.1.3 644)) (INSTALLATION (Lynx/h/38_INSTALLATI 1.1 644)) (IBMPC-charsets.announce (Lynx/h/39_IBMPC-char 1.1 644)) (FM.announce (Lynx/h/40_FM.announc 1.1 644)) @@ -348,7 +347,7 @@ (CHANGES.chartrans (Lynx/c/0_CHANGES.chartrans 1.9.1.4.1.1.1.1.1.4 644)) (README.chartrans (Lynx/d/0_README.chartrans 1.6 644)) (src/UCdomap.h (Lynx/b/0_UCdomap.h 1.2 644)) - (src/UCAux.c (Lynx/b/15_UCAux.c 1.3 644)) + (src/UCAux.c (Lynx/b/15_UCAux.c 1.3.1.1 644)) (src/UCAuto.h (Lynx/b/16_UCAuto.h 1.1 644)) (src/UCAuto.c (Lynx/b/17_UCAuto.c 1.1 644)) (src/chrtrans/cp1250_uni.tbl (Lynx/h/48_cp1250_uni 1.1 644)) @@ -358,7 +357,7 @@ (src/chrtrans/rfc_suni.tbl (Lynx/i/0_rfc_suni.tbl 1.2 644)) (src/chrtrans/makeuctb.c (Lynx/b/19_makeuctb.c 1.2 644)) (src/chrtrans/UCkd.h (Lynx/b/20_UCkd.h 1.1 644)) - (src/chrtrans/Makefile (Lynx/i/3_Makefile 1.8 644)) + (src/chrtrans/Makefile (Lynx/i/3_Makefile 1.9 644)) (src/chrtrans/README.tables (Lynx/b/23_README.tab 1.1 644)) (src/chrtrans/README.format (Lynx/i/5_README.for 1.2 644)) (src/chrtrans/cp852_uni.tbl (Lynx/i/6_cp852_uni. 1.2 644)) @@ -375,35 +374,35 @@ (src/chrtrans/iso02_uni.tbl (Lynx/i/17_iso02_uni. 1.3 644)) (src/chrtrans/iso01_uni.tbl (Lynx/i/18_iso01_uni. 1.2 644)) (src/chrtrans/cp850_uni.tbl (Lynx/i/19_cp850_uni. 1.2 644)) - (src/UCdomap.c (Lynx/b/14_UCdomap.c 1.4 644)) + (src/UCdomap.c (Lynx/b/14_UCdomap.c 1.5 644)) (WWW/Library/Implementation/UCDefs.h (Lynx/e/0_UCDefs.h 1.1 644)) (WWW/Library/Implementation/UCMap.h (Lynx/i/22_UCMap.h 1.4 644)) (WWW/Library/Implementation/UCAux.h (Lynx/f/0_UCAux.h 1.1 644)) - (WWW/Library/djgpp/makefile (Lynx/0_makefile 1.5 644)) - (src/makefile.dos (Lynx/1_makefile.d 1.6 644)) + (WWW/Library/djgpp/makefile (Lynx/0_makefile 1.6 644)) + (src/makefile.dos (Lynx/1_makefile.d 1.7 644)) (README.win-386 (Lynx/2_386-WIN.TX 1.2 644)) ;; Files added by populate at Mon, 03 Mar 1997 04:38:33 -0600: - (src/chrtrans/MAKEW32.BAT (Lynx/3_MAKEW32.BA 1.3 644)) + (src/chrtrans/MAKEW32.BAT (Lynx/3_MAKEW32.BA 1.4 644)) (src/chrtrans/MAKEFILE.W32 (Lynx/4_MAKEFILE.W 1.1 644)) (MAKEFILE.W32 (Lynx/5_MAKEFILE.W 1.2 644)) ;; 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.10 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.17 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.10 644)) + (makefile.in (Lynx/8_makefile.i 1.1.1.12 644)) (install.sh (Lynx/9_install.sh 1.1 755)) - (configure.in (Lynx/10_configure. 1.11 644)) - (config.hin (Lynx/11_config.hin 1.10 644)) - (aclocal.m4 (Lynx/12_aclocal.m4 1.13 644)) - (configure (Lynx/13_configure 1.13 755)) + (configure.in (Lynx/10_configure. 1.12 644)) + (config.hin (Lynx/11_config.hin 1.11 644)) + (aclocal.m4 (Lynx/12_aclocal.m4 1.14 644)) + (configure (Lynx/13_configure 1.14 755)) (README.configure (Lynx/14_README.con 1.6 644)) - (CHANGES.configure (Lynx/15_CHANGES.co 1.1.1.7 644)) + (CHANGES.configure (Lynx/15_CHANGES.co 1.1.1.8 644)) ;; Files added by populate at Wed, 09 Apr 1997 06:18:01 -0600: @@ -412,11 +411,11 @@ (WWW/Library/Implementation/HTDOS.c (Lynx/28_HTDOS.C 1.1 644)) - (WWW/Library/unix/makefile.in (Lynx/16_makefile.i 1.4 644)) - (src/makefile.in (Lynx/17_makefile.i 1.8 644)) - (src/chrtrans/makefile.in (Lynx/18_makefile.i 1.4 644)) + (WWW/Library/unix/makefile.in (Lynx/16_makefile.i 1.5 644)) + (src/makefile.in (Lynx/17_makefile.i 1.10 644)) + (src/chrtrans/makefile.in (Lynx/18_makefile.i 1.6 644)) - (src/chrtrans/koi8r_uni.tbl (Lynx/24_koi8r_uni. 1.1 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.2 644)) ;; Files added by populate at Thu, 24 Apr 1997 21:51:47 -0600: @@ -437,21 +436,40 @@ (src/LYStyle.h (Lynx/b/5_LYStyle.h 1.2 644)) ;; Files added by populate at Tue, 08 Jul 1997 20:40:02 -0600: - (src/LYCurses.c (Lynx/d/51_LYCurses.c 1.1.5.1.1.8.1.4.1.5 644)) - (src/LYCharUtils.c (Lynx/c/22_LYCharUtil 1.2.1.1.2.1.2.2.1.2.1.1.1.2.1.1.1.1.1.3 644)) + (src/LYCurses.c (Lynx/d/51_LYCurses.c 1.1.5.1.1.1.1.1.1.6 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.4 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.4 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.3 644)) - (src/chrtrans/build-chrtrans.com (Lynx/b/22_build-chrt 1.2 644)) + (src/chrtrans/build-chrtrans.com (Lynx/b/22_build-chrt 1.2.1.1 644)) (src/chrtrans/build-header.com (Lynx/c/0_build-head 1.1 644)) - (src/chrtrans/cp1251_uni.tbl (Lynx/b/0_cp1251_uni 1.1 644)) + (src/chrtrans/cp1251_uni.tbl (Lynx/b/0_cp1251_uni 1.2 644)) ;; Files added by populate at Thu, 07 Aug 1997 07:25:30 -0600: (about_lynx/lynx-dev.html (Lynx/b/0_lynx-dev.h 1.1 644)) + +;; Files added by populate at Sat, 09 Aug 1997 09:42:43 -0600: + + (src/chrtrans/cp866_uni.tbl (Lynx/c/0_cp866_uni. 1.1 644)) +) +(Merge-Parents + (2.7.1ac-0.54 complete + (src/LYCookie.c src/LYCookie.c src/LYCookie.c r) (src/HTFWriter.c src/HTFWriter.c src/HTFWriter.c r) + (src/LYOptions.c src/LYOptions.c src/LYOptions.c r) (src/LYLocal.c src/LYLocal.c src/LYLocal.c r) + (src/LYForms.c src/LYForms.c src/LYForms.c r) (WWW/Library/Implementation/HTFile.c WWW/Library/Implementation/HTFile.c WWW/Library/Implementation/HTFile.c r) + (WWW/Library/djgpp/makefile WWW/Library/djgpp/makefile WWW/Library/djgpp/makefile r) (src/makefile.dos src/makefile.dos src/makefile.dos r) + (src/chrtrans/MAKEW32.BAT src/chrtrans/MAKEW32.BAT src/chrtrans/MAKEW32.BAT r) (CHANGES.new CHANGES.new CHANGES.new m) + (makefile.in makefile.in makefile.in r) (configure.in configure.in configure.in r) + (config.hin config.hin config.hin r) (aclocal.m4 aclocal.m4 aclocal.m4 r) + (configure configure configure r) (CHANGES.configure CHANGES.configure CHANGES.configure r) + (WWW/Library/unix/makefile.in WWW/Library/unix/makefile.in WWW/Library/unix/makefile.in r) (src/makefile.in src/makefile.in src/makefile.in r) + (src/chrtrans/makefile.in src/chrtrans/makefile.in src/chrtrans/makefile.in r) (src/LYCharUtils.c src/LYCharUtils.c src/LYCharUtils.c r)) + (2.7.1fm-0.45 incomplete + (src/LYNews.c src/LYNews.c src/LYNews.c m) + ) ) -(Merge-Parents) (New-Merge-Parents) diff --git a/WWW/Library/Implementation/HTFile.c b/WWW/Library/Implementation/HTFile.c index 53f082ab..4d21093a 100644 --- a/WWW/Library/Implementation/HTFile.c +++ b/WWW/Library/Implementation/HTFile.c @@ -46,6 +46,10 @@ #endif /* LONG_LIST */ #endif /* !VMS */ +#ifdef USE_ZLIB +#include <GridText.h> +#endif + #define INFINITY 512 /* file name length @@ FIXME */ #define MULTI_SUFFIX ".multi" /* Extension for scanning formats */ @@ -1423,7 +1427,7 @@ PUBLIC int HTLoadFile ARGS4( extern char *list_format; #endif /* VMS */ #ifdef USE_ZLIB - gzFile gzfp; + gzFile gzfp = 0; BOOL use_gzread = NO; #endif /* USE_ZLIB */ @@ -1645,7 +1649,7 @@ PUBLIC int HTLoadFile ARGS4( "Could not open file for decompression!"); } } else -#endif /* USE_GZREAD */ +#endif /* USE_ZLIB */ { status = HTParseFile(format, format_out, anchor, fp, sink); fclose(fp); @@ -1787,9 +1791,7 @@ forget_multi: base[-1] = '/'; /* Restore directory name */ base[0] = '\0'; StrAllocCat(localname, best_name); - FREE(best_name); - /* goto open_file; */ /* Nope - might be a directory - kw */ - + FREE(best_name); } else { /* If not found suitable file */ FREE(localname); FREE(nodename); @@ -2147,7 +2149,6 @@ forget_multi: /* End of directory reading section */ #endif /* HAVE_READDIR */ -open_file: { FILE * fp = fopen(localname, "r"); @@ -2242,7 +2243,7 @@ open_file: "Could not open file for decompression!"); } } else -#endif /* USE_GZREAD */ +#endif /* USE_ZLIB */ { status = HTParseFile(format, format_out, anchor, fp, sink); fclose(fp); diff --git a/WWW/Library/Implementation/HTTP.c b/WWW/Library/Implementation/HTTP.c index f56f2daa..d5aef1e8 100644 --- a/WWW/Library/Implementation/HTTP.c +++ b/WWW/Library/Implementation/HTTP.c @@ -281,7 +281,7 @@ try_again: HTAtom_name(pres->rep), temp); len += strlen(line); - if (len > 1000 && !first_Accept) { + if (len > 252 && !first_Accept) { StrAllocCat(command, crlf); sprintf(line, "Accept: %s%s", HTAtom_name(pres->rep), @@ -293,7 +293,7 @@ try_again: } } } - sprintf(line, "%s*/*;q=0.001%c%c", + sprintf(line, "%s*/*;q=0.01%c%c", (first_Accept ? "Accept: " : ", "), CR, LF); StrAllocCat(command, line); diff --git a/WWW/Library/unix/makefile.in b/WWW/Library/unix/makefile.in index 1875b7a3..7f221b33 100644 --- a/WWW/Library/unix/makefile.in +++ b/WWW/Library/unix/makefile.in @@ -52,3 +52,7 @@ all : $(LOB)/libwww.a @SHOW_CC@ @ECHO_CC@$(CPP) -C $(CPPOPTS) $*.c >$@ +depend : + makedepend -fmakefile -- $(CFLAGS) -- $(CFILES) + +# DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/aclocal.m4 b/aclocal.m4 index 19eb64b6..f3a57e70 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -272,6 +272,44 @@ AC_MSG_RESULT($cf_cv_fancy_curses) test $cf_cv_fancy_curses = yes && AC_DEFINE(FANCY_CURSES) ]) dnl --------------------------------------------------------------------------- +dnl Look for a non-standard library, given parameters for AC_TRY_LINK. We +dnl prefer a standard location, and use -L options only if we do not find the +dnl library in the standard library location(s). +dnl $1 = library name +dnl $2 = includes +dnl $3 = code fragment to compile/link +dnl $4 = corresponding function-name +AC_DEFUN([CF_FIND_LIBRARY], +[ + cf_cv_have_lib_$1=no + AC_CHECK_FUNC($4,cf_cv_have_lib_$1=no,[ + cf_save_LIBS="$LIBS" + AC_MSG_CHECKING(for $4 in -l$1) + LIBS="-l$1 $LIBS" + AC_TRY_LINK([$2],[$3], + [AC_MSG_RESULT(yes) + cf_cv_have_lib_$1=yes + ], + [AC_MSG_RESULT(no) + CF_LIBRARY_PATH(cf_search,$1) + for cf_libdir in $cf_search + do + AC_MSG_CHECKING(for -l$1 in $cf_libdir) + LIBS="-L$cf_libdir -l$1 $cf_save_LIBS" + AC_TRY_LINK([$2],[$3], + [AC_MSG_RESULT(yes) + cf_cv_have_lib_$1=yes + break], + [AC_MSG_RESULT(no) + LIBS="$cf_save_LIBS"]) + done + ]) + ]) +if test $cf_cv_have_lib_$1 = no ; then + AC_ERROR(Cannot link $1 library) +fi +])dnl +dnl --------------------------------------------------------------------------- dnl Check if the compiler supports useful warning options. There's a few that dnl we don't use, simply because they're too noisy: dnl @@ -322,9 +360,34 @@ dnl --------------------------------------------------------------------------- dnl Construct a search-list for a nonstandard header-file AC_DEFUN([CF_HEADER_PATH], [$1="" -test "$prefix" != NONE && $1="$prefix/include $prefix/include/$2" -test "$prefix" != /usr/local && $1="[$]$1 /usr/local/include /usr/local/include/$2" -test "$prefix" != /usr && $1="[$]$1 /usr/include /usr/include/$2" +if test -d "$includedir" ; then +test "$includedir" != NONE && $1="[$]$1 $includedir $includedir/$2" +fi +if test -d "$oldincludedir" ; then +test "$oldincludedir" != NONE && $1="[$]$1 $oldincludedir $oldincludedir/$2" +fi +if test -d "$prefix"; then +test "$prefix" != NONE && $1="[$]$1 $prefix/include $prefix/include/$2" +fi +test "$prefix" != /usr/local && $1="[$]$1 /usr/local/include /usr/local/include/$2" +test "$prefix" != /usr && $1="[$]$1 /usr/include /usr/include/$2" +])dnl +dnl --------------------------------------------------------------------------- +dnl Construct a search-list for a nonstandard library-file +AC_DEFUN([CF_LIBRARY_PATH], +[$1="" +if test -d "$libdir" ; then +test "$libdir" != NONE && $1="[$]$1 $libdir $libdir/$2" +fi +if test -d "$exec_prefix"; then +test "$exec_prefix" != NONE && $1="[$]$1 $exec_prefix/lib $exec_prefix/lib/$2" +fi +if test -d "$prefix"; then +test "$prefix" != NONE && \ +test "$prefix" != "$exec_prefix" && $1="[$]$1 $prefix/lib $prefix/lib/$2" +fi +test "$prefix" != /usr/local && $1="[$]$1 /usr/local/lib /usr/local/lib/$2" +test "$prefix" != /usr && $1="[$]$1 /usr/lib /usr/lib/$2" ])dnl dnl --------------------------------------------------------------------------- dnl Check if we've got setlocale() and its header, <locale.h> @@ -475,39 +538,45 @@ dnl --------------------------------------------------------------------------- dnl Look for the ncurses library. This is a little complicated on Linux, dnl because it may be linked with the gpm (general purpose mouse) library. dnl Some distributions have gpm linked with (bsd) curses, which makes it -dnl unusable with ncurses. +dnl unusable with ncurses. However, we don't want to link with gpm unless +dnl ncurses has a dependency, since gpm is normally set up as a shared library, +dnl and the linker will record a dependency. AC_DEFUN([CF_NCURSES_LIBS], -[AC_CHECK_FUNC(initscr,,[ -AC_REQUIRE([CF_NCURSES_CPPFLAGS]) -cf_save_LIBS="$LIBS" -AC_CHECK_LIB(gpm,Gpm_Open,[ - AC_CHECK_LIB(gpm,initscr,[ - # don't try to link with gpm, since it contains curses - AC_CHECK_LIB(ncurses,initscr) - ],[ - AC_MSG_CHECKING(if ncurses needs -lgpm to link) - LIBS="-lncurses $cf_save_LIBS" - AC_TRY_LINK([#include <$cf_cv_ncurses_header>], - [initscr()], - [cf_need_gpm=no], - [LIBS="-lncurses -lgpm $cf_save_LIBS" - AC_TRY_LINK([#include <$cf_cv_ncurses_header>], - [initscr()], - [cf_need_gpm=yes], - [AC_ERROR(cannot link -lncurses)])]) - AC_MSG_RESULT($cf_need_gpm) - ])], - [AC_TRY_LINK([#include <$cf_cv_ncurses_header>], - [initscr()],,[ - case $host_os in #(vi - freebsd*) - AC_CHECK_LIB(mytinfo,tgoto,[LIBS="-lmytinfo $LIBS"]) - ;; - esac - LIBS="-lncurses $LIBS" - AC_TRY_LINK([#include <$cf_cv_ncurses_header>], - [initscr()],,[AC_ERROR(cannot link -lncurses)])])]) -])]) +[AC_REQUIRE([CF_NCURSES_CPPFLAGS]) + +cf_ncurses_LIBS="" +AC_CHECK_LIB(gpm,Gpm_Open,[AC_CHECK_LIB(gpm,initscr,,[cf_ncurses_LIBS="-lgpm"])]) + +case $host_os in #(vi +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). + AC_CHECK_LIB(mytinfo,tgoto,[cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"]) + ;; +esac + +LIBS="$cf_ncurses_LIBS $LIBS" +CF_FIND_LIBRARY(ncurses, + [#include <$cf_cv_ncurses_header>], + [initscr()], + initscr) + +if test -n "$cf_ncurses_LIBS" ; then + AC_MSG_CHECKING(if we can link ncurses without $cf_ncurses_LIBS) + cf_ncurses_SAVE="$LIBS" + for p in $cf_ncurses_LIBS ; do + q=`echo $LIBS | sed -e 's/'$p' //' -e 's/'$p'$//'` + if test "$q" != "$LIBS" ; then + LIBS="$q" + fi + done + AC_TRY_LINK([#include <$cf_cv_ncurses_header>], + [initscr()], + [AC_MSG_RESULT(yes)], + [AC_MSG_RESULT(no) + LIBS="$cf_ncurses_SAVE"]) +fi +])dnl dnl --------------------------------------------------------------------------- dnl Check for the version of ncurses, to aid in reporting bugs, etc. AC_DEFUN([CF_NCURSES_VERSION], @@ -785,22 +854,27 @@ predefined) # (vi esac ])dnl dnl --------------------------------------------------------------------------- -dnl Look for the slang library (it needs the math-library because it uses -dnl trig functions). +dnl Look for the slang library. AC_DEFUN([CF_SLANG_LIBS], [ - AC_CHECK_FUNC(SLtt_get_screen_size,,[ - AC_CHECK_LIB(slang,SLtt_get_screen_size, - [LIBS="-lslang $LIBS"], - [AC_CHECK_LIB(slang,SLtt_get_screen_size, - [LIBS="-lslang -lm $LIBS"], - AC_ERROR(cannot link -lslang),"-lm")],"-lm")]) +dnl AC_CHECK_FUNC(acos,,[AC_CHECK_LIB(m,acos,[LIBS="-lm $LIBS"])]) +CF_FIND_LIBRARY(slang, + [#include <slang.h>], + [SLtt_get_screen_size()], + SLtt_get_screen_size) ])dnl dnl --------------------------------------------------------------------------- dnl Remove "-g" option from the compiler options AC_DEFUN([CF_STRIP_G_OPT], [$1=`echo ${$1} | sed -e 's/-g //' -e 's/-g$//'`])dnl dnl --------------------------------------------------------------------------- +dnl Remove "-O" option from the compiler options +AC_DEFUN([CF_STRIP_O_OPT],[ +changequote(,)dnl +$1=`echo ${$1} | sed -e 's/-O[1-9]\? //' -e 's/-O[1-9]\?$//'` +changequote([,])dnl +])dnl +dnl --------------------------------------------------------------------------- dnl Check for declaration of sys_errlist in one of stdio.h and errno.h. dnl Declaration of sys_errlist on BSD4.4 interferes with our declaration. dnl Reported by Keith Bostic. diff --git a/config.hin b/config.hin index 5e9c7f94..12bbd324 100644 --- a/config.hin +++ b/config.hin @@ -71,7 +71,8 @@ #undef UNCOMPRESS_PATH /* CF_PATH_PROG(gunzip) */ #undef UNIX #undef UNZIP_PATH /* CF_PATH_PROG(unzip) */ -#undef USE_SLANG +#undef USE_SLANG /* AC_ARG_WITH(screen=slang) */ +#undef USE_ZLIB /* AC_ARG_WITH(zlib) */ #undef UTMPX_FOR_UTMP /* use <utmpx.h> since <utmp.h> not found */ #undef UUDECODE_PATH /* CF_PATH_PROG(uudecode) */ #undef ZCAT_PATH /* CF_PATH_PROG(zcat) */ @@ -98,7 +99,3 @@ /* FIXME:SOCKS */ /* FIXME:SVR4_BSDSELECT */ /* FIXME:SYSLOG_REQUESTED_URLS */ -/* FIXME:_BSD=44 */ -/* FIXME:_BUILTINS */ -/* FIXME:_locp=__lc_locale */ -/* FIXME:loc_t=_LC_locale_t */ diff --git a/configure b/configure index 8a9f3bb9..7ef16ef0 100755 --- a/configure +++ b/configure @@ -22,6 +22,8 @@ ac_help="$ac_help ac_help="$ac_help --with-color-style enable optional/experimental color style" ac_help="$ac_help + --with-zlib use zlib for compression/decompression" +ac_help="$ac_help --with-dired enable optional directory-editor, DirEd (default)" ac_help="$ac_help --disable-dired-archive DirEd: disable dearchiving commands (default: on)" @@ -588,7 +590,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:592: checking host system type" >&5 +echo "configure:594: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -613,7 +615,7 @@ echo "$ac_t""$host" 1>&6 # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:617: checking for $ac_word" >&5 +echo "configure:619: 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 @@ -642,7 +644,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:646: checking for $ac_word" >&5 +echo "configure:648: 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 @@ -690,7 +692,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:694: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:696: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -700,11 +702,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 704 "configure" +#line 706 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -724,12 +726,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:728: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:730: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:733: checking whether we are using GNU C" >&5 +echo "configure:735: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -738,7 +740,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:742: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:744: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -753,7 +755,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:757: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:759: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -781,7 +783,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:785: checking how to run the C preprocessor" >&5 +echo "configure:787: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -796,13 +798,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 800 "configure" +#line 802 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:806: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:808: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -813,13 +815,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 817 "configure" +#line 819 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:823: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -844,7 +846,7 @@ echo "$ac_t""$CPP" 1>&6 # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:848: checking for $ac_word" >&5 +echo "configure:850: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -871,7 +873,7 @@ else fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:875: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:877: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -899,7 +901,7 @@ fi echo $ac_n "checking for style of include in makefiles""... $ac_c" 1>&6 -echo "configure:903: checking for style of include in makefiles" >&5 +echo "configure:905: checking for style of include in makefiles" >&5 make_include_left="" make_include_right="" make_include_quote="unknown" @@ -949,7 +951,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:953: checking for a BSD compatible install" >&5 +echo "configure:955: 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 @@ -998,9 +1000,42 @@ test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' +for ac_prog in lint alint lclint tdlint +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:1009: 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 + if test -n "$LINT"; then + ac_cv_prog_LINT="$LINT" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_LINT="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +LINT="$ac_cv_prog_LINT" +if test -n "$LINT"; then + echo "$ac_t""$LINT" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$LINT" && break +done + echo $ac_n "checking if you want full utility pathnames""... $ac_c" 1>&6 -echo "configure:1004: checking if you want full utility pathnames" >&5 +echo "configure:1039: 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" @@ -1020,7 +1055,7 @@ echo "$ac_t""$with_full_paths" 1>&6 echo $ac_n "checking for system mailer""... $ac_c" 1>&6 -echo "configure:1024: checking for system mailer" >&5 +echo "configure:1059: 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 @@ -1047,7 +1082,7 @@ EOF echo $ac_n "checking system mail flags""... $ac_c" 1>&6 -echo "configure:1051: checking system mail flags" >&5 +echo "configure:1086: 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 @@ -1075,7 +1110,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:1079: checking for $ac_word" >&5 +echo "configure:1114: 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 @@ -1106,7 +1141,7 @@ fi else echo $ac_n "checking for chmod""... $ac_c" 1>&6 -echo "configure:1110: checking for chmod" >&5 +echo "configure:1145: checking for chmod" >&5 echo "$ac_t""$CHMOD" 1>&6 fi @@ -1140,7 +1175,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:1144: checking for $ac_word" >&5 +echo "configure:1179: 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 @@ -1171,7 +1206,7 @@ fi else echo $ac_n "checking for compress""... $ac_c" 1>&6 -echo "configure:1175: checking for compress" >&5 +echo "configure:1210: checking for compress" >&5 echo "$ac_t""$COMPRESS" 1>&6 fi @@ -1205,7 +1240,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:1209: checking for $ac_word" >&5 +echo "configure:1244: 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 @@ -1236,7 +1271,7 @@ fi else echo $ac_n "checking for cp""... $ac_c" 1>&6 -echo "configure:1240: checking for cp" >&5 +echo "configure:1275: checking for cp" >&5 echo "$ac_t""$COPY" 1>&6 fi @@ -1270,7 +1305,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:1274: checking for $ac_word" >&5 +echo "configure:1309: 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 @@ -1301,7 +1336,7 @@ fi else echo $ac_n "checking for gzip""... $ac_c" 1>&6 -echo "configure:1305: checking for gzip" >&5 +echo "configure:1340: checking for gzip" >&5 echo "$ac_t""$GZIP" 1>&6 fi @@ -1335,7 +1370,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:1339: checking for $ac_word" >&5 +echo "configure:1374: 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 @@ -1366,7 +1401,7 @@ fi else echo $ac_n "checking for install""... $ac_c" 1>&6 -echo "configure:1370: checking for install" >&5 +echo "configure:1405: checking for install" >&5 echo "$ac_t""$INSTALL" 1>&6 fi @@ -1400,7 +1435,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:1404: checking for $ac_word" >&5 +echo "configure:1439: 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 @@ -1431,7 +1466,7 @@ fi else echo $ac_n "checking for mkdir""... $ac_c" 1>&6 -echo "configure:1435: checking for mkdir" >&5 +echo "configure:1470: checking for mkdir" >&5 echo "$ac_t""$MKDIR" 1>&6 fi @@ -1465,7 +1500,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:1469: checking for $ac_word" >&5 +echo "configure:1504: 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 @@ -1496,7 +1531,7 @@ fi else echo $ac_n "checking for mv""... $ac_c" 1>&6 -echo "configure:1500: checking for mv" >&5 +echo "configure:1535: checking for mv" >&5 echo "$ac_t""$MV" 1>&6 fi @@ -1530,7 +1565,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:1534: checking for $ac_word" >&5 +echo "configure:1569: 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 @@ -1561,7 +1596,7 @@ fi else echo $ac_n "checking for rm""... $ac_c" 1>&6 -echo "configure:1565: checking for rm" >&5 +echo "configure:1600: checking for rm" >&5 echo "$ac_t""$RM" 1>&6 fi @@ -1595,7 +1630,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:1599: checking for $ac_word" >&5 +echo "configure:1634: 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 @@ -1626,7 +1661,7 @@ fi else echo $ac_n "checking for tar""... $ac_c" 1>&6 -echo "configure:1630: checking for tar" >&5 +echo "configure:1665: checking for tar" >&5 echo "$ac_t""$TAR" 1>&6 fi @@ -1660,7 +1695,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:1664: checking for $ac_word" >&5 +echo "configure:1699: 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 @@ -1691,7 +1726,7 @@ fi else echo $ac_n "checking for touch""... $ac_c" 1>&6 -echo "configure:1695: checking for touch" >&5 +echo "configure:1730: checking for touch" >&5 echo "$ac_t""$TOUCH" 1>&6 fi @@ -1725,7 +1760,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:1729: checking for $ac_word" >&5 +echo "configure:1764: 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 @@ -1756,7 +1791,7 @@ fi else echo $ac_n "checking for gunzip""... $ac_c" 1>&6 -echo "configure:1760: checking for gunzip" >&5 +echo "configure:1795: checking for gunzip" >&5 echo "$ac_t""$UNCOMPRESS" 1>&6 fi @@ -1790,7 +1825,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:1794: checking for $ac_word" >&5 +echo "configure:1829: 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 @@ -1821,7 +1856,7 @@ fi else echo $ac_n "checking for unzip""... $ac_c" 1>&6 -echo "configure:1825: checking for unzip" >&5 +echo "configure:1860: checking for unzip" >&5 echo "$ac_t""$UNZIP" 1>&6 fi @@ -1855,7 +1890,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:1859: checking for $ac_word" >&5 +echo "configure:1894: 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 @@ -1886,7 +1921,7 @@ fi else echo $ac_n "checking for uudecode""... $ac_c" 1>&6 -echo "configure:1890: checking for uudecode" >&5 +echo "configure:1925: checking for uudecode" >&5 echo "$ac_t""$UUDECODE" 1>&6 fi @@ -1920,7 +1955,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:1924: checking for $ac_word" >&5 +echo "configure:1959: 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 @@ -1951,7 +1986,7 @@ fi else echo $ac_n "checking for zcat""... $ac_c" 1>&6 -echo "configure:1955: checking for zcat" >&5 +echo "configure:1990: checking for zcat" >&5 echo "$ac_t""$ZCAT" 1>&6 fi @@ -1985,7 +2020,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:1989: checking for $ac_word" >&5 +echo "configure:2024: 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 @@ -2016,7 +2051,7 @@ fi else echo $ac_n "checking for zip""... $ac_c" 1>&6 -echo "configure:2020: checking for zip" >&5 +echo "configure:2055: checking for zip" >&5 echo "$ac_t""$ZIP" 1>&6 fi @@ -2051,9 +2086,10 @@ cat >> confdefs.h <<\EOF EOF - +if test -z "$GCC" ; then + echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 -echo "configure:2057: checking for ${CC-cc} option to accept ANSI C" >&5 +echo "configure:2093: 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 @@ -2071,7 +2107,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 2075 "configure" +#line 2111 "configure" #include "confdefs.h" #ifndef CC_HAS_PROTOS @@ -2087,7 +2123,7 @@ int main() { struct s2 {int (*f) (double a);}; ; return 0; } EOF -if { (eval echo configure:2091: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ansi_cc="$cf_arg"; break else @@ -2107,13 +2143,14 @@ if test ".$cf_cv_ansi_cc" != ".-DCC_HAS_PROTOS"; then fi fi +fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:2112: checking for working const" >&5 +echo "configure:2149: 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 2117 "configure" +#line 2154 "configure" #include "confdefs.h" int main() { @@ -2162,7 +2199,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:2166: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2203: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -2202,7 +2239,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:2206: checking for strcmp in -lc_s" >&5 +echo "configure:2243: 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 @@ -2210,7 +2247,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_s $LIBS" cat > conftest.$ac_ext <<EOF -#line 2214 "configure" +#line 2251 "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 @@ -2221,7 +2258,7 @@ int main() { strcmp() ; return 0; } EOF -if { (eval echo configure:2225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2262: \"$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 @@ -2299,7 +2336,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:2303: checking for $ac_word" >&5 +echo "configure:2340: 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 @@ -2359,12 +2396,12 @@ NETLIBS="" cf_have_lsocket=no # echo $ac_n "checking for gethostname""... $ac_c" 1>&6 -echo "configure:2363: checking for gethostname" >&5 +echo "configure:2400: checking for gethostname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2368 "configure" +#line 2405 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostname(); below. */ @@ -2387,7 +2424,7 @@ gethostname(); ; return 0; } EOF -if { (eval echo configure:2391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gethostname=yes" else @@ -2409,7 +2446,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:2413: checking for gethostname in -lnsl" >&5 +echo "configure:2450: 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 @@ -2417,7 +2454,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $NETLIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 2421 "configure" +#line 2458 "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 @@ -2428,7 +2465,7 @@ int main() { gethostname() ; return 0; } EOF -if { (eval echo configure:2432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2469: \"$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 @@ -2451,7 +2488,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostname in -lsocket""... $ac_c" 1>&6 -echo "configure:2455: checking for gethostname in -lsocket" >&5 +echo "configure:2492: 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 @@ -2459,7 +2496,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 2463 "configure" +#line 2500 "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 @@ -2470,7 +2507,7 @@ int main() { gethostname() ; return 0; } EOF -if { (eval echo configure:2474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2511: \"$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 @@ -2503,21 +2540,21 @@ fi # 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:2507: checking for -linet" >&5 +echo "configure:2544: 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 2514 "configure" +#line 2551 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_lib_inet=yes else @@ -2538,12 +2575,12 @@ fi # if test $cf_have_lsocket = no ; then echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:2542: checking for socket" >&5 +echo "configure:2579: checking for socket" >&5 if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2547 "configure" +#line 2584 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char socket(); below. */ @@ -2566,7 +2603,7 @@ socket(); ; return 0; } EOF -if { (eval echo configure:2570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -2588,7 +2625,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:2592: checking for socket in -lsocket" >&5 +echo "configure:2629: 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 @@ -2596,7 +2633,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $NETLIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 2600 "configure" +#line 2637 "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 @@ -2607,7 +2644,7 @@ int main() { socket() ; return 0; } EOF -if { (eval echo configure:2611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2648: \"$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 @@ -2630,7 +2667,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for socket in -lbsd""... $ac_c" 1>&6 -echo "configure:2634: checking for socket in -lbsd" >&5 +echo "configure:2671: 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 @@ -2638,7 +2675,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbsd $LIBS" cat > conftest.$ac_ext <<EOF -#line 2642 "configure" +#line 2679 "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 @@ -2649,7 +2686,7 @@ int main() { socket() ; return 0; } EOF -if { (eval echo configure:2653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2690: \"$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 @@ -2680,12 +2717,12 @@ fi fi # echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:2684: checking for gethostbyname" >&5 +echo "configure:2721: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2689 "configure" +#line 2726 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname(); below. */ @@ -2708,7 +2745,7 @@ gethostbyname(); ; return 0; } EOF -if { (eval echo configure:2712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -2730,7 +2767,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:2734: checking for gethostbyname in -lnsl" >&5 +echo "configure:2771: 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 @@ -2738,7 +2775,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $NETLIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 2742 "configure" +#line 2779 "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 @@ -2749,7 +2786,7 @@ int main() { gethostbyname() ; return 0; } EOF -if { (eval echo configure:2753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2790: \"$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 @@ -2777,12 +2814,12 @@ fi # echo $ac_n "checking for strcasecmp""... $ac_c" 1>&6 -echo "configure:2781: checking for strcasecmp" >&5 +echo "configure:2818: checking for strcasecmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_strcasecmp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2786 "configure" +#line 2823 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strcasecmp(); below. */ @@ -2805,7 +2842,7 @@ strcasecmp(); ; return 0; } EOF -if { (eval echo configure:2809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_strcasecmp=yes" else @@ -2827,7 +2864,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for strcasecmp in -lresolv""... $ac_c" 1>&6 -echo "configure:2831: checking for strcasecmp in -lresolv" >&5 +echo "configure:2868: 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 @@ -2835,7 +2872,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $NETLIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 2839 "configure" +#line 2876 "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 @@ -2846,7 +2883,7 @@ int main() { strcasecmp() ; return 0; } EOF -if { (eval echo configure:2850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2887: \"$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 @@ -2876,7 +2913,7 @@ LIBS="$LIBS $NETLIBS" echo $ac_n "checking for screen type""... $ac_c" 1>&6 -echo "configure:2880: checking for screen type" >&5 +echo "configure:2917: checking for screen type" >&5 if eval "test \"`echo '$''{'cf_cv_screen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2904,12 +2941,12 @@ case $cf_cv_screen in curses) echo $ac_n "checking for initscr""... $ac_c" 1>&6 -echo "configure:2908: checking for initscr" >&5 +echo "configure:2945: 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 2913 "configure" +#line 2950 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char initscr(); below. */ @@ -2932,7 +2969,7 @@ initscr(); ; return 0; } EOF -if { (eval echo configure:2936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_initscr=yes" else @@ -2953,7 +2990,7 @@ else case $host_os in #(vi freebsd*) echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:2957: checking for tgoto in -lmytinfo" >&5 +echo "configure:2994: 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 @@ -2961,7 +2998,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <<EOF -#line 2965 "configure" +#line 3002 "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 @@ -2972,7 +3009,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:2976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3013: \"$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 @@ -3005,12 +3042,12 @@ fi cf_save_LIBS="$LIBS" echo $ac_n "checking for tgoto""... $ac_c" 1>&6 -echo "configure:3009: checking for tgoto" >&5 +echo "configure:3046: checking for tgoto" >&5 if eval "test \"`echo '$''{'ac_cv_func_tgoto'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3014 "configure" +#line 3051 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char tgoto(); below. */ @@ -3033,7 +3070,7 @@ tgoto(); ; return 0; } EOF -if { (eval echo configure:3037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_tgoto=yes" else @@ -3049,7 +3086,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:3053: checking for initscr in -lcurses" >&5 +echo "configure:3090: 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 @@ -3057,7 +3094,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 3061 "configure" +#line 3098 "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 @@ -3068,7 +3105,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:3072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3109: \"$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 @@ -3102,7 +3139,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:3106: checking for tgoto in -ltermcap" >&5 +echo "configure:3143: 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 @@ -3110,7 +3147,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <<EOF -#line 3114 "configure" +#line 3151 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3121,7 +3158,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:3125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3139,7 +3176,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:3143: checking for initscr in -lcurses" >&5 +echo "configure:3180: 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 @@ -3147,7 +3184,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 3151 "configure" +#line 3188 "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 @@ -3158,7 +3195,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:3162: \"$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_lib_$ac_lib_var=yes" else @@ -3185,7 +3222,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for initscr in -lcursesX""... $ac_c" 1>&6 -echo "configure:3189: checking for initscr in -lcursesX" >&5 +echo "configure:3226: 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 @@ -3193,7 +3230,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcursesX $LIBS" cat > conftest.$ac_ext <<EOF -#line 3197 "configure" +#line 3234 "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 @@ -3204,7 +3241,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:3208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3245: \"$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 @@ -3231,7 +3268,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for initscr in -ljcurses""... $ac_c" 1>&6 -echo "configure:3235: checking for initscr in -ljcurses" >&5 +echo "configure:3272: 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 @@ -3239,7 +3276,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ljcurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 3243 "configure" +#line 3280 "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 @@ -3250,7 +3287,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:3254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3291: \"$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 @@ -3288,7 +3325,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6 -echo "configure:3292: checking for initscr in -lcurses" >&5 +echo "configure:3329: 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 @@ -3296,7 +3333,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 3300 "configure" +#line 3337 "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 @@ -3307,7 +3344,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:3311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3348: \"$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 @@ -3346,14 +3383,14 @@ fi echo $ac_n "checking for curses performance tradeoff""... $ac_c" 1>&6 -echo "configure:3350: checking for curses performance tradeoff" >&5 +echo "configure:3387: 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 3357 "configure" +#line 3394 "configure" #include "confdefs.h" #include <$cf_cv_ncurses_header> @@ -3367,11 +3404,11 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3371: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3408: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 3375 "configure" +#line 3412 "configure" #include "confdefs.h" #define CURS_PERFORMANCE @@ -3386,7 +3423,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3390: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3427: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_curs_performance=yes else @@ -3412,20 +3449,20 @@ EOF ncurses) echo $ac_n "checking for ncurses header file""... $ac_c" 1>&6 -echo "configure:3416: checking for ncurses header file" >&5 +echo "configure:3453: 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 3422 "configure" +#line 3459 "configure" #include "confdefs.h" #include <curses.h> int main() { printf("%s\n", NCURSES_VERSION) ; return 0; } EOF -if { (eval echo configure:3429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3466: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_header=predefined else @@ -3434,9 +3471,17 @@ else rm -rf conftest* cf_search="" -test "$prefix" != NONE && cf_search="$prefix/include $prefix/include/ncurses" -test "$prefix" != /usr/local && cf_search="$cf_search /usr/local/include /usr/local/include/ncurses" -test "$prefix" != /usr && cf_search="$cf_search /usr/include /usr/include/ncurses" +if test -d "$includedir" ; then +test "$includedir" != NONE && cf_search="$cf_search $includedir $includedir/ncurses" +fi +if test -d "$oldincludedir" ; then +test "$oldincludedir" != NONE && cf_search="$cf_search $oldincludedir $oldincludedir/ncurses" +fi +if test -d "$prefix"; then +test "$prefix" != NONE && cf_search="$cf_search $prefix/include $prefix/include/ncurses" +fi +test "$prefix" != /usr/local && cf_search="$cf_search /usr/local/include /usr/local/include/ncurses" +test "$prefix" != /usr && cf_search="$cf_search /usr/include /usr/include/ncurses" test -n "$verbose" && echo for cf_incdir in $cf_search @@ -3506,57 +3551,11 @@ done ;; esac - echo $ac_n "checking for initscr""... $ac_c" 1>&6 -echo "configure:3511: checking for initscr" >&5 -if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <<EOF -#line 3516 "configure" -#include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char initscr(); below. */ -#include <assert.h> -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char initscr(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_initscr) || defined (__stub___initscr) -choke me -#else -initscr(); -#endif - -; return 0; } -EOF -if { (eval echo configure:3539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then - rm -rf conftest* - eval "ac_cv_func_initscr=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_initscr=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'initscr`\" = yes"; then - echo "$ac_t""yes" 1>&6 - : -else - echo "$ac_t""no" 1>&6 - + -cf_save_LIBS="$LIBS" +cf_ncurses_LIBS="" echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:3560: checking for Gpm_Open in -lgpm" >&5 +echo "configure:3559: 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 @@ -3564,7 +3563,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <<EOF -#line 3568 "configure" +#line 3567 "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 @@ -3575,7 +3574,7 @@ int main() { Gpm_Open() ; return 0; } EOF -if { (eval echo configure:3579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3578: \"$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 @@ -3590,9 +3589,8 @@ LIBS="$ac_save_LIBS" 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:3596: checking for initscr in -lgpm" >&5 + echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6 +echo "configure:3594: 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 @@ -3600,7 +3598,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <<EOF -#line 3604 "configure" +#line 3602 "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 +3609,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:3613: \"$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 @@ -3626,29 +3624,49 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - - # don't try to link with gpm, since it contains curses - echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 -echo "configure:3633: checking for initscr in -lncurses" >&5 -ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'` + ac_tr_lib=HAVE_LIB`echo gpm | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <<EOF +#define $ac_tr_lib 1 +EOF + + LIBS="-lgpm $LIBS" + +else + echo "$ac_t""no" 1>&6 +cf_ncurses_LIBS="-lgpm" +fi + +else + echo "$ac_t""no" 1>&6 +fi + + +case $host_os in #(vi +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:3651: checking for tgoto in -lmytinfo" >&5 +ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lncurses $LIBS" +LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <<EOF -#line 3641 "configure" +#line 3659 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char initscr(); +char tgoto(); int main() { -initscr() +tgoto() ; return 0; } EOF -if { (eval echo configure:3652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3670: \"$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 @@ -3663,151 +3681,169 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo ncurses | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <<EOF -#define $ac_tr_lib 1 -EOF - - LIBS="-lncurses $LIBS" - + cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" else echo "$ac_t""no" 1>&6 fi - -else - echo "$ac_t""no" 1>&6 + ;; +esac - echo $ac_n "checking if ncurses needs -lgpm to link""... $ac_c" 1>&6 -echo "configure:3684: checking if ncurses needs -lgpm to link" >&5 - LIBS="-lncurses $cf_save_LIBS" - cat > conftest.$ac_ext <<EOF -#line 3687 "configure" -#include "confdefs.h" -#include <$cf_cv_ncurses_header> -int main() { -initscr() -; return 0; } -EOF -if { (eval echo configure:3694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then - rm -rf conftest* - cf_need_gpm=no +LIBS="$cf_ncurses_LIBS $LIBS" + + cf_cv_have_lib_ncurses=no + echo $ac_n "checking for initscr""... $ac_c" 1>&6 +echo "configure:3697: checking for initscr" >&5 +if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - LIBS="-lncurses -lgpm $cf_save_LIBS" - cat > conftest.$ac_ext <<EOF -#line 3703 "configure" + cat > conftest.$ac_ext <<EOF +#line 3702 "configure" #include "confdefs.h" -#include <$cf_cv_ncurses_header> +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char initscr(); below. */ +#include <assert.h> +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char initscr(); + int main() { -initscr() + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_initscr) || defined (__stub___initscr) +choke me +#else +initscr(); +#endif + ; return 0; } EOF -if { (eval echo configure:3710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* - cf_need_gpm=yes + eval "ac_cv_func_initscr=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - { echo "configure: error: cannot link -lncurses" 1>&2; exit 1; } -fi -rm -f conftest* + eval "ac_cv_func_initscr=no" fi rm -f conftest* - echo "$ac_t""$cf_need_gpm" 1>&6 - fi +if eval "test \"`echo '$ac_cv_func_'initscr`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cf_cv_have_lib_ncurses=no else echo "$ac_t""no" 1>&6 -cat > conftest.$ac_ext <<EOF -#line 3729 "configure" + + cf_save_LIBS="$LIBS" + echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 +echo "configure:3745: checking for initscr in -lncurses" >&5 + LIBS="-lncurses $LIBS" + cat > conftest.$ac_ext <<EOF +#line 3748 "configure" #include "confdefs.h" #include <$cf_cv_ncurses_header> int main() { initscr() ; return 0; } EOF -if { (eval echo configure:3736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then - : +if { (eval echo configure:3755: \"$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 + else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - - case $host_os in #(vi - freebsd*) - echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:3746: checking for tgoto in -lmytinfo" >&5 -ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lmytinfo $LIBS" -cat > conftest.$ac_ext <<EOF -#line 3754 "configure" + echo "$ac_t""no" 1>&6 + cf_search="" +if test -d "$libdir" ; then +test "$libdir" != NONE && cf_search="$cf_search $libdir $libdir/ncurses" +fi +if test -d "$exec_prefix"; then +test "$exec_prefix" != NONE && cf_search="$cf_search $exec_prefix/lib $exec_prefix/lib/ncurses" +fi +if test -d "$prefix"; then +test "$prefix" != NONE && \ +test "$prefix" != "$exec_prefix" && cf_search="$cf_search $prefix/lib $prefix/lib/ncurses" +fi +test "$prefix" != /usr/local && cf_search="$cf_search /usr/local/lib /usr/local/lib/ncurses" +test "$prefix" != /usr && cf_search="$cf_search /usr/lib /usr/lib/ncurses" + + for cf_libdir in $cf_search + do + echo $ac_n "checking for -lncurses in $cf_libdir""... $ac_c" 1>&6 +echo "configure:3782: checking for -lncurses in $cf_libdir" >&5 + LIBS="-L$cf_libdir -lncurses $cf_save_LIBS" + cat > conftest.$ac_ext <<EOF +#line 3785 "configure" #include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char tgoto(); - +#include <$cf_cv_ncurses_header> int main() { -tgoto() +initscr() ; return 0; } EOF -if { (eval echo configure:3765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" + echo "$ac_t""yes" 1>&6 + cf_cv_have_lib_ncurses=yes + break else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + echo "$ac_t""no" 1>&6 + LIBS="$cf_save_LIBS" fi rm -f conftest* -LIBS="$ac_save_LIBS" - + done + fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LIBS="-lmytinfo $LIBS" -else - echo "$ac_t""no" 1>&6 +rm -f conftest* + fi - ;; - esac - LIBS="-lncurses $LIBS" - cat > conftest.$ac_ext <<EOF -#line 3789 "configure" +if test $cf_cv_have_lib_ncurses = no ; then + { echo "configure: error: Cannot link ncurses library" 1>&2; exit 1; } +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:3819: 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'$//'` + if test "$q" != "$LIBS" ; then + LIBS="$q" + fi + done + cat > conftest.$ac_ext <<EOF +#line 3828 "configure" #include "confdefs.h" #include <$cf_cv_ncurses_header> int main() { initscr() ; return 0; } EOF -if { (eval echo configure:3796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then - : +if { (eval echo configure:3835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + echo "$ac_t""yes" 1>&6 else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - { echo "configure: error: cannot link -lncurses" 1>&2; exit 1; } -fi -rm -f conftest* + echo "$ac_t""no" 1>&6 + LIBS="$cf_ncurses_SAVE" fi rm -f conftest* fi - -fi - ;; slang) @@ -3819,7 +3855,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:3823: checking for tigetstr in -ltermlib" >&5 +echo "configure:3859: 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 @@ -3827,7 +3863,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermlib $LIBS" cat > conftest.$ac_ext <<EOF -#line 3831 "configure" +#line 3867 "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 @@ -3838,7 +3874,7 @@ int main() { tigetstr() ; return 0; } EOF -if { (eval echo configure:3842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3878: \"$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 @@ -3861,7 +3897,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:3865: checking for tgoto in -ltermlib" >&5 +echo "configure:3901: 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 @@ -3869,7 +3905,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermlib $LIBS" cat > conftest.$ac_ext <<EOF -#line 3873 "configure" +#line 3909 "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 @@ -3880,7 +3916,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:3884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3920: \"$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 @@ -3904,7 +3940,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:3908: checking for initscr in -lcurses" >&5 +echo "configure:3944: 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 @@ -3912,7 +3948,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 3916 "configure" +#line 3952 "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 @@ -3923,7 +3959,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:3927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3963: \"$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 @@ -3944,7 +3980,7 @@ else fi echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:3948: checking for tgoto in -ltermcap" >&5 +echo "configure:3984: 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 @@ -3952,7 +3988,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <<EOF -#line 3956 "configure" +#line 3992 "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 @@ -3963,7 +3999,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:3967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4003: \"$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 @@ -3986,7 +4022,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:3990: checking for tgoto in -ltermcap" >&5 +echo "configure:4026: 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 @@ -3994,7 +4030,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <<EOF -#line 3998 "configure" +#line 4034 "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 @@ -4005,7 +4041,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:4009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4045: \"$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 @@ -4028,7 +4064,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:4032: checking for tgoto in -lncurses" >&5 +echo "configure:4068: 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 @@ -4036,7 +4072,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 4040 "configure" +#line 4076 "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 @@ -4047,7 +4083,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:4051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4087: \"$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 @@ -4077,20 +4113,20 @@ fi echo $ac_n "checking for slang header file""... $ac_c" 1>&6 -echo "configure:4081: checking for slang header file" >&5 +echo "configure:4117: 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 4087 "configure" +#line 4123 "configure" #include "confdefs.h" #include <slang.h> int main() { printf("%s\n", SLANG_VERSION) ; return 0; } EOF -if { (eval echo configure:4094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_slang_header=predefined else @@ -4099,9 +4135,17 @@ else rm -rf conftest* cf_search="" -test "$prefix" != NONE && cf_search="$prefix/include $prefix/include/slang" -test "$prefix" != /usr/local && cf_search="$cf_search /usr/local/include /usr/local/include/slang" -test "$prefix" != /usr && cf_search="$cf_search /usr/include /usr/include/slang" +if test -d "$includedir" ; then +test "$includedir" != NONE && cf_search="$cf_search $includedir $includedir/slang" +fi +if test -d "$oldincludedir" ; then +test "$oldincludedir" != NONE && cf_search="$cf_search $oldincludedir $oldincludedir/slang" +fi +if test -d "$prefix"; then +test "$prefix" != NONE && cf_search="$cf_search $prefix/include $prefix/include/slang" +fi +test "$prefix" != /usr/local && cf_search="$cf_search /usr/local/include /usr/local/include/slang" +test "$prefix" != /usr && cf_search="$cf_search /usr/include /usr/include/slang" for cf_incdir in $cf_search do @@ -4158,13 +4202,15 @@ done esac + + cf_cv_have_lib_slang=no echo $ac_n "checking for SLtt_get_screen_size""... $ac_c" 1>&6 -echo "configure:4163: checking for SLtt_get_screen_size" >&5 +echo "configure:4209: 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 4168 "configure" +#line 4214 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char SLtt_get_screen_size(); below. */ @@ -4187,7 +4233,7 @@ SLtt_get_screen_size(); ; return 0; } EOF -if { (eval echo configure:4191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4237: \"$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 @@ -4201,91 +4247,81 @@ fi if eval "test \"`echo '$ac_cv_func_'SLtt_get_screen_size`\" = yes"; then echo "$ac_t""yes" 1>&6 - : + cf_cv_have_lib_slang=no else echo "$ac_t""no" 1>&6 - echo $ac_n "checking for SLtt_get_screen_size in -lslang""... $ac_c" 1>&6 -echo "configure:4210: checking for SLtt_get_screen_size in -lslang" >&5 -ac_lib_var=`echo slang'_'SLtt_get_screen_size | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lslang "-lm" $LIBS" -cat > conftest.$ac_ext <<EOF -#line 4218 "configure" + cf_save_LIBS="$LIBS" + echo $ac_n "checking for SLtt_get_screen_size in -lslang""... $ac_c" 1>&6 +echo "configure:4257: checking for SLtt_get_screen_size in -lslang" >&5 + LIBS="-lslang $LIBS" + cat > conftest.$ac_ext <<EOF +#line 4260 "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 SLtt_get_screen_size(); - +#include <slang.h> int main() { SLtt_get_screen_size() ; return 0; } EOF -if { (eval echo configure:4229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" + echo "$ac_t""yes" 1>&6 + cf_cv_have_lib_slang=yes + else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LIBS="-lslang $LIBS" -else echo "$ac_t""no" 1>&6 -echo $ac_n "checking for SLtt_get_screen_size in -lslang""... $ac_c" 1>&6 -echo "configure:4248: checking for SLtt_get_screen_size in -lslang" >&5 -ac_lib_var=`echo slang'_'SLtt_get_screen_size | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lslang "-lm" $LIBS" -cat > conftest.$ac_ext <<EOF -#line 4256 "configure" + cf_search="" +if test -d "$libdir" ; then +test "$libdir" != NONE && cf_search="$cf_search $libdir $libdir/slang" +fi +if test -d "$exec_prefix"; then +test "$exec_prefix" != NONE && cf_search="$cf_search $exec_prefix/lib $exec_prefix/lib/slang" +fi +if test -d "$prefix"; then +test "$prefix" != NONE && \ +test "$prefix" != "$exec_prefix" && cf_search="$cf_search $prefix/lib $prefix/lib/slang" +fi +test "$prefix" != /usr/local && cf_search="$cf_search /usr/local/lib /usr/local/lib/slang" +test "$prefix" != /usr && cf_search="$cf_search /usr/lib /usr/lib/slang" + + for cf_libdir in $cf_search + do + echo $ac_n "checking for -lslang in $cf_libdir""... $ac_c" 1>&6 +echo "configure:4294: checking for -lslang in $cf_libdir" >&5 + LIBS="-L$cf_libdir -lslang $cf_save_LIBS" + cat > conftest.$ac_ext <<EOF +#line 4297 "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 SLtt_get_screen_size(); - +#include <slang.h> int main() { SLtt_get_screen_size() ; return 0; } EOF -if { (eval echo configure:4267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" + echo "$ac_t""yes" 1>&6 + cf_cv_have_lib_slang=yes + break else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + echo "$ac_t""no" 1>&6 + LIBS="$cf_save_LIBS" fi rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LIBS="-lslang -lm $LIBS" -else - echo "$ac_t""no" 1>&6 -{ echo "configure: error: cannot link -lslang" 1>&2; exit 1; } + done + fi - +rm -f conftest* + fi +if test $cf_cv_have_lib_slang = no ; then + { echo "configure: error: Cannot link slang library" 1>&2; exit 1; } fi @@ -4294,12 +4330,12 @@ esac echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:4298: checking for ANSI C header files" >&5 +echo "configure:4334: 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 4303 "configure" +#line 4339 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -4307,7 +4343,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4311: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4347: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4324,7 +4360,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 4328 "configure" +#line 4364 "configure" #include "confdefs.h" #include <string.h> EOF @@ -4342,7 +4378,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 4346 "configure" +#line 4382 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -4363,7 +4399,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 4367 "configure" +#line 4403 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -4374,7 +4410,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:4378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -4398,12 +4434,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:4402: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:4438: 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 4407 "configure" +#line 4443 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -4412,7 +4448,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:4416: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -4437,12 +4473,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:4441: checking for $ac_hdr that defines DIR" >&5 +echo "configure:4477: 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 4446 "configure" +#line 4482 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_hdr> @@ -4450,7 +4486,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:4454: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4490: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -4475,7 +4511,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:4479: checking for opendir in -ldir" >&5 +echo "configure:4515: 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 @@ -4483,7 +4519,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <<EOF -#line 4487 "configure" +#line 4523 "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 @@ -4494,7 +4530,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:4498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4534: \"$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 @@ -4516,7 +4552,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:4520: checking for opendir in -lx" >&5 +echo "configure:4556: 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 @@ -4524,7 +4560,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <<EOF -#line 4528 "configure" +#line 4564 "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 @@ -4535,7 +4571,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:4539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4575: \"$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 @@ -4573,17 +4609,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:4577: checking for $ac_hdr" >&5 +echo "configure:4613: 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 4582 "configure" +#line 4618 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4587: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4623: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4611,13 +4647,13 @@ done echo $ac_n "checking termio.h and termios.h""... $ac_c" 1>&6 -echo "configure:4615: checking termio.h and termios.h" >&5 +echo "configure:4651: 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 4621 "configure" +#line 4657 "configure" #include "confdefs.h" #if HAVE_TERMIO_H @@ -4630,7 +4666,7 @@ int main() { putchar (0x0a) ; return 0; } EOF -if { (eval echo configure:4634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4670: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_termio_and_termios=yes else @@ -4651,12 +4687,12 @@ EOF echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:4655: checking for pid_t" >&5 +echo "configure:4691: 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 4660 "configure" +#line 4696 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -4685,17 +4721,17 @@ fi ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:4689: checking for vfork.h" >&5 +echo "configure:4725: 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 4694 "configure" +#line 4730 "configure" #include "confdefs.h" #include <vfork.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4699: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4735: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4720,18 +4756,18 @@ else fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:4724: checking for working vfork" >&5 +echo "configure:4760: 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:4730: checking for vfork" >&5 +echo "configure:4766: 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 4735 "configure" +#line 4771 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char vfork(); below. */ @@ -4754,7 +4790,7 @@ vfork(); ; return 0; } EOF -if { (eval echo configure:4758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_vfork=yes" else @@ -4775,7 +4811,7 @@ fi else cat > conftest.$ac_ext <<EOF -#line 4779 "configure" +#line 4815 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include <stdio.h> @@ -4870,7 +4906,7 @@ main() { } } EOF -if { (eval echo configure:4874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4910: \"$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 @@ -4894,20 +4930,20 @@ fi echo $ac_n "checking for broken/missing definition of remove""... $ac_c" 1>&6 -echo "configure:4898: checking for broken/missing definition of remove" >&5 +echo "configure:4934: 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 4904 "configure" +#line 4940 "configure" #include "confdefs.h" #include <stdio.h> int main() { remove("dummy") ; return 0; } EOF -if { (eval echo configure:4911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cf_cv_baddef_remove=no else @@ -4915,7 +4951,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 4919 "configure" +#line 4955 "configure" #include "confdefs.h" #include <stdio.h> int __unlink(name) { return unlink(name); } @@ -4923,7 +4959,7 @@ int main() { remove("dummy") ; return 0; } EOF -if { (eval echo configure:4927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cf_cv_baddef_remove=yes else @@ -4953,12 +4989,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4957: checking for $ac_func" >&5 +echo "configure:4993: 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 4962 "configure" +#line 4998 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4981,7 +5017,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5009,13 +5045,13 @@ done echo $ac_n "checking if TRUE/FALSE are defined""... $ac_c" 1>&6 -echo "configure:5013: checking if TRUE/FALSE are defined" >&5 +echo "configure:5049: 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 5019 "configure" +#line 5055 "configure" #include "confdefs.h" #include <$cf_cv_ncurses_header> @@ -5024,7 +5060,7 @@ int main() { int x = TRUE, y = FALSE ; return 0; } EOF -if { (eval echo configure:5028: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_bool_defs=yes else @@ -5050,13 +5086,13 @@ fi echo $ac_n "checking for errno external decl""... $ac_c" 1>&6 -echo "configure:5054: checking for errno external decl" >&5 +echo "configure:5090: 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 5060 "configure" +#line 5096 "configure" #include "confdefs.h" #include <errno.h> @@ -5064,7 +5100,7 @@ int main() { int x = errno ; return 0; } EOF -if { (eval echo configure:5068: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5104: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_extern_errno=yes else @@ -5084,20 +5120,20 @@ EOF echo $ac_n "checking for setlocale()""... $ac_c" 1>&6 -echo "configure:5088: checking for setlocale()" >&5 +echo "configure:5124: 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 5094 "configure" +#line 5130 "configure" #include "confdefs.h" #include <locale.h> int main() { setlocale(LC_ALL, "") ; return 0; } EOF -if { (eval echo configure:5101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cf_cv_locale=yes else @@ -5118,13 +5154,13 @@ EOF echo $ac_n "checking if NGROUPS is defined""... $ac_c" 1>&6 -echo "configure:5122: checking if NGROUPS is defined" >&5 +echo "configure:5158: 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 5128 "configure" +#line 5164 "configure" #include "confdefs.h" #if HAVE_SYS_PARAM_H @@ -5138,7 +5174,7 @@ int main() { int x = NGROUPS ; return 0; } EOF -if { (eval echo configure:5142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5178: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ngroups=yes else @@ -5146,7 +5182,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 5150 "configure" +#line 5186 "configure" #include "confdefs.h" #if HAVE_SYS_PARAM_H @@ -5160,7 +5196,7 @@ int main() { int x = NGROUPS_MAX ; return 0; } EOF -if { (eval echo configure:5164: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5200: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ngroups=NGROUPS_MAX else @@ -5191,13 +5227,13 @@ fi echo $ac_n "checking declaration of sys_errlist""... $ac_c" 1>&6 -echo "configure:5195: checking declaration of sys_errlist" >&5 +echo "configure:5231: 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 5201 "configure" +#line 5237 "configure" #include "confdefs.h" #include <stdio.h> @@ -5207,7 +5243,7 @@ int main() { char *c = (char *) *sys_errlist ; return 0; } EOF -if { (eval echo configure:5211: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5247: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_dcl_sys_errlist=yes else @@ -5227,13 +5263,13 @@ EOF echo $ac_n "checking if struct utmp is declared""... $ac_c" 1>&6 -echo "configure:5231: checking if struct utmp is declared" >&5 +echo "configure:5267: 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 5237 "configure" +#line 5273 "configure" #include "confdefs.h" #include <sys/types.h> @@ -5242,7 +5278,7 @@ int main() { struct utmp x; char *y = &x.ut_host[0] ; return 0; } EOF -if { (eval echo configure:5246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5282: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_have_utmp=yes else @@ -5250,14 +5286,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 5254 "configure" +#line 5290 "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:5261: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_have_utmp=utmpx else @@ -5288,13 +5324,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:5292: checking if curses supports alternate-character set" >&5 +echo "configure:5328: 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 5298 "configure" +#line 5334 "configure" #include "confdefs.h" #include <$cf_cv_ncurses_header> @@ -5303,7 +5339,7 @@ int main() { chtype x = acs_map['l']; acs_map['m'] = 0 ; return 0; } EOF -if { (eval echo configure:5307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cf_cv_alt_char_set=yes else @@ -5323,13 +5359,13 @@ EOF echo $ac_n "checking if curses supports fancy attributes""... $ac_c" 1>&6 -echo "configure:5327: checking if curses supports fancy attributes" >&5 +echo "configure:5363: 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 5333 "configure" +#line 5369 "configure" #include "confdefs.h" #include <$cf_cv_ncurses_header> @@ -5342,7 +5378,7 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE); ; return 0; } EOF -if { (eval echo configure:5346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cf_cv_fancy_curses=yes else @@ -5362,7 +5398,7 @@ EOF echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:5366: checking for ncurses version" >&5 +echo "configure:5402: 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 @@ -5379,7 +5415,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:5383: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:5419: \"$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" @@ -5396,7 +5432,7 @@ if eval "test \"`echo '$''{'cf_cv_ncurses_broken'+set}'`\" = set"; then else cat > conftest.$ac_ext <<EOF -#line 5400 "configure" +#line 5436 "configure" #include "confdefs.h" #include <$cf_cv_ncurses_header> @@ -5410,7 +5446,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5414: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5450: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_broken=no else @@ -5434,13 +5470,13 @@ fi echo $ac_n "checking if curses supports color attributes""... $ac_c" 1>&6 -echo "configure:5438: checking if curses supports color attributes" >&5 +echo "configure:5474: 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 5444 "configure" +#line 5480 "configure" #include "confdefs.h" #include <$cf_cv_ncurses_header> @@ -5454,7 +5490,7 @@ has_colors(); ; return 0; } EOF -if { (eval echo configure:5458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cf_cv_color_curses=yes else @@ -5475,7 +5511,7 @@ EOF echo $ac_n "checking declaration of size-change""... $ac_c" 1>&6 -echo "configure:5479: checking declaration of size-change" >&5 +echo "configure:5515: 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 @@ -5489,7 +5525,7 @@ do CFLAGS="$cf_save_CFLAGS" test -n "$cf_opts" && CFLAGS="$CFLAGS -D$cf_opts" cat > conftest.$ac_ext <<EOF -#line 5493 "configure" +#line 5529 "configure" #include "confdefs.h" #include <sys/types.h> #if HAVE_TERMIOS_H @@ -5524,7 +5560,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5528: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sizechange=yes else @@ -5555,20 +5591,20 @@ EOF echo $ac_n "checking if ttytype is declared in curses library""... $ac_c" 1>&6 -echo "configure:5559: checking if ttytype is declared in curses library" >&5 +echo "configure:5595: 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 5565 "configure" +#line 5601 "configure" #include "confdefs.h" #include <$cf_cv_ncurses_header> int main() { char *x = &ttytype[1]; *x = 1 ; return 0; } EOF -if { (eval echo configure:5572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cf_cv_have_ttytype=yes else @@ -5593,12 +5629,12 @@ EOF do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5597: checking for $ac_func" >&5 +echo "configure:5633: 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 5602 "configure" +#line 5638 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5621,7 +5657,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5651,7 +5687,7 @@ fi echo $ac_n "checking if character-translation code should be used""... $ac_c" 1>&6 -echo "configure:5655: checking if character-translation code should be used" >&5 +echo "configure:5691: checking if character-translation code should be used" >&5 if eval "test \"`echo '$''{'cf_cv_char_trans'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5677,7 +5713,7 @@ EOF fi echo $ac_n "checking if color-style code should be used""... $ac_c" 1>&6 -echo "configure:5681: checking if color-style code should be used" >&5 +echo "configure:5717: checking if color-style code should be used" >&5 if eval "test \"`echo '$''{'cf_cv_color_style'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5727,10 +5763,156 @@ EOF ;; esac +echo $ac_n "checking if you want to use zlib for compression/decompression""... $ac_c" 1>&6 +echo "configure:5768: checking if you want to use zlib for compression/decompression" >&5 +if eval "test \"`echo '$''{'cf_cv_zlib'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + +# Check whether --with-zlib or --without-zlib was given. +if test "${with_zlib+set}" = set; then + withval="$with_zlib" + cf_cv_zlib=$withval +else + cf_cv_zlib=no +fi + +fi + +echo "$ac_t""$cf_cv_zlib" 1>&6 +if test ".$cf_cv_zlib" != ".no" ; then + + cf_cv_have_lib_z=no + echo $ac_n "checking for gzopen""... $ac_c" 1>&6 +echo "configure:5788: 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 5793 "configure" +#include "confdefs.h" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char gzopen(); below. */ +#include <assert.h> +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char gzopen(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_gzopen) || defined (__stub___gzopen) +choke me +#else +gzopen(); +#endif + +; return 0; } +EOF +if { (eval echo configure:5816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_func_gzopen=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_gzopen=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'gzopen`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cf_cv_have_lib_z=no +else + echo "$ac_t""no" 1>&6 + + cf_save_LIBS="$LIBS" + echo $ac_n "checking for gzopen in -lz""... $ac_c" 1>&6 +echo "configure:5836: checking for gzopen in -lz" >&5 + LIBS="-lz $LIBS" + cat > conftest.$ac_ext <<EOF +#line 5839 "configure" +#include "confdefs.h" +#include <zlib.h> +int main() { +gzopen("name","mode") +; return 0; } +EOF +if { (eval echo configure:5846: \"$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 + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + echo "$ac_t""no" 1>&6 + cf_search="" +if test -d "$libdir" ; then +test "$libdir" != NONE && cf_search="$cf_search $libdir $libdir/z" +fi +if test -d "$exec_prefix"; then +test "$exec_prefix" != NONE && cf_search="$cf_search $exec_prefix/lib $exec_prefix/lib/z" +fi +if test -d "$prefix"; then +test "$prefix" != NONE && \ +test "$prefix" != "$exec_prefix" && cf_search="$cf_search $prefix/lib $prefix/lib/z" +fi +test "$prefix" != /usr/local && cf_search="$cf_search /usr/local/lib /usr/local/lib/z" +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:5873: checking for -lz in $cf_libdir" >&5 + LIBS="-L$cf_libdir -lz $cf_save_LIBS" + cat > conftest.$ac_ext <<EOF +#line 5876 "configure" +#include "confdefs.h" +#include <zlib.h> +int main() { +gzopen("name","mode") +; return 0; } +EOF +if { (eval echo configure:5883: \"$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 + break +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + echo "$ac_t""no" 1>&6 + LIBS="$cf_save_LIBS" +fi +rm -f conftest* + done + +fi +rm -f conftest* + +fi + +if test $cf_cv_have_lib_z = no ; then + { echo "configure: error: Cannot link z library" 1>&2; exit 1; } +fi + + cat >> confdefs.h <<\EOF +#define USE_ZLIB 1 +EOF + +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:5734: checking if directory-editor code should be used" >&5 +echo "configure:5916: checking if directory-editor code should be used" >&5 if eval "test \"`echo '$''{'cf_cv_dired'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5753,7 +5935,7 @@ EOF echo $ac_n "checking if you wish to allow extracting from archives via DirEd""... $ac_c" 1>&6 -echo "configure:5757: checking if you wish to allow extracting from archives via DirEd" >&5 +echo "configure:5939: 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" @@ -5771,7 +5953,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:5775: checking if you wish to allow users to redefine DirEd keys" >&5 +echo "configure:5957: 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" @@ -5796,7 +5978,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:5800: checking if you wish to allow permissions commands via DirEd" >&5 +echo "configure:5982: 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" @@ -5821,7 +6003,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:5825: checking if you wish to allow executable-permission commands via DirEd" >&5 +echo "configure:6007: 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" @@ -5839,7 +6021,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:5843: checking if you wish to allow \"tar\" commands from DirEd" >&5 +echo "configure:6025: 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" @@ -5864,7 +6046,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:5868: checking if you wish to allow \"uudecode\" commands from DirEd" >&5 +echo "configure:6050: 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" @@ -5889,7 +6071,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:5893: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5 +echo "configure:6075: 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" @@ -5914,7 +6096,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:5918: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5 +echo "configure:6100: 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" @@ -5940,7 +6122,7 @@ fi fi echo $ac_n "checking if you want long-directory listings""... $ac_c" 1>&6 -echo "configure:5944: checking if you want long-directory listings" >&5 +echo "configure:6126: 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" @@ -5965,7 +6147,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if parent-directory references are permitted""... $ac_c" 1>&6 -echo "configure:5969: checking if parent-directory references are permitted" >&5 +echo "configure:6151: 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" @@ -5984,7 +6166,7 @@ echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6 -echo "configure:5988: checking if you want to see long compiling messages" >&5 +echo "configure:6170: 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" @@ -6008,7 +6190,7 @@ echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you want to check memory-leaks""... $ac_c" 1>&6 -echo "configure:6012: checking if you want to check memory-leaks" >&5 +echo "configure:6194: 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" @@ -6031,7 +6213,7 @@ EOF echo $ac_n "checking if you want to enable debug-code""... $ac_c" 1>&6 -echo "configure:6035: checking if you want to enable debug-code" >&5 +echo "configure:6217: 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" @@ -6048,7 +6230,18 @@ else fi echo "$ac_t""$with_debug" 1>&6 -if test "$with_debug" != "yes" ; then +if test "$with_debug" = "yes" ; then + case $host_os in + ultrix*) + if test -z "$GCC" ; then + +CFLAGS=`echo ${CFLAGS} | sed -e 's/-O[1-9]\? //' -e 's/-O[1-9]\?$//'` + + CFLAGS="$CFLAGS -g3" + fi + ;; + esac +else if test -n "$GCC" ; then CFLAGS=`echo ${CFLAGS} | sed -e 's/-g //' -e 's/-g$//'` fi @@ -6057,7 +6250,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:6061: checking if you want to turn on gcc warnings" >&5 +echo "configure:6254: 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" @@ -6080,11 +6273,11 @@ then if test -n "$GCC" then cat > conftest.$ac_ext <<EOF -#line 6084 "configure" +#line 6277 "configure" int main(int argc, char *argv[]) { return argv[argc-1] == 0; } EOF echo "checking for gcc warning options" 1>&6 -echo "configure:6088: checking for gcc warning options" >&5 +echo "configure:6281: checking for gcc warning options" >&5 cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-W -Wall" for cf_opt in \ @@ -6099,7 +6292,7 @@ echo "configure:6088: checking for gcc warning options" >&5 Wstrict-prototypes do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo configure:6103: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:6296: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -6261,6 +6454,7 @@ s%@make_include_left@%$make_include_left%g 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%@CHMOD@%$CHMOD%g s%@COMPRESS@%$COMPRESS%g s%@COPY@%$COPY%g diff --git a/configure.in b/configure.in index 5991cfc7..97feb2c5 100644 --- a/configure.in +++ b/configure.in @@ -20,6 +20,7 @@ AC_PROG_RANLIB AC_PROG_MAKE_SET CF_MAKE_INCLUDE AC_PROG_INSTALL +AC_CHECK_PROGS(LINT, lint alint lclint tdlint, []) AC_MSG_CHECKING(if you want full utility pathnames) CF_ARG_DISABLE(full-paths, @@ -58,7 +59,9 @@ dnl -------------------------------------------------------------------------- dnl If we're able to run this script, this is true! AC_DEFINE(UNIX) -CF_ANSI_CC +if test -z "$GCC" ; then + CF_ANSI_CC +fi AC_C_CONST dnl Only add to this case statement things that we cannot design tests for. @@ -301,6 +304,21 @@ no) ;; esac +AC_MSG_CHECKING(if you want to use zlib for compression/decompression) +AC_CACHE_VAL(cf_cv_zlib,[ +AC_ARG_WITH(zlib, +[ --with-zlib use zlib for compression/decompression], + [cf_cv_zlib=$withval], + [cf_cv_zlib=no])]) +AC_MSG_RESULT($cf_cv_zlib) +if test ".$cf_cv_zlib" != ".no" ; then + CF_FIND_LIBRARY(z, + [#include <zlib.h>], + [gzopen("name","mode")], + gzopen) + AC_DEFINE(USE_ZLIB) +fi + # All DirEd functions that were enabled on compilation can be disabled # or modified at run time via DIRED_MENU symbols in lynx.cfg. AC_MSG_CHECKING(if directory-editor code should be used) @@ -396,7 +414,16 @@ CF_ARG_ENABLE(debug, [with_debug=yes], [with_debug=no]) AC_MSG_RESULT($with_debug) -if test "$with_debug" != "yes" ; then +if test "$with_debug" = "yes" ; then + case $host_os in + ultrix*) + if test -z "$GCC" ; then + CF_STRIP_O_OPT(CFLAGS) + CFLAGS="$CFLAGS -g3" + fi + ;; + esac +else if test -n "$GCC" ; then CF_STRIP_G_OPT(CFLAGS) fi diff --git a/makefile.in b/makefile.in index 5260447a..3ee36f94 100644 --- a/makefile.in +++ b/makefile.in @@ -169,6 +169,7 @@ help: @echo "Please run make with one of the following arguments" @echo "all -- to make the executable, put it in this directory" @echo "clean -- removes all '.o' and 'core' files" + @echo "depend -- use makedepend to generate header-dependencies" @echo "tar -- runs clean, removes executable, and tars the whole directory" @echo "compress -- runs tar, then compresses the result" @echo "zip -- runs clean, removes executable, and zips the whole directory" @@ -178,16 +179,20 @@ help: clean: rm -f WWW/Library/*/*.[aob] rm -f WWW/Library/*/.created - cd src; $(MAKE) clean + cd src && $(MAKE) clean rm -f *.b src/lynx core Lynx.leaks +depend: + cd WWW/Library/unix && $(MAKE) $@ + cd src && $(MAKE) $@ + distclean: clean -rm -f WWW/Library/unix/makefile src/makefile src/chrtrans/makefile -rm -f WWW/Library/*/*~ -rm -f WWW/Library/*/*.bak -rm -rf src/obsolete - -cd src; $(MAKE) clean - -cd src/chrtrans; $(MAKE) distclean + -cd src && $(MAKE) clean + -cd src/chrtrans && $(MAKE) distclean -rm -f *~ *.bak *.sav -rm -f makefile lynx_cfg.h config.status config.log config.cache -rm -f lynx @@ -219,7 +224,7 @@ save: compress: tar cd ..; rm -f $(lynxname).tar.Z; compress -f -v $(lynxname).tar -install: +install: all -mv -f $(bindir)/lynx $(bindir)/lynx.old -mv -f $(libdir)/lynx.cfg $(libdir)/lynx.oldcfg $(installbin) lynx $(bindir)/lynx diff --git a/src/HTFWriter.c b/src/HTFWriter.c index 5f41becb..ccd85a00 100644 --- a/src/HTFWriter.c +++ b/src/HTFWriter.c @@ -608,7 +608,7 @@ SaveAndExecute_tempname: if (me->remove_command == NULL) outofmem(__FILE__, "HTSaveAndExecute"); - sprintf(me->remove_command, REMOVE_COMMAND, fnam, "", "", "", "", "", ""); + sprintf(me->remove_command, REMOVE_COMMAND, fnam); StrAllocCopy(anchor->FileCache, fnam); return me; @@ -808,8 +808,7 @@ SaveToFile_tempname: if (ret_obj->remove_command == NULL) outofmem(__FILE__, "HTSaveToFile"); - sprintf(ret_obj->remove_command, - REMOVE_COMMAND, fnam, "", "", "", "", "", ""); + sprintf(ret_obj->remove_command, REMOVE_COMMAND, fnam); #ifdef VMS if (IsBinary && UseFixedRecords) { @@ -881,7 +880,7 @@ PUBLIC HTStream* HTCompressed ARGS3( HTStream* me; HTFormat format; char *type = NULL; - HTPresentation *Pres; + HTPresentation *Pres = NULL; int n, i; BOOL can_present = FALSE; char fnam[256]; @@ -1099,7 +1098,7 @@ Compressed_tempname: strlen(fnam)) * sizeof(char)); if (me->remove_command == NULL) outofmem(__FILE__, "HTCompressed"); - sprintf(me->remove_command, REMOVE_COMMAND, fnam, "", "", "", "", "", ""); + sprintf(me->remove_command, REMOVE_COMMAND, fnam); /* * Save the filename and return the structure. - FM diff --git a/src/HTInit.c b/src/HTInit.c index 5c27d8bf..db3a9225 100644 --- a/src/HTInit.c +++ b/src/HTInit.c @@ -112,7 +112,7 @@ PUBLIC void HTFormatInit NOARGS HTSetConversion("application/html", "text/plain", HTMLToPlain, 0.5, 0.0, 0.0, 0); HTSetConversion("application/html", "www/present", - HTMLPresent, 1.0, 0.0, 0.0, 0); + HTMLPresent, 2.0, 0.0, 0.0, 0); HTSetConversion("application/html", "www/source", HTPlainPresent, 1.0, 0.0, 0.0, 0); HTSetConversion("application/x-wais-source", "www/source", @@ -147,7 +147,7 @@ PUBLIC void HTFormatInit NOARGS HTSetConversion("text/x-sgml", "www/source", HTPlainPresent, 1.0, 0.0, 0.0, 0); HTSetConversion("text/x-sgml", - "www/present", HTMLPresent, 1.0, 0.0, 0.0, 0); + "www/present", HTMLPresent, 2.0, 0.0, 0.0, 0); HTSetConversion("text/sgml", "www/source", HTPlainPresent, 1.0, 0.0, 0.0, 0); HTSetConversion("text/sgml", "www/present", HTMLPresent, 1.0, 0.0, 0.0, 0); HTSetConversion("text/plain","www/present", HTPlainPresent, 1.0, 0.0, 0.0, 0); diff --git a/src/LYCharUtils.c b/src/LYCharUtils.c index 8ee363e8..14f2646c 100644 --- a/src/LYCharUtils.c +++ b/src/LYCharUtils.c @@ -66,6 +66,844 @@ PUBLIC int OL_VOID = -29998; /* flag for whether a count is set */ /* +** This function converts any ampersands in allocated +** strings to "&". If isTITLE is TRUE, it also +** converts any angle-brackets to "<" or ">". - FM +*/ +PUBLIC void LYEntify ARGS2( + char **, str, + BOOLEAN, isTITLE) +{ + char *p = *str; + char *q = NULL, *cp = NULL; + int amps = 0, lts = 0, gts = 0; + + if (p == NULL || *p == '\0') + return; + + /* + * Count the ampersands. - FM + */ + while ((*p != '\0') && (q = strchr(p, '&')) != NULL) { + amps++; + p = (q + 1); + } + + /* + * Count the left-angle-brackets, if needed. - FM + */ + if (isTITLE == TRUE) { + p = *str; + while ((*p != '\0') && (q = strchr(p, '<')) != NULL) { + lts++; + p = (q + 1); + } + } + + /* + * Count the right-angle-brackets, if needed. - FM + */ + if (isTITLE == TRUE) { + p = *str; + while ((*p != '\0') && (q = strchr(p, '>')) != NULL) { + gts++; + p = (q + 1); + } + } + + /* + * Check whether we need to convert anything. - FM + */ + if (amps == 0 && lts == 0 && gts == 0) + return; + + /* + * Allocate space and convert. - FM + */ + q = (char *)calloc(1, + (strlen(*str) + (4 * amps) + (3 * lts) + (3 * gts) + 1)); + if ((cp = q) == NULL) + outofmem(__FILE__, "LYEntify"); + for (p = *str; *p; p++) { + if (*p == '&') { + *q++ = '&'; + *q++ = 'a'; + *q++ = 'm'; + *q++ = 'p'; + *q++ = ';'; + } else if (isTITLE && *p == '<') { + *q++ = '&'; + *q++ = 'l'; + *q++ = 't'; + *q++ = ';'; + } else if (isTITLE && *p == '>') { + *q++ = '&'; + *q++ = 'g'; + *q++ = 't'; + *q++ = ';'; + } else { + *q++ = *p; + } + } + StrAllocCopy(*str, cp); + FREE(cp); +} + +/* +** This function trims characters <= that of a space (32), +** including HT_NON_BREAK_SPACE (1) and HT_EM_SPACE (2), +** but not ESC, from the heads of strings. - FM +*/ +PUBLIC void LYTrimHead ARGS1( + char *, str) +{ + int i = 0, j; + + if (!str || *str == '\0') + return; + + while (str[i] != '\0' && WHITE(str[i]) && (unsigned char)str[i] != 27) + i++; + if (i > 0) { + for (j = 0; str[i] != '\0'; i++) { + str[j++] = str[i]; + } + str[j] = '\0'; + } +} + +/* +** This function trims characters <= that of a space (32), +** including HT_NON_BREAK_SPACE (1), HT_EM_SPACE (2), and +** ESC from the tails of strings. - FM +*/ +PUBLIC void LYTrimTail ARGS1( + char *, str) +{ + int i; + + if (!str || *str == '\0') + return; + + i = (strlen(str) - 1); + while (i >= 0) { + if (WHITE(str[i])) + str[i] = '\0'; + else + break; + i--; + } +} + +/* +** This function should receive a pointer to the start +** of a comment. It returns a pointer to the end ('>') +** character of comment, or it's best guess if the comment +** is invalid. - FM +*/ +PUBLIC char *LYFindEndOfComment ARGS1( + char *, str) +{ + char *cp, *cp1; + enum comment_state { start1, start2, end1, end2 } state; + + if (str == NULL) + /* + * We got NULL, so return NULL. - FM + */ + return NULL; + + if (strncmp(str, "<!--", 4)) + /* + * We don't have the start of a comment, so + * return the beginning of the string. - FM + */ + return str; + + cp = (str + 4); + if (*cp =='>') + /* + * It's an invalid comment, so + * return this end character. - FM + */ + return cp; + + if ((cp1 = strchr(cp, '>')) == NULL) + /* + * We don't have an end character, so + * return the beginning of the string. - FM + */ + return str; + + if (*cp == '-') + /* + * Ugh, it's a "decorative" series of dashes, + * so return the next end character. - FM + */ + return cp1; + + /* + * OK, we're ready to start parsing. - FM + */ + state = start2; + while (*cp != '\0') { + switch (state) { + case start1: + if (*cp == '-') + state = start2; + else + /* + * Invalid comment, so return the first + * '>' from the start of the string. - FM + */ + return cp1; + break; + + case start2: + if (*cp == '-') + state = end1; + break; + + case end1: + if (*cp == '-') + state = end2; + else + /* + * Invalid comment, so return the first + * '>' from the start of the string. - FM + */ + return cp1; + break; + + case end2: + if (*cp == '>') + /* + * Valid comment, so return the end character. - FM + */ + return cp; + if (*cp == '-') { + state = start1; + } else if (!(WHITE(*cp) && (unsigned char)*cp != 27)) { + /* + * Invalid comment, so return the first + * '>' from the start of the string. - FM + */ + return cp1; + } + break; + + default: + break; + } + cp++; + } + + /* + * Invalid comment, so return the first + * '>' from the start of the string. - FM + */ + return cp1; +} + +/* +** If an HREF, itself or if resolved against a base, +** represents a file URL, and the host is defaulted, +** force in "//localhost". We need this until +** all the other Lynx code which performs security +** checks based on the "localhost" string is changed +** to assume "//localhost" when a host field is not +** present in file URLs - FM +*/ +PUBLIC void LYFillLocalFileURL ARGS2( + char **, href, + char *, base) +{ + char * temp = NULL; + + if (*href == NULL || *(*href) == '\0') + return; + + if (!strcmp(*href, "//") || !strncmp(*href, "///", 3)) { + if (base != NULL && !strncmp(base, "file:", 5)) { + StrAllocCopy(temp, "file:"); + StrAllocCat(temp, *href); + StrAllocCopy(*href, temp); + } + } + if (!strncmp(*href, "file:", 5)) { + if (*(*href+5) == '\0') { + StrAllocCat(*href, "//localhost"); + } else if (!strcmp(*href, "file://")) { + StrAllocCat(*href, "localhost"); + } else if (!strncmp(*href, "file:///", 8)) { + StrAllocCopy(temp, (*href+7)); + StrAllocCopy(*href, "file://localhost"); + StrAllocCat(*href, temp); + } else if (!strncmp(*href, "file:/", 6) && *(*href+6) != '/') { + StrAllocCopy(temp, (*href+5)); + StrAllocCopy(*href, "file://localhost"); + StrAllocCat(*href, temp); + } + } + + /* + * No path in a file://localhost URL means a + * directory listing for the current default. - FM + */ + if (!strcmp(*href, "file://localhost")) { +#ifdef VMS + StrAllocCat(*href, HTVMS_wwwName(getenv("PATH"))); +#else + char curdir[DIRNAMESIZE]; +#if HAVE_GETCWD + getcwd (curdir, DIRNAMESIZE); +#else + getwd (curdir); +#endif /* NO_GETCWD */ +#ifdef DOSPATH + StrAllocCat(*href, HTDOS_wwwName(curdir)); +#else + StrAllocCat(*href, curdir); +#endif /* DOSPATH */ +#endif /* VMS */ + } + +#ifdef VMS + /* + * On VMS, a file://localhost/ URL means + * a listing for the login directory. - FM + */ + if (!strcmp(*href, "file://localhost/")) + StrAllocCat(*href, (HTVMS_wwwName((char *)Home_Dir())+1)); +#endif /* VMS */ + + FREE(temp); + return; +} + +#ifdef EXP_CHARTRANS +/* +** This function writes a line with a META tag to an open file, +** which will specify a charset parameter to use when the file is +** read back in. It is meant for temporary HTML files used by the +** various special pages which may show titles of documents. When those +** files are created, the title strings normally have been translated and +** expanded to the display character set, so we have to make sure they +** don't get translated again. +** If the user has changed the display character set during the lifetime +** of the Lynx session (or, more exactly, during the time the title +** strings to be written were generated), they may now have different +** character encodings and there is currently no way to get it all right. +** To change this, we would have to add a variable for each string which +** keeps track of its character encoding... +** But at least we can try to ensure that reading the file after future +** display character set changes will give reasonable output. +** +** The META tag is not written if the display character set (passed as +** disp_chndl) already corresponds to the charset assumption that +** would be made when the file is read. - KW +*/ +PUBLIC void LYAddMETAcharsetToFD ARGS2( + FILE *, fd, + int, disp_chndl) +{ + if (disp_chndl == -1) + /* + * -1 means use current_char_set. + */ + disp_chndl = current_char_set; + + if (fd == NULL || disp_chndl < 0) + /* + * Should not happen. + */ + return; + + if (UCLYhndl_HTFile_for_unspec == disp_chndl) + /* + * Not need to do, so we don't. + */ + return; + + if (LYCharSet_UC[disp_chndl].enc == UCT_ENC_7BIT) + /* + * There shouldn't be any 8-bit characters in this case. + */ + return; + + /* + * In other cases we don't know because UCLYhndl_for_unspec may + * change during the lifetime of the file (by toggling raw mode + * or changing the display character set), so proceed. + */ + fprintf(fd, "<META %s content=\"text/html;charset=%s\">\n", + "http-equiv=\"content-type\"", + LYCharSet_UC[disp_chndl].MIMEname); +} +#endif /* EXP_CHARTRANS */ + +/* +** This function returns OL TYPE="A" strings in +** the range of " A." (1) to "ZZZ." (18278). - FM +*/ +PUBLIC char *LYUppercaseA_OL_String ARGS1( + int, seqnum) +{ + static char OLstring[8]; + + if (seqnum <= 1 ) { + strcpy(OLstring, " A."); + return OLstring; + } + if (seqnum < 27) { + sprintf(OLstring, " %c.", (seqnum + 64)); + return OLstring; + } + if (seqnum < 703) { + sprintf(OLstring, "%c%c.", ((seqnum-1)/26 + 64), + (seqnum - ((seqnum-1)/26)*26 + 64)); + return OLstring; + } + if (seqnum < 18279) { + sprintf(OLstring, "%c%c%c.", ((seqnum-27)/676 + 64), + (((seqnum - ((seqnum-27)/676)*676)-1)/26 + 64), + (seqnum - ((seqnum-1)/26)*26 + 64)); + return OLstring; + } + strcpy(OLstring, "ZZZ."); + return OLstring; +} + +/* +** This function returns OL TYPE="a" strings in +** the range of " a." (1) to "zzz." (18278). - FM +*/ +PUBLIC char *LYLowercaseA_OL_String ARGS1( + int, seqnum) +{ + static char OLstring[8]; + + if (seqnum <= 1 ) { + strcpy(OLstring, " a."); + return OLstring; + } + if (seqnum < 27) { + sprintf(OLstring, " %c.", (seqnum + 96)); + return OLstring; + } + if (seqnum < 703) { + sprintf(OLstring, "%c%c.", ((seqnum-1)/26 + 96), + (seqnum - ((seqnum-1)/26)*26 + 96)); + return OLstring; + } + if (seqnum < 18279) { + sprintf(OLstring, "%c%c%c.", ((seqnum-27)/676 + 96), + (((seqnum - ((seqnum-27)/676)*676)-1)/26 + 96), + (seqnum - ((seqnum-1)/26)*26 + 96)); + return OLstring; + } + strcpy(OLstring, "zzz."); + return OLstring; +} + +/* +** This function returns OL TYPE="I" strings in the +** range of " I." (1) to "MMM." (3000).- FM +*/ +PUBLIC char *LYUppercaseI_OL_String ARGS1( + int, seqnum) +{ + static char OLstring[8]; + int Arabic = seqnum; + + if (Arabic >= 3000) { + strcpy(OLstring, "MMM."); + return OLstring; + } + + switch(Arabic) { + case 1: + strcpy(OLstring, " I."); + return OLstring; + case 5: + strcpy(OLstring, " V."); + return OLstring; + case 10: + strcpy(OLstring, " X."); + return OLstring; + case 50: + strcpy(OLstring, " L."); + return OLstring; + case 100: + strcpy(OLstring, " C."); + return OLstring; + case 500: + strcpy(OLstring, " D."); + return OLstring; + case 1000: + strcpy(OLstring, " M."); + return OLstring; + default: + OLstring[0] = '\0'; + break; + } + + while (Arabic >= 1000) { + strcat(OLstring, "M"); + Arabic -= 1000; + } + + if (Arabic >= 900) { + strcat(OLstring, "CM"); + Arabic -= 900; + } + + if (Arabic >= 500) { + strcat(OLstring, "D"); + Arabic -= 500; + while (Arabic >= 500) { + strcat(OLstring, "C"); + Arabic -= 10; + } + } + + if (Arabic >= 400) { + strcat(OLstring, "CD"); + Arabic -= 400; + } + + while (Arabic >= 100) { + strcat(OLstring, "C"); + Arabic -= 100; + } + + if (Arabic >= 90) { + strcat(OLstring, "XC"); + Arabic -= 90; + } + + if (Arabic >= 50) { + strcat(OLstring, "L"); + Arabic -= 50; + while (Arabic >= 50) { + strcat(OLstring, "X"); + Arabic -= 10; + } + } + + if (Arabic >= 40) { + strcat(OLstring, "XL"); + Arabic -= 40; + } + + while (Arabic > 10) { + strcat(OLstring, "X"); + Arabic -= 10; + } + + switch (Arabic) { + case 1: + strcat(OLstring, "I."); + break; + case 2: + strcat(OLstring, "II."); + break; + case 3: + strcat(OLstring, "III."); + break; + case 4: + strcat(OLstring, "IV."); + break; + case 5: + strcat(OLstring, "V."); + break; + case 6: + strcat(OLstring, "VI."); + break; + case 7: + strcat(OLstring, "VII."); + break; + case 8: + strcat(OLstring, "VIII."); + break; + case 9: + strcat(OLstring, "IX."); + break; + case 10: + strcat(OLstring, "X."); + break; + default: + strcat(OLstring, "."); + break; + } + + return OLstring; +} + +/* +** This function returns OL TYPE="i" strings in +** range of " i." (1) to "mmm." (3000).- FM +*/ +PUBLIC char *LYLowercaseI_OL_String ARGS1( + int, seqnum) +{ + static char OLstring[8]; + int Arabic = seqnum; + + if (Arabic >= 3000) { + strcpy(OLstring, "mmm."); + return OLstring; + } + + switch(Arabic) { + case 1: + strcpy(OLstring, " i."); + return OLstring; + case 5: + strcpy(OLstring, " v."); + return OLstring; + case 10: + strcpy(OLstring, " x."); + return OLstring; + case 50: + strcpy(OLstring, " l."); + return OLstring; + case 100: + strcpy(OLstring, " c."); + return OLstring; + case 500: + strcpy(OLstring, " d."); + return OLstring; + case 1000: + strcpy(OLstring, " m."); + return OLstring; + default: + OLstring[0] = '\0'; + break; + } + + while (Arabic >= 1000) { + strcat(OLstring, "m"); + Arabic -= 1000; + } + + if (Arabic >= 900) { + strcat(OLstring, "cm"); + Arabic -= 900; + } + + if (Arabic >= 500) { + strcat(OLstring, "d"); + Arabic -= 500; + while (Arabic >= 500) { + strcat(OLstring, "c"); + Arabic -= 10; + } + } + + if (Arabic >= 400) { + strcat(OLstring, "cd"); + Arabic -= 400; + } + + while (Arabic >= 100) { + strcat(OLstring, "c"); + Arabic -= 100; + } + + if (Arabic >= 90) { + strcat(OLstring, "xc"); + Arabic -= 90; + } + + if (Arabic >= 50) { + strcat(OLstring, "l"); + Arabic -= 50; + while (Arabic >= 50) { + strcat(OLstring, "x"); + Arabic -= 10; + } + } + + if (Arabic >= 40) { + strcat(OLstring, "xl"); + Arabic -= 40; + } + + while (Arabic > 10) { + strcat(OLstring, "x"); + Arabic -= 10; + } + + switch (Arabic) { + case 1: + strcat(OLstring, "i."); + break; + case 2: + strcat(OLstring, "ii."); + break; + case 3: + strcat(OLstring, "iii."); + break; + case 4: + strcat(OLstring, "iv."); + break; + case 5: + strcat(OLstring, "v."); + break; + case 6: + strcat(OLstring, "vi."); + break; + case 7: + strcat(OLstring, "vii."); + break; + case 8: + strcat(OLstring, "viii."); + break; + case 9: + strcat(OLstring, "ix."); + break; + case 10: + strcat(OLstring, "x."); + break; + default: + strcat(OLstring, "."); + break; + } + + return OLstring; +} + +/* +** This function initializes the Ordered List counter. - FM +*/ +PUBLIC void LYZero_OL_Counter ARGS1( + HTStructured *, me) +{ + int i; + + if (!me) + return; + + for (i = 0; i < 12; i++) { + me->OL_Counter[i] = OL_VOID; + me->OL_Type[i] = '1'; + } + + me->Last_OL_Count = 0; + me->Last_OL_Type = '1'; + + return; +} + +#ifdef EXP_CHARTRANS +/* +** This function is used by the HTML Structured object. - kw +*/ +PUBLIC void LYGetChartransInfo ARGS1( + HTStructured *, me) +{ + me->UCLYhndl = HTAnchor_getUCLYhndl(me->node_anchor, + UCT_STAGE_STRUCTURED); + if (me->UCLYhndl < 0) { + int chndl = HTAnchor_getUCLYhndl(me->node_anchor, UCT_STAGE_HTEXT); + + if (chndl < 0) { + chndl = current_char_set; + HTAnchor_setUCInfoStage(me->node_anchor, chndl, UCT_STAGE_HTEXT, + UCT_SETBY_STRUCTURED); + } + HTAnchor_setUCInfoStage(me->node_anchor, chndl, + UCT_STAGE_STRUCTURED, UCT_SETBY_STRUCTURED); + me->UCLYhndl = HTAnchor_getUCLYhndl(me->node_anchor, + UCT_STAGE_STRUCTURED); + } + me->UCI = HTAnchor_getUCInfoStage(me->node_anchor, UCT_STAGE_STRUCTURED); +} + +#endif /* EXP_CHARTRANS */ + +/* +** This function reallocates an allocated string with +** 8-bit printable Latin characters (>= 160) converted +** to their HTML entity names and then translated for +** the current character set. - FM +*/ +PUBLIC void LYExpandString ARGS1( + char **, str) +{ + char *p = *str; + char *q = *str; + CONST char *name; + int i, j, value, high, low, diff = 0; + + /* + ** Don't do anything if we have no string + ** or are in CJK mode. - FM + */ + if (!p || *p == '\0' || + HTCJK != NOCJK) + return; + + /* + ** Start a clean copy of the string, without + ** invalidating our pointer to the original. - FM + */ + *str = NULL; + StrAllocCopy(*str, ""); + + /* + ** Check each character in the original string, + ** and add the characters or substitutions to + ** our clean copy. - FM + */ + for (i = 0; p[i]; i++) { + /* + ** Substitute Lynx special character for + ** 160 (nbsp) if HTPassHighCtrlRaw is not + ** set. - FM + */ + if (((unsigned char)p[i]) == 160 && + !HTPassHighCtrlRaw) { + p[i] = HT_NON_BREAK_SPACE; + /* + ** Substitute Lynx special character for + ** 173 (shy) if HTPassHighCtrlRaw is not + ** set. - FM + */ + } else if (((unsigned char)p[i]) == 173 && + !HTPassHighCtrlRaw) { + p[i] = LY_SOFT_HYPHEN; + /* + ** Substitute other 8-bit characters based on + ** the LYCharsets.c tables if HTPassEightBitRaw + ** is not set. - FM + */ + } else if (((unsigned char)p[i]) > 160 && + !HTPassEightBitRaw) { + value = (int)(((unsigned char)p[i]) - 160); + p[i] = '\0'; + StrAllocCat(*str, q); + q = &p[i+1]; + name = HTMLGetEntityName(value); + for (low = 0, high = HTML_dtd.number_of_entities; + high > low; + diff < 0 ? (low = j+1) : (high = j)) { + /* Binary search */ + j = (low + (high-low)/2); + diff = strcmp(HTML_dtd.entity_names[j], name); + if (diff == 0) { + StrAllocCat(*str, p_entity_values[j]); + break; + } + } + } + } + StrAllocCat(*str, q); + free_and_clear(&p); +} + +/* ** This function converts HTML named entities within a string ** to their translations in the active LYCharSets.c array. ** It also converts numeric entities to their HTML entity names @@ -875,843 +1713,6 @@ PUBLIC void LYUnEscapeToLatinOne ARGS2( } /* -** This function reallocates an allocated string with -** 8-bit printable Latin characters (>= 160) converted -** to their HTML entity names and then translated for -** the current character set. - FM -*/ -PUBLIC void LYExpandString ARGS1( - char **, str) -{ - char *p = *str; - char *q = *str; - CONST char *name; - int i, j, value, high, low, diff = 0; - - /* - ** Don't do anything if we have no string - ** or are in CJK mode. - FM - */ - if (!p || *p == '\0' || - HTCJK != NOCJK) - return; - - /* - ** Start a clean copy of the string, without - ** invalidating our pointer to the original. - FM - */ - *str = NULL; - StrAllocCopy(*str, ""); - - /* - ** Check each character in the original string, - ** and add the characters or substitutions to - ** our clean copy. - FM - */ - for (i = 0; p[i]; i++) { - /* - ** Substitute Lynx special character for - ** 160 (nbsp) if HTPassHighCtrlRaw is not - ** set. - FM - */ - if (((unsigned char)p[i]) == 160 && - !HTPassHighCtrlRaw) { - p[i] = HT_NON_BREAK_SPACE; - /* - ** Substitute Lynx special character for - ** 173 (shy) if HTPassHighCtrlRaw is not - ** set. - FM - */ - } else if (((unsigned char)p[i]) == 173 && - !HTPassHighCtrlRaw) { - p[i] = LY_SOFT_HYPHEN; - /* - ** Substitute other 8-bit characters based on - ** the LYCharsets.c tables if HTPassEightBitRaw - ** is not set. - FM - */ - } else if (((unsigned char)p[i]) > 160 && - !HTPassEightBitRaw) { - value = (int)(((unsigned char)p[i]) - 160); - p[i] = '\0'; - StrAllocCat(*str, q); - q = &p[i+1]; - name = HTMLGetEntityName(value); - for (low = 0, high = HTML_dtd.number_of_entities; - high > low; - diff < 0 ? (low = j+1) : (high = j)) { - /* Binary search */ - j = (low + (high-low)/2); - diff = strcmp(HTML_dtd.entity_names[j], name); - if (diff == 0) { - StrAllocCat(*str, p_entity_values[j]); - break; - } - } - } - } - StrAllocCat(*str, q); - free_and_clear(&p); -} - -/* -** This function converts any ampersands in allocated -** strings to "&". If isTITLE is TRUE, it also -** converts any angle-brackets to "<" or ">". - FM -*/ -PUBLIC void LYEntify ARGS2( - char **, str, - BOOLEAN, isTITLE) -{ - char *p = *str; - char *q = NULL, *cp = NULL; - int amps = 0, lts = 0, gts = 0; - - if (p == NULL || *p == '\0') - return; - - /* - * Count the ampersands. - FM - */ - while ((*p != '\0') && (q = strchr(p, '&')) != NULL) { - amps++; - p = (q + 1); - } - - /* - * Count the left-angle-brackets, if needed. - FM - */ - if (isTITLE == TRUE) { - p = *str; - while ((*p != '\0') && (q = strchr(p, '<')) != NULL) { - lts++; - p = (q + 1); - } - } - - /* - * Count the right-angle-brackets, if needed. - FM - */ - if (isTITLE == TRUE) { - p = *str; - while ((*p != '\0') && (q = strchr(p, '>')) != NULL) { - gts++; - p = (q + 1); - } - } - - /* - * Check whether we need to convert anything. - FM - */ - if (amps == 0 && lts == 0 && gts == 0) - return; - - /* - * Allocate space and convert. - FM - */ - q = (char *)calloc(1, - (strlen(*str) + (4 * amps) + (3 * lts) + (3 * gts) + 1)); - if ((cp = q) == NULL) - outofmem(__FILE__, "LYEntify"); - for (p = *str; *p; p++) { - if (*p == '&') { - *q++ = '&'; - *q++ = 'a'; - *q++ = 'm'; - *q++ = 'p'; - *q++ = ';'; - } else if (isTITLE && *p == '<') { - *q++ = '&'; - *q++ = 'l'; - *q++ = 't'; - *q++ = ';'; - } else if (isTITLE && *p == '>') { - *q++ = '&'; - *q++ = 'g'; - *q++ = 't'; - *q++ = ';'; - } else { - *q++ = *p; - } - } - StrAllocCopy(*str, cp); - FREE(cp); -} - -/* -** This function trims characters <= that of a space (32), -** including HT_NON_BREAK_SPACE (1) and HT_EM_SPACE (2), -** but not ESC, from the heads of strings. - FM -*/ -PUBLIC void LYTrimHead ARGS1( - char *, str) -{ - int i = 0, j; - - if (!str || *str == '\0') - return; - - while (str[i] != '\0' && WHITE(str[i]) && (unsigned char)str[i] != 27) - i++; - if (i > 0) { - for (j = 0; str[i] != '\0'; i++) { - str[j++] = str[i]; - } - str[j] = '\0'; - } -} - -/* -** This function trims characters <= that of a space (32), -** including HT_NON_BREAK_SPACE (1), HT_EM_SPACE (2), and -** ESC from the tails of strings. - FM -*/ -PUBLIC void LYTrimTail ARGS1( - char *, str) -{ - int i; - - if (!str || *str == '\0') - return; - - i = (strlen(str) - 1); - while (i >= 0) { - if (WHITE(str[i])) - str[i] = '\0'; - else - break; - i--; - } -} - -/* -** This function should receive a pointer to the start -** of a comment. It returns a pointer to the end ('>') -** character of comment, or it's best guess if the comment -** is invalid. - FM -*/ -PUBLIC char *LYFindEndOfComment ARGS1( - char *, str) -{ - char *cp, *cp1; - enum comment_state { start1, start2, end1, end2 } state; - - if (str == NULL) - /* - * We got NULL, so return NULL. - FM - */ - return NULL; - - if (strncmp(str, "<!--", 4)) - /* - * We don't have the start of a comment, so - * return the beginning of the string. - FM - */ - return str; - - cp = (str + 4); - if (*cp =='>') - /* - * It's an invalid comment, so - * return this end character. - FM - */ - return cp; - - if ((cp1 = strchr(cp, '>')) == NULL) - /* - * We don't have an end character, so - * return the beginning of the string. - FM - */ - return str; - - if (*cp == '-') - /* - * Ugh, it's a "decorative" series of dashes, - * so return the next end character. - FM - */ - return cp1; - - /* - * OK, we're ready to start parsing. - FM - */ - state = start2; - while (*cp != '\0') { - switch (state) { - case start1: - if (*cp == '-') - state = start2; - else - /* - * Invalid comment, so return the first - * '>' from the start of the string. - FM - */ - return cp1; - break; - - case start2: - if (*cp == '-') - state = end1; - break; - - case end1: - if (*cp == '-') - state = end2; - else - /* - * Invalid comment, so return the first - * '>' from the start of the string. - FM - */ - return cp1; - break; - - case end2: - if (*cp == '>') - /* - * Valid comment, so return the end character. - FM - */ - return cp; - if (*cp == '-') { - state = start1; - } else if (!(WHITE(*cp) && (unsigned char)*cp != 27)) { - /* - * Invalid comment, so return the first - * '>' from the start of the string. - FM - */ - return cp1; - } - break; - - default: - break; - } - cp++; - } - - /* - * Invalid comment, so return the first - * '>' from the start of the string. - FM - */ - return cp1; -} - -/* -** If an HREF, itself or if resolved against a base, -** represents a file URL, and the host is defaulted, -** force in "//localhost". We need this until -** all the other Lynx code which performs security -** checks based on the "localhost" string is changed -** to assume "//localhost" when a host field is not -** present in file URLs - FM -*/ -PUBLIC void LYFillLocalFileURL ARGS2( - char **, href, - char *, base) -{ - char * temp = NULL; - - if (*href == NULL || *(*href) == '\0') - return; - - if (!strcmp(*href, "//") || !strncmp(*href, "///", 3)) { - if (base != NULL && !strncmp(base, "file:", 5)) { - StrAllocCopy(temp, "file:"); - StrAllocCat(temp, *href); - StrAllocCopy(*href, temp); - } - } - if (!strncmp(*href, "file:", 5)) { - if (*(*href+5) == '\0') { - StrAllocCat(*href, "//localhost"); - } else if (!strcmp(*href, "file://")) { - StrAllocCat(*href, "localhost"); - } else if (!strncmp(*href, "file:///", 8)) { - StrAllocCopy(temp, (*href+7)); - StrAllocCopy(*href, "file://localhost"); - StrAllocCat(*href, temp); - } else if (!strncmp(*href, "file:/", 6) && *(*href+6) != '/') { - StrAllocCopy(temp, (*href+5)); - StrAllocCopy(*href, "file://localhost"); - StrAllocCat(*href, temp); - } - } - - /* - * No path in a file://localhost URL means a - * directory listing for the current default. - FM - */ - if (!strcmp(*href, "file://localhost")) { -#ifdef VMS - StrAllocCat(*href, HTVMS_wwwName(getenv("PATH"))); -#else - char curdir[DIRNAMESIZE]; -#if HAVE_GETCWD - getcwd (curdir, DIRNAMESIZE); -#else - getwd (curdir); -#endif /* NO_GETCWD */ -#ifdef DOSPATH - StrAllocCat(*href, HTDOS_wwwName(curdir)); -#else - StrAllocCat(*href, curdir); -#endif /* DOSPATH */ -#endif /* VMS */ - } - -#ifdef VMS - /* - * On VMS, a file://localhost/ URL means - * a listing for the login directory. - FM - */ - if (!strcmp(*href, "file://localhost/")) - StrAllocCat(*href, (HTVMS_wwwName((char *)Home_Dir())+1)); -#endif /* VMS */ - - FREE(temp); - return; -} - -#ifdef EXP_CHARTRANS -/* -** This function writes a line with a META tag to an open file, -** which will specify a charset parameter to use when the file is -** read back in. It is meant for temporary HTML files used by the -** various special pages which may show titles of documents. When those -** files are created, the title strings normally have been translated and -** expanded to the display character set, so we have to make sure they -** don't get translated again. -** If the user has changed the display character set during the lifetime -** of the Lynx session (or, more exactly, during the time the title -** strings to be written were generated), they may now have different -** character encodings and there is currently no way to get it all right. -** To change this, we would have to add a variable for each string which -** keeps track of its character encoding... -** But at least we can try to ensure that reading the file after future -** display character set changes will give reasonable output. -** -** The META tag is not written if the display character set (passed as -** disp_chndl) already corresponds to the charset assumption that -** would be made when the file is read. - KW -*/ -PUBLIC void LYAddMETAcharsetToFD ARGS2( - FILE *, fd, - int, disp_chndl) -{ - if (disp_chndl == -1) - /* - * -1 means use current_char_set. - */ - disp_chndl = current_char_set; - - if (fd == NULL || disp_chndl < 0) - /* - * Should not happen. - */ - return; - - if (UCLYhndl_HTFile_for_unspec == disp_chndl) - /* - * Not need to do, so we don't. - */ - return; - - if (LYCharSet_UC[disp_chndl].enc == UCT_ENC_7BIT) - /* - * There shouldn't be any 8-bit characters in this case. - */ - return; - - /* - * In other cases we don't know because UCLYhndl_for_unspec may - * change during the lifetime of the file (by toggling raw mode - * or changing the display character set), so proceed. - */ - fprintf(fd, "<META %s content=\"text/html;charset=%s\">\n", - "http-equiv=\"content-type\"", - LYCharSet_UC[disp_chndl].MIMEname); -} -#endif /* EXP_CHARTRANS */ - -/* -** This function returns OL TYPE="A" strings in -** the range of " A." (1) to "ZZZ." (18278). - FM -*/ -PUBLIC char *LYUppercaseA_OL_String ARGS1( - int, seqnum) -{ - static char OLstring[8]; - - if (seqnum <= 1 ) { - strcpy(OLstring, " A."); - return OLstring; - } - if (seqnum < 27) { - sprintf(OLstring, " %c.", (seqnum + 64)); - return OLstring; - } - if (seqnum < 703) { - sprintf(OLstring, "%c%c.", ((seqnum-1)/26 + 64), - (seqnum - ((seqnum-1)/26)*26 + 64)); - return OLstring; - } - if (seqnum < 18279) { - sprintf(OLstring, "%c%c%c.", ((seqnum-27)/676 + 64), - (((seqnum - ((seqnum-27)/676)*676)-1)/26 + 64), - (seqnum - ((seqnum-1)/26)*26 + 64)); - return OLstring; - } - strcpy(OLstring, "ZZZ."); - return OLstring; -} - -/* -** This function returns OL TYPE="a" strings in -** the range of " a." (1) to "zzz." (18278). - FM -*/ -PUBLIC char *LYLowercaseA_OL_String ARGS1( - int, seqnum) -{ - static char OLstring[8]; - - if (seqnum <= 1 ) { - strcpy(OLstring, " a."); - return OLstring; - } - if (seqnum < 27) { - sprintf(OLstring, " %c.", (seqnum + 96)); - return OLstring; - } - if (seqnum < 703) { - sprintf(OLstring, "%c%c.", ((seqnum-1)/26 + 96), - (seqnum - ((seqnum-1)/26)*26 + 96)); - return OLstring; - } - if (seqnum < 18279) { - sprintf(OLstring, "%c%c%c.", ((seqnum-27)/676 + 96), - (((seqnum - ((seqnum-27)/676)*676)-1)/26 + 96), - (seqnum - ((seqnum-1)/26)*26 + 96)); - return OLstring; - } - strcpy(OLstring, "zzz."); - return OLstring; -} - -/* -** This function returns OL TYPE="I" strings in the -** range of " I." (1) to "MMM." (3000).- FM -*/ -PUBLIC char *LYUppercaseI_OL_String ARGS1( - int, seqnum) -{ - static char OLstring[8]; - int Arabic = seqnum; - - if (Arabic >= 3000) { - strcpy(OLstring, "MMM."); - return OLstring; - } - - switch(Arabic) { - case 1: - strcpy(OLstring, " I."); - return OLstring; - case 5: - strcpy(OLstring, " V."); - return OLstring; - case 10: - strcpy(OLstring, " X."); - return OLstring; - case 50: - strcpy(OLstring, " L."); - return OLstring; - case 100: - strcpy(OLstring, " C."); - return OLstring; - case 500: - strcpy(OLstring, " D."); - return OLstring; - case 1000: - strcpy(OLstring, " M."); - return OLstring; - default: - OLstring[0] = '\0'; - break; - } - - while (Arabic >= 1000) { - strcat(OLstring, "M"); - Arabic -= 1000; - } - - if (Arabic >= 900) { - strcat(OLstring, "CM"); - Arabic -= 900; - } - - if (Arabic >= 500) { - strcat(OLstring, "D"); - Arabic -= 500; - while (Arabic >= 500) { - strcat(OLstring, "C"); - Arabic -= 10; - } - } - - if (Arabic >= 400) { - strcat(OLstring, "CD"); - Arabic -= 400; - } - - while (Arabic >= 100) { - strcat(OLstring, "C"); - Arabic -= 100; - } - - if (Arabic >= 90) { - strcat(OLstring, "XC"); - Arabic -= 90; - } - - if (Arabic >= 50) { - strcat(OLstring, "L"); - Arabic -= 50; - while (Arabic >= 50) { - strcat(OLstring, "X"); - Arabic -= 10; - } - } - - if (Arabic >= 40) { - strcat(OLstring, "XL"); - Arabic -= 40; - } - - while (Arabic > 10) { - strcat(OLstring, "X"); - Arabic -= 10; - } - - switch (Arabic) { - case 1: - strcat(OLstring, "I."); - break; - case 2: - strcat(OLstring, "II."); - break; - case 3: - strcat(OLstring, "III."); - break; - case 4: - strcat(OLstring, "IV."); - break; - case 5: - strcat(OLstring, "V."); - break; - case 6: - strcat(OLstring, "VI."); - break; - case 7: - strcat(OLstring, "VII."); - break; - case 8: - strcat(OLstring, "VIII."); - break; - case 9: - strcat(OLstring, "IX."); - break; - case 10: - strcat(OLstring, "X."); - break; - default: - strcat(OLstring, "."); - break; - } - - return OLstring; -} - -/* -** This function returns OL TYPE="i" strings in -** range of " i." (1) to "mmm." (3000).- FM -*/ -PUBLIC char *LYLowercaseI_OL_String ARGS1( - int, seqnum) -{ - static char OLstring[8]; - int Arabic = seqnum; - - if (Arabic >= 3000) { - strcpy(OLstring, "mmm."); - return OLstring; - } - - switch(Arabic) { - case 1: - strcpy(OLstring, " i."); - return OLstring; - case 5: - strcpy(OLstring, " v."); - return OLstring; - case 10: - strcpy(OLstring, " x."); - return OLstring; - case 50: - strcpy(OLstring, " l."); - return OLstring; - case 100: - strcpy(OLstring, " c."); - return OLstring; - case 500: - strcpy(OLstring, " d."); - return OLstring; - case 1000: - strcpy(OLstring, " m."); - return OLstring; - default: - OLstring[0] = '\0'; - break; - } - - while (Arabic >= 1000) { - strcat(OLstring, "m"); - Arabic -= 1000; - } - - if (Arabic >= 900) { - strcat(OLstring, "cm"); - Arabic -= 900; - } - - if (Arabic >= 500) { - strcat(OLstring, "d"); - Arabic -= 500; - while (Arabic >= 500) { - strcat(OLstring, "c"); - Arabic -= 10; - } - } - - if (Arabic >= 400) { - strcat(OLstring, "cd"); - Arabic -= 400; - } - - while (Arabic >= 100) { - strcat(OLstring, "c"); - Arabic -= 100; - } - - if (Arabic >= 90) { - strcat(OLstring, "xc"); - Arabic -= 90; - } - - if (Arabic >= 50) { - strcat(OLstring, "l"); - Arabic -= 50; - while (Arabic >= 50) { - strcat(OLstring, "x"); - Arabic -= 10; - } - } - - if (Arabic >= 40) { - strcat(OLstring, "xl"); - Arabic -= 40; - } - - while (Arabic > 10) { - strcat(OLstring, "x"); - Arabic -= 10; - } - - switch (Arabic) { - case 1: - strcat(OLstring, "i."); - break; - case 2: - strcat(OLstring, "ii."); - break; - case 3: - strcat(OLstring, "iii."); - break; - case 4: - strcat(OLstring, "iv."); - break; - case 5: - strcat(OLstring, "v."); - break; - case 6: - strcat(OLstring, "vi."); - break; - case 7: - strcat(OLstring, "vii."); - break; - case 8: - strcat(OLstring, "viii."); - break; - case 9: - strcat(OLstring, "ix."); - break; - case 10: - strcat(OLstring, "x."); - break; - default: - strcat(OLstring, "."); - break; - } - - return OLstring; -} - -/* -** This function initializes the Ordered List counter. - FM -*/ -PUBLIC void LYZero_OL_Counter ARGS1( - HTStructured *, me) -{ - int i; - - if (!me) - return; - - for (i = 0; i < 12; i++) { - me->OL_Counter[i] = OL_VOID; - me->OL_Type[i] = '1'; - } - - me->Last_OL_Count = 0; - me->Last_OL_Type = '1'; - - return; -} - -#ifdef EXP_CHARTRANS -/* -** This function is used by the HTML Structured object. - kw -*/ -PUBLIC void LYGetChartransInfo ARGS1( - HTStructured *, me) -{ - me->UCLYhndl = HTAnchor_getUCLYhndl(me->node_anchor, - UCT_STAGE_STRUCTURED); - if (me->UCLYhndl < 0) { - int chndl = HTAnchor_getUCLYhndl(me->node_anchor, UCT_STAGE_HTEXT); - - if (chndl < 0) { - chndl = current_char_set; - HTAnchor_setUCInfoStage(me->node_anchor, chndl, UCT_STAGE_HTEXT, - UCT_SETBY_STRUCTURED); - } - HTAnchor_setUCInfoStage(me->node_anchor, chndl, - UCT_STAGE_STRUCTURED, UCT_SETBY_STRUCTURED); - me->UCLYhndl = HTAnchor_getUCLYhndl(me->node_anchor, - UCT_STAGE_STRUCTURED); - } - me->UCI = HTAnchor_getUCInfoStage(me->node_anchor, UCT_STAGE_STRUCTURED); -} - -#endif /* EXP_CHARTRANS */ -/* ** This function processes META tags in HTML streams. - FM */ PUBLIC void LYHandleMETA ARGS4( @@ -2710,7 +2711,6 @@ PUBLIC int LYLegitimizeHREF ARGS4( * it, such that the bad partial reference might get corrected * by the document provider. - FM */ - int i = 0, j = 0; char *temp = NULL, *path = NULL, *str = "", *cp; if (((temp = HTParse(*href, diff --git a/src/LYCookie.c b/src/LYCookie.c index aacd99ac..efed484c 100644 --- a/src/LYCookie.c +++ b/src/LYCookie.c @@ -511,7 +511,6 @@ PRIVATE char * scan_cookie_sublist ARGS6( HTList *hl = sublist, *next = NULL; cookie *co; time_t now = time(NULL); - BOOL Quoted = FALSE; int len = 0; char crlftab[8]; @@ -669,7 +668,6 @@ PRIVATE void LYProcessSetCookies ARGS6( char *, path, int, port) { - char *header = NULL; CONST char *p, *attr_start, *attr_end, *value_start, *value_end; HTList *CombinedCookies = NULL, *cl = NULL; cookie *cur_cookie = NULL, *co = NULL; @@ -1695,8 +1693,8 @@ PRIVATE void LYProcessSetCookies ARGS6( (co->name ? co->name : "[no name]"), (co->value ? co->value : "[no value]")); if (co->expires > 0) { - fprintf(stderr, " expires: %i, %s\n", - co->expires, + fprintf(stderr, " expires: %ld, %s\n", + (long) co->expires, ctime(&co->expires)); } } diff --git a/src/LYHistory.c b/src/LYHistory.c index 142703dd..9f815d2f 100644 --- a/src/LYHistory.c +++ b/src/LYHistory.c @@ -174,8 +174,8 @@ PUBLIC void LYpush ARGS2( if (history[nhist-1].internal_link == doc->internal_link) { /* But it is nice to have the last position remembered! - kw */ - history[nhist].link = doc->link; - history[nhist].page = doc->line; + history[nhist-1].link = doc->link; + history[nhist-1].page = doc->line; return; } } diff --git a/src/LYNews.c b/src/LYNews.c index bd18e4ee..e3c9167b 100644 --- a/src/LYNews.c +++ b/src/LYNews.c @@ -159,10 +159,6 @@ PUBLIC char *LYNewsPost ARGS2( } if (strncasecomp(cp, "Re:", 3)) { strcat(user_input, "Re: "); - cp += 3; - while (isspace(*cp)) { - cp++; - } } strcat(user_input, cp); } diff --git a/src/LYUtils.c b/src/LYUtils.c index ba4d706d..26015709 100644 --- a/src/LYUtils.c +++ b/src/LYUtils.c @@ -190,16 +190,7 @@ PUBLIC void highlight ARGS3( */ if (links[cur].hightext2 && links[cur].ly < display_lines) { lynx_stop_link_color (flag == ON, links[cur].inUnderline); - -#ifndef USE_SLANG - if ((char)(inch() & A_CHARTEXT) == '-') - move(links[cur].ly + 1, 0); - else -#endif - addch('\n'); - for (i = 0; i < links[cur].hightext2_offset; i++) - addch(' '); - + move((links[cur].ly + 1), links[cur].hightext2_offset); #ifndef USE_COLOR_STYLE lynx_start_link_color (flag == ON, links[cur].inUnderline); #else diff --git a/src/chrtrans/makefile.in b/src/chrtrans/makefile.in index b1e00c7d..924b6a77 100644 --- a/src/chrtrans/makefile.in +++ b/src/chrtrans/makefile.in @@ -17,6 +17,7 @@ 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@ @@ -103,3 +104,8 @@ clean: distclean: clean -rm -rf obsolete rm -f core *.bak *.sav *~ *.h_old + +depend : + makedepend -fmakefile -- $(CFLAGS) -- $(C_SRC) + +# DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/src/makefile.in b/src/makefile.in index e024ff12..897dc39e 100644 --- a/src/makefile.in +++ b/src/makefile.in @@ -19,9 +19,13 @@ 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@ +LINT = @LINT@ +LINTOPTS = + LIBS = @LIBS@ $(RESOLVLIB) $(WAISLIB) $(SOCKSLIB) $(SITE_LIBS) LDFLAGS = @LDFLAGS@ @@ -36,6 +40,8 @@ LYLeaks.o LYexit.o LYJump.o LYList.o LYCgi.o LYTraversal.o \ LYEditmap.o LYCharSets.o LYCharUtils.o LYMap.o LYCookie.o LYExtern.o \ LYStyle.o LYHash.o @EXTRA_OBJS@ +C_SRC = $(OBJS:.o=.c) + all: lynx .SUFFIXES : .i @@ -65,12 +71,14 @@ do_chartrans_stuff: CC="$(CC)" tables lint: - lint $(CPPOPTS) *.c > ../lint.out + $(LINT) $(LINTOPTS) $(CPPOPTS) *.c > ../lint.out clean: - rm -f lynx core *.[ob] + rm -f lynx core *.[ob] *.bak cd chrtrans && $(MAKE) clean +distclean: clean + LYMain.o: ../userdefs.h LYMainLoop.o: ../userdefs.h LYReadCFG.o: ../userdefs.h @@ -120,3 +128,8 @@ UCdomap.o: UCdomap.c chrtrans/UCkd.h chrtrans/makeuctb chrtrans/makeuctb.c \ UCAux.o : UCAux.c $(CMN)UCAux.h $(CMN)UCDefs.h LYCookie.o: ../userdefs.h + +depend : + makedepend -fmakefile -- $(CFLAGS) -- $(C_SRC) + +# DO NOT DELETE THIS LINE -- make depend depends on it. |