--- lynx2-8-5/aclocal.m4.orig	Thu Aug 16 00:09:52 2001
+++ lynx2-8-5/aclocal.m4	Mon Oct  1 22:18:39 2001
@@ -1269,7 +1269,7 @@
 		;;
 	inria) #(vi
 		dnl http://www.kame.net/
-		AC_EGREP_CPP(yes, [dnl
+		AC_EGREP_CPP(yes, [
 #include <netinet/in.h>
 #ifdef IPV6_INRIA_VERSION
 yes
@@ -1277,7 +1277,7 @@
 		;;
 	kame) #(vi
 		dnl http://www.kame.net/
-		AC_EGREP_CPP(yes, [dnl
+		AC_EGREP_CPP(yes, [
 #include <netinet/in.h>
 #ifdef __KAME__
 yes
@@ -1285,7 +1285,7 @@
 		;;
 	linux-glibc) #(vi
 		dnl http://www.v6.linux.or.jp/
-		AC_EGREP_CPP(yes, [dnl
+		AC_EGREP_CPP(yes, [
 #include <features.h>
 #if defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1
 yes
@@ -1302,21 +1302,21 @@
 		fi
 		;;
 	toshiba) #(vi
-		AC_EGREP_CPP(yes, [dnl
+		AC_EGREP_CPP(yes, [
 #include <sys/param.h>
 #ifdef _TOSHIBA_INET6
 yes
 #endif],	[cf_cv_ipv6type=$i])
 		;;
 	v6d) #(vi
-		AC_EGREP_CPP(yes, [dnl
+		AC_EGREP_CPP(yes, [
 #include </usr/local/v6/include/sys/v6config.h>
 #ifdef __V6D__
 yes
 #endif],	[cf_cv_ipv6type=$i])
 		;;
 	zeta)
-		AC_EGREP_CPP(yes, [dnl
+		AC_EGREP_CPP(yes, [
 #include <sys/param.h>
 #ifdef _ZETA_MINAMI_INET6
 yes
@@ -2842,7 +2839,6 @@
 dnl Check if this is a SYSV flavor of UTMP
 AC_DEFUN([CF_SYSV_UTMP],
 [
-AC_REQUIRE([CF_UTMP])
 AC_CACHE_CHECK(if $cf_cv_have_utmp is SYSV flavor,cf_cv_sysv_utmp,[
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 AC_TRY_LINK([
@@ -3081,7 +3077,6 @@
 dnl Check if UTMP/UTMPX struct defines ut_host member
 AC_DEFUN([CF_UTMP_UT_HOST],
 [
-AC_REQUIRE([CF_UTMP])
 if test $cf_cv_have_utmp != no ; then
 AC_MSG_CHECKING(if utmp.ut_host is declared)
 AC_CACHE_VAL(cf_cv_have_utmp_ut_host,[
@@ -3100,7 +3095,6 @@
 dnl Check if UTMP/UTMPX struct defines ut_session member
 AC_DEFUN([CF_UTMP_UT_SESSION],
 [
-AC_REQUIRE([CF_UTMP])
 if test $cf_cv_have_utmp != no ; then
 AC_CACHE_CHECK(if utmp.ut_session is declared, cf_cv_have_utmp_ut_session,[
 	AC_TRY_COMPILE([
@@ -3128,7 +3122,6 @@
 dnl system header files.
 AC_DEFUN([CF_UTMP_UT_XSTATUS],
 [
-AC_REQUIRE([CF_UTMP])
 if test $cf_cv_have_utmp != no ; then
 AC_CACHE_CHECK(for exit-status in $cf_cv_have_utmp,cf_cv_have_utmp_ut_xstatus,[
 for cf_result in \
@@ -3156,7 +3149,6 @@
 dnl Check if UTMP/UTMPX struct defines ut_xtime member
 AC_DEFUN([CF_UTMP_UT_XTIME],
 [
-AC_REQUIRE([CF_UTMP])
 if test $cf_cv_have_utmp != no ; then
 AC_CACHE_CHECK(if utmp.ut_xtime is declared, cf_cv_have_utmp_ut_xtime,[
 	AC_TRY_COMPILE([
--- lynx2-8-5/makefile.in.orig	Mon Oct  1 22:32:44 2001
+++ lynx2-8-5/makefile.in	Mon Oct  1 22:32:02 2001
@@ -419,7 +419,7 @@
 	@echo
 	@echo '**********************************************'
 
-cfg_defs.h : $(srcdir)/cfg_defs.sh $(srcdir)/cfg_edit.sh config.cache lynx_cfg.h
+cfg_defs.h : $(srcdir)/cfg_defs.sh $(srcdir)/cfg_edit.sh config.log lynx_cfg.h
 	@rm -f $@
 	$(SHELL) -c '$(srcdir)/cfg_defs.sh $(srcdir)'
 
--- lynx2-8-5/cfg_defs.sh.orig	Thu Nov 18 05:08:08 1999
+++ lynx2-8-5/cfg_defs.sh	Mon Oct  1 22:43:01 2001
@@ -16,11 +16,14 @@
 EOF
 
 sed \
-	-e '/^#/d'     \
+	-e '/^$/d' \
+	-e '/^[^acgn]/d'     \
+	-e '/^.[^cfmst]/d'     \
+	-e '/^..[^s_]/d'     \
 	-e 's/^.[^=]*_cv_//' \
 	-e 's/=\${.*=/=/'  \
 	-e 's/}$//'          \
-	config.cache | $TOP/cfg_edit.sh >>$OUT
+	config.log | $TOP/cfg_edit.sh >>$OUT
 
 cat >>$OUT <<EOF
 };
--- lynx2-8-5/config.hin.orig	Mon Oct  1 22:45:02 2001
+++ lynx2-8-5/config.hin	Mon Oct  1 23:02:02 2001
@@ -2,252 +2,252 @@
 #ifndef LYNX_CFG_H
 #define LYNX_CFG_H 1
 
-#undef ALL_CHARSETS		/* AC_ARG_WITH(charsets) */
-#undef ALT_CHAR_SET		/* CF_ALT_CHAR_SET */
-#undef ANSI_VARARGS		/* CF_VARARGS */
-#undef ARCHIVE_ONLY		/* CF_ARG_DISABLE(dired-archive) */
-#undef BZIP2_PATH		/* CF_PATH_PROG(bzip2) */
-#undef CAN_SET_ERRNO		/* CF_SET_ERRNO */
-#undef CHMOD_PATH		/* CF_PATH_PROG(chmod) */
-#undef CJK_EX			/* CF_ARG_ENABLE(cjk) */
-#undef COLOR_CURSES		/* defined by CF_COLOR_CURSES */
-#undef COMPRESS_PATH		/* CF_PATH_PROG(compress) */
-#undef COPY_PATH		/* CF_PATH_PROG(cp) */
-#undef CURS_PERFORMANCE		/* CF_CURS_PERFORMANCE */
-#undef DEBUG			/* configure --enable-debug */
+#undef ALL_CHARSETS
+#undef ALT_CHAR_SET
+#undef ANSI_VARARGS
+#undef ARCHIVE_ONLY
+#undef BZIP2_PATH
+#undef CAN_SET_ERRNO
+#undef CHMOD_PATH
+#undef CJK_EX
+#undef COLOR_CURSES
+#undef COMPRESS_PATH
+#undef COPY_PATH
+#undef CURS_PERFORMANCE
+#undef DEBUG
 #undef DECL_ERRNO
 #undef DECL_GETGRGID
 #undef DECL_GETGRNAM
 #undef DECL_STRSTR
 #undef DECL_SYS_ERRLIST
-#undef DIRED_SUPPORT		/* AC_ARG_WITH(dired) */
-#undef DISABLE_BIBP		/* CF_ARG_DISABLE(bibp-urls) */
-#undef DISABLE_FINGER		/* CF_ARG_DISABLE(finger) */
-#undef DISABLE_FTP		/* CF_ARG_DISABLE(ftp) */
-#undef DISABLE_GOPHER		/* CF_ARG_DISABLE(gopher) */
-#undef DISABLE_NEWS		/* CF_ARG_DISABLE(news) */
-#undef DISP_PARTIAL		/* CF_ARG_ENABLE(partial) */
-#undef DONT_TRACK_INTERNAL_LINKS /* CF_ARG_DISABLE(internal-links) */
-#undef ENABLE_IPV6		/* CF_CHECK_IPV6 */
-#undef ENABLE_NLS		/* defined if NLS is requested */
-#undef ENABLE_OPTS_CHANGE_EXEC	/* CF_ARG_ENABLE(change-exec) */
-#undef EXEC_LINKS		/* CF_ARG_ENABLE(exec-links) */
-#undef EXEC_SCRIPTS		/* CF_ARG_ENABLE(exec-scripts) */
-#undef EXP_ADDRLIST_PAGE	/* CF_ARG_ENABLE(addrlist-page) */
-#undef EXP_ALT_BINDINGS		/* CF_ARG_ENABLE(alt-bindings) */
-#undef EXP_CHARSET_CHOICE	/* CF_ARG_ENABLE(charset-choice) */
-#undef EXP_CHARTRANS_AUTOSWITCH	/* CF_ARG_ENABLE(font-switch) */
-#undef EXP_FILE_UPLOAD		/* CF_ARG_ENABLE(file-upload) */
-#undef EXP_JUSTIFY_ELTS		/* CF_ARG_ENABLE(justify-elts) */
-#undef EXP_KEYBOARD_LAYOUT	/* CF_ARG_ENABLE(kbd-layout) */
-#undef EXP_LIBJS		/* CF_ARG_ENABLE(libjs) */
-#undef EXP_NESTED_TABLES	/* CF_ARG_ENABLE(nested-tables) */
-#undef EXP_PERSISTENT_COOKIES	/* CF_ARG_ENABLE(persistent-cookies) */
-#undef EXP_READPROGRESS		/* CF_ARG_ENABLE(read-eta) */
-#undef FANCY_CURSES		/* defined by CF_FANCY_CURSES */
-#undef GCC_NORETURN		/* CF_GCC_ATTRIBUTES */
-#undef GCC_PRINTF		/* CF_GCC_ATTRIBUTES */
-#undef GCC_UNUSED		/* CF_GCC_ATTRIBUTES */
-#undef GETGROUPS_T		/* AC_TYPE_GETGROUPS */
-#undef GZIP_PATH		/* CF_PATH_PROG(gzip) */
-#undef HAVE_ALLOCA		/* defined by AM_GNU_GETTEXT */
-#undef HAVE_ALLOCA_H		/* defined by AM_GNU_GETTEXT */
-#undef HAVE_ARGZ_H		/* defined by AM_GNU_GETTEXT */
+#undef DIRED_SUPPORT
+#undef DISABLE_BIBP
+#undef DISABLE_FINGER
+#undef DISABLE_FTP
+#undef DISABLE_GOPHER
+#undef DISABLE_NEWS
+#undef DISP_PARTIAL
+#undef DONT_TRACK_INTERNAL_LINKS
+#undef ENABLE_IPV6
+#undef ENABLE_NLS
+#undef ENABLE_OPTS_CHANGE_EXEC
+#undef EXEC_LINKS
+#undef EXEC_SCRIPTS
+#undef EXP_ADDRLIST_PAGE
+#undef EXP_ALT_BINDINGS
+#undef EXP_CHARSET_CHOICE
+#undef EXP_CHARTRANS_AUTOSWITCH
+#undef EXP_FILE_UPLOAD
+#undef EXP_JUSTIFY_ELTS
+#undef EXP_KEYBOARD_LAYOUT
+#undef EXP_LIBJS
+#undef EXP_NESTED_TABLES
+#undef EXP_PERSISTENT_COOKIES
+#undef EXP_READPROGRESS
+#undef FANCY_CURSES
+#undef GCC_NORETURN
+#undef GCC_PRINTF
+#undef GCC_UNUSED
+#undef GETGROUPS_T
+#undef GZIP_PATH
+#undef HAVE_ALLOCA
+#undef HAVE_ALLOCA_H
+#undef HAVE_ARGZ_H
 #undef HAVE_ARPA_INET_H
-#undef HAVE_ASSUME_DEFAULT_COLORS /* ncurses extension */
-#undef HAVE_BSD_TOUCHLINE	/* CF_CURS_TOUCHLINE */
-#undef HAVE_CATGETS		/* defined if you want to use non-GNU catgets */
+#undef HAVE_ASSUME_DEFAULT_COLORS
+#undef HAVE_BSD_TOUCHLINE
+#undef HAVE_CATGETS
 #undef HAVE_CBREAK
 #undef HAVE_CURSESX_H
 #undef HAVE_CUSERID
-#undef HAVE_DCGETTEXT		/* defined by AM_GNU_GETTEXT */
+#undef HAVE_DCGETTEXT
 #undef HAVE_DEFINE_KEY
-#undef HAVE_DELSCREEN		/* defined by CF_CURSES_FUNCS  */
-#undef HAVE_DIRENT_H		/* defined by AC_HEADER_DIRENT */
-#undef HAVE_FCNTL_H		/* have <fcntl.h> */
+#undef HAVE_DELSCREEN
+#undef HAVE_DIRENT_H
+#undef HAVE_FCNTL_H
 #undef HAVE_FTIME
-#undef HAVE_GAI_STRERROR	/* CF_CHECK_IPV6 */
-#undef HAVE_GETADDRINFO		/* CF_CHECK_IPV6 */
+#undef HAVE_GAI_STRERROR
+#undef HAVE_GETADDRINFO
 #undef HAVE_GETATTRS
 #undef HAVE_GETBEGX
 #undef HAVE_GETBEGY
-#undef HAVE_GETBKGD		/* defined by CF_COLOR_CURSES */
+#undef HAVE_GETBKGD
 #undef HAVE_GETCWD
 #undef HAVE_GETGROUPS
-#undef HAVE_GETTEXT		/* defined if you want to use non-GNU gettext */
+#undef HAVE_GETTEXT
 #undef HAVE_GETTIMEOFDAY
 #undef HAVE_GETUID
 #undef HAVE_H_ERRNO
-#undef HAVE_INET_ATON		/* CF_INET_ADDR */
+#undef HAVE_INET_ATON
 #undef HAVE_JCURSES_H
 #undef HAVE_KEYPAD
-#undef HAVE_LC_MESSAGES		/* locale messages */
-#undef HAVE_LIBINTL_H		/* AM_GNU_GETTEXT, or cleanup from that */
+#undef HAVE_LC_MESSAGES	
+#undef HAVE_LIBINTL_H
 #undef HAVE_LIMITS_H
 #undef HAVE_LOCALE_H
-#undef HAVE_LSTAT		/* defined by CF_FUNC_LSTAT */
-#undef HAVE_MALLOC_H		/* defined by AM_GNU_GETTEXT */
+#undef HAVE_LSTAT
+#undef HAVE_MALLOC_H
 #undef HAVE_MKSTEMP
 #undef HAVE_MKTEMP
-#undef HAVE_MMAP		/* defined by AM_GNU_GETTEXT */
-#undef HAVE_MUNMAP		/* defined by AM_GNU_GETTEXT */
+#undef HAVE_MMAP
+#undef HAVE_MUNMAP
 #undef HAVE_NAPMS
-#undef HAVE_NCURSES_H		/* defined if we include <ncurses.h> */
-#undef HAVE_NCURSES_NCURSES_H	/* defined if we include <ncurses/ncurses.h> */
-#undef HAVE_NCURSES_TERM_H	/* have <ncurses/term.h> */
+#undef HAVE_NCURSES_H
+#undef HAVE_NCURSES_NCURSES_H
+#undef HAVE_NCURSES_TERM_H
 #undef HAVE_NEWPAD
 #undef HAVE_NEWTERM
-#undef HAVE_NL_TYPES_H		/* defined by AM_GNU_GETTEXT */
+#undef HAVE_NL_TYPES_H
 #undef HAVE_PNOUTREFRESH
 #undef HAVE_POPEN
 #undef HAVE_PUTENV
 #undef HAVE_READDIR
 #undef HAVE_RESIZETERM
 #undef HAVE_RESOLV_H
-#undef HAVE_SETENV		/* defined by AM_GNU_GETTEXT */
+#undef HAVE_SETENV
 #undef HAVE_SETLOCALE
 #undef HAVE_SETUID
-#undef HAVE_SIGACTION		/* CF_FUNC_SIGACTION */
-#undef HAVE_SIZECHANGE		/* defined by CF_SIZECHANGE */
-#undef HAVE_STDARG_H		/* CF_VARARGS */
+#undef HAVE_SIGACTION
+#undef HAVE_SIZECHANGE
+#undef HAVE_STDARG_H
 #undef HAVE_STDLIB_H
-#undef HAVE_STPCPY		/* defined by AM_GNU_GETTEXT */
-#undef HAVE_STRCASECMP		/* defined by AM_GNU_GETTEXT */
-#undef HAVE_STRCHR		/* defined by AM_GNU_GETTEXT */
+#undef HAVE_STPCPY
+#undef HAVE_STRCASECMP
+#undef HAVE_STRCHR
 #undef HAVE_STRERROR
 #undef HAVE_STRING_H
 #undef HAVE_SYSLOG_H
-#undef HAVE_SYSV_TOUCHLINE	/* CF_CURS_TOUCHLINE */
-#undef HAVE_SYS_DIR_H		/* defined by AC_HEADER_DIRENT */
-#undef HAVE_SYS_FCNTL_H		/* have <sys/fcntl.h> */
-#undef HAVE_SYS_FILIO_H		/* have <sys/filio.h> */
-#undef HAVE_SYS_IOCTL_H		/* have <sys/ioctl.h> */
-#undef HAVE_SYS_NDIR_H		/* defined by AC_HEADER_DIRENT */
-#undef HAVE_SYS_PARAM_H		/* defined by AM_GNU_GETTEXT */
-#undef HAVE_SYS_TIMEB_H		/* have <sys/timeb.h> */
-#undef HAVE_SYS_WAIT_H		/* have <sys/wait.h> */
-#undef HAVE_TERMIOS_H		/* have <termios.h> */
-#undef HAVE_TERMIO_H		/* have <termio.h> */
-#undef HAVE_TERM_H		/* have <term.h> */
+#undef HAVE_SYSV_TOUCHLINE
+#undef HAVE_SYS_DIR_H
+#undef HAVE_SYS_FCNTL_H
+#undef HAVE_SYS_FILIO_H
+#undef HAVE_SYS_IOCTL_H
+#undef HAVE_SYS_NDIR_H
+#undef HAVE_SYS_PARAM_H
+#undef HAVE_SYS_TIMEB_H
+#undef HAVE_SYS_WAIT_H
+#undef HAVE_TERMIOS_H
+#undef HAVE_TERMIO_H
+#undef HAVE_TERM_H
 #undef HAVE_TOUCHLINE
 #undef HAVE_TOUCHWIN
 #undef HAVE_TRUNCATE
 #undef HAVE_TTYNAME
 #undef HAVE_TTYTYPE
-#undef HAVE_TYPE_UNIONWAIT	/* CF_UNION_WAIT */
-#undef HAVE_UNISTD_H		/* have <unistd.h> */
+#undef HAVE_TYPE_UNIONWAIT
+#undef HAVE_UNISTD_H
 #undef HAVE_UNSETENV
-#undef HAVE_USE_DEFAULT_COLORS	/* ncurses extension */
-#undef HAVE_UTMP		/* CF_UTMP */
-#undef HAVE_UTMP_UT_HOST	/* CF_UTMP_UT_HOST */
-#undef HAVE_UTMP_UT_SESSION	/* CF_UTMP_UT_SESSION */
-#undef HAVE_UTMP_UT_XSTATUS	/* CF_UTMP_UT_XSTATUS */
-#undef HAVE_UTMP_UT_XTIME	/* CF_UTMP_UT_XTIME */
-#undef HAVE_VALUES_H		/* defined by AM_GNU_GETTEXT */
-#undef HAVE_VARARGS_H		/* CF_VARARGS */
+#undef HAVE_USE_DEFAULT_COLORS
+#undef HAVE_UTMP
+#undef HAVE_UTMP_UT_HOST
+#undef HAVE_UTMP_UT_SESSION
+#undef HAVE_UTMP_UT_XSTATUS
+#undef HAVE_UTMP_UT_XTIME
+#undef HAVE_VALUES_H
+#undef HAVE_VARARGS_H
 #undef HAVE_VASPRINTF
-#undef HAVE_VFORK_H		/* have <vfork.h> */
+#undef HAVE_VFORK_H
 #undef HAVE_WAITPID
 #undef HAVE_WBORDER
 #undef HAVE_WREDRAWLN
 #undef HAVE_WRESIZE
-#undef HAVE_XCURSES		/* CF_PDCURSES_X11 */
-#undef HAVE___ARGZ_COUNT	/* defined by AM_GNU_GETTEXT */
-#undef HAVE___ARGZ_NEXT		/* defined by AM_GNU_GETTEXT */
-#undef HAVE___ARGZ_STRINGIFY	/* defined by AM_GNU_GETTEXT */
-#undef IGNORE_CTRL_C		/* FIXME: make tests? */
-#undef INCLUDE_PROTOTYPES	/* CF_SOCKS5 */
-#undef INSTALL_ARGS		/* CF_PATH_PROG(install) */
-#undef INSTALL_PATH		/* CF_PATH_PROG(install) */
-#undef LINUX			/* FIXME: make tests? */
-#undef LOCALE			/* for locale support */
-#undef LONG_LIST		/* CF_ARG_DISABLE(long-list) */
-#undef LYNXCGI_LINKS		/* CF_ARG_ENABLE(cgi-links) */
-#undef LYNX_CFG_FILE		/* $libdir/lynx.cfg */
-#undef LYNX_LSS_FILE		/* $libdir/lynx.lss */
-#undef LYNX_RAND_MAX		/* CF_SRAND */
-#undef LY_FIND_LEAKS		/* CF_ARG_ENABLE(find-leaks) */
-#undef LY_TRACELINE		/* CF_ARG_ENABLE(vertrace) */
-#undef MKDIR_PATH		/* CF_PATH_PROG(mkdir) */
-#undef MV_PATH			/* CF_PATH_PROG(mv) */
-#undef NCURSES			/* defined for ncurses support */
-#undef NCURSES_BROKEN		/* defined for ncurses color support */
-#undef NEED_PTEM_H		/* defined by CF_SIZECHANGE */
-#undef NEED_REMOVE		/* defined by CF_REMOVE_BROKEN */
-#undef NGROUPS			/* defined by CF_NGROUPS */
-#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		/* CF_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	/* CF_ARG_DISABLE(parent-dir-refs) */
-#undef NSL_FORK			/* CF_ARG_ENABLE(nsl-fork) */
-#undef OK_GZIP			/* CF_ARG_DISABLE(dired-gzip) */
+#undef HAVE_XCURSES
+#undef HAVE___ARGZ_COUNT
+#undef HAVE___ARGZ_NEXT
+#undef HAVE___ARGZ_STRINGIFY
+#undef IGNORE_CTRL_C
+#undef INCLUDE_PROTOTYPES
+#undef INSTALL_ARGS
+#undef INSTALL_PATH
+#undef LINUX
+#undef LOCALE
+#undef LONG_LIST
+#undef LYNXCGI_LINKS
+#undef LYNX_CFG_FILE
+#undef LYNX_LSS_FILE
+#undef LYNX_RAND_MAX
+#undef LY_FIND_LEAKS
+#undef LY_TRACELINE
+#undef MKDIR_PATH
+#undef MV_PATH	
+#undef NCURSES
+#undef NCURSES_BROKEN
+#undef NEED_PTEM_H
+#undef NEED_REMOVE
+#undef NGROUPS
+#undef NO_CHANGE_EXECUTE_PERMS
+#undef NO_CONFIG_INFO
+#undef NO_EXTENDED_HTMLDTD
+#undef NO_LYNX_TRACE
+#undef NO_OPTION_FORMS
+#undef NO_OPTION_MENU
+#undef NO_PARENT_DIR_REFERENCE
+#undef NSL_FORK
+#undef OK_GZIP
 #undef OK_INSTALL
-#undef OK_OVERRIDE		/* CF_ARG_DISABLE(dired-override) */
-#undef OK_PERMIT		/* CF_ARG_DISABLE(dired-permit) */
-#undef OK_TAR			/* CF_ARG_DISABLE(dired-tar) */
-#undef OK_UUDECODE		/* CF_ARG_DISABLE(dired-uudecode) */
-#undef OK_ZIP			/* CF_ARG_DISABLE(dired-zip) */
-#undef REAL_UNIX_SYSTEM		/* CF_SLANG_UNIX_DEFS */
-#undef RLOGIN_PATH		/* CF_PATH_PROG(rlogin) */
-#undef RM_PATH			/* CF_PATH_PROG(rm) */
-#undef SOCKS			/* CF_SOCKS, CF_SOCKS5 */
-#undef SOURCE_CACHE		/* CF_ARG_ENABLE(source-cache) */
+#undef OK_OVERRIDE
+#undef OK_PERMIT
+#undef OK_TAR
+#undef OK_UUDECODE
+#undef OK_ZIP
+#undef REAL_UNIX_SYSTEM
+#undef RLOGIN_PATH
+#undef RM_PATH
+#undef SOCKS
+#undef SOURCE_CACHE
 #undef STDC_HEADERS
-#undef SYSTEM_MAIL		/* CF_DEFINE_PROG */
-#undef SYSTEM_MAIL_FLAGS	/* defined by CF_SYSTEM_MAIL_FLAGS */
-#undef SYSTEM_NAME		/* CF_CHECK_CACHE */
-#undef TAR_PATH			/* CF_PATH_PROG(tar) */
-#undef TELNET_PATH		/* CF_PATH_PROG(telnet) */
-#undef TERMIO_AND_CURSES	/* CF_TERMIO_AND_CURSES workaround */
-#undef TERMIO_AND_TERMIOS	/* CF_TERMIO_AND_TERMIOS workaround */
-#undef TN3270_PATH		/* CF_PATH_PROG(tn3270) */
-#undef TOUCH_PATH		/* CF_PATH_PROG(touch) */
-#undef ULTRIX			/* config.sub */
-#undef UNCOMPRESS_PATH		/* CF_PATH_PROG(gunzip) */
-#undef UNDERLINE_LINKS		/* CF_ARG_ENABLE(underlines) */
+#undef SYSTEM_MAIL
+#undef SYSTEM_MAIL_FLAGS
+#undef SYSTEM_NAME
+#undef TAR_PATH
+#undef TELNET_PATH
+#undef TERMIO_AND_CURSES
+#undef TERMIO_AND_TERMIOS
+#undef TN3270_PATH
+#undef TOUCH_PATH
+#undef ULTRIX
+#undef UNCOMPRESS_PATH
+#undef UNDERLINE_LINKS
 #undef UNIX
-#undef UNZIP_PATH		/* CF_PATH_PROG(unzip) */
-#undef USE_COLOR_STYLE		/* CF_ARG_ENABLE(color-style) */
-#undef USE_DEFAULT_COLORS	/* CF_ARG_ENABLE(default-colors) */
-#undef USE_EXECVP		/* CF_ARG_DISABLE(full-paths) */
-#undef USE_EXTERNALS		/* CF_ARG_ENABLE(externs) */
-#undef USE_FCNTL		/* CF_FIONBIO */
-#undef USE_OPENSSL_INCL		/* CF_SSL */
-#undef USE_PRETTYSRC		/* CF_ARG_ENABLE(prettysrc) */
-#undef USE_SCROLLBAR		/* CF_ARG_ENABLE(scrollbar) */
-#undef USE_SLANG		/* AC_ARG_WITH(screen=slang) */
-#undef USE_SOCKS4_PREFIX	/* CF_SOCKS5 */
-#undef USE_SOCKS5		/* CF_SOCKS5 */
-#undef USE_SSL			/* CF_SSL */
-#undef USE_SYSV_UTMP		/* CF_UTMP */
-#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 WAITPID_USES_UNION	/* CF_FUNC_WAIT */
-#undef WAIT_USES_UNION		/* CF_FUNC_WAIT */
-#undef XCURSES			/* CF_PDCURSES_X11 */
-#undef ZCAT_PATH		/* CF_PATH_PROG(zcat) */
-#undef ZIP_PATH			/* CF_PATH_PROG(zip) */
-#undef _ALL_SOURCE		/* AC_AIX */
-#undef inline			/* defined by AC_C_INLINE */
-#undef lynx_rand		/* CF_SRAND */
-#undef lynx_srand		/* CF_SRAND */
-#undef mode_t			/* defined by AC_TYPE_MODE_T */
-#undef off_t			/* defined by AC_TYPE_OFF_T */
-#undef pid_t			/* defined by AC_TYPE_PID_T */
-#undef uid_t			/* defined by AC_TYPE_UID_T */
-#undef ut_name			/* CF_UTMP */
-#undef ut_xstatus		/* CF_UTMP_UT_XSTATUS */
-#undef ut_xtime			/* CF_UTMP_UT_XTIME */
+#undef UNZIP_PATH
+#undef USE_COLOR_STYLE
+#undef USE_DEFAULT_COLORS
+#undef USE_EXECVP
+#undef USE_EXTERNALS
+#undef USE_FCNTL
+#undef USE_OPENSSL_INCL
+#undef USE_PRETTYSRC
+#undef USE_SCROLLBAR
+#undef USE_SLANG
+#undef USE_SOCKS4_PREFIX
+#undef USE_SOCKS5
+#undef USE_SSL
+#undef USE_SYSV_UTMP
+#undef USE_ZLIB
+#undef UTMPX_FOR_UTMP
+#undef UUDECODE_PATH
+#undef WAITPID_USES_UNION
+#undef WAIT_USES_UNION
+#undef XCURSES
+#undef ZCAT_PATH
+#undef ZIP_PATH
+#undef _ALL_SOURCE
+#undef inline
+#undef lynx_rand
+#undef lynx_srand
+#undef mode_t
+#undef off_t
+#undef pid_t
+#undef uid_t
+#undef ut_name
+#undef ut_xstatus
+#undef ut_xtime
 
 /*
  * U/Win defines vfork() as a macro in vfork.h, which is included from unistd.h.
  */
 #ifndef HAVE_VFORK_H
-#undef vfork			/* defined by AC_FUNC_FORK */
+#undef vfork
 #endif
 
 /* 'const' may be defined externally by the compiler-wrapper, as in 'unproto'