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

1 files changed, 42 insertions, 3 deletions

diff --git a/configure.in b/configure.in
index d0962e02..dfef6c10 100644
--- a/configure.in
+++ b/configure.in
@@ -105,7 +105,6 @@ CF_PATH_PROG(CHMOD,	chmod)
 CF_PATH_PROG(COMPRESS,	compress)
 CF_PATH_PROG(COPY,	cp)
 CF_PATH_PROG(GZIP,	gzip)
-CF_PATH_PROG(INSTALL,	install)
 CF_PATH_PROG(MKDIR,	mkdir)
 CF_PATH_PROG(MV,	mv)
 CF_PATH_PROG(RM,	rm)
@@ -117,6 +116,17 @@ CF_PATH_PROG(UUDECODE,	uudecode)
 CF_PATH_PROG(ZCAT,	zcat)
 CF_PATH_PROG(ZIP,	zip)
 
+dnl 'INSTALL' is a special case, since the configure script has to find a
+dnl BSD-compatible one so the build/install works properly.
+case "$INSTALL" in
+$srcdir*) # (vi
+	AC_DEFINE_UNQUOTED(INSTALL_PATH,"install")
+	;;
+*) # (vi
+	AC_DEFINE_UNQUOTED(INSTALL_PATH,"$INSTALL")
+	;;
+esac
+
 dnl --------------------------------------------------------------------------
 dnl Checks for compiler & standard-library characteristics
 dnl --------------------------------------------------------------------------
@@ -326,7 +336,9 @@ AC_REPLACE_FUNCS( \
 )
 
 CF_CHECK_FUNCDECLS([#include <string.h>], strstr)
-CF_CHECK_FUNCDECLS([#include <grp.h>], getgrgid getgrnam)
+CF_CHECK_FUNCDECLS([
+#include <stdio.h>
+#include <grp.h>], getgrgid getgrnam)
 
 dnl --------------------------------------------------------------------------
 dnl Checks for external-data
@@ -400,6 +412,7 @@ fi
 case $use_color_style in
 no)
 	AC_MSG_RESULT(no)
+	INSTALL_LSS=
 	;;
 *)
 	AC_DEFINE(USE_COLOR_STYLE)
@@ -409,8 +422,10 @@ no)
 	LYNX_LSS_FILE=$cf_libdir/lynx.lss
 	AC_DEFINE_UNQUOTED(LYNX_LSS_FILE,"$LYNX_LSS_FILE")
 	AC_MSG_RESULT($LYNX_LSS_FILE)
+	INSTALL_LSS=install-lss
 	;;
 esac
+AC_SUBST(INSTALL_LSS)
 
 AC_MSG_CHECKING(if you want to use external commands)
 CF_ARG_ENABLE(externs,
@@ -418,7 +433,31 @@ CF_ARG_ENABLE(externs,
 	[use_externs=yes],
 	[use_externs=no])
 AC_MSG_RESULT($use_externs)
-test $use_externs != ".no" && AC_DEFINE(USE_EXTERNS)
+test $use_externs != ".no" && AC_DEFINE(USE_EXTERNALS)
+
+AC_MSG_CHECKING(if you want to use setfont support)
+CF_ARG_ENABLE(font-switch,
+[  --enable-font-switch    use Linux setfont for character-translation],
+	[use_setfont=yes],
+	[use_setfont=no])
+AC_MSG_RESULT($use_setfont)
+test $use_setfont = yes && AC_DEFINE(EXP_CHARTRANS_AUTOSWITCH)
+
+AC_MSG_CHECKING(if you want to fork NSL requests)
+CF_ARG_ENABLE(nsl-fork,
+[  --enable-nsl-fork       fork NSL requests, allowing them to be aborted],
+	[use_nsl_fork=yes],
+	[use_nsl_fork=no])
+AC_MSG_RESULT($use_nsl_fork)
+test $use_nsl_fork = yes && AC_DEFINE(NSL_FORK)
+
+AC_MSG_CHECKING(if you want to underline links)
+CF_ARG_ENABLE(underlines,
+[  --enable-underlines     underline links rather than using boldface],
+	[use_underline=yes],
+	[use_underline=no])
+AC_MSG_RESULT($use_underline)
+test $use_underline = yes && AC_DEFINE(UNDERLINE_LINKS)
 
 AC_MSG_CHECKING(if you want to use zlib for decompression of some gzip files)
 AC_ARG_WITH(zlib,