It has been a while since I have had the time to compile lynx, and I see that problems for both mingw and DJGPP platforms have crept in. The attached patch shows the changes I made to allow compilation. I have also attached the shell scripts I used for configuring, in case configuration options affected the results. Note that I did not build for mingw with a native MSYS system, but rather compiled under Cygwin with -mnocygwin. Some of the patch is to counter inappropriate configure results due to picking up Cygwin capabilities not in Mingw. I built both with the latest Openssl 0.9.9 snapshots, but didn't upgrade everything on my system. Cygwin compile was with gcc 3.4.4 and DJGPP with gcc 3.3.2. Gettext/libintl version 0.15 with Mingw and 0.17 with DJGPP. Both used PDCurses in the 3.0 series, compiled from cvs September 2006. DJGPP uses pkg-config, while mingw does not. I used autoconf 2.61 for DJGPP and 2.59 for mingw, both compiled with Tom's patch modified for those versions.
The main changes were in aclocal.m4, to account for the DOS path
separator and for maintaining the order of includes. Several pieces of
code, after finding new includes, PREPEND them to the list of includes
rather than APPENDING them. This breaks compilation where the order
of includes is critical, and overrides the include order specified
in CPPFLAGS in the command line or environment. Some code also only
checked for files in specific directories, ignoring the -I and -L
directives specified on the configuration command line. I added some
dummy arguments to allow the command line arguments to be used.
Some of the changes may not be compatible with autoconf 2.13, but I am
not sure how to keep compatibility as the versions diverge. The 2.61
version of autoconf does not allow comments on the same line as the
defines, so I removed the comments. They could be moved to separate
lines and still be compatible with the different autoconf versions.
I see that one change I made was to remove a "-DHAVE_CONFIG_H"
from within aclocal.m4. I made the change a while ago and don't
remember what problem it fixed, but I am not sure I understand what
HAVE_CONFIG_H does, before lynx_cfg.h has been generated.
I totally failed in my efforts to modify CF_SSL version 16, so it
would pick up the openssl libraries in mingw (without pkg-config).
This worked fine in DJGPP with pkg-config. I had to substitute CF_SSL
version 12 in aclocal.m4 to get it to work with mingw. Specifying
--with-pkg-config=no didn't seem to make a difference. The files
specified by --with-ssl=path were still ignored.
I also included code to compile the lynx icon into the lynx binary for
mingw. This requires whoever is compiling to put their lynx.ico file
in the src directory. No icon is distributed with the standard lynx
source code. I think I finally got the right screen clearing code for
mingw also.
Tom, I hope you can include at least parts of these changes in the
main code. Let me know if or when there is modified code I can test on
these platforms.
Doug
--
Doug Kaufman
Internet: [email protected]
--- LYMessages_en.h.orig 2008-12-31 17:22:26.000000000 -0800
+++ LYMessages_en.h 2009-01-02 07:01:08.000000000 -0800
@@ -224,7 +224,7 @@
#else
#ifdef DOSPATH
#define SPAWNING_MSG \
- gettext("Type EXIT to return to Lynx.\n")
+ gettext("Type EXIT to return to Lynx.\r\n")
#else /* UNIX */
#define SPAWNING_MSG \
gettext("Spawning your default shell. Use 'exit' to return to Lynx.\n")
--- aclocal.m4.orig 2008-12-31 17:22:26.000000000 -0800
+++ aclocal.m4 2009-01-02 07:01:08.000000000 -0800
@@ -400,6 +400,8 @@
dnl to fall back to GNU NLS library.
CATOBJEXT=NONE
+ cf_save_LIBS_1="$LIBS"
+ LIBS="$LIBICONV $LIBS"
AC_CACHE_CHECK([for libintl.h and gettext()], cf_cv_func_gettext,[
CF_FIND_LINKAGE(CF__INTL_HEAD,
CF__INTL_BODY,
@@ -407,6 +409,7 @@
cf_cv_func_gettext=yes,
cf_cv_func_gettext=no)
])
+ LIBS="$cf_save_LIBS_1"
if test "$cf_cv_func_gettext" = yes ; then
AC_DEFINE(HAVE_LIBINTL_H)
@@ -686,7 +689,7 @@
if test -n "$cf_new_cppflags" ; then
ifelse($2,,,[CF_VERBOSE(add to \$CPPFLAGS $cf_new_cppflags)])
- CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
fi
if test -n "$cf_new_extra_cppflags" ; then
@@ -710,7 +713,7 @@
if test -n "$1" ; then
for cf_add_incdir in $1
do
- while test $cf_add_incdir != /usr/include
+ while test $cf_add_incdir != /usr/include && test $cf_add_incdir !=
dummy
do
if test -d $cf_add_incdir
then
@@ -741,7 +744,7 @@
if test "$cf_have_incdir" = no ; then
CF_VERBOSE(adding $cf_add_incdir to include-path)
- ifelse($2,,CPPFLAGS,$2)="-I$cf_add_incdir
$ifelse($2,,CPPFLAGS,[$]$2)"
+ ifelse($2,,CPPFLAGS,$2)="$ifelse($2,,CPPFLAGS,[$]$2)
-I$cf_add_incdir"
cf_top_incdir=`echo $cf_add_incdir | sed -e
's%/include/.*$%/include%'`
test "$cf_top_incdir" = "$cf_add_incdir" && break
@@ -769,7 +772,7 @@
if test -n "$1" ; then
for cf_add_libdir in $1
do
- if test $cf_add_libdir = /usr/lib ; then
+ if test $cf_add_libdir = /usr/lib || test $cf_add_libdir = dummy; then
:
elif test -d $cf_add_libdir
then
@@ -821,7 +824,8 @@
dnl $2 is the action to take if a parameter does not yield a directory.
AC_DEFUN([CF_ADD_SEARCHPATH],
[
-for cf_searchpath in `echo "$1" | tr : ' '`; do
+AC_REQUIRE([_AS_PATH_SEPARATOR_PREPARE])
+for cf_searchpath in `echo "$1" | tr $PATH_SEPARATOR ' '`; do
if test -d $cf_searchpath/include; then
CF_ADD_INCDIR($cf_searchpath/include)
elif test -d $cf_searchpath/../include ; then
@@ -2143,9 +2147,9 @@
cf_test_CPPFLAGS="$CPPFLAGS"
CF_HEADER_PATH(cf_search,ifelse([$6],,[$3],[$6]))
- for cf_cv_header_path_$3 in $cf_search
+ for cf_cv_header_path_$3 in dummy $cf_search
do
- if test -d $cf_cv_header_path_$3 ; then
+ if (test -d $cf_cv_header_path_$3 || test $cf_cv_header_path_$3 = dummy)
; then
CF_VERBOSE(... testing $cf_cv_header_path_$3)
CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_$3"
AC_TRY_COMPILE([$1],[$2],[
@@ -2177,9 +2181,9 @@
if test "$cf_cv_find_linkage_$3" != yes ; then
CF_LIBRARY_PATH(cf_search,$3)
- for cf_cv_library_path_$3 in $cf_search
+ for cf_cv_library_path_$3 in dummy $cf_search
do
- if test -d $cf_cv_library_path_$3 ; then
+ if (test -d $cf_cv_library_path_$3 || test $cf_cv_library_path_$3 =
dummy) ; then
CF_VERBOSE(... testing $cf_cv_library_path_$3)
CPPFLAGS="$cf_test_CPPFLAGS"
LIBS="-l$3 $7 $cf_save_LIBS"
@@ -3699,16 +3703,7 @@
cf_path_prog=""
cf_path_args=""
-IFS="${IFS= }"; cf_save_ifs="$IFS"
-case $host_os in #(vi
-os2*) #(vi
- IFS="${IFS};"
- ;;
-*)
- IFS="${IFS}:"
- ;;
-esac
-
+IFS="${IFS= }"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
for cf_temp in $ac_cv_path_$1
do
if test -z "$cf_path_prog" ; then
@@ -4834,7 +4829,7 @@
[
AC_CACHE_CHECK(if we can include termio.h with curses,cf_cv_termio_and_curses,[
cf_save_CFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS -DHAVE_CONFIG_H -I. -I${srcdir-.} -I${srcdir-.}/src
-I${srcdir-.}/WWW/Library/Implementation"
+ CPPFLAGS="$CPPFLAGS -I. -I${srcdir-.} -I${srcdir-.}/src
-I${srcdir-.}/WWW/Library/Implementation"
touch lynx_cfg.h
AC_TRY_COMPILE([
#include <$1>
--- config.hin.orig 2008-12-31 17:22:26.000000000 -0800
+++ config.hin 2009-01-02 07:25:52.000000000 -0800
@@ -7,311 +7,310 @@
#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 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 /* 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 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_HAVE_TM_GMTOFF /* CF_TM_GMTOFF */
-#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_ASCII_CTYPES /* CF_ARG_ENABLE(ascii-ctypes) */
-#undef EXP_CHARSET_CHOICE /* CF_ARG_ENABLE(charset-choice) */
-#undef EXP_CHARTRANS_AUTOSWITCH /* CF_ARG_ENABLE(font-switch) */
-#undef EXP_JAPANESEUTF8_SUPPORT /* CF_ARG_ENABLE(japanese-utf8) */
-#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 FANCY_CURSES /* 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 /* AM_GNU_GETTEXT/AC_FUNC_ALLOCA */
-#undef HAVE_ALLOCA_H /* AM_GNU_GETTEXT/AC_FUNC_ALLOCA */
-#undef HAVE_ARGZ_H /* 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_HAVE_TM_GMTOFF
+#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_ASCII_CTYPES
+#undef EXP_CHARSET_CHOICE
+#undef EXP_CHARTRANS_AUTOSWITCH
+#undef EXP_JAPANESEUTF8_SUPPORT
+#undef EXP_JUSTIFY_ELTS
+#undef EXP_KEYBOARD_LAYOUT
+#undef EXP_LIBJS
+#undef EXP_NESTED_TABLES
+#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_CTERMID
#undef HAVE_CURSESX_H
-#undef HAVE_CURSES_VERSION /* CF_FUNC_CURSES_VERSION */
+#undef HAVE_CURSES_VERSION
#undef HAVE_CUSERID
-#undef HAVE_DCGETTEXT /* AM_GNU_GETTEXT */
+#undef HAVE_DCGETTEXT
#undef HAVE_DEFINE_KEY
-#undef HAVE_DELSCREEN /* CF_CURSES_FUNCS */
-#undef HAVE_DIRENT_H /* 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 /* 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_ICONV /* AM_ICONV */
-#undef HAVE_INET_ATON /* CF_INET_ADDR */
+#undef HAVE_ICONV
+#undef HAVE_INET_ATON
#undef HAVE_INTTYPES_H
#undef HAVE_JCURSES_H
#undef HAVE_KEYPAD
-#undef HAVE_LANGINFO_CODESET /* AM_LANGINFO_CODESET */
-#undef HAVE_LC_MESSAGES /* locale messages */
-#undef HAVE_LIBDBMALLOC /* --with-dbmalloc */
-#undef HAVE_LIBDMALLOC /* --with-dmalloc */
-#undef HAVE_LIBGETTEXT_H /* defined if you want to use bundled gettext */
-#undef HAVE_LIBINTL_H /* AM_GNU_GETTEXT, or cleanup from that */
-#undef HAVE_LIBUTF8_H /* may be needed for libncursesw */
+#undef HAVE_LANGINFO_CODESET
+#undef HAVE_LC_MESSAGES
+#undef HAVE_LIBDBMALLOC
+#undef HAVE_LIBDMALLOC
+#undef HAVE_LIBGETTEXT_H
+#undef HAVE_LIBINTL_H
+#undef HAVE_LIBUTF8_H
#undef HAVE_LIMITS_H
#undef HAVE_LOCALE_H
-#undef HAVE_LSTAT /* CF_FUNC_LSTAT */
-#undef HAVE_MALLOC_H /* AM_GNU_GETTEXT */
-#undef HAVE_MBSTATE_T /* CF_WIDEC_CURSES */
+#undef HAVE_LSTAT
+#undef HAVE_MALLOC_H
+#undef HAVE_MBSTATE_T
#undef HAVE_MKDTEMP
#undef HAVE_MKTEMP
-#undef HAVE_MMAP /* AM_GNU_GETTEXT */
-#undef HAVE_MUNMAP /* AM_GNU_GETTEXT */
+#undef HAVE_MMAP
+#undef HAVE_MUNMAP
#undef HAVE_NAPMS
-#undef HAVE_NCURSESW_NCURSES_H /* defined if we include <ncursesw/ncurses.h> */
-#undef HAVE_NCURSESW_TERM_H /* have <ncursesw/term.h> */
-#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_NCURSESW_NCURSES_H
+#undef HAVE_NCURSESW_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 /* 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 /* AM_GNU_GETTEXT */
+#undef HAVE_SETENV
#undef HAVE_SETLOCALE
#undef HAVE_SETUID
-#undef HAVE_SIGACTION /* CF_FUNC_SIGACTION */
-#undef HAVE_SIZECHANGE /* 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 /* AM_GNU_GETTEXT */
-#undef HAVE_STRCASECMP /* AM_GNU_GETTEXT */
-#undef HAVE_STRCHR /* AM_GNU_GETTEXT */
+#undef HAVE_STPCPY
+#undef HAVE_STRCASECMP
+#undef HAVE_STRCHR
#undef HAVE_STRERROR
#undef HAVE_STRING_H
-#undef HAVE_STRUCT_DIRENT64 /* CF_LARGEFILE */
#undef HAVE_SYSLOG_H
-#undef HAVE_SYSV_TOUCHLINE /* CF_CURS_TOUCHLINE */
-#undef HAVE_SYS_DIR_H /* 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 /* AC_HEADER_DIRENT */
-#undef HAVE_SYS_PARAM_H /* 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_USE_LEGACY_CODING /* ncurses extension */
+#undef HAVE_USE_DEFAULT_COLORS
+#undef HAVE_USE_LEGACY_CODING
#undef HAVE_USLEEP
-#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 /* AM_GNU_GETTEXT */
-#undef HAVE_VARARGS_H /* CF_VARARGS */
+#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_WATTR_GET
#undef HAVE_WBORDER
-#undef HAVE_WINDOWS_H /* CF_NETLIBS */
-#undef HAVE_WINSOCK2_H /* CF_NETLIBS */
-#undef HAVE_WINSOCK_H /* CF_NETLIBS */
+#undef HAVE_WINDOWS_H
+#undef HAVE_WINSOCK2_H
+#undef HAVE_WINSOCK_H
#undef HAVE_WREDRAWLN
#undef HAVE_WRESIZE
-#undef HAVE_XCURSES /* CF_PDCURSES_X11 */
+#undef HAVE_XCURSES
#undef HAVE_ZERROR
-#undef HAVE__NC_FREEALL /* ncurses debugging extension */
-#undef HAVE__NC_FREE_AND_EXIT /* ncurses debugging extension */
-#undef HAVE___ARGZ_COUNT /* AM_GNU_GETTEXT */
-#undef HAVE___ARGZ_NEXT /* AM_GNU_GETTEXT */
-#undef HAVE___ARGZ_STRINGIFY /* AM_GNU_GETTEXT */
+#undef HAVE__NC_FREEALL
+#undef HAVE__NC_FREE_AND_EXIT
+#undef HAVE___ARGZ_COUNT
+#undef HAVE___ARGZ_NEXT
+#undef HAVE___ARGZ_STRINGIFY
#undef ICONV_CONST
-#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 /* $sysconfdir/lynx.cfg */
-#undef LYNX_LSS_FILE /* $sysconfdir/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 MIME_LIBDIR /* CF_WITH_PATH(mime-libdir */
-#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 /* CF_SIZECHANGE */
-#undef NEED_REMOVE /* CF_REMOVE_BROKEN */
-#undef NEED_WCHAR_H /* CF_WIDEC_CURSES */
-#undef NGROUPS /* 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 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 MIME_LIBDIR
+#undef MKDIR_PATH
+#undef MV_PATH
+#undef NCURSES
+#undef NCURSES_BROKEN
+#undef NEED_PTEM_H
+#undef NEED_REMOVE
+#undef NEED_WCHAR_H
+#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_INSTALL
-#undef OK_OVERRIDE /* CF_ARG_DISABLE(dired-override) */
-#undef OK_PERMIT /* CF_ARG_DISABLE(dired-permit) */
-#undef REAL_UNIX_SYSTEM /* CF_SLANG_UNIX_DEFS */
-#undef RLOGIN_PATH /* CF_PATH_PROG(rlogin) */
-#undef RM_PATH /* CF_PATH_PROG(rm) */
-#undef SETFONT_PATH /* CF_PATH_PROG(setfont) */
-#undef SIZEOF_INT /* AC_CHECK_SIZEOF(int) */
-#undef SIZEOF_LONG /* AC_CHECK_SIZEOF(long) */
-#undef SIZEOF_OFF_T /* AC_CHECK_SIZEOF(off_t) */
-#undef SIZEOF_TIME_T /* AC_CHECK_SIZEOF(time_t) */
-#undef SOCKS /* CF_SOCKS, CF_SOCKS5 */
+#undef OK_OVERRIDE
+#undef OK_PERMIT
+#undef REAL_UNIX_SYSTEM
+#undef RLOGIN_PATH
+#undef RM_PATH
+#undef SETFONT_PATH
+#undef SIZEOF_INT
+#undef SIZEOF_LONG
+#undef SIZEOF_OFF_T
+#undef SIZEOF_TIME_T
+#undef SOCKS
#undef STDC_HEADERS
-#undef SYSTEM_MAIL /* CF_DEFINE_PROG */
-#undef SYSTEM_MAIL_FLAGS /* CF_SYSTEM_MAIL_FLAGS */
-#undef SYSTEM_NAME /* CF_CHECK_CACHE */
-#undef TAR_DOWN_OPTIONS /* CF_TAR_OPTIONS */
-#undef TAR_FILE_OPTIONS /* CF_TAR_OPTIONS */
-#undef TAR_PATH /* CF_PATH_PROG(tar) */
-#undef TAR_PIPE_OPTIONS /* CF_TAR_OPTIONS */
-#undef TAR_UP_OPTIONS /* CF_TAR_OPTIONS */
-#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_DOWN_OPTIONS
+#undef TAR_FILE_OPTIONS
+#undef TAR_PATH
+#undef TAR_PIPE_OPTIONS
+#undef TAR_UP_OPTIONS
+#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_BZLIB /* AC_ARG_WITH(bzlib) */
-#undef USE_CACHEJAR /* CF_ARG_ENABLE(session-cache) */
-#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_FILE_UPLOAD /* CF_ARG_ENABLE(file-upload) */
-#undef USE_GNUTLS_FUNCS /* CF_GNUTLS */
-#undef USE_GNUTLS_INCL /* CF_GNUTLS */
-#undef USE_LOCALE_CHARSET /* CF_ARG_ENABLE(locale-charset) */
-#undef USE_OPENSSL_INCL /* CF_SSL */
-#undef USE_PERSISTENT_COOKIES /* CF_ARG_ENABLE(persistent-cookies) */
-#undef USE_PRETTYSRC /* CF_ARG_ENABLE(prettysrc) */
-#undef USE_PROGRESSBAR /* CF_ARG_ENABLE(progressbar) */
-#undef USE_READPROGRESS /* CF_ARG_ENABLE(read-eta) */
-#undef USE_SCROLLBAR /* CF_ARG_ENABLE(scrollbar) */
-#undef USE_SESSIONS /* CF_ARG_ENABLE(sessions) */
-#undef USE_SLANG /* AC_ARG_WITH(screen=slang) */
-#undef USE_SOCKS4_PREFIX /* CF_SOCKS5 */
-#undef USE_SOCKS5 /* CF_SOCKS5 */
-#undef USE_SOURCE_CACHE /* CF_ARG_ENABLE(source-cache) */
-#undef USE_SSL /* CF_SSL */
-#undef USE_SYSV_UTMP /* CF_UTMP */
-#undef USE_X509_SUPPORT /* CF_GNUTLS, CF_SSL */
-#undef USE_ZLIB /* AC_ARG_WITH(zlib) */
-#undef UTF8 /* CF_SLANG_CPPFLAGS */
-#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 WIDEC_CURSES /* CF_WIDEC_CURSES */
-#undef XCURSES /* CF_PDCURSES_X11 */
-#undef ZCAT_PATH /* CF_PATH_PROG(zcat) */
-#undef ZIP_PATH /* CF_PATH_PROG(zip) */
-#undef _WINDOWS_NSL /* CF_ARG_ENABLE(nsl-fork) */
-#undef inline /* AC_C_INLINE */
-#undef lynx_rand /* CF_SRAND */
-#undef lynx_srand /* CF_SRAND */
-#undef mode_t /* AC_TYPE_MODE_T */
-#undef off_t /* AC_TYPE_OFF_T */
-#undef pid_t /* AC_TYPE_PID_T */
-#undef socklen_t /* CF_CHECK_TYPE(socklen_t,...) */
-#undef uid_t /* 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_BZLIB
+#undef USE_CACHEJAR
+#undef USE_COLOR_STYLE
+#undef USE_DEFAULT_COLORS
+#undef USE_EXECVP
+#undef USE_EXTERNALS
+#undef USE_FCNTL
+#undef USE_FILE_UPLOAD
+#undef USE_GNUTLS_FUNCS
+#undef USE_GNUTLS_INCL
+#undef USE_LOCALE_CHARSET
+#undef USE_OPENSSL_INCL
+#undef USE_PERSISTENT_COOKIES
+#undef USE_PRETTYSRC
+#undef USE_PROGRESSBAR
+#undef USE_READPROGRESS
+#undef USE_SCROLLBAR
+#undef USE_SESSIONS
+#undef USE_SLANG
+#undef USE_SOCKS4_PREFIX
+#undef USE_SOCKS5
+#undef USE_SOURCE_CACHE
+#undef USE_SSL
+#undef USE_SYSV_UTMP
+#undef USE_X509_SUPPORT
+#undef USE_ZLIB
+#undef UTF8
+#undef UTMPX_FOR_UTMP
+#undef UUDECODE_PATH
+#undef WAITPID_USES_UNION
+#undef WAIT_USES_UNION
+#undef WIDEC_CURSES
+#undef XCURSES
+#undef ZCAT_PATH
+#undef ZIP_PATH
+#undef _WINDOWS_NSL
+#undef inline
+#undef lynx_rand
+#undef lynx_srand
+#undef mode_t
+#undef off_t
+#undef pid_t
+#undef socklen_t
+#undef uid_t
+#undef ut_name
+#undef ut_xstatus
+#undef ut_xtime
#ifdef GZIP_PATH
-#undef OK_GZIP /* CF_ARG_DISABLE(dired-gzip) */
+#undef OK_GZIP
#endif
#ifdef TAR_PATH
-#undef OK_TAR /* CF_ARG_DISABLE(dired-tar) */
+#undef OK_TAR
#endif
#ifdef UUDECODE_PATH
-#undef OK_UUDECODE /* CF_ARG_DISABLE(dired-uudecode) */
+#undef OK_UUDECODE
#endif
#ifdef ZIP_PATH
-#undef OK_ZIP /* CF_ARG_DISABLE(dired-zip) */
+#undef OK_ZIP
#endif
/*
* U/Win defines vfork() as a macro in vfork.h, which is included from
unistd.h.
*/
#ifndef HAVE_VFORK_H
-#undef vfork /* AC_FUNC_FORK */
+#undef vfork
#endif
/* 'const' may be defined externally by the compiler-wrapper, as in 'unproto'
@@ -348,7 +347,7 @@
#endif
#ifdef HAVE_SYSLOG_H
-#undef SYSLOG_REQUESTED_URLS /* CF_ARG_ENABLE(syslog) */
+#undef SYSLOG_REQUESTED_URLS
#endif
#ifndef HAVE_LSTAT
--- configure.in.orig 2008-12-31 17:22:26.000000000 -0800
+++ configure.in 2009-01-02 07:01:08.000000000 -0800
@@ -41,7 +41,8 @@
rm -f config.cache
AC_PREREQ(2.13.20020210)
-AC_INIT(userdefs.h)
+AC_INIT([lynx], [2.9.7dev.12], [[email protected]])
+AC_CONFIG_SRCDIR(userdefs.h)
# autoconf 2.5x defaults to no cache file; we need the cache file's information
# for building the config page. But start with it empty to avoid confusion by
@@ -50,7 +51,7 @@
rm -f config.cache; touch config.cache
CONFIG_H=lynx_cfg.h
-AC_CONFIG_HEADER($CONFIG_H:config.hin)
+AC_CONFIG_HEADERS([lynx_cfg.h:config.hin])
AC_SUBST(CONFIG_H)
CF_CHECK_CACHE([AC_CANONICAL_SYSTEM])
@@ -67,6 +68,8 @@
AC_SUBST(PACKAGE)
AC_SUBST(VERSION)
+_AS_PATH_SEPARATOR_PREPARE
+AC_SUBST(PATH_SEPARATOR)
AC_MSG_CHECKING(for DESTDIR)
CF_WITH_PATH(destdir,
[ --with-destdir=XXX set DESTDIR destination for install],
@@ -93,6 +96,14 @@
AC_PROG_CC
AC_PROG_CPP
AC_PROG_LN_S
+case $host_os in
+mingw*)
+LN_S="cp -p"
+AC_MSG_RESULT(Override: No symbolic links in mingw.)
+ ;;
+*)
+ ;;
+esac
AC_PROG_MAKE_SET
AC_PROG_INSTALL
AC_PROG_YACC
@@ -339,6 +350,13 @@
;;
esac
+
+case $host_os in
+mingw*)
+ EXTRA_OBJS="$EXTRA_OBJS LYIcon\$o"
+ ;;
+esac
+
CF_ANSI_CC_REQD
dnl --------------------------------------------------------------------------
@@ -354,9 +372,14 @@
dnl --------------------------------------------------------------------------
dnl Set of available languages (based on source distribution)
+AC_CHECK_PROG(have_msginit, msginit,yes,no,,)
+test $have_msginit = yes && AC_DEFINE(HAVE_MSGINIT)
+
if test -z "$ALL_LINGUAS" ; then
ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && echo *.po|sed -e
's/\.po//g' -e 's/*//'`
+ if test $have_msginit = yes ; then
ALL_LINGUAS="$ALL_LINGUAS en"
+ fi
fi
CF_BUNDLED_INTL(makefile,disable)
@@ -755,7 +778,6 @@
ftime \
getcwd \
getgroups \
- gettimeofday \
getuid \
mktemp \
mkdtemp \
@@ -772,6 +794,15 @@
waitpid \
zError \
)
+
+case $host_os in
+mingw*)
+AC_MSG_RESULT(Override: no gettimeofday in mingw.)
+ ;;
+*)
+ AC_CHECK_FUNCS(gettimeofday)
+ ;;
+esac
AC_REPLACE_FUNCS( \
mktime \
strstr \
@@ -1453,13 +1484,12 @@
fi
AC_SUBST(SRCDIR_CLEAN)
-AC_OUTPUT(
- [makefile \
+AC_CONFIG_FILES(makefile \
WWW/Library/Implementation/makefile \
src/makefile \
src/chrtrans/makefile \
- $SUB_MAKEFILE
- ],[
+ $SUB_MAKEFILE)
+AC_CONFIG_COMMANDS([default],[
if test "$USE_NLS" = yes ; then
if test "$use_our_messages" = yes ; then
echo creating po/makefile
@@ -1474,5 +1504,5 @@
],[
USE_NLS=$USE_NLS
use_our_messages=$use_our_messages
- ]
-)
+ ])
+AC_OUTPUT
--- makefile.in.orig 2008-09-21 14:49:46.000000000 -0800
+++ makefile.in 2009-01-02 07:04:50.000000000 -0800
@@ -12,6 +12,7 @@
srcdir = @srcdir@
builddir = .
VPATH = $(srcdir)
+PATH_SEPARATOR = @PATH_SEPARATOR@
CC = @CC@
CFLAGS = @CFLAGS@
@@ -189,9 +190,9 @@
all lynx$x: cfg_defs.h LYHelp.h
@MSG_DIR_MAKE@ $(SHELL) $(scripts_dir)/fixtext.sh $(srcdir)/LYMessages_en.h
>LYMessages.c
-...@msg_dir_make@ cd $(PO_DIR) && $(MAKE_RECUR)
- cd $(WWW_DIR) && $(MAKE_RECUR) $(WWW_CFLAGS)
- cd $(SRC_DIR) && $(MAKE_RECUR) all $(SRC_CFLAGS)
+...@msg_dir_make@ (cd $(PO_DIR) && $(MAKE_RECUR))
+ (cd $(WWW_DIR) && $(MAKE_RECUR) $(WWW_CFLAGS))
+ (cd $(SRC_DIR) && $(MAKE_RECUR) all $(SRC_CFLAGS))
lint:
cd $(WWW_DIR) && $(MAKE_RECUR) LINT="$(LINT)" $(WWW_CFLAGS) $@
@@ -212,27 +213,27 @@
clean:
rm -f WWW/Library/*/*.[aoib]
rm -f WWW/Library/*/.created
- cd $(WWW_DIR) && $(MAKE_RECUR) $@
- cd $(SRC_DIR) && $(MAKE_RECUR) $@
+ (cd $(WWW_DIR) && $(MAKE_RECUR) $@)
+ (cd $(SRC_DIR) && $(MAKE_RECUR) $@)
@MSG_DIR_MAKE@ rm -f LYMessages.c
-...@msg_dir_make@ cd $(PO_DIR) && $(MAKE_RECUR) $@
+...@msg_dir_make@ (cd $(PO_DIR) && $(MAKE_RECUR) $@)
rm -f *.b $(SRC_DIR)/lynx$x *.leaks cfg_defs.h LYHelp.h lint.*
@LYNXCFG_MAKE@ -rm -f alphatoc.html body.html cattoc.html tmp007
rm -f help_files.sed
rm -f core *.core
depend: cfg_defs.h LYHelp.h
- cd $(WWW_DIR) && $(MAKE_RECUR) $@
- cd $(SRC_DIR) && $(MAKE_RECUR) $@
+ (cd $(WWW_DIR) && $(MAKE_RECUR) $@)
+ (cd $(SRC_DIR) && $(MAKE_RECUR) $@)
distclean: clean
-rm -f WWW/Library/*/*~
-rm -f WWW/Library/*/*.bak
-rm -rf $(SRC_DIR)/obsolete
- -cd $(WWW_DIR) && $(MAKE_RECUR) $@
- -cd $(SRC_DIR) && $(MAKE_RECUR) $@
- -cd $(CHR_DIR) && $(MAKE_RECUR) $@
-...@msg_dir_make@ cd $(PO_DIR) && $(MAKE_RECUR) $@
+ -(cd $(WWW_DIR) && $(MAKE_RECUR) $@)
+ -(cd $(SRC_DIR) && $(MAKE_RECUR) $@)
+ -(cd $(CHR_DIR) && $(MAKE_RECUR) $@)
+...@msg_dir_make@ (cd $(PO_DIR) && $(MAKE_RECUR) $@)
@MSG_DIR_MAKE@ -rmdir $(PO_DIR)
-rm -f *~ *.bak *.sav tags TAGS
-rm -f $(WWW_DIR)/makefile $(SRC_DIR)/makefile $(CHR_DIR)/makefile
@@ -301,7 +302,7 @@
@echo Full installation complete.
install-bin: $(BINDIR) lynx$x
-...@msg_dir_make@ cd $(PO_DIR) && $(MAKE_RECUR) install
+...@msg_dir_make@ (cd $(PO_DIR) && $(MAKE_RECUR) install)
@echo...@$(SHELL) -c \
'if test -f $(BINDIR)/lynx$x ; then \
mv -f $(BINDIR)/lynx$x $(BINDIR)/lynx.old; fi'
@@ -318,8 +319,8 @@
(cd $(DOCDIR) && $(COMPRESS_PROG) -f docs/CHANGES*.[0-9]
docs/*.announce ) \
fi'
$(SHELL) -c 'for name in COPYING COPYHEADER; do \
- cd $(HELPDIR) && rm -f $$name ;\
- cd $(HELPDIR) && ( $(LN_S) $(DOCDIR)/$$name . || cp
$(DOCDIR)/$$name . );\
+ (cd $(HELPDIR) && rm -f $$name) ;\
+ (cd $(HELPDIR) && ( $(LN_S) $(DOCDIR)/$$name . || cp
$(DOCDIR)/$$name . ));\
done'
-$(SHELL) -c 'case `id|sed -e "s/(.*//"` in uid=0) chown -R root
$(DOCDIR);; esac'
@@ -361,7 +362,7 @@
- (cd $(HELPDIR) && WD=`pwd` && HEAD=`echo $$WD|sed -e
's!/lynx_help$$!!'` && test $$WD != $$HEAD && rm -fr *)
test -d $(HELPDIR)/keystrokes || mkdir $(HELPDIR)/keystrokes
@LYNXCFG_MAKE@ @echo 'Making htmlized lynx.cfg'
-...@lynxcfg_make@ cd $(SRC_DIR) && $(MAKE_RECUR) LYReadCFG.i
+...@lynxcfg_make@ (cd $(SRC_DIR) && $(MAKE_RECUR) LYReadCFG.i)
@LYNXCFG_MAKE@ @-rm -f alphatoc.html body.html cattoc.html
@LYNXCFG_MAKE@ sed -n -e '/Config_Type *Config_Table/,/{0, *0, *0}/ p'
$(SRC_DIR)/LYReadCFG.i | \
@LYNXCFG_MAKE@ sed -e 's/ *{ *"\([^"]*\)".*/\1/' | \
@@ -426,7 +427,7 @@
@$(SHELL) $(scripts_dir)/install-lss.sh "$(INSTALL_DATA)"
$(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss
uninstall ::
-...@msg_dir_make@ cd $(PO_DIR) && $(MAKE_RECUR) uninstall
+...@msg_dir_make@ (cd $(PO_DIR) && $(MAKE_RECUR) uninstall)
-rm -f $(BINDIR)/lynx$x
-rm -f $(MANDIR)/lynx.1
-rm -f $(SYSCONFDIR)/lynx.cfg
--- userdefs.h.orig 2008-12-31 17:22:26.000000000 -0800
+++ userdefs.h 2009-01-02 07:01:10.000000000 -0800
@@ -306,7 +306,11 @@
* definitions in lynx.cfg and built-in defaults from src/HTInit.c.
*/
#define GLOBAL_EXTENSION_MAP MIME_LIBDIR "mime.types"
+#ifdef DOSPATH
+#define PERSONAL_EXTENSION_MAP "./_mime.types"
+#else
#define PERSONAL_EXTENSION_MAP "~/.mime.types"
+#endif /* DOSPATH */
/**************************
* The MAILCAP file allows you to map file MIME types to
@@ -316,7 +320,11 @@
* definitions in lynx.cfg and built-in defaults from src/HTInit.c.
*/
#define GLOBAL_MAILCAP MIME_LIBDIR "mailcap"
+#ifdef DOSPATH
+#define PERSONAL_MAILCAP "./_mailcap"
+#else
#define PERSONAL_MAILCAP "~/.mailcap"
+#endif /* DOSPATH */
/**************************
* XLOADIMAGE_COMMAND will be used as a default in src/HTInit.c for
@@ -500,7 +508,7 @@
* An index to your CWIS can be placed here or a document containing
* pointers to lots of interesting places on the web.
*/
-#define DEFAULT_INDEX_FILE
"http://www.ncsa.uiuc.edu/SDG/Software/Mosaic/MetaIndex.html";
+#define DEFAULT_INDEX_FILE "http://lynx.isc.org/current/index.html";
/*****************************
* If USE_TRACE_LOG is set FALSE, then when TRACE mode is invoked the
@@ -850,7 +858,11 @@
* directory. If it is in a subdirectory, begin it with a dot-slash
* (e.g., ./lynx/.lynxsig). The definition here can be changed in lynx.cfg.
*/
+#ifdef DOSPATH
+#define LYNX_SIG_FILE "lynx.sig"
+#else
#define LYNX_SIG_FILE ".lynxsig"
+#endif /* DOSPATH */
/********************************
* BIBP_GLOBAL_SERVER is the default global server for bibp: links, used
--- samples/home.htm.orig 2008-02-17 14:00:58.000000000 -0800
+++ samples/home.htm 2009-01-02 07:01:10.000000000 -0800
@@ -22,7 +22,7 @@
...for quicker & saver browsing...
</p>
<p>
- Light-height, fast and secure text browser.
+ Light-weight, fast and secure text browser.
</p>
</td>
</tr>
--- src/LYCurses.c.orig 2008-09-21 14:49:46.000000000 -0800
+++ src/LYCurses.c 2009-01-02 07:01:10.000000000 -0800
@@ -8,6 +8,10 @@
#endif /* UNIX */
#endif /* __MINGW32__ */
+#ifdef __DJGPP__
+#include <pc.h>
+#endif /* __DJGPP__ */
+
#include <LYCurses.h>
#include <LYStyle.h>
#include <LYUtils.h>
@@ -1448,20 +1452,22 @@
#endif /* __DJGPP__ */
#if defined(DOSPATH) && !(defined(USE_SLANG) || defined(_WIN_CC))
-#if defined(PDCURSES)
- endwin();
-#else /* !PDCURSES */
#ifdef __DJGPP__
ScreenClear();
-#else /* some flavor of win32? */
-#ifdef __MINGW32__
+#if defined(PDCURSES)
+ endwin();
+#endif /* PDCURSES */
+#elif defined(__MINGW32__)
+ chtype bb;
+ bb=getbkgd(stdscr);
+ bkgdset(0);
clear();
-#else
- clrscr();
-#endif
-#endif /* win32 */
+ refresh();
+ bkgdset(bb);
+#if defined(PDCURSES)
+ endwin();
#endif /* PDCURSES */
-#else
+#else /* !__DJGPP && !__MINGW32__ */
if (LYCursesON == TRUE) {
lynx_nl2crlf(TRUE);
@@ -1479,7 +1485,7 @@
}
#endif
}
-
+#endif /* __DJGPP__ */
fflush(stdout);
#endif /* defined(DOSPATH) && !(defined(USE_SLANG) || defined(_WIN_CC)) */
fflush(stderr);
--- src/LYEdit.c.orig 2008-12-31 17:22:26.000000000 -0800
+++ src/LYEdit.c 2009-01-02 07:01:10.000000000 -0800
@@ -265,7 +265,9 @@
if (rv == -1) {
HTUserMsg2(gettext("Error starting editor, %s"),
LYStrerror(save_err));
- } else if (WIFSIGNALED(rv)) {
+ }
+#ifdef HAVE_SYS_WAIT_H
+ else if (WIFSIGNALED(rv)) {
HTAlwaysAlert(NULL, gettext("Editor killed by signal"));
} else if (WIFEXITED(rv) && WEXITSTATUS(rv) != 127) {
char exitcode[80];
@@ -273,7 +275,9 @@
sprintf(exitcode, "%d", WEXITSTATUS(rv));
HTUserMsg2(gettext("Editor returned with error status %s"),
exitcode);
- } else
+ }
+#endif /* HAVE_SYS_WAIT_H */
+ else
#endif
HTAlwaysAlert(NULL, ERROR_SPAWNING_EDITOR);
}
--- src/LYIcon.rc.orig 2009-01-02 07:01:10.000000000 -0800
+++ src/LYIcon.rc 2009-01-02 07:01:10.000000000 -0800
@@ -0,0 +1 @@
+100 ICON "./lynx.ico"
--- src/LYMainLoop.c.orig 2008-12-31 17:22:26.000000000 -0800
+++ src/LYMainLoop.c 2009-01-02 07:01:10.000000000 -0800
@@ -4203,7 +4203,7 @@
{
if (!no_shell) {
stop_curses();
- printf("%s\r\n", SPAWNING_MSG);
+ printf("\r\n%s", SPAWNING_MSG);
#if defined(__CYGWIN__)
/* handling "exec $SHELL" does not work if $SHELL is null */
if (LYGetEnv("SHELL") == NULL) {
--- src/makefile.in.orig 2008-12-31 17:22:26.000000000 -0800
+++ src/makefile.in 2009-01-02 07:01:12.000000000 -0800
@@ -149,6 +149,9 @@
LYmktime$o : $(top_srcdir)/userdefs.h
LYrcFile$o : $(top_srcdir)/userdefs.h
+LYIcon$o:
+ windres -i LYIcon.rc -o LYIcon$o -O coff
+
CHRTR= chrtrans/
TABLES= \
--- www/Library/Implementation/www_tcp.h.orig 2008-12-31 17:22:26.000000000
-0800
+++ www/Library/Implementation/www_tcp.h 2009-01-02 11:27:10.000000000
-0800
@@ -632,6 +632,9 @@
#ifdef word
#undef word
#endif /* word */
+#ifdef set_timeout
+#undef set_timeout
+#endif /* set_timeout */
#define select select_s
#undef NETWRITE
lynx_mingw_conf.sh
Description: Bourne shell script
lynx_djgpp_config.sh
Description: Bourne shell script
_______________________________________________ Lynx-dev mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/lynx-dev
