lynx-dev [PATCH][dev22] Fix --disable-trace, #includes

[John Bley]

* Fix --disable-trace, chop more unneeded #includes (John Bley)

Strange:
Turning trace off at compile-time transforms all instances of
CTRACE(...)
  to 
if (0) fprintf(...)

But the string literals in the CTRACE calls still wind up in the binaries 
for me.  (Tried this with both Sun's cc and gcc).  This is like 30k worth 
of string literal over the whole lynx source.  It's very disturbing.

-- 
John Bley - address@hidden
Duke '99 - English/Computer Science
  Since English is a mess, it maps well onto the problem space,
  which is also a mess, which we call reality.     - Larry Wall

diff -Burp lynx2-8-2/WWW/Library/Implementation/HTUtils.h 
lynx2-8-2-patched/WWW/Library/Implementation/HTUtils.h
--- lynx2-8-2/WWW/Library/Implementation/HTUtils.h      Tue Apr 13 05:39:16 1999
+++ lynx2-8-2-patched/WWW/Library/Implementation/HTUtils.h      Fri Apr 16 
19:02:34 1999
@@ -122,13 +122,13 @@ Debug message control.
 
  */
 
-#ifdef DEBUG
+#ifdef NO_LYNX_TRACE
+#define TRACE 0
+#define PROGRESS(str) /* nothing for now */
+#else
 #define TRACE (WWW_TraceFlag)
 #define PROGRESS(str) printf(str)
         extern int WWW_TraceFlag;
-#else
-#define TRACE 0
-#define PROGRESS(str) /* nothing for now */
 #endif
 
 /*
diff -Burp lynx2-8-2/src/HTFWriter.c lynx2-8-2-patched/src/HTFWriter.c
--- lynx2-8-2/src/HTFWriter.c   Thu Mar  4 05:39:45 1999
+++ lynx2-8-2-patched/src/HTFWriter.c   Fri Apr 16 18:49:50 1999
@@ -23,7 +23,6 @@
 #include <LYUtils.h>
 #include <LYGlobalDefs.h>
 #include <LYClean.h>
-#include <LYSignal.h>
 #include <GridText.h>
 #include <LYexit.h>
 #include <LYLeaks.h>
diff -Burp lynx2-8-2/src/LYCgi.c lynx2-8-2-patched/src/LYCgi.c
--- lynx2-8-2/src/LYCgi.c       Tue Apr 13 05:39:16 1999
+++ lynx2-8-2-patched/src/LYCgi.c       Fri Apr 16 18:49:50 1999
@@ -41,7 +41,6 @@
 #include <LYBookmark.h>
 #include <GridText.h>
 #include <LYCgi.h>
-#include <LYSignal.h>
 #include <LYStrings.h>
 #include <LYLocal.h>
 
diff -Burp lynx2-8-2/src/LYCharUtils.c lynx2-8-2-patched/src/LYCharUtils.c
--- lynx2-8-2/src/LYCharUtils.c Wed Mar 17 22:17:11 1999
+++ lynx2-8-2-patched/src/LYCharUtils.c Fri Apr 16 18:49:50 1999
@@ -29,7 +29,6 @@
 #include <HTForms.h>
 #include <HTNestedList.h>
 #include <GridText.h>
-#include <LYSignal.h>
 #include <LYStrings.h>
 #include <LYUtils.h>
 #include <LYMap.h>
diff -Burp lynx2-8-2/src/LYClean.c lynx2-8-2-patched/src/LYClean.c
--- lynx2-8-2/src/LYClean.c     Tue Apr 13 05:39:16 1999
+++ lynx2-8-2-patched/src/LYClean.c     Fri Apr 16 18:49:50 1999
@@ -5,7 +5,6 @@
 #include <LYClean.h>
 #include <LYMainLoop.h>
 #include <LYGlobalDefs.h>
-#include <LYStrings.h>
 #include <LYTraversal.h>
 #include <LYCookie.h>
 #include <UCAuto.h>
diff -Burp lynx2-8-2/src/LYCookie.c lynx2-8-2-patched/src/LYCookie.c
--- lynx2-8-2/src/LYCookie.c    Tue Apr 13 05:39:16 1999
+++ lynx2-8-2-patched/src/LYCookie.c    Fri Apr 16 18:49:50 1999
@@ -59,7 +59,6 @@
 #include <HTParse.h>
 #include <HTAlert.h>
 #include <LYCurses.h>
-#include <LYSignal.h>
 #include <LYUtils.h>
 #include <LYCharUtils.h>
 #include <LYClean.h>
diff -Burp lynx2-8-2/src/LYEdit.c lynx2-8-2-patched/src/LYEdit.c
--- lynx2-8-2/src/LYEdit.c      Tue Apr 13 05:39:16 1999
+++ lynx2-8-2-patched/src/LYEdit.c      Fri Apr 16 18:49:50 1999
@@ -5,7 +5,6 @@
 #include <LYUtils.h>
 #include <LYGlobalDefs.h>
 #include <LYEdit.h>
-#include <LYStrings.h>
 #ifdef VMS
 #include <unixio.h>
 #endif /* VMS */
diff -Burp lynx2-8-2/src/LYHistory.c lynx2-8-2-patched/src/LYHistory.c
--- lynx2-8-2/src/LYHistory.c   Tue Apr 13 05:39:16 1999
+++ lynx2-8-2-patched/src/LYHistory.c   Fri Apr 16 18:49:50 1999
@@ -11,7 +11,6 @@
 #include <LYKeymap.h>
 #include <LYList.h>
 #include <LYShowInfo.h>
-#include <LYSignal.h>
 #include <LYStrings.h>
 #include <LYCharUtils.h>
 
diff -Burp lynx2-8-2/src/LYList.c lynx2-8-2-patched/src/LYList.c
--- lynx2-8-2/src/LYList.c      Thu Mar  4 05:39:45 1999
+++ lynx2-8-2-patched/src/LYList.c      Fri Apr 16 18:49:50 1999
@@ -11,7 +11,6 @@
 #include <GridText.h>
 #include <LYList.h>
 #include <LYClean.h>
-#include <LYSignal.h>
 #include <LYGlobalDefs.h>
 #include <LYCharUtils.h>
 
diff -Burp lynx2-8-2/src/LYMap.c lynx2-8-2-patched/src/LYMap.c
--- lynx2-8-2/src/LYMap.c       Tue Apr 13 05:39:16 1999
+++ lynx2-8-2-patched/src/LYMap.c       Fri Apr 16 18:49:50 1999
@@ -15,7 +15,6 @@
 #include <LYUtils.h>
 #include <LYMap.h>
 #include <GridText.h>
-#include <LYSignal.h>
 #include <LYGlobalDefs.h>
 #include <LYKeymap.h>
 #include <LYCharUtils.h>
diff -Burp lynx2-8-2/src/LYReadCFG.c lynx2-8-2-patched/src/LYReadCFG.c
--- lynx2-8-2/src/LYReadCFG.c   Tue Apr 13 05:39:16 1999
+++ lynx2-8-2-patched/src/LYReadCFG.c   Fri Apr 16 18:49:50 1999
@@ -17,7 +17,6 @@
 #include <LYGetFile.h>
 #include <LYCgi.h>
 #include <LYCurses.h>
-#include <LYSignal.h>
 #include <LYBookmark.h>
 #include <LYCookie.h>
 #include <LYReadCFG.h>
diff -Burp lynx2-8-2/src/LYShowInfo.c lynx2-8-2-patched/src/LYShowInfo.c
--- lynx2-8-2/src/LYShowInfo.c  Tue Apr 13 05:39:16 1999
+++ lynx2-8-2-patched/src/LYShowInfo.c  Fri Apr 16 18:49:51 1999
@@ -4,12 +4,10 @@
 #include <HTAlert.h>
 #include <HTTP.h>
 #include <LYCurses.h>
-#include <LYStrings.h>
 #include <LYUtils.h>
 #include <LYStructs.h>
 #include <LYGlobalDefs.h>
 #include <LYShowInfo.h>
-#include <LYSignal.h>
 #include <LYCharUtils.h>
 #include <GridText.h>
 #include <LYReadCFG.h>
diff -Burp lynx2-8-2/src/LYStyle.c lynx2-8-2-patched/src/LYStyle.c
--- lynx2-8-2/src/LYStyle.c     Tue Apr 13 05:39:16 1999
+++ lynx2-8-2-patched/src/LYStyle.c     Fri Apr 16 18:49:51 1999
@@ -4,7 +4,6 @@
  */
 #include <HTUtils.h>
 #include <HTML.h>
-#include <LYSignal.h>
 #include <LYGlobalDefs.h>
 
 #include <LYStructs.h>
diff -Burp lynx2-8-2/src/LYUpload.c lynx2-8-2-patched/src/LYUpload.c
--- lynx2-8-2/src/LYUpload.c    Wed Feb 17 09:29:33 1999
+++ lynx2-8-2-patched/src/LYUpload.c    Fri Apr 16 18:49:51 1999
@@ -21,7 +21,6 @@
 #include <LYCurses.h>
 #include <LYUtils.h>
 #include <LYGlobalDefs.h>
-#include <LYSignal.h>
 #include <LYStrings.h>
 #include <LYClean.h>
 #include <LYGetFile.h>
diff -Burp lynx2-8-2/src/UCdomap.c lynx2-8-2-patched/src/UCdomap.c
--- lynx2-8-2/src/UCdomap.c     Tue Apr 13 05:39:16 1999
+++ lynx2-8-2-patched/src/UCdomap.c     Fri Apr 16 18:49:51 1999
@@ -25,7 +25,6 @@
 #include <UCMap.h>
 #include <UCDefs.h>
 #include <LYCharSets.h>
-#include <LYStrings.h>
 
 #include <LYLeaks.h>