snapshot of project "lynx", label v2-7-1ac_0-64

1 files changed, 106 insertions, 75 deletions

diff --git a/configure.in b/configure.in
index 4e78a02c..bd56accd 100644
--- a/configure.in
+++ b/configure.in
@@ -22,6 +22,80 @@ CF_MAKE_INCLUDE
 AC_PROG_INSTALL
 AC_CHECK_PROGS(LINT, lint alint lclint tdlint, [])
 
+dnl --------------------------------------------------------------------------
+dnl Debug/development/test
+dnl --------------------------------------------------------------------------
+
+CF_HELP_MESSAGE(
+Development Options:)
+
+AC_MSG_CHECKING(if you want to see long compiling messages)
+CF_ARG_DISABLE(echo,
+	[  --disable-echo          display \"compiling\" commands],
+	[SHOW_CC='	@echo compiling $@'
+    ECHO_CC='@'],
+	[SHOW_CC='# compiling'
+    ECHO_CC=''])
+AC_MSG_RESULT($enableval)
+AC_SUBST(SHOW_CC)
+AC_SUBST(ECHO_CC)
+
+AC_MSG_CHECKING(if you want to check memory-leaks)
+CF_ARG_ENABLE(find-leaks,
+	[  --enable-find-leaks     logic for testing memory leaks],
+	[with_leak_checks=yes],
+	[with_leak_checks=no])
+AC_MSG_RESULT($with_leak_checks)
+test "$with_leak_checks" = "yes" && AC_DEFINE(LY_FIND_LEAKS)
+
+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)
+if test "$with_debug" = "yes" ; then
+	case $host_os in
+	ultrix*)
+		CF_STRIP_O_OPT(CFLAGS)
+		if test -z "$GCC" ; then
+			CFLAGS="$CFLAGS -g3"
+		fi
+		;;
+	esac
+else
+	case $host_os in
+	ultrix*) #(vi
+		CF_STRIP_G_OPT(CFLAGS)
+		;;
+	*)
+		if test -n "$GCC" ; then
+			CF_STRIP_G_OPT(CFLAGS)
+		fi
+		;;
+	esac
+fi
+
+if test -n "$GCC"
+then
+AC_MSG_CHECKING(if you want to turn on gcc warnings)
+CF_ARG_ENABLE(warnings,
+	[  --enable-warnings       GCC compiler warnings],
+	[with_warnings=yes],
+	[with_warnings=no])
+AC_MSG_RESULT($with_warnings)
+if test "$with_warnings" = "yes"
+then
+	CF_GCC_WARNINGS
+fi
+fi
+
+dnl --------------------------------------------------------------------------
+dnl --------------------------------------------------------------------------
+
+CF_HELP_MESSAGE(
+Basic Configuration Options:)
+
 AC_MSG_CHECKING(if you want full utility pathnames)
 CF_ARG_DISABLE(full-paths,
 	[  --disable-full-paths    control whether full utility pathnames are used],
@@ -140,6 +214,10 @@ sequent-ptx)
 sequent-ptx2)
 	CFLAGS="$CFLAGS -DSVR4_BSDSELECT"
 	;;
+sony-newsos*)
+	CFLAGS="$CFLAGS -I/usr/sony/include"
+	AC_CHECK_HEADERS(jcurses.h)
+	;;
 svr4)
 	CFLAGS="$CFLAGS -DSVR4_BSDSELECT -DSVR4"
 	;;
@@ -153,6 +231,7 @@ ultrix*)
 	# Increase the maximum size of functions that will be optimized.
 	test -z "$GCC" && CFLAGS="$CFLAGS -O -Olimit 600 -G 7"
 	CFLAGS="$CFLAGS -DULTRIX" 
+	AC_CHECK_HEADERS(cursesX.h, cf_cv_ncurses_header=cursesX.h)
 	;;
 esac
 
@@ -181,9 +260,11 @@ AC_MSG_RESULT($cf_cv_screen)
 
 case $cf_cv_screen in
 curses)
+	if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" != set"; then
+		cf_cv_ncurses_header=curses.h
+	fi
 	CF_CURSES_LIBS
 	CF_CURS_PERFORMANCE
-	cf_cv_ncurses_header=curses.h
 	;;
 ncurses)
 	CF_NCURSES_CPPFLAGS
@@ -198,7 +279,7 @@ esac
 
 CF_WITH_PATH(cfg-file,
 [  --with-cfg-file=XXXX    specify config-pathname],
-LYNX_CFG_FILE,[$]ac_default_prefix/lib/lynx.cfg)
+LYNX_CFG_FILE,LIBDIR/lynx.cfg,[$]libdir/lynx.cfg)
 AC_DEFINE_UNQUOTED(LYNX_CFG_FILE,"$LYNX_CFG_FILE")
 
 dnl --------------------------------------------------------------------------
@@ -217,11 +298,14 @@ AC_CHECK_HEADERS( \
 	sys/ioctl.h \
 	sys/param.h \
 	sys/time.h \
+	sys/wait.h \
 	termio.h \
 	termios.h \
 	unistd.h \
+	waitstatus.h \
 )
 CF_TERMIO_AND_TERMIOS
+CF_UNION_WAIT
 
 dnl --------------------------------------------------------------------------
 dnl Checks for library units
@@ -234,6 +318,7 @@ AC_CHECK_FUNCS( \
 	getcwd \
 	putenv \
 	readdir \
+	waitpid \
 )
 
 dnl --------------------------------------------------------------------------
@@ -265,6 +350,10 @@ fi
 dnl --------------------------------------------------------------------------
 dnl Miscellaneous options that don't need to test system features
 dnl --------------------------------------------------------------------------
+
+CF_HELP_MESSAGE(
+Miscellaneous Options:)
+
 AC_SUBST(EXTRA_OBJS)
 AC_SUBST(EXTRA_DEPS)
 
@@ -324,6 +413,13 @@ if test ".$use_zlib" != ".no" ; then
 	AC_DEFINE(USE_ZLIB)
 fi
 
+dnl --------------------------------------------------------------------------
+dnl DirEd (directory-editor) options
+dnl --------------------------------------------------------------------------
+
+CF_HELP_MESSAGE(
+Directory Editor Options:)
+
 # 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)
@@ -338,42 +434,42 @@ if test ".$use_dired" != ".no" ; then
 
 	AC_MSG_CHECKING(if you wish to allow extracting from archives via DirEd)
 	CF_ARG_DISABLE(dired-archive,
-	[  --disable-dired-archive  DirEd: disable dearchiving commands],[AC_DEFINE(ARCHIVE_ONLY)])
+	[  --disable-dired-archive  disable dearchiving commands],[AC_DEFINE(ARCHIVE_ONLY)])
 	AC_MSG_RESULT($enableval)
 
 	AC_MSG_CHECKING(if you wish to allow users to redefine DirEd keys)
 	CF_ARG_DISABLE(dired-override,
-	[  --disable-dired-override DirEd: disable private keymaps],,[AC_DEFINE(OK_OVERRIDE)])
+	[  --disable-dired-override disable private keymaps],,[AC_DEFINE(OK_OVERRIDE)])
 	AC_MSG_RESULT($enableval)
 
 	AC_MSG_CHECKING(if you wish to allow permissions commands via DirEd)
 	CF_ARG_DISABLE(dired-permit,
-	[  --disable-dired-permit  DirEd: disable chmod/attrib commands],,[AC_DEFINE(OK_PERMIT)])
+	[  --disable-dired-permit  disable chmod/attrib commands],,[AC_DEFINE(OK_PERMIT)])
 	AC_MSG_RESULT($enableval)
 
 	AC_MSG_CHECKING(if you wish to allow executable-permission commands via DirEd)
 	CF_ARG_DISABLE(dired-xpermit,
-	[  --disable-dired-xpermit DirEd: disable chmod/attrib commands],[AC_DEFINE(NO_CHANGE_EXECUTE_PERMS)])
+	[  --disable-dired-xpermit disable chmod/attrib commands],[AC_DEFINE(NO_CHANGE_EXECUTE_PERMS)])
 	AC_MSG_RESULT($enableval)
 
 	AC_MSG_CHECKING(if you wish to allow \"tar\" commands from DirEd)
 	CF_ARG_DISABLE(dired-tar,
-	[  --disable-dired-tar     DirEd: disable \"tar\" command],,[AC_DEFINE(OK_TAR)])
+	[  --disable-dired-tar     disable \"tar\" command],,[AC_DEFINE(OK_TAR)])
 	AC_MSG_RESULT($enableval)
 
 	AC_MSG_CHECKING(if you wish to allow \"uudecode\" commands from DirEd)
 	CF_ARG_DISABLE(dired-uudecode,
-	[  --disable-dired-uudecode DirEd: disable \"uudecode\" command],,[AC_DEFINE(OK_UUDECODE)])
+	[  --disable-dired-uudecode disable \"uudecode\" command],,[AC_DEFINE(OK_UUDECODE)])
 	AC_MSG_RESULT($enableval)
 
 	AC_MSG_CHECKING(if you wish to allow \"zip\" and \"unzip\" commands from DirEd)
 	CF_ARG_DISABLE(dired-zip,
-	[  --disable-dired-zip     DirEd: disable \"zip\", \"unzip\"  commands],,[AC_DEFINE(OK_ZIP)])
+	[  --disable-dired-zip     disable \"zip\", \"unzip\"  commands],,[AC_DEFINE(OK_ZIP)])
 	AC_MSG_RESULT($enableval)
 
 	AC_MSG_CHECKING(if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd)
 	CF_ARG_DISABLE(dired-gzip,
-	[  --disable-dired-gzip    DirEd: disable \"gzip\", \"gunzip\" commands],,[AC_DEFINE(OK_GZIP)])
+	[  --disable-dired-gzip    disable \"gzip\", \"gunzip\" commands],,[AC_DEFINE(OK_GZIP)])
 	AC_MSG_RESULT($enableval)
 fi
 
@@ -390,71 +486,6 @@ CF_ARG_DISABLE(parent-dir-refs,
 	[AC_DEFINE(NO_PARENT_DIR_REFERENCE)])
 AC_MSG_RESULT($enableval)
 
-dnl --------------------------------------------------------------------------
-dnl Debug/development/test
-dnl --------------------------------------------------------------------------
-
-AC_MSG_CHECKING(if you want to see long compiling messages)
-CF_ARG_DISABLE(echo,
-	[  --disable-echo          develop: display \"compiling\" commands],
-	[SHOW_CC='	@echo compiling $@'
-    ECHO_CC='@'],
-	[SHOW_CC='# compiling'
-    ECHO_CC=''])
-AC_MSG_RESULT($enableval)
-AC_SUBST(SHOW_CC)
-AC_SUBST(ECHO_CC)
-
-AC_MSG_CHECKING(if you want to check memory-leaks)
-CF_ARG_ENABLE(find-leaks,
-	[  --enable-find-leaks     develop: logic for testing memory leaks],
-	[with_leak_checks=yes],
-	[with_leak_checks=no])
-AC_MSG_RESULT($with_leak_checks)
-test "$with_leak_checks" = "yes" && AC_DEFINE(LY_FIND_LEAKS)
-
-AC_MSG_CHECKING(if you want to enable debug-code)
-CF_ARG_ENABLE(debug,
-	[  --enable-debug          develop: logic for traces/debugging],
-	[with_debug=yes],
-	[with_debug=no])
-AC_MSG_RESULT($with_debug)
-if test "$with_debug" = "yes" ; then
-	case $host_os in
-	ultrix*)
-		CF_STRIP_O_OPT(CFLAGS)
-		if test -z "$GCC" ; then
-			CFLAGS="$CFLAGS -g3"
-		fi
-		;;
-	esac
-else
-	case $host_os in
-	ultrix*) #(vi
-		CF_STRIP_G_OPT(CFLAGS)
-		;;
-	*)
-		if test -n "$GCC" ; then
-			CF_STRIP_G_OPT(CFLAGS)
-		fi
-		;;
-	esac
-fi
-
-if test -n "$GCC"
-then
-AC_MSG_CHECKING(if you want to turn on gcc warnings)
-CF_ARG_ENABLE(warnings,
-	[  --enable-warnings       develop: GCC compiler warnings],
-	[with_warnings=yes],
-	[with_warnings=no])
-AC_MSG_RESULT($with_warnings)
-if test "$with_warnings" = "yes"
-then
-	CF_GCC_WARNINGS
-fi
-fi
-
 ### Finally, build config.h and the makefiles
 CFLAGS="$CFLAGS $EXTRA_CFLAGS"
 AC_OUTPUT(