*** WWW/Library/Implementation/HTGopher.c.df	Thu Dec 24 06:27:23 1998
--- WWW/Library/Implementation/HTGopher.c	Fri Feb 26 23:37:44 1999
***************
*** 16,21 ****
--- 16,22 ----
  */
  
  #include <HTUtils.h>		/* Coding convention macros */
+ #ifndef DISABLE_GOPHER
  #include <HTAlert.h>
  #include <HTParse.h>
  #include <HTTCP.h>
***************
*** 1928,1930 ****
--- 1929,1933 ----
  GLOBALDEF PUBLIC HTProtocol HTGopher = { "gopher", HTLoadGopher, NULL };
  GLOBALDEF PUBLIC HTProtocol HTCSO = { "cso", HTLoadCSO, NULL };
  #endif /* GLOBALDEF_IS_MACRO */
+ 
+ #endif /* not DISABLE_GOPHER */
*** WWW/Library/Implementation/HTAccess.c.df	Thu Dec 24 06:27:23 1998
--- WWW/Library/Implementation/HTAccess.c	Fri Feb 26 22:44:29 1999
***************
*** 141,148 ****
--- 141,150 ----
  extern GLOBALREF (HTProtocol, HTSNews);
  extern GLOBALREF (HTProtocol, HTSNewsPost);
  extern GLOBALREF (HTProtocol, HTSNewsReply);
+ #ifndef DISABLE_GOPHER
  extern GLOBALREF (HTProtocol, HTGopher);
  extern GLOBALREF (HTProtocol, HTCSO);
+ #endif /* not DISABLE_GOPHER */
  extern GLOBALREF (HTProtocol, HTFinger);
  #ifdef DIRECT_WAIS
  extern GLOBALREF (HTProtocol, HTWAIS);
***************
*** 153,159 ****
  #ifndef DECNET
  GLOBALREF HTProtocol HTFTP, HTNews, HTNNTP, HTNewsPost, HTNewsReply;
  GLOBALREF HTProtocol HTSNews, HTSNewsPost, HTSNewsReply;
! GLOBALREF HTProtocol HTGopher, HTCSO, HTFinger;
  #ifdef DIRECT_WAIS
  GLOBALREF  HTProtocol HTWAIS;
  #endif /* DIRECT_WAIS */
--- 155,164 ----
  #ifndef DECNET
  GLOBALREF HTProtocol HTFTP, HTNews, HTNNTP, HTNewsPost, HTNewsReply;
  GLOBALREF HTProtocol HTSNews, HTSNewsPost, HTSNewsReply;
! #ifndef DISABLE_GOPHER
! GLOBALREF HTProtocol HTGopher, HTCSO;
! #endif /* not DISABLE_GOPHER */
! GLOBALREF HTProtocol HTFinger;
  #ifdef DIRECT_WAIS
  GLOBALREF  HTProtocol HTWAIS;
  #endif /* DIRECT_WAIS */
***************
*** 177,184 ****
--- 182,191 ----
      HTRegisterProtocol(&HTSNews);
      HTRegisterProtocol(&HTSNewsPost);
      HTRegisterProtocol(&HTSNewsReply);
+ #ifndef DISABLE_GOPHER
      HTRegisterProtocol(&HTGopher);
      HTRegisterProtocol(&HTCSO);
+ #endif /* not DISABLE_GOPHER */
      HTRegisterProtocol(&HTFinger);
  #ifdef DIRECT_WAIS
      HTRegisterProtocol(&HTWAIS);
*** WWW/Library/Implementation/HTUtils.h.df	Mon Feb  8 05:32:59 1999
--- WWW/Library/Implementation/HTUtils.h	Fri Feb 26 22:19:20 1999
***************
*** 5,13 ****
  
   */
  
! #ifndef DEBUG
! #define DEBUG   /* Noone ever turns this off as trace is too important */
! #endif          /* Keep option for really small memory applications tho */
  
  #ifndef HTUTILS_H
  #define HTUTILS_H
--- 5,13 ----
  
   */
  
! #ifndef NO_LYNX_TRACE
! #define DEBUG   /* Turns on trace; turn off for smaller binary */
! #endif
  
  #ifndef HTUTILS_H
  #define HTUTILS_H
*** configure.in.df	Mon Feb  8 05:32:59 1999
--- configure.in	Fri Feb 26 22:39:40 1999
***************
*** 57,63 ****
  
  AC_MSG_CHECKING(if you want to enable debug-code)
  CF_ARG_ENABLE(debug,
! 	[  --enable-debug          logic for traces/debugging],
  	[with_debug=yes],
  	[with_debug=no])
  AC_MSG_RESULT($with_debug)
--- 57,63 ----
  
  AC_MSG_CHECKING(if you want to enable debug-code)
  CF_ARG_ENABLE(debug,
! 	[  --enable-debug          logic for object code debugging],
  	[with_debug=yes],
  	[with_debug=no])
  AC_MSG_RESULT($with_debug)
***************
*** 82,87 ****
--- 82,94 ----
  	esac
  fi
  
+ AC_MSG_CHECKING(if you want to enable lynx trace code *recommended* )
+ CF_ARG_DISABLE(trace,
+ 	[  --disable-trace          disable logic for trace code],
+ 	[with_trace=$enableval],
+ 	[with_trace=yes])
+ AC_MSG_RESULT($with_trace)
+ test $with_trace = no && AC_DEFINE(NO_LYNX_TRACE)
  
  if test -n "$GCC"
  then
***************
*** 714,719 ****
--- 721,735 ----
  		gzopen)
  	AC_DEFINE(USE_ZLIB)
  fi
+ 
+ AC_MSG_CHECKING(if you want to exclude GOPHER code)
+ CF_ARG_DISABLE(gopher,
+ [  --disable-gopher  disable GOPHER logic],
+         [use_gopher=yes],
+         [use_gopher=no])
+ AC_MSG_RESULT($use_gopher)
+ test $use_gopher != "no" && AC_DEFINE(DISABLE_GOPHER)
+ 
  
  dnl --------------------------------------------------------------------------
  dnl DirEd (directory-editor) options
*** config.hin.df	Mon Feb  8 05:32:59 1999
--- config.hin	Fri Feb 26 22:37:40 1999
***************
*** 17,22 ****
--- 17,23 ----
  #undef DECL_STRSTR
  #undef DECL_SYS_ERRLIST
  #undef DIRED_SUPPORT		/* AC_ARG_WITH(dired) */
+ #undef DISABLE_GOPHER		/* defined if GOPHER code unwanted */
  #undef DISP_PARTIAL		/* CF_ARG_ENABLE(partial) */
  #undef DONT_TRACK_INTERNAL_LINKS /* CF_ARG_DISABLE(internal-links) */
  #undef EBCDIC			/* CF_EBCDIC */
***************
*** 118,123 ****
--- 119,125 ----
  #undef NO_CHANGE_EXECUTE_PERMS	/* CF_ARG_DISABLE(dired-xpermit) */
  #undef NO_CONFIG_INFO		/* CF_ARG_DISABLE(config-info) */
  #undef NO_EXTENDED_HTMLDTD	/* CF_ARG_DISABLE(extended-dtd) */
+ #undef NO_LYNX_TRACE		/* AC_ARG_DISABLE(trace) */
  #undef NO_OPTION_FORMS		/* CF_ARG_DISABLE(forms-options) */
  #undef NO_OPTION_MENU		/* CF_ARG_DISABLE(option-menu) */
  #undef NO_PARENT_DIR_REFERENCE	/* configure --disable-parent-dir */