aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGES20
-rw-r--r--INSTALLATION2
-rw-r--r--WWW/Library/Implementation/SGML.c2
-rw-r--r--aclocal.m4206
-rw-r--r--config.hin3
-rwxr-xr-xconfigure2761
-rw-r--r--configure.in27
-rw-r--r--docs/README.jp (renamed from README.jp)0
-rw-r--r--makefile.bcb5
-rw-r--r--makefile.msc9
-rw-r--r--makelynx.bat5
-rw-r--r--src/LYCurses.c33
-rw-r--r--src/LYCurses.h40
-rw-r--r--src/LYForms.c14
-rw-r--r--src/LYMain.c2
-rw-r--r--src/LYMainLoop.c2
-rw-r--r--src/LYOptions.c8
-rw-r--r--src/LYReadCFG.c2
-rw-r--r--src/LYStrings.c62
-rw-r--r--src/LYUtils.c4
-rw-r--r--userdefs.h4
21 files changed, 2546 insertions, 665 deletions
diff --git a/CHANGES b/CHANGES
index 94d2c9d4..d71a7d56 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,26 @@
Changes since Lynx 2.8 release
===============================================================================
+2000-04-06 (2.8.3pre.3)
+* remove definitions for NCURSES and NCURSES_VERSION from top-level makefiles
+ that really use PDCurses -TD
+* add USE_MOUSE symbol: cleanup/simplify ifdef'ing of mouse code,
+ replace USE_SLANG_MOUSE / NCURSES_MOUSE_VERSION / PDCURSES_MOUSE_VERSION
+ with USE_MOUSE (and modifier when necessary) -LP
+* windows makefiles: add new symbols SOURCE_CACHE and USE_PRETTYSRC,
+ remove obsolete EXP_CHARTRANS and unused EXP_CHARTRANS_AUTOSWITCH -LP
+* fixed a bug with psrcview on lss-enabled lynx. Code such as <a blah href=.>
+ (i.e. unknown attribute and then some other attribute) was causing calls to
+ PSRCSTOP(barattr) twice (and lynx was switched to "non-preformatted" mode
+ losing all white spaces of the document after that piece of code) -VH
+* add configure option --with-screen=pdcurses, mainly for checking ifdef
+ conflicts between ncurses and pdcurses. This builds/runs with the PDCurses
+ X11 library, but is not recommended for general use -TD
+* remove test-artifact in configure check for zlib.h -TD
+* add CF_SLANG_UNIX configure macro, to allow slang configuration to build on
+ AIX, etc., (reported by Jens Schleusener <Jens.Schleusener@dlr.de>) -TD
+* update CF_CURSES_LIBS macro from CDK fixes, adds a special check for HPUX
+ 11.x -lcur_colr library -TD
2000-04-02 (2.8.3pre.2)
* fixed problem with charset handling for SOURCE_CACHE:MEMORY - if the charset
was specified by Content-Type http header it won't be lost (as it was) when
diff --git a/INSTALLATION b/INSTALLATION
index bc14f004..688959d0 100644
--- a/INSTALLATION
+++ b/INSTALLATION
@@ -401,7 +401,7 @@ II. Compile instructions -- UNIX
Disabled by default, this allows interruption of NSL requests,
so that `z' will stop the `look-up' phase of a connection.
- --enable-prettysrc (define USE_PSRC)
+ --enable-prettysrc (define USE_PRETTYSRC)
Use this option to compile-in support for colorizing the source view of
HTML pages. If compiled-in, new source view mode is available with
-prettysrc command line option.
diff --git a/WWW/Library/Implementation/SGML.c b/WWW/Library/Implementation/SGML.c
index db7e9e40..03c3ac37 100644
--- a/WWW/Library/Implementation/SGML.c
+++ b/WWW/Library/Implementation/SGML.c
@@ -3560,12 +3560,14 @@ top1:
break;
}
#ifdef USE_PRETTYSRC
+#if 0 /*seems this is not needed. It was causing some LSS style stack underflow -VH*/
/* we are here because this char seemed the beginning of attrname */
if (psrc_view && context->current_attribute_number == INVALID) {
PSRCSTOP(badattr);
PUTC(' ');
}
#endif
+#endif
HTChunkPutc(string, c);
context->state = S_attr; /* Get next attribute */
break;
diff --git a/aclocal.m4 b/aclocal.m4
index 8df3a937..3a53e918 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -736,9 +736,14 @@ do
eval cf_result='$ac_cv_func_'$cf_func
if test ".$cf_result" != ".no"; then
AC_TRY_LINK([
+#ifdef HAVE_XCURSES
+#include <xcurses.h>
+char * XCursesProgramName = "test";
+#else
#include <curses.h>
#ifdef HAVE_TERM_H
#include <term.h>
+#endif
#endif],
[
#ifndef ${cf_func}
@@ -767,7 +772,7 @@ case $host_os in #(vi
freebsd*) #(vi
AC_CHECK_LIB(mytinfo,tgoto,[LIBS="-lmytinfo $LIBS"])
;;
-hpux10.*)
+hpux10.*|hpux11.*)
AC_CHECK_LIB(cur_colr,initscr,[
LIBS="-lcur_colr $LIBS"
CFLAGS="-I/usr/include/curses_colr $CFLAGS"
@@ -1765,6 +1770,32 @@ case ".[$]$1" in #(vi
esac
])dnl
dnl ---------------------------------------------------------------------------
+dnl Configure for PDCurses' X11 library
+AC_DEFUN([CF_PDCURSES_X11],[
+AC_REQUIRE([CF_X_ATHENA])
+LDFLAGS="$LDFLAGS $X_LIBS"
+CFLAGS="$CFLAGS $X_CFLAGS"
+AC_CHECK_LIB(X11,XOpenDisplay,
+ [LIBS="-lX11 $LIBS"],,
+ [$X_PRE_LIBS $LIBS $X_EXTRA_LIBS])
+AC_CACHE_CHECK(for XCurses library,cf_cv_lib_XCurses,[
+LIBS="-lXCurses $LIBS"
+AC_TRY_LINK([
+#include <xcurses.h>
+char *XCursesProgramName = "test";
+],[XCursesExit();],
+[cf_cv_lib_XCurses=yes],
+[cf_cv_lib_XCurses=no])
+])
+if test $cf_cv_lib_XCurses = yes ; then
+ AC_DEFINE(UNIX)
+ AC_DEFINE(XCURSES)
+ AC_DEFINE(HAVE_XCURSES)
+else
+ AC_ERROR(Cannot link with XCurses)
+fi
+])
+dnl ---------------------------------------------------------------------------
dnl Re-check on a function to see if we can pick it up by adding a library.
dnl $1 = function to check
dnl $2 = library to check in
@@ -1970,6 +2001,28 @@ AC_MSG_RESULT($cf_result)
test $cf_result = no && LIBS="$cf_slang_LIBS3"
])dnl
dnl ---------------------------------------------------------------------------
+dnl Slang's header files rely on some predefined symbols to declare variables
+dnl that we might find useful. This check is needed, because those symbols
+dnl are generally not available.
+AC_DEFUN([CF_SLANG_UNIX_DEFS],
+[
+AC_REQUIRE([CF_SLANG_CPPFLAGS])
+AC_REQUIRE([CF_SLANG_LIBS])
+AC_CACHE_CHECK(if we must tell slang this is UNIX,cf_cv_slang_unix,[
+AC_TRY_LINK([#include <slang.h>],
+ [
+#ifdef REAL_UNIX_SYSTEM
+make an error
+#else
+int x = SLang_TT_Baud_Rate
+#endif
+],
+ [cf_cv_slang_unix=yes],
+ [cf_cv_slang_unix=no])
+])
+test $cf_cv_slang_unix = yes && AC_DEFINE(REAL_UNIX_SYSTEM)
+])dnl
+dnl ---------------------------------------------------------------------------
dnl Check for socks library
dnl $1 = the [optional] directory in which the library may be found
dnl $2 = the [optional] name of the library
@@ -2351,3 +2404,154 @@ AC_TRY_LINK([
[cf_cv_need_xopen_extension=no])])])
test $cf_cv_need_xopen_extension = yes && CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
])dnl
+dnl ---------------------------------------------------------------------------
+dnl Check for Xaw (Athena) libraries
+dnl
+AC_DEFUN([CF_X_ATHENA],
+[AC_REQUIRE([CF_X_TOOLKIT])
+cf_x_athena=${cf_x_athena-Xaw}
+
+AC_ARG_WITH(Xaw3d,
+ [ --with-Xaw3d link with Xaw 3d library],
+ [cf_x_athena=Xaw3d])
+
+AC_ARG_WITH(neXtaw,
+ [ --with-neXtaw link with neXT Athena library],
+ [cf_x_athena=neXtaw])
+
+
+AC_CHECK_LIB(Xext,XextCreateExtension,
+ [LIBS="-lXext $LIBS"])
+
+cf_x_athena_include=""
+cf_x_athena_lib=""
+
+for cf_path in default \
+ /usr/contrib/X11R6 \
+ /usr/contrib/X11R5 \
+ /usr/lib/X11R5
+do
+
+ if test -z "$cf_x_athena_include" ; then
+ cf_save="$CFLAGS"
+ cf_test=X11/$cf_x_athena/SimpleMenu.h
+ if test $cf_path != default ; then
+ CFLAGS="-I$cf_path/include $cf_save"
+ AC_MSG_CHECKING(for $cf_test in $cf_path)
+ else
+ AC_MSG_CHECKING(for $cf_test)
+ fi
+ AC_TRY_COMPILE([
+#include <X11/Intrinsic.h>
+#include <$cf_test>],[],
+ [cf_result=yes],
+ [cf_result=no])
+ AC_MSG_RESULT($cf_result)
+ if test "$cf_result" = yes ; then
+ cf_x_athena_include=$cf_path
+ else
+ CFLAGS="$cf_save"
+ fi
+ fi
+
+ for cf_lib in "-l$cf_x_athena -lXmu" "-l${cf_x_athena}_s -lXmu_s"
+ do
+ if test -z "$cf_x_athena_lib" ; then
+ cf_save="$LIBS"
+ cf_test=XawSimpleMenuAddGlobalActions
+ if test $cf_path != default ; then
+ LIBS="-L$cf_path/lib $cf_lib $LIBS"
+ AC_MSG_CHECKING(for $cf_lib in $cf_path)
+ else
+ LIBS="$cf_lib $LIBS"
+ AC_MSG_CHECKING(for $cf_test in $cf_lib)
+ fi
+ AC_TRY_LINK([],[$cf_test()],
+ [cf_result=yes],
+ [cf_result=no],
+ [$X_PRE_LIBS $LIBS $X_EXTRA_LIBS])
+ AC_MSG_RESULT($cf_result)
+ if test "$cf_result" = yes ; then
+ cf_x_athena_lib="$cf_lib"
+ else
+ LIBS="$cf_save"
+ fi
+ fi
+ done
+done
+
+if test -z "$cf_x_athena_include" ; then
+ AC_MSG_WARN(
+[Unable to successfully find Athena header files with test program])
+fi
+
+if test -z "$cf_x_athena_lib" ; then
+ AC_ERROR(
+[Unable to successfully link Athena library (-l$cf_x_athena) with test program])
+fi
+
+CF_UPPER(CF_X_ATHENA_LIBS,HAVE_LIB_$cf_x_athena)
+AC_DEFINE_UNQUOTED($CF_X_ATHENA_LIBS)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl Check for X Toolkit libraries
+dnl
+AC_DEFUN([CF_X_TOOLKIT],
+[
+AC_REQUIRE([CF_CHECK_CACHE])
+# We need to check for -lsocket and -lnsl here in order to work around an
+# autoconf bug. autoconf-2.12 is not checking for these prior to checking for
+# the X11R6 -lSM and -lICE libraries. The resultant failures cascade...
+# (tested on Solaris 2.5 w/ X11R6)
+SYSTEM_NAME=`echo "$cf_cv_system_name"|tr ' ' -`
+cf_have_X_LIBS=no
+case $SYSTEM_NAME in
+changequote(,)dnl
+irix[56]*) ;;
+changequote([,])dnl
+clix*)
+ # FIXME: modify the library lookup in autoconf to
+ # allow _s.a suffix ahead of .a
+ AC_CHECK_LIB(c_s,open,
+ [LIBS="-lc_s $LIBS"
+ AC_CHECK_LIB(bsd,gethostname,
+ [LIBS="-lbsd $LIBS"
+ AC_CHECK_LIB(nsl_s,gethostname,
+ [LIBS="-lnsl_s $LIBS"
+ AC_CHECK_LIB(X11_s,XOpenDisplay,
+ [LIBS="-lX11_s $LIBS"
+ AC_CHECK_LIB(Xt_s,XtAppInitialize,
+ [LIBS="-lXt_s $LIBS"
+ cf_have_X_LIBS=Xt
+ ]) ]) ]) ]) ])
+ ;;
+*)
+ AC_CHECK_LIB(socket,socket)
+ AC_CHECK_LIB(nsl,gethostname)
+ ;;
+esac
+
+if test $cf_have_X_LIBS = no ; then
+ AC_PATH_XTRA
+ LDFLAGS="$LDFLAGS $X_LIBS"
+ CFLAGS="$CFLAGS $X_CFLAGS"
+ AC_CHECK_LIB(X11,XOpenDisplay,
+ [LIBS="-lX11 $LIBS"],,
+ [$X_PRE_LIBS $LIBS $X_EXTRA_LIBS])
+ AC_CHECK_LIB(Xt, XtAppInitialize,
+ [AC_DEFINE(HAVE_LIBXT)
+ cf_have_X_LIBS=Xt
+ LIBS="-lXt $X_PRE_LIBS $LIBS"],,
+ [$X_PRE_LIBS $LIBS $X_EXTRA_LIBS])
+else
+ LDFLAGS="$LDFLAGS $X_LIBS"
+ CFLAGS="$CFLAGS $X_CFLAGS"
+fi
+
+if test $cf_have_X_LIBS = no ; then
+ AC_WARN(
+[Unable to successfully link X Toolkit library (-lXt) with
+test program. You will have to check and add the proper libraries by hand
+to makefile.])
+fi
+])dnl
diff --git a/config.hin b/config.hin
index dffc831b..f3a91d8a 100644
--- a/config.hin
+++ b/config.hin
@@ -128,6 +128,7 @@
#undef HAVE_WAITPID
#undef HAVE_WBORDER
#undef HAVE_WREDRAWLN
+#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 */
@@ -165,6 +166,7 @@
#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 */
@@ -201,6 +203,7 @@
#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 */
diff --git a/configure b/configure
index 208bf36c..848c7989 100755
--- a/configure
+++ b/configure
@@ -264,6 +264,9 @@ cat <<EOF
--disable-long-list disable long "ls -l" directory listings
--disable-parent-dir-refs
disable "Up-to" links in directory listings
+ --with-x use the X Window System
+ --with-Xaw3d link with Xaw 3d library
+ --with-neXtaw link with neXT Athena library
EOF
exit 0 ;;
@@ -632,7 +635,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:636: checking host system type" >&5
+echo "configure:639: checking host system type" >&5
host_alias=$host
case "$host_alias" in
@@ -687,7 +690,7 @@ test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && ec
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:691: checking for $ac_word" >&5
+echo "configure:694: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -717,7 +720,7 @@ if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:721: checking for $ac_word" >&5
+echo "configure:724: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -768,7 +771,7 @@ fi
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:772: checking for $ac_word" >&5
+echo "configure:775: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -800,7 +803,7 @@ fi
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:804: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:807: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -811,12 +814,12 @@ cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext << EOF
-#line 815 "configure"
+#line 818 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -842,12 +845,12 @@ if test $ac_cv_prog_cc_works = no; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:846: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:849: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:851: checking whether we are using GNU C" >&5
+echo "configure:854: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -856,7 +859,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:860: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:863: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
@@ -875,7 +878,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:879: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:882: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -907,7 +910,7 @@ else
fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:911: checking how to run the C preprocessor" >&5
+echo "configure:914: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -922,13 +925,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 926 "configure"
+#line 929 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:932: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:935: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -939,13 +942,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 943 "configure"
+#line 946 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:949: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:952: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -956,13 +959,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 960 "configure"
+#line 963 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:966: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:969: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -987,7 +990,7 @@ fi
echo "$ac_t""$CPP" 1>&6
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:991: checking whether ln -s works" >&5
+echo "configure:994: checking whether ln -s works" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1010,7 +1013,7 @@ fi
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1014: checking for $ac_word" >&5
+echo "configure:1017: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1038,7 +1041,7 @@ else
fi
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1042: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1045: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1076,7 +1079,7 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1080: checking for a BSD compatible install" >&5
+echo "configure:1083: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1133,7 +1136,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1137: checking for $ac_word" >&5
+echo "configure:1140: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LINT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1164,9 +1167,9 @@ done
echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:1168: checking for AIX" >&5
+echo "configure:1171: checking for AIX" >&5
cat > conftest.$ac_ext <<EOF
-#line 1170 "configure"
+#line 1173 "configure"
#include "confdefs.h"
#ifdef _AIX
yes
@@ -1188,7 +1191,7 @@ rm -f conftest*
echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:1192: checking for POSIXized ISC" >&5
+echo "configure:1195: checking for POSIXized ISC" >&5
if test -d /etc/conf/kconfig.d &&
grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
then
@@ -1214,7 +1217,7 @@ fi
echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6
-echo "configure:1218: checking if you want to see long compiling messages" >&5
+echo "configure:1221: checking if you want to see long compiling messages" >&5
# Check whether --enable-echo or --disable-echo was given.
if test "${enable_echo+set}" = set; then
@@ -1262,7 +1265,7 @@ fi
echo $ac_n "checking if you want to check memory-leaks""... $ac_c" 1>&6
-echo "configure:1266: checking if you want to check memory-leaks" >&5
+echo "configure:1269: checking if you want to check memory-leaks" >&5
# Check whether --enable-find-leaks or --disable-find-leaks was given.
if test "${enable_find_leaks+set}" = set; then
@@ -1286,7 +1289,7 @@ EOF
echo $ac_n "checking if you want to enable debug-code""... $ac_c" 1>&6
-echo "configure:1290: checking if you want to enable debug-code" >&5
+echo "configure:1293: checking if you want to enable debug-code" >&5
# Check whether --enable-debug or --disable-debug was given.
if test "${enable_debug+set}" = set; then
@@ -1328,7 +1331,7 @@ else
fi
echo $ac_n "checking if you want to enable lynx trace code *recommended* ""... $ac_c" 1>&6
-echo "configure:1332: checking if you want to enable lynx trace code *recommended* " >&5
+echo "configure:1335: checking if you want to enable lynx trace code *recommended* " >&5
# Check whether --enable-trace or --disable-trace was given.
if test "${enable_trace+set}" = set; then
@@ -1354,7 +1357,7 @@ EOF
if test -n "$GCC"
then
echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6
-echo "configure:1358: checking if you want to turn on gcc warnings" >&5
+echo "configure:1361: checking if you want to turn on gcc warnings" >&5
# Check whether --enable-warnings or --disable-warnings was given.
if test "${enable_warnings+set}" = set; then
@@ -1394,9 +1397,9 @@ EOF
if test -n "$GCC"
then
echo "checking for $CC __attribute__ directives" 1>&6
-echo "configure:1398: checking for $CC __attribute__ directives" >&5
+echo "configure:1401: checking for $CC __attribute__ directives" >&5
cat > conftest.$ac_ext <<EOF
-#line 1400 "configure"
+#line 1403 "configure"
#include "confdefs.h"
#include "conftest.h"
#include "conftest.i"
@@ -1434,7 +1437,7 @@ EOF
EOF
;;
esac
- if { (eval echo configure:1438: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ if { (eval echo configure:1441: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
test -n "$verbose" && echo "$ac_t""... $cf_attribute" 1>&6
cat conftest.h >>confdefs.h
# else
@@ -1451,11 +1454,11 @@ fi
if test -n "$GCC"
then
cat > conftest.$ac_ext <<EOF
-#line 1455 "configure"
+#line 1458 "configure"
int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
EOF
echo "checking for $CC warning options" 1>&6
-echo "configure:1459: checking for $CC warning options" >&5
+echo "configure:1462: checking for $CC warning options" >&5
cf_save_CFLAGS="$CFLAGS"
EXTRA_CFLAGS="-W -Wall"
cf_warn_CONST=""
@@ -1473,7 +1476,7 @@ echo "configure:1459: checking for $CC warning options" >&5
Wstrict-prototypes $cf_warn_CONST
do
CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
- if { (eval echo configure:1477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ if { (eval echo configure:1480: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6
EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
test "$cf_opt" = Wcast-qual && EXTRA_CFLAGS="$EXTRA_CFLAGS -DXTSTRINGDEFINES"
@@ -1491,12 +1494,12 @@ fi
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1495: checking for ANSI C header files" >&5
+echo "configure:1498: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1500 "configure"
+#line 1503 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -1504,7 +1507,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1508: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1511: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1521,7 +1524,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1525 "configure"
+#line 1528 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -1539,7 +1542,7 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1543 "configure"
+#line 1546 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -1560,7 +1563,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 1564 "configure"
+#line 1567 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1571,7 +1574,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
-if { (eval echo configure:1575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -1595,12 +1598,12 @@ EOF
fi
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1599: checking for working const" >&5
+echo "configure:1602: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1604 "configure"
+#line 1607 "configure"
#include "confdefs.h"
int main() {
@@ -1649,7 +1652,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
-if { (eval echo configure:1653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1656: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -1670,21 +1673,21 @@ EOF
fi
echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:1674: checking for inline" >&5
+echo "configure:1677: checking for inline" >&5
if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat > conftest.$ac_ext <<EOF
-#line 1681 "configure"
+#line 1684 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:1688: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
@@ -1710,12 +1713,12 @@ EOF
esac
echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:1714: checking for off_t" >&5
+echo "configure:1717: checking for off_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1719 "configure"
+#line 1722 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -1743,12 +1746,12 @@ EOF
fi
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:1747: checking for size_t" >&5
+echo "configure:1750: checking for size_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1752 "configure"
+#line 1755 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -1778,19 +1781,19 @@ fi
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments. Useless!
echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:1782: checking for working alloca.h" >&5
+echo "configure:1785: checking for working alloca.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1787 "configure"
+#line 1790 "configure"
#include "confdefs.h"
#include <alloca.h>
int main() {
char *p = alloca(2 * sizeof(int));
; return 0; }
EOF
-if { (eval echo configure:1794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_header_alloca_h=yes
else
@@ -1811,12 +1814,12 @@ EOF
fi
echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:1815: checking for alloca" >&5
+echo "configure:1818: checking for alloca" >&5
if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1820 "configure"
+#line 1823 "configure"
#include "confdefs.h"
#ifdef __GNUC__
@@ -1844,7 +1847,7 @@ int main() {
char *p = (char *) alloca(1);
; return 0; }
EOF
-if { (eval echo configure:1848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_func_alloca_works=yes
else
@@ -1876,12 +1879,12 @@ EOF
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:1880: checking whether alloca needs Cray hooks" >&5
+echo "configure:1883: checking whether alloca needs Cray hooks" >&5
if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1885 "configure"
+#line 1888 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
@@ -1906,12 +1909,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
if test $ac_cv_os_cray = yes; then
for ac_func in _getb67 GETB67 getb67; do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1910: checking for $ac_func" >&5
+echo "configure:1913: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1915 "configure"
+#line 1918 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1934,7 +1937,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:1938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -1961,7 +1964,7 @@ done
fi
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:1965: checking stack direction for C alloca" >&5
+echo "configure:1968: checking stack direction for C alloca" >&5
if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1969,7 +1972,7 @@ else
ac_cv_c_stack_direction=0
else
cat > conftest.$ac_ext <<EOF
-#line 1973 "configure"
+#line 1976 "configure"
#include "confdefs.h"
find_stack_direction ()
{
@@ -1988,7 +1991,7 @@ main ()
exit (find_stack_direction() < 0);
}
EOF
-if { (eval echo configure:1992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_stack_direction=1
else
@@ -2013,17 +2016,17 @@ for ac_hdr in unistd.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2017: checking for $ac_hdr" >&5
+echo "configure:2020: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2022 "configure"
+#line 2025 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2027: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2030: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2052,12 +2055,12 @@ done
for ac_func in getpagesize
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2056: checking for $ac_func" >&5
+echo "configure:2059: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2061 "configure"
+#line 2064 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2080,7 +2083,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2105,7 +2108,7 @@ fi
done
echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:2109: checking for working mmap" >&5
+echo "configure:2112: checking for working mmap" >&5
if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2113,7 +2116,7 @@ else
ac_cv_func_mmap_fixed_mapped=no
else
cat > conftest.$ac_ext <<EOF
-#line 2117 "configure"
+#line 2120 "configure"
#include "confdefs.h"
/* Thanks to Mike Haertel and Jim Avera for this test.
@@ -2253,7 +2256,7 @@ main()
}
EOF
-if { (eval echo configure:2257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_mmap_fixed_mapped=yes
else
@@ -2281,17 +2284,17 @@ unistd.h sys/param.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2285: checking for $ac_hdr" >&5
+echo "configure:2288: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2290 "configure"
+#line 2293 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2295: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2298: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2321,12 +2324,12 @@ done
strdup __argz_count __argz_stringify __argz_next
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2325: checking for $ac_func" >&5
+echo "configure:2328: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2330 "configure"
+#line 2333 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2349,7 +2352,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2378,12 +2381,12 @@ done
for ac_func in stpcpy
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2382: checking for $ac_func" >&5
+echo "configure:2385: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2387 "configure"
+#line 2390 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2406,7 +2409,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2440,19 +2443,19 @@ EOF
if test $ac_cv_header_locale_h = yes; then
echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:2444: checking for LC_MESSAGES" >&5
+echo "configure:2447: checking for LC_MESSAGES" >&5
if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2449 "configure"
+#line 2452 "configure"
#include "confdefs.h"
#include <locale.h>
int main() {
return LC_MESSAGES
; return 0; }
EOF
-if { (eval echo configure:2456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
am_cv_val_LC_MESSAGES=yes
else
@@ -2473,7 +2476,7 @@ EOF
fi
fi
echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:2477: checking whether NLS is requested" >&5
+echo "configure:2480: checking whether NLS is requested" >&5
# Check whether --enable-nls or --disable-nls was given.
if test "${enable_nls+set}" = set; then
@@ -2494,7 +2497,7 @@ fi
EOF
echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:2498: checking whether included gettext is requested" >&5
+echo "configure:2501: checking whether included gettext is requested" >&5
# Check whether --with-included-gettext or --without-included-gettext was given.
if test "${with_included_gettext+set}" = set; then
@@ -2514,17 +2517,17 @@ fi
ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:2518: checking for libintl.h" >&5
+echo "configure:2521: checking for libintl.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2523 "configure"
+#line 2526 "configure"
#include "confdefs.h"
#include <libintl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2528: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2531: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2541,19 +2544,19 @@ fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6
-echo "configure:2545: checking for gettext in libc" >&5
+echo "configure:2548: checking for gettext in libc" >&5
if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2550 "configure"
+#line 2553 "configure"
#include "confdefs.h"
#include <libintl.h>
int main() {
return (int) gettext ("")
; return 0; }
EOF
-if { (eval echo configure:2557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
gt_cv_func_gettext_libc=yes
else
@@ -2569,7 +2572,7 @@ echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6
if test "$gt_cv_func_gettext_libc" != "yes"; then
echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
-echo "configure:2573: checking for bindtextdomain in -lintl" >&5
+echo "configure:2576: checking for bindtextdomain in -lintl" >&5
ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2577,7 +2580,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lintl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2581 "configure"
+#line 2584 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2588,7 +2591,7 @@ int main() {
bindtextdomain()
; return 0; }
EOF
-if { (eval echo configure:2592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2604,19 +2607,19 @@ fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6
-echo "configure:2608: checking for gettext in libintl" >&5
+echo "configure:2611: checking for gettext in libintl" >&5
if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2613 "configure"
+#line 2616 "configure"
#include "confdefs.h"
int main() {
return (int) gettext ("")
; return 0; }
EOF
-if { (eval echo configure:2620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
gt_cv_func_gettext_libintl=yes
else
@@ -2648,7 +2651,7 @@ EOF
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2652: checking for $ac_word" >&5
+echo "configure:2655: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2682,12 +2685,12 @@ fi
for ac_func in dcgettext
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2686: checking for $ac_func" >&5
+echo "configure:2689: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2691 "configure"
+#line 2694 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2710,7 +2713,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2737,7 +2740,7 @@ done
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2741: checking for $ac_word" >&5
+echo "configure:2744: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2773,7 +2776,7 @@ fi
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2777: checking for $ac_word" >&5
+echo "configure:2780: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2805,7 +2808,7 @@ else
fi
cat > conftest.$ac_ext <<EOF
-#line 2809 "configure"
+#line 2812 "configure"
#include "confdefs.h"
int main() {
@@ -2813,7 +2816,7 @@ extern int _nl_msg_cat_cntr;
return _nl_msg_cat_cntr
; return 0; }
EOF
-if { (eval echo configure:2817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
CATOBJEXT=.gmo
DATADIRNAME=share
@@ -2836,7 +2839,7 @@ fi
if test "$CATOBJEXT" = "NONE"; then
echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6
-echo "configure:2840: checking whether catgets can be used" >&5
+echo "configure:2843: checking whether catgets can be used" >&5
# Check whether --with-catgets or --without-catgets was given.
if test "${with_catgets+set}" = set; then
@@ -2850,7 +2853,7 @@ fi
if test "$nls_cv_use_catgets" = "yes"; then
echo $ac_n "checking for main in -li""... $ac_c" 1>&6
-echo "configure:2854: checking for main in -li" >&5
+echo "configure:2857: checking for main in -li" >&5
ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2858,14 +2861,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-li $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2862 "configure"
+#line 2865 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2893,12 +2896,12 @@ else
fi
echo $ac_n "checking for catgets""... $ac_c" 1>&6
-echo "configure:2897: checking for catgets" >&5
+echo "configure:2900: checking for catgets" >&5
if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2902 "configure"
+#line 2905 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char catgets(); below. */
@@ -2921,7 +2924,7 @@ catgets();
; return 0; }
EOF
-if { (eval echo configure:2925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_catgets=yes"
else
@@ -2943,7 +2946,7 @@ EOF
# Extract the first word of "gencat", so it can be a program name with args.
set dummy gencat; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2947: checking for $ac_word" >&5
+echo "configure:2950: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2979,7 +2982,7 @@ fi
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2983: checking for $ac_word" >&5
+echo "configure:2986: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3016,7 +3019,7 @@ fi
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3020: checking for $ac_word" >&5
+echo "configure:3023: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3051,7 +3054,7 @@ fi
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3055: checking for $ac_word" >&5
+echo "configure:3058: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3109,7 +3112,7 @@ fi
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3113: checking for $ac_word" >&5
+echo "configure:3116: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3143,7 +3146,7 @@ fi
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3147: checking for $ac_word" >&5
+echo "configure:3150: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3179,7 +3182,7 @@ fi
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3183: checking for $ac_word" >&5
+echo "configure:3186: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3273,7 +3276,7 @@ fi
LINGUAS=
else
echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:3277: checking for catalogs to be installed" >&5
+echo "configure:3280: checking for catalogs to be installed" >&5
NEW_LINGUAS=
for lang in ${LINGUAS=$ALL_LINGUAS}; do
case "$ALL_LINGUAS" in
@@ -3302,17 +3305,17 @@ echo "configure:3277: checking for catalogs to be installed" >&5
if test "$CATOBJEXT" = ".cat"; then
ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
-echo "configure:3306: checking for linux/version.h" >&5
+echo "configure:3309: checking for linux/version.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3311 "configure"
+#line 3314 "configure"
#include "confdefs.h"
#include <linux/version.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3316: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3319: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3427,7 +3430,7 @@ use_our_messages=no
if test "$USE_NLS" = yes ; then
if test -d $srcdir/po ; then
echo $ac_n "checking if we should use included message-library""... $ac_c" 1>&6
-echo "configure:3431: checking if we should use included message-library" >&5
+echo "configure:3434: checking if we should use included message-library" >&5
# Check whether --enable-included-msgs or --disable-included-msgs was given.
if test "${enable_included_msgs+set}" = set; then
@@ -3464,17 +3467,17 @@ elif test "$USE_NLS" = yes ; then
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3468: checking for $ac_hdr" >&5
+echo "configure:3471: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3473 "configure"
+#line 3476 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3478: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3481: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3544,7 +3547,7 @@ EOF
fi
echo $ac_n "checking if you want full utility pathnames""... $ac_c" 1>&6
-echo "configure:3548: checking if you want full utility pathnames" >&5
+echo "configure:3551: checking if you want full utility pathnames" >&5
# Check whether --enable-full-paths or --disable-full-paths was given.
if test "${enable_full_paths+set}" = set; then
@@ -3569,7 +3572,7 @@ EOF
echo $ac_n "checking for system mailer""... $ac_c" 1>&6
-echo "configure:3573: checking for system mailer" >&5
+echo "configure:3576: checking for system mailer" >&5
if eval "test \"`echo '$''{'cf_cv_SYSTEM_MAIL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3596,7 +3599,7 @@ EOF
echo $ac_n "checking system mail flags""... $ac_c" 1>&6
-echo "configure:3600: checking system mail flags" >&5
+echo "configure:3603: checking system mail flags" >&5
if eval "test \"`echo '$''{'cf_cv_system_mail_flags'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3624,7 +3627,7 @@ if test "$with_full_paths" = yes ; then
# Extract the first word of "chmod", so it can be a program name with args.
set dummy chmod; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3628: checking for $ac_word" >&5
+echo "configure:3631: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_CHMOD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3659,7 +3662,7 @@ fi
else
echo $ac_n "checking for chmod""... $ac_c" 1>&6
-echo "configure:3663: checking for chmod" >&5
+echo "configure:3666: checking for chmod" >&5
echo "$ac_t""$CHMOD" 1>&6
eval 'ac_cv_path_'CHMOD'="'chmod'"'
fi
@@ -3701,7 +3704,7 @@ if test "$with_full_paths" = yes ; then
# Extract the first word of "compress", so it can be a program name with args.
set dummy compress; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3705: checking for $ac_word" >&5
+echo "configure:3708: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_COMPRESS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3736,7 +3739,7 @@ fi
else
echo $ac_n "checking for compress""... $ac_c" 1>&6
-echo "configure:3740: checking for compress" >&5
+echo "configure:3743: checking for compress" >&5
echo "$ac_t""$COMPRESS" 1>&6
eval 'ac_cv_path_'COMPRESS'="'compress'"'
fi
@@ -3778,7 +3781,7 @@ if test "$with_full_paths" = yes ; then
# Extract the first word of "cp", so it can be a program name with args.
set dummy cp; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3782: checking for $ac_word" >&5
+echo "configure:3785: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_COPY'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3813,7 +3816,7 @@ fi
else
echo $ac_n "checking for cp""... $ac_c" 1>&6
-echo "configure:3817: checking for cp" >&5
+echo "configure:3820: checking for cp" >&5
echo "$ac_t""$COPY" 1>&6
eval 'ac_cv_path_'COPY'="'cp'"'
fi
@@ -3855,7 +3858,7 @@ if test "$with_full_paths" = yes ; then
# Extract the first word of "gzip", so it can be a program name with args.
set dummy gzip; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3859: checking for $ac_word" >&5
+echo "configure:3862: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GZIP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3890,7 +3893,7 @@ fi
else
echo $ac_n "checking for gzip""... $ac_c" 1>&6
-echo "configure:3894: checking for gzip" >&5
+echo "configure:3897: checking for gzip" >&5
echo "$ac_t""$GZIP" 1>&6
eval 'ac_cv_path_'GZIP'="'gzip'"'
fi
@@ -3932,7 +3935,7 @@ if test "$with_full_paths" = yes ; then
# Extract the first word of "mkdir", so it can be a program name with args.
set dummy mkdir; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3936: checking for $ac_word" >&5
+echo "configure:3939: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MKDIR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3967,7 +3970,7 @@ fi
else
echo $ac_n "checking for mkdir""... $ac_c" 1>&6
-echo "configure:3971: checking for mkdir" >&5
+echo "configure:3974: checking for mkdir" >&5
echo "$ac_t""$MKDIR" 1>&6
eval 'ac_cv_path_'MKDIR'="'mkdir'"'
fi
@@ -4009,7 +4012,7 @@ if test "$with_full_paths" = yes ; then
# Extract the first word of "mv", so it can be a program name with args.
set dummy mv; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4013: checking for $ac_word" >&5
+echo "configure:4016: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MV'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4044,7 +4047,7 @@ fi
else
echo $ac_n "checking for mv""... $ac_c" 1>&6
-echo "configure:4048: checking for mv" >&5
+echo "configure:4051: checking for mv" >&5
echo "$ac_t""$MV" 1>&6
eval 'ac_cv_path_'MV'="'mv'"'
fi
@@ -4086,7 +4089,7 @@ if test "$with_full_paths" = yes ; then
# Extract the first word of "rm", so it can be a program name with args.
set dummy rm; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4090: checking for $ac_word" >&5
+echo "configure:4093: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_RM'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4121,7 +4124,7 @@ fi
else
echo $ac_n "checking for rm""... $ac_c" 1>&6
-echo "configure:4125: checking for rm" >&5
+echo "configure:4128: checking for rm" >&5
echo "$ac_t""$RM" 1>&6
eval 'ac_cv_path_'RM'="'rm'"'
fi
@@ -4163,7 +4166,7 @@ if test "$with_full_paths" = yes ; then
# Extract the first word of "tar", so it can be a program name with args.
set dummy tar; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4167: checking for $ac_word" >&5
+echo "configure:4170: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_TAR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4198,7 +4201,7 @@ fi
else
echo $ac_n "checking for tar""... $ac_c" 1>&6
-echo "configure:4202: checking for tar" >&5
+echo "configure:4205: checking for tar" >&5
echo "$ac_t""$TAR" 1>&6
eval 'ac_cv_path_'TAR'="'tar'"'
fi
@@ -4240,7 +4243,7 @@ if test "$with_full_paths" = yes ; then
# Extract the first word of "touch", so it can be a program name with args.
set dummy touch; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4244: checking for $ac_word" >&5
+echo "configure:4247: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_TOUCH'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4275,7 +4278,7 @@ fi
else
echo $ac_n "checking for touch""... $ac_c" 1>&6
-echo "configure:4279: checking for touch" >&5
+echo "configure:4282: checking for touch" >&5
echo "$ac_t""$TOUCH" 1>&6
eval 'ac_cv_path_'TOUCH'="'touch'"'
fi
@@ -4317,7 +4320,7 @@ if test "$with_full_paths" = yes ; then
# Extract the first word of "gunzip", so it can be a program name with args.
set dummy gunzip; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4321: checking for $ac_word" >&5
+echo "configure:4324: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_UNCOMPRESS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4352,7 +4355,7 @@ fi
else
echo $ac_n "checking for gunzip""... $ac_c" 1>&6
-echo "configure:4356: checking for gunzip" >&5
+echo "configure:4359: checking for gunzip" >&5
echo "$ac_t""$UNCOMPRESS" 1>&6
eval 'ac_cv_path_'UNCOMPRESS'="'gunzip'"'
fi
@@ -4394,7 +4397,7 @@ if test "$with_full_paths" = yes ; then
# Extract the first word of "unzip", so it can be a program name with args.
set dummy unzip; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4398: checking for $ac_word" >&5
+echo "configure:4401: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_UNZIP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4429,7 +4432,7 @@ fi
else
echo $ac_n "checking for unzip""... $ac_c" 1>&6
-echo "configure:4433: checking for unzip" >&5
+echo "configure:4436: checking for unzip" >&5
echo "$ac_t""$UNZIP" 1>&6
eval 'ac_cv_path_'UNZIP'="'unzip'"'
fi
@@ -4471,7 +4474,7 @@ if test "$with_full_paths" = yes ; then
# Extract the first word of "bzip2", so it can be a program name with args.
set dummy bzip2; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4475: checking for $ac_word" >&5
+echo "configure:4478: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_BZIP2'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4506,7 +4509,7 @@ fi
else
echo $ac_n "checking for bzip2""... $ac_c" 1>&6
-echo "configure:4510: checking for bzip2" >&5
+echo "configure:4513: checking for bzip2" >&5
echo "$ac_t""$BZIP2" 1>&6
eval 'ac_cv_path_'BZIP2'="'bzip2'"'
fi
@@ -4548,7 +4551,7 @@ if test "$with_full_paths" = yes ; then
# Extract the first word of "uudecode", so it can be a program name with args.
set dummy uudecode; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4552: checking for $ac_word" >&5
+echo "configure:4555: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_UUDECODE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4583,7 +4586,7 @@ fi
else
echo $ac_n "checking for uudecode""... $ac_c" 1>&6
-echo "configure:4587: checking for uudecode" >&5
+echo "configure:4590: checking for uudecode" >&5
echo "$ac_t""$UUDECODE" 1>&6
eval 'ac_cv_path_'UUDECODE'="'uudecode'"'
fi
@@ -4625,7 +4628,7 @@ if test "$with_full_paths" = yes ; then
# Extract the first word of "zcat", so it can be a program name with args.
set dummy zcat; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4629: checking for $ac_word" >&5
+echo "configure:4632: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_ZCAT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4660,7 +4663,7 @@ fi
else
echo $ac_n "checking for zcat""... $ac_c" 1>&6
-echo "configure:4664: checking for zcat" >&5
+echo "configure:4667: checking for zcat" >&5
echo "$ac_t""$ZCAT" 1>&6
eval 'ac_cv_path_'ZCAT'="'zcat'"'
fi
@@ -4702,7 +4705,7 @@ if test "$with_full_paths" = yes ; then
# Extract the first word of "zip", so it can be a program name with args.
set dummy zip; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4706: checking for $ac_word" >&5
+echo "configure:4709: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_ZIP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4737,7 +4740,7 @@ fi
else
echo $ac_n "checking for zip""... $ac_c" 1>&6
-echo "configure:4741: checking for zip" >&5
+echo "configure:4744: checking for zip" >&5
echo "$ac_t""$ZIP" 1>&6
eval 'ac_cv_path_'ZIP'="'zip'"'
fi
@@ -4779,7 +4782,7 @@ if test "$with_full_paths" = yes ; then
# Extract the first word of "telnet", so it can be a program name with args.
set dummy telnet; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4783: checking for $ac_word" >&5
+echo "configure:4786: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_TELNET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4814,7 +4817,7 @@ fi
else
echo $ac_n "checking for telnet""... $ac_c" 1>&6
-echo "configure:4818: checking for telnet" >&5
+echo "configure:4821: checking for telnet" >&5
echo "$ac_t""$TELNET" 1>&6
eval 'ac_cv_path_'TELNET'="'telnet'"'
fi
@@ -4856,7 +4859,7 @@ if test "$with_full_paths" = yes ; then
# Extract the first word of "tn3270", so it can be a program name with args.
set dummy tn3270; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4860: checking for $ac_word" >&5
+echo "configure:4863: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_TN3270'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4891,7 +4894,7 @@ fi
else
echo $ac_n "checking for tn3270""... $ac_c" 1>&6
-echo "configure:4895: checking for tn3270" >&5
+echo "configure:4898: checking for tn3270" >&5
echo "$ac_t""$TN3270" 1>&6
eval 'ac_cv_path_'TN3270'="'tn3270'"'
fi
@@ -4933,7 +4936,7 @@ if test "$with_full_paths" = yes ; then
# Extract the first word of "rlogin", so it can be a program name with args.
set dummy rlogin; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4937: checking for $ac_word" >&5
+echo "configure:4940: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_RLOGIN'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4968,7 +4971,7 @@ fi
else
echo $ac_n "checking for rlogin""... $ac_c" 1>&6
-echo "configure:4972: checking for rlogin" >&5
+echo "configure:4975: checking for rlogin" >&5
echo "$ac_t""$RLOGIN" 1>&6
eval 'ac_cv_path_'RLOGIN'="'rlogin'"'
fi
@@ -5020,7 +5023,7 @@ if test "$with_full_paths" = yes ; then
# Extract the first word of "install", so it can be a program name with args.
set dummy install; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5024: checking for $ac_word" >&5
+echo "configure:5027: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_INSTALL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5055,7 +5058,7 @@ fi
else
echo $ac_n "checking for install""... $ac_c" 1>&6
-echo "configure:5059: checking for install" >&5
+echo "configure:5062: checking for install" >&5
echo "$ac_t""$INSTALL" 1>&6
eval 'ac_cv_path_'INSTALL'="'install'"'
fi
@@ -5104,7 +5107,7 @@ EOF
if test -z "$GCC" ; then
echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
-echo "configure:5108: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "configure:5111: checking for ${CC-cc} option to accept ANSI C" >&5
if eval "test \"`echo '$''{'cf_cv_ansi_cc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5128,7 +5131,7 @@ for cf_arg in "-DCC_HAS_PROTOS" \
do
CFLAGS="$cf_save_CFLAGS $cf_arg"
cat > conftest.$ac_ext <<EOF
-#line 5132 "configure"
+#line 5135 "configure"
#include "confdefs.h"
#ifndef CC_HAS_PROTOS
@@ -5144,7 +5147,7 @@ int main() {
struct s2 {int (*f) (double a);};
; return 0; }
EOF
-if { (eval echo configure:5148: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5151: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_ansi_cc="$cf_arg"; break
else
@@ -5172,12 +5175,12 @@ fi
fi
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:5176: checking for working const" >&5
+echo "configure:5179: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5181 "configure"
+#line 5184 "configure"
#include "confdefs.h"
int main() {
@@ -5226,7 +5229,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
-if { (eval echo configure:5230: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5233: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -5268,7 +5271,7 @@ clix*)
# contributed by Alex Matulich (matuli_a@marlin.navsea.navy.mil) also
# references -lmalloc and -lbsd.
echo $ac_n "checking for strcmp in -lc_s""... $ac_c" 1>&6
-echo "configure:5272: checking for strcmp in -lc_s" >&5
+echo "configure:5275: checking for strcmp in -lc_s" >&5
ac_lib_var=`echo c_s'_'strcmp | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5276,7 +5279,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lc_s $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5280 "configure"
+#line 5283 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5287,7 +5290,7 @@ int main() {
strcmp()
; return 0; }
EOF
-if { (eval echo configure:5291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5381,7 +5384,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5385: checking for $ac_word" >&5
+echo "configure:5388: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5426,17 +5429,17 @@ sony-newsos*)
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5430: checking for $ac_hdr" >&5
+echo "configure:5433: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5435 "configure"
+#line 5438 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5440: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5443: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -5480,17 +5483,17 @@ ultrix*)
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5484: checking for $ac_hdr" >&5
+echo "configure:5487: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5489 "configure"
+#line 5492 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5494: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5497: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -5526,13 +5529,13 @@ esac
echo $ac_n "checking if we must define _GNU_SOURCE""... $ac_c" 1>&6
-echo "configure:5530: checking if we must define _GNU_SOURCE" >&5
+echo "configure:5533: checking if we must define _GNU_SOURCE" >&5
if eval "test \"`echo '$''{'cf_cv_gnu_source'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5536 "configure"
+#line 5539 "configure"
#include "confdefs.h"
#include <sys/types.h>
int main() {
@@ -5542,7 +5545,7 @@ make an error
#endif
; return 0; }
EOF
-if { (eval echo configure:5546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_gnu_source=no
else
@@ -5552,7 +5555,7 @@ else
cf_save="$CFLAGS"
CFLAGS="$CFLAGS -D_GNU_SOURCE"
cat > conftest.$ac_ext <<EOF
-#line 5556 "configure"
+#line 5559 "configure"
#include "confdefs.h"
#include <sys/types.h>
int main() {
@@ -5562,7 +5565,7 @@ make an error
#endif
; return 0; }
EOF
-if { (eval echo configure:5566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5569: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_gnu_source=no
else
@@ -5587,16 +5590,16 @@ if test -n "$TRY_CFLAGS" ; then
cf_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $TRY_CFLAGS"
echo $ac_n "checking if we should use compile options $TRY_CFLAGS""... $ac_c" 1>&6
-echo "configure:5591: checking if we should use compile options $TRY_CFLAGS" >&5
+echo "configure:5594: checking if we should use compile options $TRY_CFLAGS" >&5
cat > conftest.$ac_ext <<EOF
-#line 5593 "configure"
+#line 5596 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
FILE *fp = stdin
; return 0; }
EOF
-if { (eval echo configure:5600: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5603: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_result=yes
else
@@ -5614,7 +5617,7 @@ fi
### Look for network libraries first, since some functions (such as gethostname)
### are used in a lot of places.
echo $ac_n "checking if you want socks library""... $ac_c" 1>&6
-echo "configure:5618: checking if you want socks library" >&5
+echo "configure:5621: checking if you want socks library" >&5
if eval "test \"`echo '$''{'cf_cv_use_libsocks'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5634,7 +5637,7 @@ fi
echo "$ac_t""$cf_cv_use_libsocks" 1>&6
echo $ac_n "checking if you want socks5 library""... $ac_c" 1>&6
-echo "configure:5638: checking if you want socks5 library" >&5
+echo "configure:5641: checking if you want socks5 library" >&5
if eval "test \"`echo '$''{'cf_cv_use_libsocks5'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5700,7 +5703,7 @@ cat >> confdefs.h <<\EOF
EOF
cat > conftest.$ac_ext <<EOF
-#line 5704 "configure"
+#line 5707 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -5709,7 +5712,7 @@ int main() {
accept((char *)0)
; return 0; }
EOF
-if { (eval echo configure:5713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
:
else
echo "configure: failed program was:" >&5
@@ -5739,9 +5742,9 @@ cat >> confdefs.h <<\EOF
EOF
echo $ac_n "checking if the socks library uses socks4 prefix""... $ac_c" 1>&6
-echo "configure:5743: checking if the socks library uses socks4 prefix" >&5
+echo "configure:5746: checking if the socks library uses socks4 prefix" >&5
cat > conftest.$ac_ext <<EOF
-#line 5745 "configure"
+#line 5748 "configure"
#include "confdefs.h"
#include <socks.h>
@@ -5750,7 +5753,7 @@ int main() {
Rinit((char *)0)
; return 0; }
EOF
-if { (eval echo configure:5754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define USE_SOCKS4_PREFIX 1
@@ -5762,14 +5765,14 @@ else
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 5766 "configure"
+#line 5769 "configure"
#include "confdefs.h"
#include <socks.h>
int main() {
SOCKSinit((char *)0)
; return 0; }
EOF
-if { (eval echo configure:5773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_use_socks4=no
else
@@ -5838,7 +5841,7 @@ else
cf_test_netlibs=no
echo $ac_n "checking for network libraries""... $ac_c" 1>&6
-echo "configure:5842: checking for network libraries" >&5
+echo "configure:5845: checking for network libraries" >&5
if eval "test \"`echo '$''{'cf_cv_netlibs'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5849,12 +5852,12 @@ cf_test_netlibs=yes
for ac_func in gethostname
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5853: checking for $ac_func" >&5
+echo "configure:5856: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5858 "configure"
+#line 5861 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -5877,7 +5880,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:5881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -5900,7 +5903,7 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6
-echo "configure:5904: checking for gethostname in -lnsl" >&5
+echo "configure:5907: checking for gethostname in -lnsl" >&5
ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5908,7 +5911,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lnsl $cf_cv_netlibs $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5912 "configure"
+#line 5915 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5919,7 +5922,7 @@ int main() {
gethostname()
; return 0; }
EOF
-if { (eval echo configure:5923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5952,7 +5955,7 @@ else
echo $ac_n "checking for gethostname in -lsocket""... $ac_c" 1>&6
-echo "configure:5956: checking for gethostname in -lsocket" >&5
+echo "configure:5959: checking for gethostname in -lsocket" >&5
ac_lib_var=`echo socket'_'gethostname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5960,7 +5963,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $cf_cv_netlibs $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5964 "configure"
+#line 5967 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5971,7 +5974,7 @@ int main() {
gethostname()
; return 0; }
EOF
-if { (eval echo configure:5975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6016,7 +6019,7 @@ done
# I don't know the entrypoints - 97/7/22 TD
# AC_HAVE_LIBRARY(inet,cf_cv_netlibs="-linet $cf_cv_netlibs")
echo $ac_n "checking for main in -linet""... $ac_c" 1>&6
-echo "configure:6020: checking for main in -linet" >&5
+echo "configure:6023: checking for main in -linet" >&5
ac_lib_var=`echo inet'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6024,14 +6027,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-linet $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6028 "configure"
+#line 6031 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:6035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6056,12 +6059,12 @@ if test "$ac_cv_func_lsocket" != no ; then
for ac_func in socket
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6060: checking for $ac_func" >&5
+echo "configure:6063: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6065 "configure"
+#line 6068 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -6084,7 +6087,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:6088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -6107,7 +6110,7 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:6111: checking for socket in -lsocket" >&5
+echo "configure:6114: checking for socket in -lsocket" >&5
ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6115,7 +6118,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $cf_cv_netlibs $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6119 "configure"
+#line 6122 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6126,7 +6129,7 @@ int main() {
socket()
; return 0; }
EOF
-if { (eval echo configure:6130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6159,7 +6162,7 @@ else
echo $ac_n "checking for socket in -lbsd""... $ac_c" 1>&6
-echo "configure:6163: checking for socket in -lbsd" >&5
+echo "configure:6166: checking for socket in -lbsd" >&5
ac_lib_var=`echo bsd'_'socket | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6167,7 +6170,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lbsd $cf_cv_netlibs $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6171 "configure"
+#line 6174 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6178,7 +6181,7 @@ int main() {
socket()
; return 0; }
EOF
-if { (eval echo configure:6182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6223,12 +6226,12 @@ fi
for ac_func in gethostbyname
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6227: checking for $ac_func" >&5
+echo "configure:6230: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6232 "configure"
+#line 6235 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -6251,7 +6254,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:6255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -6274,7 +6277,7 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:6278: checking for gethostbyname in -lnsl" >&5
+echo "configure:6281: checking for gethostbyname in -lnsl" >&5
ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6282,7 +6285,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lnsl $cf_cv_netlibs $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6286 "configure"
+#line 6289 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6293,7 +6296,7 @@ int main() {
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:6297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6334,12 +6337,12 @@ done
for ac_func in strcasecmp
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6338: checking for $ac_func" >&5
+echo "configure:6341: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6343 "configure"
+#line 6346 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -6362,7 +6365,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:6366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -6385,7 +6388,7 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for strcasecmp in -lresolv""... $ac_c" 1>&6
-echo "configure:6389: checking for strcasecmp in -lresolv" >&5
+echo "configure:6392: checking for strcasecmp in -lresolv" >&5
ac_lib_var=`echo resolv'_'strcasecmp | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6393,7 +6396,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lresolv $cf_cv_netlibs $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6397 "configure"
+#line 6400 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6404,7 +6407,7 @@ int main() {
strcasecmp()
; return 0; }
EOF
-if { (eval echo configure:6408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6450,13 +6453,13 @@ test $cf_test_netlibs = no && echo "$cf_cv_netlibs" >&6
fi
echo $ac_n "checking for inet_aton function""... $ac_c" 1>&6
-echo "configure:6454: checking for inet_aton function" >&5
+echo "configure:6457: checking for inet_aton function" >&5
if eval "test \"`echo '$''{'cf_cv_have_inet_aton'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6460 "configure"
+#line 6463 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/socket.h>
@@ -6467,7 +6470,7 @@ int main() {
inet_aton(0, (struct in_addr *)0)
; return 0; }
EOF
-if { (eval echo configure:6471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_have_inet_aton=yes
else
@@ -6487,13 +6490,13 @@ EOF
else
echo $ac_n "checking for inet_addr function""... $ac_c" 1>&6
-echo "configure:6491: checking for inet_addr function" >&5
+echo "configure:6494: checking for inet_addr function" >&5
if eval "test \"`echo '$''{'cf_cv_have_inet_addr'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6497 "configure"
+#line 6500 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/socket.h>
@@ -6504,7 +6507,7 @@ int main() {
inet_addr(0)
; return 0; }
EOF
-if { (eval echo configure:6508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_have_inet_addr=yes
else
@@ -6519,7 +6522,7 @@ fi
echo "$ac_t""$cf_cv_have_inet_addr" 1>&6
if test "$cf_cv_have_inet_addr" = no ; then
echo $ac_n "checking for library with inet_addr""... $ac_c" 1>&6
-echo "configure:6523: checking for library with inet_addr" >&5
+echo "configure:6526: checking for library with inet_addr" >&5
if eval "test \"`echo '$''{'cf_cv_lib_inet_addr'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6529,7 +6532,7 @@ else
do
LIBS="$cf_save_LIBS $cf_inetlib"
cat > conftest.$ac_ext <<EOF
-#line 6533 "configure"
+#line 6536 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/socket.h>
@@ -6540,7 +6543,7 @@ int main() {
inet_addr(0)
; return 0; }
EOF
-if { (eval echo configure:6544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_lib_inet_addr=$cf_inetlib
else
@@ -6567,7 +6570,7 @@ fi
echo $ac_n "checking for screen type""... $ac_c" 1>&6
-echo "configure:6571: checking for screen type" >&5
+echo "configure:6574: checking for screen type" >&5
if eval "test \"`echo '$''{'cf_cv_screen'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6578,7 +6581,7 @@ if test "${with_screen+set}" = set; then
withval="$with_screen"
case $withval in
-curses|ncurses|slang)
+curses|ncurses|pdcurses|slang)
cf_cv_screen=$withval
;;
*) { echo "configure: error: Unexpected value" 1>&2; exit 1; }
@@ -6592,22 +6595,29 @@ fi
echo "$ac_t""$cf_cv_screen" 1>&6
-if test $cf_cv_screen != ncurses ; then
+case $cf_cv_screen in
+ncurses|slang)
+ ;;
+pdcurses)
+ cf_cv_ncurses_header=xcurses.h
+ ;;
+curses)
if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" != set"; then
cf_cv_ncurses_header=curses.h
fi
-fi
+ ;;
+esac
case $cf_cv_screen in
curses)
echo $ac_n "checking for initscr""... $ac_c" 1>&6
-echo "configure:6606: checking for initscr" >&5
+echo "configure:6616: checking for initscr" >&5
if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6611 "configure"
+#line 6621 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char initscr(); below. */
@@ -6630,7 +6640,7 @@ initscr();
; return 0; }
EOF
-if { (eval echo configure:6634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_initscr=yes"
else
@@ -6651,7 +6661,7 @@ else
case $host_os in #(vi
freebsd*) #(vi
echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6
-echo "configure:6655: checking for tgoto in -lmytinfo" >&5
+echo "configure:6665: checking for tgoto in -lmytinfo" >&5
ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6659,7 +6669,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lmytinfo $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6663 "configure"
+#line 6673 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6670,7 +6680,7 @@ int main() {
tgoto()
; return 0; }
EOF
-if { (eval echo configure:6674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6691,9 +6701,9 @@ else
fi
;;
-hpux10.*)
+hpux10.*|hpux11.*)
echo $ac_n "checking for initscr in -lcur_colr""... $ac_c" 1>&6
-echo "configure:6697: checking for initscr in -lcur_colr" >&5
+echo "configure:6707: checking for initscr in -lcur_colr" >&5
ac_lib_var=`echo cur_colr'_'initscr | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6701,7 +6711,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lcur_colr $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6705 "configure"
+#line 6715 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6712,7 +6722,7 @@ int main() {
initscr()
; return 0; }
EOF
-if { (eval echo configure:6716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6736,7 +6746,7 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for initscr in -lHcurses""... $ac_c" 1>&6
-echo "configure:6740: checking for initscr in -lHcurses" >&5
+echo "configure:6750: checking for initscr in -lHcurses" >&5
ac_lib_var=`echo Hcurses'_'initscr | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6744,7 +6754,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lHcurses $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6748 "configure"
+#line 6758 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6755,7 +6765,7 @@ int main() {
initscr()
; return 0; }
EOF
-if { (eval echo configure:6759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6804,12 +6814,12 @@ if test ".$ac_cv_func_initscr" != .yes ; then
# Check for library containing tgoto. Do this before curses library
# because it may be needed to link the test-case for initscr.
echo $ac_n "checking for tgoto""... $ac_c" 1>&6
-echo "configure:6808: checking for tgoto" >&5
+echo "configure:6818: checking for tgoto" >&5
if eval "test \"`echo '$''{'ac_cv_func_tgoto'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6813 "configure"
+#line 6823 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char tgoto(); below. */
@@ -6832,7 +6842,7 @@ tgoto();
; return 0; }
EOF
-if { (eval echo configure:6836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_tgoto=yes"
else
@@ -6853,7 +6863,7 @@ else
for cf_term_lib in termcap termlib unknown
do
echo $ac_n "checking for tgoto in -l$cf_term_lib""... $ac_c" 1>&6
-echo "configure:6857: checking for tgoto in -l$cf_term_lib" >&5
+echo "configure:6867: checking for tgoto in -l$cf_term_lib" >&5
ac_lib_var=`echo $cf_term_lib'_'tgoto | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6861,7 +6871,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l$cf_term_lib $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6865 "configure"
+#line 6875 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6872,7 +6882,7 @@ int main() {
tgoto()
; return 0; }
EOF
-if { (eval echo configure:6876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6902,7 +6912,7 @@ fi
for cf_curs_lib in cursesX curses ncurses xcurses jcurses unknown
do
echo $ac_n "checking for initscr in -l$cf_curs_lib""... $ac_c" 1>&6
-echo "configure:6906: checking for initscr in -l$cf_curs_lib" >&5
+echo "configure:6916: checking for initscr in -l$cf_curs_lib" >&5
ac_lib_var=`echo $cf_curs_lib'_'initscr | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6910,7 +6920,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l$cf_curs_lib $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6914 "configure"
+#line 6924 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6921,7 +6931,7 @@ int main() {
initscr()
; return 0; }
EOF
-if { (eval echo configure:6925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6947,16 +6957,16 @@ fi
LIBS="-l$cf_curs_lib $cf_save_LIBS"
if test "$cf_term_lib" = unknown ; then
echo $ac_n "checking if we can link with $cf_curs_lib library""... $ac_c" 1>&6
-echo "configure:6951: checking if we can link with $cf_curs_lib library" >&5
+echo "configure:6961: checking if we can link with $cf_curs_lib library" >&5
cat > conftest.$ac_ext <<EOF
-#line 6953 "configure"
+#line 6963 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header-curses.h}>
int main() {
initscr()
; return 0; }
EOF
-if { (eval echo configure:6960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_result=yes
else
@@ -6970,16 +6980,16 @@ rm -f conftest*
test $cf_result = no && { echo "configure: error: Cannot link curses library" 1>&2; exit 1; }
elif test "$cf_term_lib" != predefined ; then
echo $ac_n "checking if we need both $cf_curs_lib and $cf_term_lib libraries""... $ac_c" 1>&6
-echo "configure:6974: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+echo "configure:6984: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
cat > conftest.$ac_ext <<EOF
-#line 6976 "configure"
+#line 6986 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header-curses.h}>
int main() {
initscr(); tgoto((char *)0, 0, 0);
; return 0; }
EOF
-if { (eval echo configure:6983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_result=no
else
@@ -6989,14 +6999,14 @@ else
LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6993 "configure"
+#line 7003 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header-curses.h}>
int main() {
initscr()
; return 0; }
EOF
-if { (eval echo configure:7000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_result=yes
else
@@ -7018,14 +7028,14 @@ fi
echo $ac_n "checking for curses performance tradeoff""... $ac_c" 1>&6
-echo "configure:7022: checking for curses performance tradeoff" >&5
+echo "configure:7032: checking for curses performance tradeoff" >&5
if eval "test \"`echo '$''{'cf_cv_curs_performance'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cf_cv_curs_performance=no
cat > conftest.$ac_ext <<EOF
-#line 7029 "configure"
+#line 7039 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header-curses.h}>
@@ -7039,11 +7049,11 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:7043: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7053: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 7047 "configure"
+#line 7057 "configure"
#include "confdefs.h"
#define CURS_PERFORMANCE
@@ -7058,7 +7068,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:7062: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_curs_performance=yes
else
@@ -7083,13 +7093,13 @@ EOF
ncurses)
echo $ac_n "checking for ncurses header file""... $ac_c" 1>&6
-echo "configure:7087: checking for ncurses header file" >&5
+echo "configure:7097: checking for ncurses header file" >&5
if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7093 "configure"
+#line 7103 "configure"
#include "confdefs.h"
#include <curses.h>
int main() {
@@ -7106,7 +7116,7 @@ make an error
; return 0; }
EOF
-if { (eval echo configure:7110: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7120: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_ncurses_header=predefined
else
@@ -7193,7 +7203,7 @@ done
;;
esac
echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
-echo "configure:7197: checking for ncurses version" >&5
+echo "configure:7207: checking for ncurses version" >&5
if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7218,7 +7228,7 @@ Autoconf "old"
#endif
EOF
cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
- { (eval echo configure:7222: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
+ { (eval echo configure:7232: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
if test -f conftest.out ; then
cf_out=`cat conftest.out | sed -e 's@^Autoconf @@' -e 's@^[^"]*"@@' -e 's@".*@@'`
test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
@@ -7227,7 +7237,7 @@ EOF
else
cat > conftest.$ac_ext <<EOF
-#line 7231 "configure"
+#line 7241 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header-curses.h}>
@@ -7250,7 +7260,7 @@ int main()
exit(0);
}
EOF
-if { (eval echo configure:7254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -7275,7 +7285,7 @@ echo "$ac_t""$cf_cv_ncurses_version" 1>&6
cf_ncurses_LIBS=""
cf_ncurses_SAVE="$LIBS"
echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:7279: checking for Gpm_Open in -lgpm" >&5
+echo "configure:7289: checking for Gpm_Open in -lgpm" >&5
ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -7283,7 +7293,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgpm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7287 "configure"
+#line 7297 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7294,7 +7304,7 @@ int main() {
Gpm_Open()
; return 0; }
EOF
-if { (eval echo configure:7298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7310,7 +7320,7 @@ fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6
-echo "configure:7314: checking for initscr in -lgpm" >&5
+echo "configure:7324: checking for initscr in -lgpm" >&5
ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -7318,7 +7328,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgpm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7322 "configure"
+#line 7332 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7329,7 +7339,7 @@ int main() {
initscr()
; return 0; }
EOF
-if { (eval echo configure:7333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7360,7 +7370,7 @@ freebsd*)
# This is only necessary if you are linking against an obsolete
# version of ncurses (but it should do no harm, since it's static).
echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6
-echo "configure:7364: checking for tgoto in -lmytinfo" >&5
+echo "configure:7374: checking for tgoto in -lmytinfo" >&5
ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -7368,7 +7378,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lmytinfo $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7372 "configure"
+#line 7382 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7379,7 +7389,7 @@ int main() {
tgoto()
; return 0; }
EOF
-if { (eval echo configure:7383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7407,12 +7417,12 @@ LIBS="$cf_ncurses_LIBS $LIBS"
cf_cv_have_lib_ncurses=no
cf_libdir=""
echo $ac_n "checking for initscr""... $ac_c" 1>&6
-echo "configure:7411: checking for initscr" >&5
+echo "configure:7421: checking for initscr" >&5
if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7416 "configure"
+#line 7426 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char initscr(); below. */
@@ -7435,7 +7445,7 @@ initscr();
; return 0; }
EOF
-if { (eval echo configure:7439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_initscr=yes"
else
@@ -7455,17 +7465,17 @@ else
cf_save_LIBS="$LIBS"
echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6
-echo "configure:7459: checking for initscr in -lncurses" >&5
+echo "configure:7469: checking for initscr in -lncurses" >&5
LIBS="-lncurses $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7462 "configure"
+#line 7472 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header-curses.h}>
int main() {
initscr()
; return 0; }
EOF
-if { (eval echo configure:7469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
cf_cv_have_lib_ncurses=yes
@@ -7493,17 +7503,17 @@ test "$prefix" != /opt && cf_search="$cf_search /opt/lib /opt/lib/ncur
for cf_libdir in $cf_search
do
echo $ac_n "checking for -lncurses in $cf_libdir""... $ac_c" 1>&6
-echo "configure:7497: checking for -lncurses in $cf_libdir" >&5
+echo "configure:7507: checking for -lncurses in $cf_libdir" >&5
LIBS="-L$cf_libdir -lncurses $cf_save_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7500 "configure"
+#line 7510 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header-curses.h}>
int main() {
initscr()
; return 0; }
EOF
-if { (eval echo configure:7507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
cf_cv_have_lib_ncurses=yes
@@ -7535,7 +7545,7 @@ esac
if test -n "$cf_ncurses_LIBS" ; then
echo $ac_n "checking if we can link ncurses without $cf_ncurses_LIBS""... $ac_c" 1>&6
-echo "configure:7539: checking if we can link ncurses without $cf_ncurses_LIBS" >&5
+echo "configure:7549: checking if we can link ncurses without $cf_ncurses_LIBS" >&5
cf_ncurses_SAVE="$LIBS"
for p in $cf_ncurses_LIBS ; do
q=`echo $LIBS | sed -e 's/'$p' //' -e 's/'$p'$//'`
@@ -7544,14 +7554,14 @@ echo "configure:7539: checking if we can link ncurses without $cf_ncurses_LIBS"
fi
done
cat > conftest.$ac_ext <<EOF
-#line 7548 "configure"
+#line 7558 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header-curses.h}>
int main() {
initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
; return 0; }
EOF
-if { (eval echo configure:7555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
else
@@ -7565,23 +7575,26 @@ rm -f conftest*
fi
;;
+pdcurses)
+ # do this last, since it changes definition of main: CF_PDCURSES_X11
+ ;;
slang)
echo $ac_n "checking for slang header file""... $ac_c" 1>&6
-echo "configure:7572: checking for slang header file" >&5
+echo "configure:7585: checking for slang header file" >&5
if eval "test \"`echo '$''{'cf_cv_slang_header'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7578 "configure"
+#line 7591 "configure"
#include "confdefs.h"
#include <slang.h>
int main() {
printf("%s\n", SLANG_VERSION)
; return 0; }
EOF
-if { (eval echo configure:7585: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7598: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_slang_header=predefined
else
@@ -7655,7 +7668,7 @@ done
;;
esac
-
+
cf_slang_LIBS1="$LIBS"
if eval "test \"`echo '$''{'cf_cv_termlib'+set}'`\" = set"; then
@@ -7664,24 +7677,24 @@ else
cf_cv_termlib=none
cat > conftest.$ac_ext <<EOF
-#line 7668 "configure"
+#line 7681 "configure"
#include "confdefs.h"
int main() {
char *x=(char*)tgoto("",0,0)
; return 0; }
EOF
-if { (eval echo configure:7675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 7678 "configure"
+#line 7691 "configure"
#include "confdefs.h"
int main() {
int x=tigetstr("")
; return 0; }
EOF
-if { (eval echo configure:7685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_termlib=terminfo
else
@@ -7710,16 +7723,16 @@ if test "$cf_cv_termlib" = none; then
for cf_func in tigetstr tgetstr
do
echo $ac_n "checking for $cf_func in -l$cf_lib""... $ac_c" 1>&6
-echo "configure:7714: checking for $cf_func in -l$cf_lib" >&5
+echo "configure:7727: checking for $cf_func in -l$cf_lib" >&5
cat > conftest.$ac_ext <<EOF
-#line 7716 "configure"
+#line 7729 "configure"
#include "confdefs.h"
int main() {
int x=$cf_func("")
; return 0; }
EOF
-if { (eval echo configure:7723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_result=yes
else
@@ -7746,7 +7759,7 @@ fi
if test "$cf_cv_termlib" = none; then
# allow curses library for broken AIX system.
echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6
-echo "configure:7750: checking for initscr in -lcurses" >&5
+echo "configure:7763: checking for initscr in -lcurses" >&5
ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -7754,7 +7767,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lcurses $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7758 "configure"
+#line 7771 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7765,7 +7778,7 @@ int main() {
initscr()
; return 0; }
EOF
-if { (eval echo configure:7769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7786,7 +7799,7 @@ else
fi
echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
-echo "configure:7790: checking for tgoto in -ltermcap" >&5
+echo "configure:7803: checking for tgoto in -ltermcap" >&5
ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -7794,7 +7807,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ltermcap $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7798 "configure"
+#line 7811 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7805,7 +7818,7 @@ int main() {
tgoto()
; return 0; }
EOF
-if { (eval echo configure:7809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7837,12 +7850,12 @@ fi
cf_slang_LIBS2="$LIBS"
echo $ac_n "checking for acos""... $ac_c" 1>&6
-echo "configure:7841: checking for acos" >&5
+echo "configure:7854: checking for acos" >&5
if eval "test \"`echo '$''{'ac_cv_func_acos'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7846 "configure"
+#line 7859 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char acos(); below. */
@@ -7865,7 +7878,7 @@ acos();
; return 0; }
EOF
-if { (eval echo configure:7869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_acos=yes"
else
@@ -7884,7 +7897,7 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for acos in -lm""... $ac_c" 1>&6
-echo "configure:7888: checking for acos in -lm" >&5
+echo "configure:7901: checking for acos in -lm" >&5
ac_lib_var=`echo m'_'acos | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -7892,7 +7905,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7896 "configure"
+#line 7909 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7903,7 +7916,7 @@ int main() {
acos()
; return 0; }
EOF
-if { (eval echo configure:7907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7943,12 +7956,12 @@ fi
cf_cv_have_lib_slang=no
cf_libdir=""
echo $ac_n "checking for SLtt_get_screen_size""... $ac_c" 1>&6
-echo "configure:7947: checking for SLtt_get_screen_size" >&5
+echo "configure:7960: checking for SLtt_get_screen_size" >&5
if eval "test \"`echo '$''{'ac_cv_func_SLtt_get_screen_size'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7952 "configure"
+#line 7965 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char SLtt_get_screen_size(); below. */
@@ -7971,7 +7984,7 @@ SLtt_get_screen_size();
; return 0; }
EOF
-if { (eval echo configure:7975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_SLtt_get_screen_size=yes"
else
@@ -7991,17 +8004,17 @@ else
cf_save_LIBS="$LIBS"
echo $ac_n "checking for SLtt_get_screen_size in -lslang""... $ac_c" 1>&6
-echo "configure:7995: checking for SLtt_get_screen_size in -lslang" >&5
+echo "configure:8008: checking for SLtt_get_screen_size in -lslang" >&5
LIBS="-lslang $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7998 "configure"
+#line 8011 "configure"
#include "confdefs.h"
#include <slang.h>
int main() {
SLtt_get_screen_size()
; return 0; }
EOF
-if { (eval echo configure:8005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
cf_cv_have_lib_slang=yes
@@ -8029,17 +8042,17 @@ test "$prefix" != /opt && cf_search="$cf_search /opt/lib /opt/lib/slan
for cf_libdir in $cf_search
do
echo $ac_n "checking for -lslang in $cf_libdir""... $ac_c" 1>&6
-echo "configure:8033: checking for -lslang in $cf_libdir" >&5
+echo "configure:8046: checking for -lslang in $cf_libdir" >&5
LIBS="-L$cf_libdir -lslang $cf_save_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 8036 "configure"
+#line 8049 "configure"
#include "confdefs.h"
#include <slang.h>
int main() {
SLtt_get_screen_size()
; return 0; }
EOF
-if { (eval echo configure:8043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
cf_cv_have_lib_slang=yes
@@ -8070,7 +8083,7 @@ esac
cf_slang_LIBS3="$LIBS"
echo $ac_n "checking if we can link slang without termcap""... $ac_c" 1>&6
-echo "configure:8074: checking if we can link slang without termcap" >&5
+echo "configure:8087: checking if we can link slang without termcap" >&5
if test -n "`echo $cf_slang_LIBS1 | sed -e 's/ //g'`" ; then
cf_exclude=`echo ".$cf_slang_LIBS2" | sed -e "s@$cf_slang_LIBS1@@" -e 's@^.@@'`
else
@@ -8078,14 +8091,14 @@ else
fi
LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s@$cf_exclude@@" -e 's@^.@@'`
cat > conftest.$ac_ext <<EOF
-#line 8082 "configure"
+#line 8095 "configure"
#include "confdefs.h"
#include <slang.h>
int main() {
SLtt_get_screen_size()
; return 0; }
EOF
-if { (eval echo configure:8089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_result=yes
else
@@ -8098,6 +8111,48 @@ rm -f conftest*
echo "$ac_t""$cf_result" 1>&6
test $cf_result = no && LIBS="$cf_slang_LIBS3"
+
+
+
+echo $ac_n "checking if we must tell slang this is UNIX""... $ac_c" 1>&6
+echo "configure:8119: checking if we must tell slang this is UNIX" >&5
+if eval "test \"`echo '$''{'cf_cv_slang_unix'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+
+cat > conftest.$ac_ext <<EOF
+#line 8125 "configure"
+#include "confdefs.h"
+#include <slang.h>
+int main() {
+
+#ifdef REAL_UNIX_SYSTEM
+make an error
+#else
+int x = SLang_TT_Baud_Rate
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:8138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ cf_cv_slang_unix=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ cf_cv_slang_unix=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$cf_cv_slang_unix" 1>&6
+test $cf_cv_slang_unix = yes && cat >> confdefs.h <<\EOF
+#define REAL_UNIX_SYSTEM 1
+EOF
+
+
;;
esac
@@ -8105,7 +8160,7 @@ eval cf_libdir=$libdir
cf_libdir=`echo $cf_libdir | sed -e s@'^NONE/'@$prefix/@ -e s@'^NONE/'@$ac_default_prefix/@`
echo $ac_n "checking for location of config-file""... $ac_c" 1>&6
-echo "configure:8109: checking for location of config-file" >&5
+echo "configure:8164: checking for location of config-file" >&5
LYNX_CFG_FILE=$cf_libdir/lynx.cfg
cat >> confdefs.h <<EOF
#define LYNX_CFG_FILE "$LYNX_CFG_FILE"
@@ -8117,7 +8172,7 @@ CHARSET_DEFS=
echo $ac_n "checking if you want only a few charsets""... $ac_c" 1>&6
-echo "configure:8121: checking if you want only a few charsets" >&5
+echo "configure:8176: checking if you want only a few charsets" >&5
# Check whether --with-charsets or --without-charsets was given.
if test "${with_charsets+set}" = set; then
@@ -8162,12 +8217,12 @@ fi
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:8166: checking for ANSI C header files" >&5
+echo "configure:8221: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8171 "configure"
+#line 8226 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -8175,7 +8230,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8234: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -8192,7 +8247,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 8196 "configure"
+#line 8251 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -8210,7 +8265,7 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 8214 "configure"
+#line 8269 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -8231,7 +8286,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 8235 "configure"
+#line 8290 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -8242,7 +8297,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
-if { (eval echo configure:8246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -8266,12 +8321,12 @@ EOF
fi
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:8270: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:8325: checking whether time.h and sys/time.h may both be included" >&5
if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8275 "configure"
+#line 8330 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -8280,7 +8335,7 @@ int main() {
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:8284: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8339: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
@@ -8305,12 +8360,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:8309: checking for $ac_hdr that defines DIR" >&5
+echo "configure:8364: checking for $ac_hdr that defines DIR" >&5
if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8314 "configure"
+#line 8369 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_hdr>
@@ -8318,7 +8373,7 @@ int main() {
DIR *dirp = 0;
; return 0; }
EOF
-if { (eval echo configure:8322: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8377: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_dirent_$ac_safe=yes"
else
@@ -8343,7 +8398,7 @@ done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:8347: checking for opendir in -ldir" >&5
+echo "configure:8402: checking for opendir in -ldir" >&5
ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -8351,7 +8406,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldir $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 8355 "configure"
+#line 8410 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8362,7 +8417,7 @@ int main() {
opendir()
; return 0; }
EOF
-if { (eval echo configure:8366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8384,7 +8439,7 @@ fi
else
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:8388: checking for opendir in -lx" >&5
+echo "configure:8443: checking for opendir in -lx" >&5
ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -8392,7 +8447,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lx $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 8396 "configure"
+#line 8451 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8403,7 +8458,7 @@ int main() {
opendir()
; return 0; }
EOF
-if { (eval echo configure:8407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8444,17 +8499,17 @@ for ac_hdr in \
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8448: checking for $ac_hdr" >&5
+echo "configure:8503: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8453 "configure"
+#line 8508 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8458: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8513: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -8482,13 +8537,13 @@ done
echo $ac_n "checking termio.h and termios.h""... $ac_c" 1>&6
-echo "configure:8486: checking termio.h and termios.h" >&5
+echo "configure:8541: checking termio.h and termios.h" >&5
if eval "test \"`echo '$''{'cf_cv_termio_and_termios'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8492 "configure"
+#line 8547 "configure"
#include "confdefs.h"
#if HAVE_TERMIO_H
@@ -8501,7 +8556,7 @@ int main() {
putchar (0x0a)
; return 0; }
EOF
-if { (eval echo configure:8505: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_termio_and_termios=yes
else
@@ -8521,13 +8576,13 @@ EOF
echo $ac_n "checking for sigaction and structs""... $ac_c" 1>&6
-echo "configure:8525: checking for sigaction and structs" >&5
+echo "configure:8580: checking for sigaction and structs" >&5
if eval "test \"`echo '$''{'cf_cv_func_sigaction'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8531 "configure"
+#line 8586 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -8542,7 +8597,7 @@ struct sigaction act;
; return 0; }
EOF
-if { (eval echo configure:8546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_func_sigaction=yes
else
@@ -8566,17 +8621,17 @@ for ac_hdr in sys/wait.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8570: checking for $ac_hdr" >&5
+echo "configure:8625: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8575 "configure"
+#line 8630 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8580: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8635: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -8613,17 +8668,17 @@ for ac_hdr in wait.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8617: checking for $ac_hdr" >&5
+echo "configure:8672: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8622 "configure"
+#line 8677 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8627: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8682: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -8653,17 +8708,17 @@ for ac_hdr in waitstatus.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8657: checking for $ac_hdr" >&5
+echo "configure:8712: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8662 "configure"
+#line 8717 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8667: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8722: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -8704,13 +8759,13 @@ fi
echo $ac_n "checking for union wait""... $ac_c" 1>&6
-echo "configure:8708: checking for union wait" >&5
+echo "configure:8763: checking for union wait" >&5
if eval "test \"`echo '$''{'cf_cv_type_unionwait'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8714 "configure"
+#line 8769 "configure"
#include "confdefs.h"
$cf_wait_headers
int main() {
@@ -8721,7 +8776,7 @@ int x;
; return 0; }
EOF
-if { (eval echo configure:8725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_type_unionwait=no
echo compiles ok w/o union wait 1>&5
@@ -8732,7 +8787,7 @@ else
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 8736 "configure"
+#line 8791 "configure"
#include "confdefs.h"
$cf_wait_headers
int main() {
@@ -8747,7 +8802,7 @@ union wait x;
; return 0; }
EOF
-if { (eval echo configure:8751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_type_unionwait=yes
echo compiles ok with union wait and possibly macros too 1>&5
@@ -8774,20 +8829,20 @@ EOF
if test $cf_cv_type_unionwait = yes; then
echo $ac_n "checking if union wait can be used as wait-arg""... $ac_c" 1>&6
-echo "configure:8778: checking if union wait can be used as wait-arg" >&5
+echo "configure:8833: checking if union wait can be used as wait-arg" >&5
if eval "test \"`echo '$''{'cf_cv_arg_union_wait'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8784 "configure"
+#line 8839 "configure"
#include "confdefs.h"
$cf_wait_headers
int main() {
union wait x; wait(&x)
; return 0; }
EOF
-if { (eval echo configure:8791: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8846: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_arg_union_wait=yes
else
@@ -8807,20 +8862,20 @@ EOF
echo $ac_n "checking if union wait can be used as waitpid-arg""... $ac_c" 1>&6
-echo "configure:8811: checking if union wait can be used as waitpid-arg" >&5
+echo "configure:8866: checking if union wait can be used as waitpid-arg" >&5
if eval "test \"`echo '$''{'cf_cv_arg_union_waitpid'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8817 "configure"
+#line 8872 "configure"
#include "confdefs.h"
$cf_wait_headers
int main() {
union wait x; waitpid(0, &x, 0)
; return 0; }
EOF
-if { (eval echo configure:8824: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8879: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_arg_union_waitpid=yes
else
@@ -8846,17 +8901,17 @@ for ac_hdr in stdarg.h varargs.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8850: checking for $ac_hdr" >&5
+echo "configure:8905: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8855 "configure"
+#line 8910 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8860: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8915: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -8883,13 +8938,13 @@ fi
done
echo $ac_n "checking for standard varargs""... $ac_c" 1>&6
-echo "configure:8887: checking for standard varargs" >&5
+echo "configure:8942: checking for standard varargs" >&5
if eval "test \"`echo '$''{'cf_cv_ansi_varargs'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8893 "configure"
+#line 8948 "configure"
#include "confdefs.h"
#if HAVE_STDARG_H
@@ -8904,7 +8959,7 @@ int main() {
return 0;} int foo(char *fmt,...){va_list args;va_start(args,fmt);va_end(args)
; return 0; }
EOF
-if { (eval echo configure:8908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_ansi_varargs=yes
else
@@ -8924,12 +8979,12 @@ EOF
echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:8928: checking for uid_t in sys/types.h" >&5
+echo "configure:8983: checking for uid_t in sys/types.h" >&5
if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8933 "configure"
+#line 8988 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
@@ -8958,7 +9013,7 @@ EOF
fi
echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6
-echo "configure:8962: checking type of array argument to getgroups" >&5
+echo "configure:9017: checking type of array argument to getgroups" >&5
if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -8966,7 +9021,7 @@ else
ac_cv_type_getgroups=cross
else
cat > conftest.$ac_ext <<EOF
-#line 8970 "configure"
+#line 9025 "configure"
#include "confdefs.h"
/* Thanks to Mike Rendell for this test. */
@@ -8991,7 +9046,7 @@ main()
}
EOF
-if { (eval echo configure:8995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_type_getgroups=gid_t
else
@@ -9005,7 +9060,7 @@ fi
if test $ac_cv_type_getgroups = cross; then
cat > conftest.$ac_ext <<EOF
-#line 9009 "configure"
+#line 9064 "configure"
#include "confdefs.h"
#include <unistd.h>
EOF
@@ -9029,12 +9084,12 @@ EOF
echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:9033: checking for pid_t" >&5
+echo "configure:9088: checking for pid_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9038 "configure"
+#line 9093 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -9062,12 +9117,12 @@ EOF
fi
echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:9066: checking for uid_t in sys/types.h" >&5
+echo "configure:9121: checking for uid_t in sys/types.h" >&5
if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9071 "configure"
+#line 9126 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
@@ -9096,12 +9151,12 @@ EOF
fi
echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:9100: checking for mode_t" >&5
+echo "configure:9155: checking for mode_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9105 "configure"
+#line 9160 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -9132,17 +9187,17 @@ fi
ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:9136: checking for vfork.h" >&5
+echo "configure:9191: checking for vfork.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9141 "configure"
+#line 9196 "configure"
#include "confdefs.h"
#include <vfork.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9146: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -9167,18 +9222,18 @@ else
fi
echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:9171: checking for working vfork" >&5
+echo "configure:9226: checking for working vfork" >&5
if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$cross_compiling" = yes; then
echo $ac_n "checking for vfork""... $ac_c" 1>&6
-echo "configure:9177: checking for vfork" >&5
+echo "configure:9232: checking for vfork" >&5
if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9182 "configure"
+#line 9237 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vfork(); below. */
@@ -9201,7 +9256,7 @@ vfork();
; return 0; }
EOF
-if { (eval echo configure:9205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_vfork=yes"
else
@@ -9223,7 +9278,7 @@ fi
ac_cv_func_vfork_works=$ac_cv_func_vfork
else
cat > conftest.$ac_ext <<EOF
-#line 9227 "configure"
+#line 9282 "configure"
#include "confdefs.h"
/* Thanks to Paul Eggert for this test. */
#include <stdio.h>
@@ -9318,7 +9373,7 @@ main() {
}
}
EOF
-if { (eval echo configure:9322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_vfork_works=yes
else
@@ -9342,13 +9397,13 @@ fi
echo $ac_n "checking if we should use fcntl or ioctl""... $ac_c" 1>&6
-echo "configure:9346: checking if we should use fcntl or ioctl" >&5
+echo "configure:9401: checking if we should use fcntl or ioctl" >&5
if eval "test \"`echo '$''{'cf_cv_fionbio'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9352 "configure"
+#line 9407 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -9360,7 +9415,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:9364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_fionbio=ioctl
else
@@ -9369,7 +9424,7 @@ else
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 9373 "configure"
+#line 9428 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -9386,7 +9441,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:9390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_fionbio=fcntl
else
@@ -9409,20 +9464,20 @@ EOF
echo $ac_n "checking for broken/missing definition of remove""... $ac_c" 1>&6
-echo "configure:9413: checking for broken/missing definition of remove" >&5
+echo "configure:9468: checking for broken/missing definition of remove" >&5
if eval "test \"`echo '$''{'cf_cv_baddef_remove'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9419 "configure"
+#line 9474 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
remove("dummy")
; return 0; }
EOF
-if { (eval echo configure:9426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_baddef_remove=no
else
@@ -9430,7 +9485,7 @@ else
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 9434 "configure"
+#line 9489 "configure"
#include "confdefs.h"
#include <stdio.h>
int __unlink(name) { return unlink(name); }
@@ -9438,7 +9493,7 @@ int main() {
remove("dummy")
; return 0; }
EOF
-if { (eval echo configure:9442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_baddef_remove=yes
else
@@ -9462,13 +9517,13 @@ EOF
echo $ac_n "checking for lstat""... $ac_c" 1>&6
-echo "configure:9466: checking for lstat" >&5
+echo "configure:9521: checking for lstat" >&5
if eval "test \"`echo '$''{'ac_cv_func_lstat'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9472 "configure"
+#line 9527 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -9477,7 +9532,7 @@ int main() {
lstat(".", (struct stat *)0)
; return 0; }
EOF
-if { (eval echo configure:9481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_func_lstat=yes
else
@@ -9520,12 +9575,12 @@ for ac_func in \
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9524: checking for $ac_func" >&5
+echo "configure:9579: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9529 "configure"
+#line 9584 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -9548,7 +9603,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:9552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -9578,12 +9633,12 @@ for ac_func in \
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9582: checking for $ac_func" >&5
+echo "configure:9637: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9587 "configure"
+#line 9642 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -9606,7 +9661,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:9610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -9637,12 +9692,12 @@ for ac_func in strstr
do
echo $ac_n "checking for $ac_func declaration""... $ac_c" 1>&6
-echo "configure:9641: checking for $ac_func declaration" >&5
+echo "configure:9696: checking for $ac_func declaration" >&5
if eval "test \"`echo '$''{'ac_cv_func_decl_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9646 "configure"
+#line 9701 "configure"
#include "confdefs.h"
#include <string.h>
int main() {
@@ -9651,11 +9706,11 @@ extern int ${ac_func}();
#endif
; return 0; }
EOF
-if { (eval echo configure:9655: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 9659 "configure"
+#line 9714 "configure"
#include "confdefs.h"
#include <string.h>
int main() {
@@ -9664,7 +9719,7 @@ int (*p)() = ${ac_func};
#endif
; return 0; }
EOF
-if { (eval echo configure:9668: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9723: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_decl_$ac_func=yes"
@@ -9706,12 +9761,12 @@ for ac_func in getgrgid getgrnam
do
echo $ac_n "checking for $ac_func declaration""... $ac_c" 1>&6
-echo "configure:9710: checking for $ac_func declaration" >&5
+echo "configure:9765: checking for $ac_func declaration" >&5
if eval "test \"`echo '$''{'ac_cv_func_decl_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9715 "configure"
+#line 9770 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -9722,11 +9777,11 @@ extern int ${ac_func}();
#endif
; return 0; }
EOF
-if { (eval echo configure:9726: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9781: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 9730 "configure"
+#line 9785 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -9737,7 +9792,7 @@ int (*p)() = ${ac_func};
#endif
; return 0; }
EOF
-if { (eval echo configure:9741: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9796: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_decl_$ac_func=yes"
@@ -9779,13 +9834,13 @@ done
echo $ac_n "checking if TRUE/FALSE are defined""... $ac_c" 1>&6
-echo "configure:9783: checking if TRUE/FALSE are defined" >&5
+echo "configure:9838: checking if TRUE/FALSE are defined" >&5
if eval "test \"`echo '$''{'cf_cv_bool_defs'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9789 "configure"
+#line 9844 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header-curses.h}>
@@ -9794,7 +9849,7 @@ int main() {
int x = TRUE, y = FALSE
; return 0; }
EOF
-if { (eval echo configure:9798: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_bool_defs=yes
else
@@ -9821,13 +9876,13 @@ fi
echo $ac_n "checking if external errno is declared""... $ac_c" 1>&6
-echo "configure:9825: checking if external errno is declared" >&5
+echo "configure:9880: checking if external errno is declared" >&5
if eval "test \"`echo '$''{'cf_cv_dcl_errno'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9831 "configure"
+#line 9886 "configure"
#include "confdefs.h"
#ifdef HAVE_STDLIB_H
@@ -9840,7 +9895,7 @@ int main() {
long x = (long) errno
; return 0; }
EOF
-if { (eval echo configure:9844: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9899: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval 'cf_cv_dcl_'errno'=yes'
else
@@ -9871,13 +9926,13 @@ fi
# It's possible (for near-UNIX clones) that the data doesn't exist
echo $ac_n "checking if external errno exists""... $ac_c" 1>&6
-echo "configure:9875: checking if external errno exists" >&5
+echo "configure:9930: checking if external errno exists" >&5
if eval "test \"`echo '$''{'cf_cv_have_errno'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9881 "configure"
+#line 9936 "configure"
#include "confdefs.h"
#undef errno
@@ -9887,7 +9942,7 @@ int main() {
errno = 2
; return 0; }
EOF
-if { (eval echo configure:9891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval 'cf_cv_have_'errno'=yes'
else
@@ -9919,21 +9974,21 @@ fi
echo $ac_n "checking if we can set errno""... $ac_c" 1>&6
-echo "configure:9923: checking if we can set errno" >&5
+echo "configure:9978: checking if we can set errno" >&5
if eval "test \"`echo '$''{'cf_cv_set_errno'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$cross_compiling" = yes; then
cat > conftest.$ac_ext <<EOF
-#line 9930 "configure"
+#line 9985 "configure"
#include "confdefs.h"
#include <errno.h>
int main() {
errno = 255
; return 0; }
EOF
-if { (eval echo configure:9937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_set_errno=maybe
else
@@ -9945,7 +10000,7 @@ fi
rm -f conftest*
else
cat > conftest.$ac_ext <<EOF
-#line 9949 "configure"
+#line 10004 "configure"
#include "confdefs.h"
#include <errno.h>
@@ -9955,7 +10010,7 @@ int main()
exit(errno != 255);
}
EOF
-if { (eval echo configure:9959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cf_cv_set_errno=yes
else
@@ -9978,20 +10033,20 @@ EOF
echo $ac_n "checking for setlocale()""... $ac_c" 1>&6
-echo "configure:9982: checking for setlocale()" >&5
+echo "configure:10037: checking for setlocale()" >&5
if eval "test \"`echo '$''{'cf_cv_locale'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9988 "configure"
+#line 10043 "configure"
#include "confdefs.h"
#include <locale.h>
int main() {
setlocale(LC_ALL, "")
; return 0; }
EOF
-if { (eval echo configure:9995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_locale=yes
else
@@ -10012,13 +10067,13 @@ EOF
echo $ac_n "checking if NGROUPS is defined""... $ac_c" 1>&6
-echo "configure:10016: checking if NGROUPS is defined" >&5
+echo "configure:10071: checking if NGROUPS is defined" >&5
if eval "test \"`echo '$''{'cf_cv_ngroups'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10022 "configure"
+#line 10077 "configure"
#include "confdefs.h"
#if HAVE_SYS_PARAM_H
@@ -10032,7 +10087,7 @@ int main() {
int x = NGROUPS
; return 0; }
EOF
-if { (eval echo configure:10036: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10091: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_ngroups=yes
else
@@ -10040,7 +10095,7 @@ else
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 10044 "configure"
+#line 10099 "configure"
#include "confdefs.h"
#if HAVE_SYS_PARAM_H
@@ -10054,7 +10109,7 @@ int main() {
int x = NGROUPS_MAX
; return 0; }
EOF
-if { (eval echo configure:10058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_ngroups=NGROUPS_MAX
else
@@ -10088,13 +10143,13 @@ for cf_name in sys_nerr sys_errlist
do
echo $ac_n "checking if external $cf_name is declared""... $ac_c" 1>&6
-echo "configure:10092: checking if external $cf_name is declared" >&5
+echo "configure:10147: checking if external $cf_name is declared" >&5
if eval "test \"`echo '$''{'cf_cv_dcl_$cf_name'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10098 "configure"
+#line 10153 "configure"
#include "confdefs.h"
#ifdef HAVE_STDLIB_H
@@ -10107,7 +10162,7 @@ int main() {
long x = (long) $cf_name
; return 0; }
EOF
-if { (eval echo configure:10111: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10166: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval 'cf_cv_dcl_'$cf_name'=yes'
else
@@ -10138,13 +10193,13 @@ fi
# It's possible (for near-UNIX clones) that the data doesn't exist
echo $ac_n "checking if external $cf_name exists""... $ac_c" 1>&6
-echo "configure:10142: checking if external $cf_name exists" >&5
+echo "configure:10197: checking if external $cf_name exists" >&5
if eval "test \"`echo '$''{'cf_cv_have_$cf_name'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10148 "configure"
+#line 10203 "configure"
#include "confdefs.h"
#undef $cf_name
@@ -10154,7 +10209,7 @@ int main() {
$cf_name = 2
; return 0; }
EOF
-if { (eval echo configure:10158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval 'cf_cv_have_'$cf_name'=yes'
else
@@ -10187,13 +10242,13 @@ done
echo $ac_n "checking if struct utmp is declared""... $ac_c" 1>&6
-echo "configure:10191: checking if struct utmp is declared" >&5
+echo "configure:10246: checking if struct utmp is declared" >&5
if eval "test \"`echo '$''{'cf_cv_have_utmp'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10197 "configure"
+#line 10252 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -10202,7 +10257,7 @@ int main() {
struct utmp x; char *y = &x.ut_host[0]
; return 0; }
EOF
-if { (eval echo configure:10206: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10261: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_have_utmp=yes
else
@@ -10210,14 +10265,14 @@ else
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 10214 "configure"
+#line 10269 "configure"
#include "confdefs.h"
#include <utmpx.h>
int main() {
struct utmpx x; char *y = &x.ut_host[0]
; return 0; }
EOF
-if { (eval echo configure:10221: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10276: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_have_utmp=utmpx
else
@@ -10245,13 +10300,13 @@ EOF
echo $ac_n "checking if external h_errno exists""... $ac_c" 1>&6
-echo "configure:10249: checking if external h_errno exists" >&5
+echo "configure:10304: checking if external h_errno exists" >&5
if eval "test \"`echo '$''{'cf_cv_have_h_errno'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10255 "configure"
+#line 10310 "configure"
#include "confdefs.h"
#undef h_errno
@@ -10261,7 +10316,7 @@ int main() {
h_errno = 2
; return 0; }
EOF
-if { (eval echo configure:10265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval 'cf_cv_have_'h_errno'=yes'
else
@@ -10292,13 +10347,13 @@ fi
echo $ac_n "checking if character set is EBCDIC""... $ac_c" 1>&6
-echo "configure:10296: checking if character set is EBCDIC" >&5
+echo "configure:10351: checking if character set is EBCDIC" >&5
if eval "test \"`echo '$''{'cf_cv_ebcdic'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10302 "configure"
+#line 10357 "configure"
#include "confdefs.h"
int main() {
@@ -10311,7 +10366,7 @@ make an error "Character set is not EBCDIC"
#endif
; return 0; }
EOF
-if { (eval echo configure:10315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10370: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# TryCompile action if true
cf_cv_ebcdic=yes
@@ -10345,7 +10400,7 @@ esac
if test $cf_cv_screen != slang ; then
echo $ac_n "checking if curses supports alternate-character set""... $ac_c" 1>&6
-echo "configure:10349: checking if curses supports alternate-character set" >&5
+echo "configure:10404: checking if curses supports alternate-character set" >&5
if eval "test \"`echo '$''{'cf_cv_alt_char_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -10353,7 +10408,7 @@ else
for mapname in acs_map _acs_map
do
cat > conftest.$ac_ext <<EOF
-#line 10357 "configure"
+#line 10412 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header-curses.h}>
@@ -10362,7 +10417,7 @@ int main() {
chtype x = $mapname['l']; $mapname['m'] = 0
; return 0; }
EOF
-if { (eval echo configure:10366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_alt_char_set=$mapname
break
@@ -10385,13 +10440,13 @@ EOF
echo $ac_n "checking if curses supports fancy attributes""... $ac_c" 1>&6
-echo "configure:10389: checking if curses supports fancy attributes" >&5
+echo "configure:10444: checking if curses supports fancy attributes" >&5
if eval "test \"`echo '$''{'cf_cv_fancy_curses'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10395 "configure"
+#line 10450 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header-curses.h}>
@@ -10404,7 +10459,7 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
; return 0; }
EOF
-if { (eval echo configure:10408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_fancy_curses=yes
else
@@ -10424,7 +10479,7 @@ EOF
echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
-echo "configure:10428: checking for ncurses version" >&5
+echo "configure:10483: checking for ncurses version" >&5
if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -10449,7 +10504,7 @@ Autoconf "old"
#endif
EOF
cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
- { (eval echo configure:10453: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
+ { (eval echo configure:10508: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
if test -f conftest.out ; then
cf_out=`cat conftest.out | sed -e 's@^Autoconf @@' -e 's@^[^"]*"@@' -e 's@".*@@'`
test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
@@ -10458,7 +10513,7 @@ EOF
else
cat > conftest.$ac_ext <<EOF
-#line 10462 "configure"
+#line 10517 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header-curses.h}>
@@ -10481,7 +10536,7 @@ int main()
exit(0);
}
EOF
-if { (eval echo configure:10485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -10501,13 +10556,13 @@ echo "$ac_t""$cf_cv_ncurses_version" 1>&6
if test "$cf_cv_ncurses_version" != no ; then
echo $ac_n "checking for obsolete/broken version of ncurses""... $ac_c" 1>&6
-echo "configure:10505: checking for obsolete/broken version of ncurses" >&5
+echo "configure:10560: checking for obsolete/broken version of ncurses" >&5
if eval "test \"`echo '$''{'cf_cv_ncurses_broken'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10511 "configure"
+#line 10566 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header-curses.h}>
@@ -10521,7 +10576,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:10525: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_ncurses_broken=no
else
@@ -10546,13 +10601,13 @@ fi
echo $ac_n "checking if curses supports color attributes""... $ac_c" 1>&6
-echo "configure:10550: checking if curses supports color attributes" >&5
+echo "configure:10605: checking if curses supports color attributes" >&5
if eval "test \"`echo '$''{'cf_cv_color_curses'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10556 "configure"
+#line 10611 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header-curses.h}>
@@ -10567,7 +10622,7 @@ chtype x = COLOR_BLUE;
; return 0; }
EOF
-if { (eval echo configure:10571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_color_curses=yes
else
@@ -10594,7 +10649,7 @@ fi
echo $ac_n "checking declaration of size-change""... $ac_c" 1>&6
-echo "configure:10598: checking declaration of size-change" >&5
+echo "configure:10653: checking declaration of size-change" >&5
if eval "test \"`echo '$''{'cf_cv_sizechange'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -10608,7 +10663,7 @@ do
CFLAGS="$cf_save_CFLAGS"
test -n "$cf_opts" && CFLAGS="$CFLAGS -D$cf_opts"
cat > conftest.$ac_ext <<EOF
-#line 10612 "configure"
+#line 10667 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if HAVE_TERMIOS_H
@@ -10647,7 +10702,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:10651: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10706: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_sizechange=yes
else
@@ -10679,20 +10734,20 @@ EOF
echo $ac_n "checking if ttytype is declared in curses library""... $ac_c" 1>&6
-echo "configure:10683: checking if ttytype is declared in curses library" >&5
+echo "configure:10738: checking if ttytype is declared in curses library" >&5
if eval "test \"`echo '$''{'cf_cv_have_ttytype'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10689 "configure"
+#line 10744 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header-curses.h}>
int main() {
char *x = &ttytype[1]; *x = 1
; return 0; }
EOF
-if { (eval echo configure:10696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_have_ttytype=yes
else
@@ -10713,13 +10768,13 @@ EOF
echo $ac_n "checking if we must define _XOPEN_SOURCE_EXTENDED""... $ac_c" 1>&6
-echo "configure:10717: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "configure:10772: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
if eval "test \"`echo '$''{'cf_cv_need_xopen_extension'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10723 "configure"
+#line 10778 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -10729,7 +10784,7 @@ int main() {
long x = winnstr(stdscr, "", 0)
; return 0; }
EOF
-if { (eval echo configure:10733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_need_xopen_extension=no
else
@@ -10737,7 +10792,7 @@ else
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 10741 "configure"
+#line 10796 "configure"
#include "confdefs.h"
#define _XOPEN_SOURCE_EXTENDED
@@ -10748,7 +10803,7 @@ int main() {
long x = winnstr(stdscr, "", 0)
; return 0; }
EOF
-if { (eval echo configure:10752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_need_xopen_extension=yes
else
@@ -10784,9 +10839,9 @@ do
cf_tr_func=`echo $cf_func | tr '[a-z]' '[A-Z]'`
echo $ac_n "checking for ${cf_func}""... $ac_c" 1>&6
-echo "configure:10788: checking for ${cf_func}" >&5
+echo "configure:10843: checking for ${cf_func}" >&5
-echo "(line 10790) testing ${cf_func} ..." 1>&5
+echo "(line 10845) testing ${cf_func} ..." 1>&5
if eval "test \"`echo '$''{'cf_cv_func_$cf_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -10795,13 +10850,18 @@ else
eval cf_result='$ac_cv_func_'$cf_func
if test ".$cf_result" != ".no"; then
cat > conftest.$ac_ext <<EOF
-#line 10799 "configure"
+#line 10854 "configure"
#include "confdefs.h"
+#ifdef HAVE_XCURSES
+#include <xcurses.h>
+char * XCursesProgramName = "test";
+#else
#include <curses.h>
#ifdef HAVE_TERM_H
#include <term.h>
#endif
+#endif
int main() {
#ifndef ${cf_func}
@@ -10810,7 +10870,7 @@ long foo = (long)(&${cf_func});
; return 0; }
EOF
-if { (eval echo configure:10814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_result=yes
else
@@ -10842,7 +10902,7 @@ fi
echo $ac_n "checking if configuration info should be browsable""... $ac_c" 1>&6
-echo "configure:10846: checking if configuration info should be browsable" >&5
+echo "configure:10906: checking if configuration info should be browsable" >&5
# Check whether --enable-config-info or --disable-config-info was given.
if test "${enable_config_info+set}" = set; then
@@ -10866,7 +10926,7 @@ EOF
echo $ac_n "checking if new-style forms-based options screen should be used""... $ac_c" 1>&6
-echo "configure:10870: checking if new-style forms-based options screen should be used" >&5
+echo "configure:10930: checking if new-style forms-based options screen should be used" >&5
# Check whether --enable-forms-options or --disable-forms-options was given.
if test "${enable_forms_options+set}" = set; then
@@ -10890,7 +10950,7 @@ EOF
echo $ac_n "checking if old-style options menu should be used""... $ac_c" 1>&6
-echo "configure:10894: checking if old-style options menu should be used" >&5
+echo "configure:10954: checking if old-style options menu should be used" >&5
# Check whether --enable-menu-options or --disable-menu-options was given.
if test "${enable_menu_options+set}" = set; then
@@ -10914,7 +10974,7 @@ EOF
echo $ac_n "checking if experimental address-list page should be used""... $ac_c" 1>&6
-echo "configure:10918: checking if experimental address-list page should be used" >&5
+echo "configure:10978: checking if experimental address-list page should be used" >&5
# Check whether --enable-addrlist-page or --disable-addrlist-page was given.
if test "${enable_addrlist_page+set}" = set; then
@@ -10938,7 +10998,7 @@ EOF
echo $ac_n "checking if experimental charset-selection logic should be used""... $ac_c" 1>&6
-echo "configure:10942: checking if experimental charset-selection logic should be used" >&5
+echo "configure:11002: checking if experimental charset-selection logic should be used" >&5
# Check whether --enable-charset-choice or --disable-charset-choice was given.
if test "${enable_charset_choice+set}" = set; then
@@ -10962,7 +11022,7 @@ EOF
echo $ac_n "checking if experimental CJK logic should be used""... $ac_c" 1>&6
-echo "configure:10966: checking if experimental CJK logic should be used" >&5
+echo "configure:11026: checking if experimental CJK logic should be used" >&5
# Check whether --enable-cjk or --disable-cjk was given.
if test "${enable_cjk+set}" = set; then
@@ -10986,7 +11046,7 @@ EOF
echo $ac_n "checking if color-style code should be used""... $ac_c" 1>&6
-echo "configure:10990: checking if color-style code should be used" >&5
+echo "configure:11050: checking if color-style code should be used" >&5
# Check whether --enable-color-style or --disable-color-style was given.
if test "${enable_color_style+set}" = set; then
@@ -11034,7 +11094,7 @@ EOF
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for location of style-sheet file""... $ac_c" 1>&6
-echo "configure:11038: checking for location of style-sheet file" >&5
+echo "configure:11098: checking for location of style-sheet file" >&5
LYNX_LSS_FILE=$cf_libdir/lynx.lss
cat >> confdefs.h <<EOF
#define LYNX_LSS_FILE "$LYNX_LSS_FILE"
@@ -11052,7 +11112,7 @@ test ".$cf_cv_func_use_default_colors" = ".yes" && use_dft_colors=maybe
if test "$use_dft_colors" != no ; then
echo $ac_n "checking if you want to use default-colors""... $ac_c" 1>&6
-echo "configure:11056: checking if you want to use default-colors" >&5
+echo "configure:11116: checking if you want to use default-colors" >&5
# Check whether --enable-default-colors or --disable-default-colors was given.
if test "${enable_default_colors+set}" = set; then
@@ -11077,7 +11137,7 @@ EOF
fi
echo $ac_n "checking if experimental file-upload logic should be used""... $ac_c" 1>&6
-echo "configure:11081: checking if experimental file-upload logic should be used" >&5
+echo "configure:11141: checking if experimental file-upload logic should be used" >&5
# Check whether --enable-file-upload or --disable-file-upload was given.
if test "${enable_file_upload+set}" = set; then
@@ -11101,7 +11161,7 @@ EOF
echo $ac_n "checking if experimental htmlized lynx.cfg should be built""... $ac_c" 1>&6
-echo "configure:11105: checking if experimental htmlized lynx.cfg should be built" >&5
+echo "configure:11165: checking if experimental htmlized lynx.cfg should be built" >&5
# Check whether --enable-htmlized-cfg or --disable-htmlized-cfg was given.
if test "${enable_htmlized_cfg+set}" = set; then
@@ -11130,7 +11190,7 @@ fi
echo $ac_n "checking if experimental element-justification logic should be used""... $ac_c" 1>&6
-echo "configure:11134: checking if experimental element-justification logic should be used" >&5
+echo "configure:11194: checking if experimental element-justification logic should be used" >&5
# Check whether --enable-justify-elts or --disable-justify-elts was given.
if test "${enable_justify_elts+set}" = set; then
@@ -11154,7 +11214,7 @@ EOF
echo $ac_n "checking if experimental keyboard-layout logic should be used""... $ac_c" 1>&6
-echo "configure:11158: checking if experimental keyboard-layout logic should be used" >&5
+echo "configure:11218: checking if experimental keyboard-layout logic should be used" >&5
# Check whether --enable-kbd-layout or --disable-kbd-layout was given.
if test "${enable_kbd_layout+set}" = set; then
@@ -11178,7 +11238,7 @@ EOF
echo $ac_n "checking if experimental JavaScript support should be used""... $ac_c" 1>&6
-echo "configure:11182: checking if experimental JavaScript support should be used" >&5
+echo "configure:11242: checking if experimental JavaScript support should be used" >&5
# Check whether --enable-libjs or --disable-libjs was given.
if test "${enable_libjs+set}" = set; then
@@ -11202,7 +11262,7 @@ EOF
echo $ac_n "checking if html source should be colorized""... $ac_c" 1>&6
-echo "configure:11206: checking if html source should be colorized" >&5
+echo "configure:11266: checking if html source should be colorized" >&5
# Check whether --enable-prettysrc or --disable-prettysrc was given.
if test "${enable_prettysrc+set}" = set; then
@@ -11226,7 +11286,7 @@ EOF
echo $ac_n "checking if read-progress message should show ETA""... $ac_c" 1>&6
-echo "configure:11230: checking if read-progress message should show ETA" >&5
+echo "configure:11290: checking if read-progress message should show ETA" >&5
# Check whether --enable-read-eta or --disable-read-eta was given.
if test "${enable_read_eta+set}" = set; then
@@ -11250,7 +11310,7 @@ EOF
echo $ac_n "checking if scrollbar code should be used""... $ac_c" 1>&6
-echo "configure:11254: checking if scrollbar code should be used" >&5
+echo "configure:11314: checking if scrollbar code should be used" >&5
# Check whether --enable-scrollbar or --disable-scrollbar was given.
if test "${enable_scrollbar+set}" = set; then
@@ -11281,7 +11341,7 @@ EOF
fi
echo $ac_n "checking if source caching should be used""... $ac_c" 1>&6
-echo "configure:11285: checking if source caching should be used" >&5
+echo "configure:11345: checking if source caching should be used" >&5
# Check whether --enable-source-cache or --disable-source-cache was given.
if test "${enable_source_cache+set}" = set; then
@@ -11308,7 +11368,7 @@ EOF
echo $ac_n "checking if alternative line-edit bindings should be used""... $ac_c" 1>&6
-echo "configure:11312: checking if alternative line-edit bindings should be used" >&5
+echo "configure:11372: checking if alternative line-edit bindings should be used" >&5
# Check whether --enable-alt-bindings or --disable-alt-bindings was given.
if test "${enable_alt_bindings+set}" = set; then
@@ -11332,7 +11392,7 @@ EOF
echo $ac_n "checking if you want to use extended HTML DTD logic""... $ac_c" 1>&6
-echo "configure:11336: checking if you want to use extended HTML DTD logic" >&5
+echo "configure:11396: checking if you want to use extended HTML DTD logic" >&5
# Check whether --enable-extended-dtd or --disable-extended-dtd was given.
if test "${enable_extended_dtd+set}" = set; then
@@ -11356,7 +11416,7 @@ EOF
echo $ac_n "checking if partial-display should be used""... $ac_c" 1>&6
-echo "configure:11360: checking if partial-display should be used" >&5
+echo "configure:11420: checking if partial-display should be used" >&5
# Check whether --enable-partial or --disable-partial was given.
if test "${enable_partial+set}" = set; then
@@ -11380,7 +11440,7 @@ EOF
echo $ac_n "checking if you want to use external commands""... $ac_c" 1>&6
-echo "configure:11384: checking if you want to use external commands" >&5
+echo "configure:11444: checking if you want to use external commands" >&5
# Check whether --enable-externs or --disable-externs was given.
if test "${enable_externs+set}" = set; then
@@ -11404,7 +11464,7 @@ EOF
echo $ac_n "checking if you want to use setfont support""... $ac_c" 1>&6
-echo "configure:11408: checking if you want to use setfont support" >&5
+echo "configure:11468: checking if you want to use setfont support" >&5
# Check whether --enable-font-switch or --disable-font-switch was given.
if test "${enable_font_switch+set}" = set; then
@@ -11428,7 +11488,7 @@ EOF
echo $ac_n "checking if you want cgi-link support""... $ac_c" 1>&6
-echo "configure:11432: checking if you want cgi-link support" >&5
+echo "configure:11492: checking if you want cgi-link support" >&5
# Check whether --enable-cgi-links or --disable-cgi-links was given.
if test "${enable_cgi_links+set}" = set; then
@@ -11447,7 +11507,7 @@ fi
echo "$ac_t""$enableval" 1>&6
echo $ac_n "checking if you want change-exec support""... $ac_c" 1>&6
-echo "configure:11451: checking if you want change-exec support" >&5
+echo "configure:11511: checking if you want change-exec support" >&5
# Check whether --enable-change-exec or --disable-change-exec was given.
if test "${enable_change_exec+set}" = set; then
@@ -11471,7 +11531,7 @@ EOF
echo $ac_n "checking if you want exec-links support""... $ac_c" 1>&6
-echo "configure:11475: checking if you want exec-links support" >&5
+echo "configure:11535: checking if you want exec-links support" >&5
# Check whether --enable-exec-links or --disable-exec-links was given.
if test "${enable_exec_links+set}" = set; then
@@ -11495,7 +11555,7 @@ EOF
echo $ac_n "checking if you want exec-scripts support""... $ac_c" 1>&6
-echo "configure:11499: checking if you want exec-scripts support" >&5
+echo "configure:11559: checking if you want exec-scripts support" >&5
# Check whether --enable-exec-scripts or --disable-exec-scripts was given.
if test "${enable_exec_scripts+set}" = set; then
@@ -11519,7 +11579,7 @@ EOF
echo $ac_n "checking if you want internal-links feature""... $ac_c" 1>&6
-echo "configure:11523: checking if you want internal-links feature" >&5
+echo "configure:11583: checking if you want internal-links feature" >&5
# Check whether --enable-internal-links or --disable-internal-links was given.
if test "${enable_internal_links+set}" = set; then
@@ -11543,7 +11603,7 @@ EOF
echo $ac_n "checking if you want to fork NSL requests""... $ac_c" 1>&6
-echo "configure:11547: checking if you want to fork NSL requests" >&5
+echo "configure:11607: checking if you want to fork NSL requests" >&5
# Check whether --enable-nsl-fork or --disable-nsl-fork was given.
if test "${enable_nsl_fork+set}" = set; then
@@ -11567,7 +11627,7 @@ EOF
echo $ac_n "checking if you want to log URL requests via syslog""... $ac_c" 1>&6
-echo "configure:11571: checking if you want to log URL requests via syslog" >&5
+echo "configure:11631: checking if you want to log URL requests via syslog" >&5
# Check whether --enable-syslog or --disable-syslog was given.
if test "${enable_syslog+set}" = set; then
@@ -11591,7 +11651,7 @@ EOF
echo $ac_n "checking if persistent-cookie logic should be used""... $ac_c" 1>&6
-echo "configure:11595: checking if persistent-cookie logic should be used" >&5
+echo "configure:11655: checking if persistent-cookie logic should be used" >&5
# Check whether --enable-persistent-cookies or --disable-persistent-cookies was given.
if test "${enable_persistent_cookies+set}" = set; then
@@ -11615,7 +11675,7 @@ EOF
echo $ac_n "checking if you want to underline links""... $ac_c" 1>&6
-echo "configure:11619: checking if you want to underline links" >&5
+echo "configure:11679: checking if you want to underline links" >&5
# Check whether --enable-underlines or --disable-underlines was given.
if test "${enable_underlines+set}" = set; then
@@ -11639,7 +11699,7 @@ EOF
echo $ac_n "checking if help files should be gzip'ed""... $ac_c" 1>&6
-echo "configure:11643: checking if help files should be gzip'ed" >&5
+echo "configure:11703: checking if help files should be gzip'ed" >&5
# Check whether --enable-gzip-help or --disable-gzip-help was given.
if test "${enable_gzip_help+set}" = set; then
@@ -11668,7 +11728,7 @@ fi
echo $ac_n "checking if you want to use zlib for decompression of some gzip files""... $ac_c" 1>&6
-echo "configure:11672: checking if you want to use zlib for decompression of some gzip files" >&5
+echo "configure:11732: checking if you want to use zlib for decompression of some gzip files" >&5
# Check whether --with-zlib or --without-zlib was given.
if test "${with_zlib+set}" = set; then
@@ -11682,16 +11742,16 @@ echo "$ac_t""$use_zlib" 1>&6
if test ".$use_zlib" != ".no" ; then
echo $ac_n "checking if we need to add -I option to get zlib.h""... $ac_c" 1>&6
-echo "configure:11686: checking if we need to add -I option to get zlib.h" >&5
+echo "configure:11746: checking if we need to add -I option to get zlib.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 11688 "configure"
+#line 11748 "configure"
#include "confdefs.h"
-#include <zlibx.h>
+#include <zlib.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:11695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""no" 1>&6
else
@@ -11732,12 +11792,12 @@ rm -f conftest*
cf_cv_have_lib_z=no
cf_libdir=""
echo $ac_n "checking for gzopen""... $ac_c" 1>&6
-echo "configure:11736: checking for gzopen" >&5
+echo "configure:11796: checking for gzopen" >&5
if eval "test \"`echo '$''{'ac_cv_func_gzopen'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 11741 "configure"
+#line 11801 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gzopen(); below. */
@@ -11760,7 +11820,7 @@ gzopen();
; return 0; }
EOF
-if { (eval echo configure:11764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gzopen=yes"
else
@@ -11780,17 +11840,17 @@ else
cf_save_LIBS="$LIBS"
echo $ac_n "checking for gzopen in -lz""... $ac_c" 1>&6
-echo "configure:11784: checking for gzopen in -lz" >&5
+echo "configure:11844: checking for gzopen in -lz" >&5
LIBS="-lz $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 11787 "configure"
+#line 11847 "configure"
#include "confdefs.h"
#include <zlib.h>
int main() {
gzopen("name","mode")
; return 0; }
EOF
-if { (eval echo configure:11794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
cf_cv_have_lib_z=yes
@@ -11818,17 +11878,17 @@ test "$prefix" != /opt && cf_search="$cf_search /opt/lib /opt/lib/z"
for cf_libdir in $cf_search
do
echo $ac_n "checking for -lz in $cf_libdir""... $ac_c" 1>&6
-echo "configure:11822: checking for -lz in $cf_libdir" >&5
+echo "configure:11882: checking for -lz in $cf_libdir" >&5
LIBS="-L$cf_libdir -lz $cf_save_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 11825 "configure"
+#line 11885 "configure"
#include "confdefs.h"
#include <zlib.h>
int main() {
gzopen("name","mode")
; return 0; }
EOF
-if { (eval echo configure:11832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
cf_cv_have_lib_z=yes
@@ -11864,7 +11924,7 @@ EOF
fi
echo $ac_n "checking if you want to exclude FINGER code""... $ac_c" 1>&6
-echo "configure:11868: checking if you want to exclude FINGER code" >&5
+echo "configure:11928: checking if you want to exclude FINGER code" >&5
# Check whether --enable-finger or --disable-finger was given.
if test "${enable_finger+set}" = set; then
@@ -11888,7 +11948,7 @@ EOF
echo $ac_n "checking if you want to exclude GOPHER code""... $ac_c" 1>&6
-echo "configure:11892: checking if you want to exclude GOPHER code" >&5
+echo "configure:11952: checking if you want to exclude GOPHER code" >&5
# Check whether --enable-gopher or --disable-gopher was given.
if test "${enable_gopher+set}" = set; then
@@ -11912,7 +11972,7 @@ EOF
echo $ac_n "checking if you want to exclude NEWS code""... $ac_c" 1>&6
-echo "configure:11916: checking if you want to exclude NEWS code" >&5
+echo "configure:11976: checking if you want to exclude NEWS code" >&5
# Check whether --enable-news or --disable-news was given.
if test "${enable_news+set}" = set; then
@@ -11936,7 +11996,7 @@ EOF
echo $ac_n "checking if you want to exclude FTP code""... $ac_c" 1>&6
-echo "configure:11940: checking if you want to exclude FTP code" >&5
+echo "configure:12000: checking if you want to exclude FTP code" >&5
# Check whether --enable-ftp or --disable-ftp was given.
if test "${enable_ftp+set}" = set; then
@@ -11965,7 +12025,7 @@ EOF
# All DirEd functions that were enabled on compilation can be disabled
# or modified at run time via DIRED_MENU symbols in lynx.cfg.
echo $ac_n "checking if directory-editor code should be used""... $ac_c" 1>&6
-echo "configure:11969: checking if directory-editor code should be used" >&5
+echo "configure:12029: checking if directory-editor code should be used" >&5
# Check whether --enable-dired or --disable-dired was given.
if test "${enable_dired+set}" = set; then
@@ -11991,7 +12051,7 @@ EOF
echo $ac_n "checking if you wish to allow extracting from archives via DirEd""... $ac_c" 1>&6
-echo "configure:11995: checking if you wish to allow extracting from archives via DirEd" >&5
+echo "configure:12055: checking if you wish to allow extracting from archives via DirEd" >&5
# Check whether --enable-dired-dearchive or --disable-dired-dearchive was given.
if test "${enable_dired_dearchive+set}" = set; then
@@ -12010,7 +12070,7 @@ fi
echo "$ac_t""$enableval" 1>&6
echo $ac_n "checking if DirEd mode should override keys""... $ac_c" 1>&6
-echo "configure:12014: checking if DirEd mode should override keys" >&5
+echo "configure:12074: checking if DirEd mode should override keys" >&5
# Check whether --enable-dired-override or --disable-dired-override was given.
if test "${enable_dired_override+set}" = set; then
@@ -12036,7 +12096,7 @@ fi
echo "$ac_t""$enableval" 1>&6
echo $ac_n "checking if you wish to allow permissions commands via DirEd""... $ac_c" 1>&6
-echo "configure:12040: checking if you wish to allow permissions commands via DirEd" >&5
+echo "configure:12100: checking if you wish to allow permissions commands via DirEd" >&5
# Check whether --enable-dired-permit or --disable-dired-permit was given.
if test "${enable_dired_permit+set}" = set; then
@@ -12062,7 +12122,7 @@ fi
echo "$ac_t""$enableval" 1>&6
echo $ac_n "checking if you wish to allow executable-permission commands via DirEd""... $ac_c" 1>&6
-echo "configure:12066: checking if you wish to allow executable-permission commands via DirEd" >&5
+echo "configure:12126: checking if you wish to allow executable-permission commands via DirEd" >&5
# Check whether --enable-dired-xpermit or --disable-dired-xpermit was given.
if test "${enable_dired_xpermit+set}" = set; then
@@ -12081,7 +12141,7 @@ fi
echo "$ac_t""$enableval" 1>&6
echo $ac_n "checking if you wish to allow "tar" commands from DirEd""... $ac_c" 1>&6
-echo "configure:12085: checking if you wish to allow "tar" commands from DirEd" >&5
+echo "configure:12145: checking if you wish to allow "tar" commands from DirEd" >&5
# Check whether --enable-dired-tar or --disable-dired-tar was given.
if test "${enable_dired_tar+set}" = set; then
@@ -12107,7 +12167,7 @@ fi
echo "$ac_t""$enableval" 1>&6
echo $ac_n "checking if you wish to allow "uudecode" commands from DirEd""... $ac_c" 1>&6
-echo "configure:12111: checking if you wish to allow "uudecode" commands from DirEd" >&5
+echo "configure:12171: checking if you wish to allow "uudecode" commands from DirEd" >&5
# Check whether --enable-dired-uudecode or --disable-dired-uudecode was given.
if test "${enable_dired_uudecode+set}" = set; then
@@ -12133,7 +12193,7 @@ fi
echo "$ac_t""$enableval" 1>&6
echo $ac_n "checking if you wish to allow "zip" and "unzip" commands from DirEd""... $ac_c" 1>&6
-echo "configure:12137: checking if you wish to allow "zip" and "unzip" commands from DirEd" >&5
+echo "configure:12197: checking if you wish to allow "zip" and "unzip" commands from DirEd" >&5
# Check whether --enable-dired-zip or --disable-dired-zip was given.
if test "${enable_dired_zip+set}" = set; then
@@ -12159,7 +12219,7 @@ fi
echo "$ac_t""$enableval" 1>&6
echo $ac_n "checking if you wish to allow "gzip" and "gunzip" commands from DirEd""... $ac_c" 1>&6
-echo "configure:12163: checking if you wish to allow "gzip" and "gunzip" commands from DirEd" >&5
+echo "configure:12223: checking if you wish to allow "gzip" and "gunzip" commands from DirEd" >&5
# Check whether --enable-dired-gzip or --disable-dired-gzip was given.
if test "${enable_dired_gzip+set}" = set; then
@@ -12186,7 +12246,7 @@ fi
fi
echo $ac_n "checking if you want long-directory listings""... $ac_c" 1>&6
-echo "configure:12190: checking if you want long-directory listings" >&5
+echo "configure:12250: checking if you want long-directory listings" >&5
# Check whether --enable-long-list or --disable-long-list was given.
if test "${enable_long_list+set}" = set; then
@@ -12212,7 +12272,7 @@ fi
echo "$ac_t""$enableval" 1>&6
echo $ac_n "checking if parent-directory references are permitted""... $ac_c" 1>&6
-echo "configure:12216: checking if parent-directory references are permitted" >&5
+echo "configure:12276: checking if parent-directory references are permitted" >&5
# Check whether --enable-parent-dir-refs or --disable-parent-dir-refs was given.
if test "${enable_parent_dir_refs+set}" = set; then
@@ -12230,9 +12290,1519 @@ fi
echo "$ac_t""$enableval" 1>&6
+if test $cf_cv_screen = pdcurses ; then
+ # If we find X, set shell vars x_includes and x_libraries to the
+# paths, otherwise set no_x=yes.
+# Uses ac_ vars as temps to allow command line to override cache and checks.
+# --without-x overrides everything else, but does not touch the cache.
+echo $ac_n "checking for X""... $ac_c" 1>&6
+echo "configure:12300: checking for X" >&5
+
+
+# Check whether --with-x or --without-x was given.
+if test "${with_x+set}" = set; then
+ withval="$with_x"
+ :
+fi
+
+# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
+if test "x$with_x" = xno; then
+ # The user explicitly disabled X.
+ have_x=disabled
+else
+ if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
+ # Both variables are already set.
+ have_x=yes
+ else
+if eval "test \"`echo '$''{'ac_cv_have_x'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ # One or both of the vars are not set, and there is no cached value.
+ac_x_includes=NO ac_x_libraries=NO
+rm -fr conftestdir
+if mkdir conftestdir; then
+ cd conftestdir
+ # Make sure to not put "make" in the Imakefile rules, since we grep it out.
+ cat > Imakefile <<'EOF'
+acfindx:
+ @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
+EOF
+ if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
+ # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+ eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
+ # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
+ for ac_extension in a so sl; do
+ if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
+ test -f $ac_im_libdir/libX11.$ac_extension; then
+ ac_im_usrlibdir=$ac_im_libdir; break
+ fi
+ done
+ # Screen out bogus values from the imake configuration. They are
+ # bogus both because they are the default anyway, and because
+ # using them would break gcc on systems where it needs fixed includes.
+ case "$ac_im_incroot" in
+ /usr/include) ;;
+ *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;;
+ esac
+ case "$ac_im_usrlibdir" in
+ /usr/lib | /lib) ;;
+ *) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;;
+ esac
+ fi
+ cd ..
+ rm -fr conftestdir
+fi
+
+if test "$ac_x_includes" = NO; then
+ # Guess where to find include files, by looking for this one X11 .h file.
+ test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
+
+ # First, try using that file with no special directory specified.
+cat > conftest.$ac_ext <<EOF
+#line 12363 "configure"
+#include "confdefs.h"
+#include <$x_direct_test_include>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:12368: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+ rm -rf conftest*
+ # We can compile using X headers with no special include directory.
+ac_x_includes=
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ # Look for the header file in a standard set of common directories.
+# Check X11 before X11Rn because it is often a symlink to the current release.
+ for ac_dir in \
+ /usr/X11/include \
+ /usr/X11R6/include \
+ /usr/X11R5/include \
+ /usr/X11R4/include \
+ \
+ /usr/include/X11 \
+ /usr/include/X11R6 \
+ /usr/include/X11R5 \
+ /usr/include/X11R4 \
+ \
+ /usr/local/X11/include \
+ /usr/local/X11R6/include \
+ /usr/local/X11R5/include \
+ /usr/local/X11R4/include \
+ \
+ /usr/local/include/X11 \
+ /usr/local/include/X11R6 \
+ /usr/local/include/X11R5 \
+ /usr/local/include/X11R4 \
+ \
+ /usr/X386/include \
+ /usr/x386/include \
+ /usr/XFree86/include/X11 \
+ \
+ /usr/include \
+ /usr/local/include \
+ /usr/unsupported/include \
+ /usr/athena/include \
+ /usr/local/x11r5/include \
+ /usr/lpp/Xamples/include \
+ \
+ /usr/openwin/include \
+ /usr/openwin/share/include \
+ ; \
+ do
+ if test -r "$ac_dir/$x_direct_test_include"; then
+ ac_x_includes=$ac_dir
+ break
+ fi
+ done
+fi
+rm -f conftest*
+fi # $ac_x_includes = NO
+
+if test "$ac_x_libraries" = NO; then
+ # Check for the libraries.
+
+ test -z "$x_direct_test_library" && x_direct_test_library=Xt
+ test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
+
+ # See if we find them without any special options.
+ # Don't add to $LIBS permanently.
+ ac_save_LIBS="$LIBS"
+ LIBS="-l$x_direct_test_library $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 12437 "configure"
+#include "confdefs.h"
+
+int main() {
+${x_direct_test_function}()
+; return 0; }
+EOF
+if { (eval echo configure:12444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ LIBS="$ac_save_LIBS"
+# We can link X programs with no special library path.
+ac_x_libraries=
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ LIBS="$ac_save_LIBS"
+# First see if replacing the include by lib works.
+# Check X11 before X11Rn because it is often a symlink to the current release.
+for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \
+ /usr/X11/lib \
+ /usr/X11R6/lib \
+ /usr/X11R5/lib \
+ /usr/X11R4/lib \
+ \
+ /usr/lib/X11 \
+ /usr/lib/X11R6 \
+ /usr/lib/X11R5 \
+ /usr/lib/X11R4 \
+ \
+ /usr/local/X11/lib \
+ /usr/local/X11R6/lib \
+ /usr/local/X11R5/lib \
+ /usr/local/X11R4/lib \
+ \
+ /usr/local/lib/X11 \
+ /usr/local/lib/X11R6 \
+ /usr/local/lib/X11R5 \
+ /usr/local/lib/X11R4 \
+ \
+ /usr/X386/lib \
+ /usr/x386/lib \
+ /usr/XFree86/lib/X11 \
+ \
+ /usr/lib \
+ /usr/local/lib \
+ /usr/unsupported/lib \
+ /usr/athena/lib \
+ /usr/local/x11r5/lib \
+ /usr/lpp/Xamples/lib \
+ /lib/usr/lib/X11 \
+ \
+ /usr/openwin/lib \
+ /usr/openwin/share/lib \
+ ; \
+do
+ for ac_extension in a so sl; do
+ if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
+ ac_x_libraries=$ac_dir
+ break 2
+ fi
+ done
+done
+fi
+rm -f conftest*
+fi # $ac_x_libraries = NO
+
+if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then
+ # Didn't find X anywhere. Cache the known absence of X.
+ ac_cv_have_x="have_x=no"
+else
+ # Record where we found X for the cache.
+ ac_cv_have_x="have_x=yes \
+ ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
+fi
+fi
+ fi
+ eval "$ac_cv_have_x"
+fi # $with_x != no
+
+if test "$have_x" != yes; then
+ echo "$ac_t""$have_x" 1>&6
+ no_x=yes
+else
+ # If each of the values was on the command line, it overrides each guess.
+ test "x$x_includes" = xNONE && x_includes=$ac_x_includes
+ test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
+ # Update the cache value to reflect the command line values.
+ ac_cv_have_x="have_x=yes \
+ ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+ echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6
+fi
+
+
+
+# We need to check for -lsocket and -lnsl here in order to work around an
+# autoconf bug. autoconf-2.12 is not checking for these prior to checking for
+# the X11R6 -lSM and -lICE libraries. The resultant failures cascade...
+# (tested on Solaris 2.5 w/ X11R6)
+SYSTEM_NAME=`echo "$cf_cv_system_name"|tr ' ' -`
+cf_have_X_LIBS=no
+case $SYSTEM_NAME in
+irix[56]*) ;;
+clix*)
+ # FIXME: modify the library lookup in autoconf to
+ # allow _s.a suffix ahead of .a
+ echo $ac_n "checking for open in -lc_s""... $ac_c" 1>&6
+echo "configure:12544: checking for open in -lc_s" >&5
+ac_lib_var=`echo c_s'_'open | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lc_s $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 12552 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char open();
+int main() {
+open()
+; return 0; }
+EOF
+if { (eval echo configure:12563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ LIBS="-lc_s $LIBS"
+ echo $ac_n "checking for gethostname in -lbsd""... $ac_c" 1>&6
+echo "configure:12580: checking for gethostname in -lbsd" >&5
+ac_lib_var=`echo bsd'_'gethostname | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lbsd $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 12588 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char gethostname();
+
+int main() {
+gethostname()
+; return 0; }
+EOF
+if { (eval echo configure:12599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ LIBS="-lbsd $LIBS"
+ echo $ac_n "checking for gethostname in -lnsl_s""... $ac_c" 1>&6
+echo "configure:12616: checking for gethostname in -lnsl_s" >&5
+ac_lib_var=`echo nsl_s'_'gethostname | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lnsl_s $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 12624 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char gethostname();
+
+int main() {
+gethostname()
+; return 0; }
+EOF
+if { (eval echo configure:12635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ LIBS="-lnsl_s $LIBS"
+ echo $ac_n "checking for XOpenDisplay in -lX11_s""... $ac_c" 1>&6
+echo "configure:12652: checking for XOpenDisplay in -lX11_s" >&5
+ac_lib_var=`echo X11_s'_'XOpenDisplay | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lX11_s $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 12660 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char XOpenDisplay();
+
+int main() {
+XOpenDisplay()
+; return 0; }
+EOF
+if { (eval echo configure:12671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ LIBS="-lX11_s $LIBS"
+ echo $ac_n "checking for XtAppInitialize in -lXt_s""... $ac_c" 1>&6
+echo "configure:12688: checking for XtAppInitialize in -lXt_s" >&5
+ac_lib_var=`echo Xt_s'_'XtAppInitialize | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lXt_s $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 12696 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char XtAppInitialize();
+
+int main() {
+XtAppInitialize()
+; return 0; }
+EOF
+if { (eval echo configure:12707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ LIBS="-lXt_s $LIBS"
+ cf_have_X_LIBS=Xt
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ ;;
+*)
+ echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
+echo "configure:12748: checking for socket in -lsocket" >&5
+ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lsocket $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 12756 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char socket();
+
+int main() {
+socket()
+; return 0; }
+EOF
+if { (eval echo configure:12767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_lib=HAVE_LIB`echo socket | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+ LIBS="-lsocket $LIBS"
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6
+echo "configure:12795: checking for gethostname in -lnsl" >&5
+ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lnsl $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 12803 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char gethostname();
+
+int main() {
+gethostname()
+; return 0; }
+EOF
+if { (eval echo configure:12814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_lib=HAVE_LIB`echo nsl | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+ LIBS="-lnsl $LIBS"
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ ;;
+esac
+
+if test $cf_have_X_LIBS = no ; then
+ if test "$no_x" = yes; then
+ # Not all programs may use this symbol, but it does not hurt to define it.
+ cat >> confdefs.h <<\EOF
+#define X_DISPLAY_MISSING 1
+EOF
+
+ X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
+else
+ if test -n "$x_includes"; then
+ X_CFLAGS="$X_CFLAGS -I$x_includes"
+ fi
+
+ # It would also be nice to do this for all -L options, not just this one.
+ if test -n "$x_libraries"; then
+ X_LIBS="$X_LIBS -L$x_libraries"
+ # For Solaris; some versions of Sun CC require a space after -R and
+ # others require no space. Words are not sufficient . . . .
+ case "`(uname -sr) 2>/dev/null`" in
+ "SunOS 5"*)
+ echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
+echo "configure:12865: checking whether -R must be followed by a space" >&5
+ ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
+ cat > conftest.$ac_ext <<EOF
+#line 12868 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:12875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ ac_R_nospace=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ ac_R_nospace=no
+fi
+rm -f conftest*
+ if test $ac_R_nospace = yes; then
+ echo "$ac_t""no" 1>&6
+ X_LIBS="$X_LIBS -R$x_libraries"
+ else
+ LIBS="$ac_xsave_LIBS -R $x_libraries"
+ cat > conftest.$ac_ext <<EOF
+#line 12891 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:12898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ ac_R_space=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ ac_R_space=no
+fi
+rm -f conftest*
+ if test $ac_R_space = yes; then
+ echo "$ac_t""yes" 1>&6
+ X_LIBS="$X_LIBS -R $x_libraries"
+ else
+ echo "$ac_t""neither works" 1>&6
+ fi
+ fi
+ LIBS="$ac_xsave_LIBS"
+ esac
+ fi
+
+ # Check for system-dependent libraries X programs must link with.
+ # Do this before checking for the system-independent R6 libraries
+ # (-lICE), since we may need -lsocket or whatever for X linking.
+
+ if test "$ISC" = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
+ else
+ # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X
+ # libraries were built with DECnet support. And karl@cs.umb.edu says
+ # the Alpha needs dnet_stub (dnet does not exist).
+ echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
+echo "configure:12930: checking for dnet_ntoa in -ldnet" >&5
+ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-ldnet $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 12938 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char dnet_ntoa();
+
+int main() {
+dnet_ntoa()
+; return 0; }
+EOF
+if { (eval echo configure:12949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+ echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
+echo "configure:12971: checking for dnet_ntoa in -ldnet_stub" >&5
+ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-ldnet_stub $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 12979 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char dnet_ntoa();
+
+int main() {
+dnet_ntoa()
+; return 0; }
+EOF
+if { (eval echo configure:12990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ fi
+
+ # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
+ # to get the SysV transport functions.
+ # chad@anasazi.com says the Pyramis MIS-ES running DC/OSx (SVR4)
+ # needs -lnsl.
+ # The nsl library prevents programs from opening the X display
+ # on Irix 5.2, according to dickey@clark.net.
+ echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
+echo "configure:13019: checking for gethostbyname" >&5
+if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 13024 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char gethostbyname(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char gethostbyname();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
+choke me
+#else
+gethostbyname();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:13047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_gethostbyname=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_gethostbyname=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ :
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ if test $ac_cv_func_gethostbyname = no; then
+ echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
+echo "configure:13068: checking for gethostbyname in -lnsl" >&5
+ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lnsl $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 13076 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char gethostbyname();
+
+int main() {
+gethostbyname()
+; return 0; }
+EOF
+if { (eval echo configure:13087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ fi
+
+ # lieder@skyler.mavd.honeywell.com says without -lsocket,
+ # socket/setsockopt and other routines are undefined under SCO ODT
+ # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary
+ # on later versions), says simon@lia.di.epfl.ch: it contains
+ # gethostby* variants that don't use the nameserver (or something).
+ # -lsocket must be given before -lnsl if both are needed.
+ # We assume that if connect needs -lnsl, so does gethostbyname.
+ echo $ac_n "checking for connect""... $ac_c" 1>&6
+echo "configure:13117: checking for connect" >&5
+if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 13122 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char connect(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char connect();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_connect) || defined (__stub___connect)
+choke me
+#else
+connect();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:13145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_connect=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_connect=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ :
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ if test $ac_cv_func_connect = no; then
+ echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
+echo "configure:13166: checking for connect in -lsocket" >&5
+ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 13174 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char connect();
+
+int main() {
+connect()
+; return 0; }
+EOF
+if { (eval echo configure:13185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ fi
+
+ # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
+ echo $ac_n "checking for remove""... $ac_c" 1>&6
+echo "configure:13209: checking for remove" >&5
+if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 13214 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char remove(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char remove();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_remove) || defined (__stub___remove)
+choke me
+#else
+remove();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:13237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_remove=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_remove=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'remove`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ :
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ if test $ac_cv_func_remove = no; then
+ echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
+echo "configure:13258: checking for remove in -lposix" >&5
+ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lposix $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 13266 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char remove();
+
+int main() {
+remove()
+; return 0; }
+EOF
+if { (eval echo configure:13277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ fi
+
+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+ echo $ac_n "checking for shmat""... $ac_c" 1>&6
+echo "configure:13301: checking for shmat" >&5
+if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 13306 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char shmat(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char shmat();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_shmat) || defined (__stub___shmat)
+choke me
+#else
+shmat();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:13329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_shmat=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_shmat=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'shmat`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ :
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ if test $ac_cv_func_shmat = no; then
+ echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
+echo "configure:13350: checking for shmat in -lipc" >&5
+ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lipc $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 13358 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char shmat();
+
+int main() {
+shmat()
+; return 0; }
+EOF
+if { (eval echo configure:13369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ fi
+ fi
+
+ # Check for libraries that X11R6 Xt/Xaw programs need.
+ ac_save_LDFLAGS="$LDFLAGS"
+ test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
+ # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
+ # check for ICE first), but we must link in the order -lSM -lICE or
+ # we get undefined symbols. So assume we have SM if we have ICE.
+ # These have to be linked with before -lX11, unlike the other
+ # libraries we check for below, so use a different variable.
+ # --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
+ echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
+echo "configure:13402: checking for IceConnectionNumber in -lICE" >&5
+ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 13410 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char IceConnectionNumber();
+
+int main() {
+IceConnectionNumber()
+; return 0; }
+EOF
+if { (eval echo configure:13421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ LDFLAGS="$ac_save_LDFLAGS"
+
+fi
+
+ LDFLAGS="$LDFLAGS $X_LIBS"
+ CFLAGS="$CFLAGS $X_CFLAGS"
+ echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
+echo "configure:13448: checking for XOpenDisplay in -lX11" >&5
+ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 13456 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char XOpenDisplay();
+
+int main() {
+XOpenDisplay()
+; return 0; }
+EOF
+if { (eval echo configure:13467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ LIBS="-lX11 $LIBS"
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6
+echo "configure:13488: checking for XtAppInitialize in -lXt" >&5
+ac_lib_var=`echo Xt'_'XtAppInitialize | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 13496 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char XtAppInitialize();
+
+int main() {
+XtAppInitialize()
+; return 0; }
+EOF
+if { (eval echo configure:13507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ cat >> confdefs.h <<\EOF
+#define HAVE_LIBXT 1
+EOF
+
+ cf_have_X_LIBS=Xt
+ LIBS="-lXt $X_PRE_LIBS $LIBS"
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+else
+ LDFLAGS="$LDFLAGS $X_LIBS"
+ CFLAGS="$CFLAGS $X_CFLAGS"
+fi
+
+if test $cf_have_X_LIBS = no ; then
+ echo "configure: warning: Unable to successfully link X Toolkit library (-lXt) with
+test program. You will have to check and add the proper libraries by hand
+to makefile." 1>&2
+fi
+
+
+cf_x_athena=${cf_x_athena-Xaw}
+
+
+# Check whether --with-Xaw3d or --without-Xaw3d was given.
+if test "${with_Xaw3d+set}" = set; then
+ withval="$with_Xaw3d"
+ cf_x_athena=Xaw3d
+fi
+
+
+
+# Check whether --with-neXtaw or --without-neXtaw was given.
+if test "${with_neXtaw+set}" = set; then
+ withval="$with_neXtaw"
+ cf_x_athena=neXtaw
+fi
+
+
+
+echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6
+echo "configure:13564: checking for XextCreateExtension in -lXext" >&5
+ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lXext $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 13572 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char XextCreateExtension();
+
+int main() {
+XextCreateExtension()
+; return 0; }
+EOF
+if { (eval echo configure:13583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ LIBS="-lXext $LIBS"
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+
+cf_x_athena_include=""
+cf_x_athena_lib=""
+
+for cf_path in default \
+ /usr/contrib/X11R6 \
+ /usr/contrib/X11R5 \
+ /usr/lib/X11R5
+do
+
+ if test -z "$cf_x_athena_include" ; then
+ cf_save="$CFLAGS"
+ cf_test=X11/$cf_x_athena/SimpleMenu.h
+ if test $cf_path != default ; then
+ CFLAGS="-I$cf_path/include $cf_save"
+ echo $ac_n "checking for $cf_test in $cf_path""... $ac_c" 1>&6
+echo "configure:13619: checking for $cf_test in $cf_path" >&5
+ else
+ echo $ac_n "checking for $cf_test""... $ac_c" 1>&6
+echo "configure:13622: checking for $cf_test" >&5
+ fi
+ cat > conftest.$ac_ext <<EOF
+#line 13625 "configure"
+#include "confdefs.h"
+
+#include <X11/Intrinsic.h>
+#include <$cf_test>
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:13634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ cf_result=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ cf_result=no
+fi
+rm -f conftest*
+ echo "$ac_t""$cf_result" 1>&6
+ if test "$cf_result" = yes ; then
+ cf_x_athena_include=$cf_path
+ else
+ CFLAGS="$cf_save"
+ fi
+ fi
+
+ for cf_lib in "-l$cf_x_athena -lXmu" "-l${cf_x_athena}_s -lXmu_s"
+ do
+ if test -z "$cf_x_athena_lib" ; then
+ cf_save="$LIBS"
+ cf_test=XawSimpleMenuAddGlobalActions
+ if test $cf_path != default ; then
+ LIBS="-L$cf_path/lib $cf_lib $LIBS"
+ echo $ac_n "checking for $cf_lib in $cf_path""... $ac_c" 1>&6
+echo "configure:13660: checking for $cf_lib in $cf_path" >&5
+ else
+ LIBS="$cf_lib $LIBS"
+ echo $ac_n "checking for $cf_test in $cf_lib""... $ac_c" 1>&6
+echo "configure:13664: checking for $cf_test in $cf_lib" >&5
+ fi
+ cat > conftest.$ac_ext <<EOF
+#line 13667 "configure"
+#include "confdefs.h"
+
+int main() {
+$cf_test()
+; return 0; }
+EOF
+if { (eval echo configure:13674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ cf_result=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ cf_result=no
+fi
+rm -f conftest*
+ echo "$ac_t""$cf_result" 1>&6
+ if test "$cf_result" = yes ; then
+ cf_x_athena_lib="$cf_lib"
+ else
+ LIBS="$cf_save"
+ fi
+ fi
+ done
+done
+
+if test -z "$cf_x_athena_include" ; then
+ echo "configure: warning: Unable to successfully find Athena header files with test program" 1>&2
+fi
+
+if test -z "$cf_x_athena_lib" ; then
+ { echo "configure: error: Unable to successfully link Athena library (-l$cf_x_athena) with test program" 1>&2; exit 1; }
+fi
+
+
+CF_X_ATHENA_LIBS=`echo HAVE_LIB_$cf_x_athena | tr '[a-z]' '[A-Z]'`
+
+cat >> confdefs.h <<EOF
+#define $CF_X_ATHENA_LIBS 1
+EOF
+
+
+
+
+LDFLAGS="$LDFLAGS $X_LIBS"
+CFLAGS="$CFLAGS $X_CFLAGS"
+echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
+echo "configure:13715: checking for XOpenDisplay in -lX11" >&5
+ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 13723 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char XOpenDisplay();
+
+int main() {
+XOpenDisplay()
+; return 0; }
+EOF
+if { (eval echo configure:13734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ LIBS="-lX11 $LIBS"
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+echo $ac_n "checking for XCurses library""... $ac_c" 1>&6
+echo "configure:13755: checking for XCurses library" >&5
+if eval "test \"`echo '$''{'cf_cv_lib_XCurses'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+
+LIBS="-lXCurses $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 13762 "configure"
+#include "confdefs.h"
+
+#include <xcurses.h>
+char *XCursesProgramName = "test";
+
+int main() {
+XCursesExit();
+; return 0; }
+EOF
+if { (eval echo configure:13772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ cf_cv_lib_XCurses=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ cf_cv_lib_XCurses=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$cf_cv_lib_XCurses" 1>&6
+if test $cf_cv_lib_XCurses = yes ; then
+ cat >> confdefs.h <<\EOF
+#define UNIX 1
+EOF
+
+ cat >> confdefs.h <<\EOF
+#define XCURSES 1
+EOF
+
+ cat >> confdefs.h <<\EOF
+#define HAVE_XCURSES 1
+EOF
+
+else
+ { echo "configure: error: Cannot link with XCurses" 1>&2; exit 1; }
+fi
+
+else
+
echo $ac_n "checking if we can include termio.h with curses""... $ac_c" 1>&6
-echo "configure:12236: checking if we can include termio.h with curses" >&5
+echo "configure:13806: checking if we can include termio.h with curses" >&5
if eval "test \"`echo '$''{'cf_cv_termio_and_curses'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -12241,7 +13811,7 @@ else
CFLAGS="$CFLAGS -DHAVE_CONFIG_H -I. -I${srcdir-.} -I${srcdir-.}/src -I${srcdir-.}/WWW/Library/Implementation"
touch lynx_cfg.h
cat > conftest.$ac_ext <<EOF
-#line 12245 "configure"
+#line 13815 "configure"
#include "confdefs.h"
#include <LYCurses.h>
@@ -12250,7 +13820,7 @@ int main() {
putchar(0x0a)
; return 0; }
EOF
-if { (eval echo configure:12254: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13824: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_termio_and_curses=yes
else
@@ -12272,6 +13842,7 @@ test $cf_cv_termio_and_curses = yes && cat >> confdefs.h <<\EOF
EOF
+fi
### Finally, build config.h and the makefiles
CFLAGS="$CFLAGS $EXTRA_CFLAGS"
@@ -12501,6 +14072,10 @@ s%@LYNXCFG_MAKE@%$LYNXCFG_MAKE%g
s%@LYNXCFG_URL@%$LYNXCFG_URL%g
s%@COMPRESS_PROG@%$COMPRESS_PROG%g
s%@COMPRESS_EXT@%$COMPRESS_EXT%g
+s%@X_CFLAGS@%$X_CFLAGS%g
+s%@X_PRE_LIBS@%$X_PRE_LIBS%g
+s%@X_LIBS@%$X_LIBS%g
+s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
s%@CONFIG_SHELL@%$CONFIG_SHELL%g
s%@SRCDIR_CLEAN@%$SRCDIR_CLEAN%g
diff --git a/configure.in b/configure.in
index ba4894eb..80a5ecfd 100644
--- a/configure.in
+++ b/configure.in
@@ -408,7 +408,7 @@ AC_ARG_WITH(screen,
(XXX is curses (default), ncurses or slang)],
[
case $withval in
-curses|ncurses|slang)
+curses|ncurses|pdcurses|slang)
cf_cv_screen=$withval
;;
*) AC_ERROR(Unexpected value)
@@ -416,11 +416,18 @@ curses|ncurses|slang)
esac],
[cf_cv_screen=curses])])
-if test $cf_cv_screen != ncurses ; then
+case $cf_cv_screen in
+ncurses|slang)
+ ;;
+pdcurses)
+ cf_cv_ncurses_header=xcurses.h
+ ;;
+curses)
if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" != set"; then
cf_cv_ncurses_header=curses.h
fi
-fi
+ ;;
+esac
case $cf_cv_screen in
curses)
@@ -431,9 +438,11 @@ ncurses)
CF_NCURSES_CPPFLAGS
CF_NCURSES_LIBS
;;
+pdcurses)
+ # do this last, since it changes definition of main: CF_PDCURSES_X11
+ ;;
slang)
- CF_SLANG_CPPFLAGS
- CF_SLANG_LIBS
+ CF_SLANG_UNIX_DEFS
;;
esac
@@ -929,7 +938,7 @@ AC_MSG_RESULT($use_zlib)
if test ".$use_zlib" != ".no" ; then
AC_MSG_CHECKING(if we need to add -I option to get zlib.h)
- AC_TRY_COMPILE([#include <zlibx.h>],[],[AC_MSG_RESULT(no)],[
+ AC_TRY_COMPILE([#include <zlib.h>],[],[AC_MSG_RESULT(no)],[
AC_MSG_RESULT(yes)
CF_HEADER_PATH(cf_search,zlib)
for cf_incdir in $cf_search
@@ -1057,7 +1066,11 @@ AC_MSG_RESULT($enableval)
dnl --------------------------------------------------------------------------
dnl Test features that rely on configure-definitions
dnl --------------------------------------------------------------------------
-CF_TERMIO_AND_CURSES(LYCurses.h)
+if test $cf_cv_screen = pdcurses ; then
+ CF_PDCURSES_X11
+else
+ CF_TERMIO_AND_CURSES(LYCurses.h)
+fi
### Finally, build config.h and the makefiles
CFLAGS="$CFLAGS $EXTRA_CFLAGS"
diff --git a/README.jp b/docs/README.jp
index b2d5a526..b2d5a526 100644
--- a/README.jp
+++ b/docs/README.jp
diff --git a/makefile.bcb b/makefile.bcb
index 6b5d5c32..8be8ca0c 100644
--- a/makefile.bcb
+++ b/makefile.bcb
@@ -47,13 +47,10 @@ CC_FLAGS = $(DEBUG) \
-DNOSIGHUP \
-DDOSPATH \
-DNOUSERS \
--DEXP_CHARTRANS \
--DNCURSES \
-DFANCY_CURSES \
-DCOLOR_CURSES \
-DUSE_COLOR_TABLE \
-DHAVE_KEYPAD \
--DNCURSES_VERSION \
-DUSE_EXTERNALS \
-DUSE_ZLIB \
-DPDCURSES \
@@ -66,7 +63,7 @@ CC_FLAGS = $(DEBUG) \
-DNO_CONFIG_INFO \
-DEXP_ALT_BINDINGS \
-DSOURCE_CACHE \
--DUSE_PSRC \
+-DUSE_PRETTYSRC \
### Add by Hiroyuki
-DLY_MAXPATH=1024 \
-D_WIN_CC=1 \
diff --git a/makefile.msc b/makefile.msc
index 2e0bd75f..41ef907c 100644
--- a/makefile.msc
+++ b/makefile.msc
@@ -34,13 +34,10 @@ DEFS = $(CS_DEFS) \
/D "DISP_PARTIAL" \
/D "DOSPATH" \
/D "EXP_ALT_BINDINGS" \
- /D "EXP_CHARTRANS" \
/D "EXP_PERSISTENT_COOKIES" \
/D "FANCY_CURSES" \
/D "HAVE_KEYPAD" \
/D "LONG_LIST" \
- /D "NCURSES" \
- /D "NCURSES_VERSION" \
/D "NDEBUG" \
/D "NO_CONFIG_INFO" \
/D "NO_CUSERID" \
@@ -51,11 +48,13 @@ DEFS = $(CS_DEFS) \
/D "NOSIGHUP" \
/D "NOUSERS" \
/D "PDCURSES" \
+ /D "SOURCE_CACHE" \
/D "SH_EX" \
/D "SUPPORT_MULTIBYTE_EDIT" \
/D "USE_COLOR_TABLE" \
/D "USE_EXTERNALS" \
/D "USE_MULTIBYTE_CURSES" \
+ /D "USE_PRETTYSRC" \
/D "USE_ZLIB" \
/D "WIN_EX" \
/D "WIN32" \
@@ -139,6 +138,7 @@ OBJS = $(CS_OBJS) \
"LYMap.obj" \
"LYNews.obj" \
"LYOptions.obj" \
+ "LYPrettySrc.obj" \
"LYPrint.obj" \
"LYrcFile.obj" \
"LYReadCFG.obj" \
@@ -265,6 +265,9 @@ LYNews.obj : $(SRC_DIR)\LYNews.c
LYOptions.obj : $(SRC_DIR)\LYOptions.c
$(COMPILE) $(SRC_DIR)\LYOptions.c
+LYPrettySrc.obj : $(SRC_DIR)\LYPrettySrc.c
+ $(COMPILE) $(SRC_DIR)\LYPrettySrc.c
+
LYPrint.obj : $(SRC_DIR)\LYPrint.c
$(COMPILE) $(SRC_DIR)\LYPrint.c
diff --git a/makelynx.bat b/makelynx.bat
index a02524af..3cbce2a2 100644
--- a/makelynx.bat
+++ b/makelynx.bat
@@ -25,7 +25,6 @@ SET DEFINES=%DEFINES% -D_WIN_CC
SET DEFINES=%DEFINES% -D_WINDOWS
SET DEFINES=%DEFINES% -DDOSPATH
SET DEFINES=%DEFINES% -DEXP_ALT_BINDINGS
-SET DEFINES=%DEFINES% -DEXP_CHARTRANS_AUTOSWITCH
SET DEFINES=%DEFINES% -DEXP_PERSISTENT_COOKIES
SET DEFINES=%DEFINES% -DHAVE_DIRENT_H
SET DEFINES=%DEFINES% -DHAVE_KEYPAD
@@ -40,16 +39,16 @@ SET DEFINES=%DEFINES% -DNOSIGHUP
SET DEFINES=%DEFINES% -DNOUSERS
SET DEFINES=%DEFINES% -DLONG_LIST
SET DEFINES=%DEFINES% -DDISP_PARTIAL
+SET DEFINES=%DEFINES% -DSOURCE_CACHE
+SET DEFINES=%DEFINES% -DUSE_PRETTYSRC
SET DEFINES=%DEFINES% -DVC="2.14FM"
if "%LIBRARY%" == "PDCURSES" goto else1
SET DEFINES=%DEFINES% -DUSE_SLANG
goto endif1
:else1
-SET DEFINES=%DEFINES% -DNCURSES
SET DEFINES=%DEFINES% -DFANCY_CURSES
SET DEFINES=%DEFINES% -DCOLOR_CURSES
SET DEFINES=%DEFINES% -DUSE_COLOR_TABLE
-SET DEFINES=%DEFINES% -DNCURSES_VERSION
SET DEFINES=%DEFINES% -DPDCURSES
SET DEFINES=%DEFINES% -DSUPPORT_MULTIBYTE_EDIT
SET DEFINES=%DEFINES% -DUSE_MULTIBYTE_CURSES
diff --git a/src/LYCurses.c b/src/LYCurses.c
index f74b38b3..5fbd864e 100644
--- a/src/LYCurses.c
+++ b/src/LYCurses.c
@@ -37,6 +37,10 @@ extern int _NOSHARE(COLS);
int lynx_has_color = FALSE;
#endif
+#ifdef HAVE_XCURSES
+char *XCursesProgramName = "Lynx";
+#endif
+
#if defined(USE_COLOR_STYLE) && !USE_COLOR_TABLE
#define COLOR_BKGD ((s_normal != NOSTYLE) ? hashStyles[s_normal].color : A_NORMAL)
#else
@@ -522,15 +526,6 @@ PRIVATE void LYsetWAttr ARGS1(WINDOW *, win)
int code = 0;
int attr = A_NORMAL;
int offs = 1;
- static int NoColorVideo = -1;
-
-#if defined(UNIX) && !defined(PDCURSES)
- if (NoColorVideo < 0) {
- NoColorVideo = tigetnum("ncv");
- }
- if (NoColorVideo < 0)
- NoColorVideo = 0;
-#endif /* UNIX */
if (Current_Attr & A_BOLD)
code |= 1;
@@ -920,6 +915,8 @@ PUBLIC void start_curses NOARGS
PUBLIC void lynx_enable_mouse ARGS1(int,state)
{
+#ifdef USE_MOUSE
+/***********************************************************************/
#if defined(WIN_EX)
/* modify lynx_enable_mouse() for pdcurses configuration so that mouse support
@@ -939,19 +936,20 @@ PUBLIC void lynx_enable_mouse ARGS1(int,state)
if (LYUseMouse == 0)
return;
-#ifdef USE_SLANG_MOUSE
+
+#if defined(USE_SLANG)
SLtt_set_mouse_mode (state, 0);
SLtt_flush_output ();
#else
-#if defined(WIN_EX) && defined(PDCURSES_MOUSE_VERSION)
+#if defined(WIN_EX) && defined(PDCURSES)
if (state)
{
SetConsoleMode(hConIn, ENABLE_MOUSE_INPUT | ENABLE_WINDOW_INPUT);
FlushConsoleInputBuffer(hConIn);
}
#else
-#ifdef NCURSES_MOUSE_VERSION
+#if defined(NCURSES)
if (state) {
/* Compensate for small value of maxclick in ncurses. */
static int was = 0;
@@ -983,17 +981,20 @@ PUBLIC void lynx_enable_mouse ARGS1(int,state)
NULL);
} else
mousemask(0, NULL);
-#endif /* NCURSES_MOUSE_VERSION */
-#endif /* WIN_EX and PDCURSES_MOUSE_VERSION */
+#endif /* NCURSES */
+#endif /* WIN_EX and PDCURSES */
-#if defined(PDCURSES_MOUSE_VERSION)
+#if defined(PDCURSES)
if (state)
mouse_set(
BUTTON1_CLICKED | BUTTON1_PRESSED | BUTTON1_RELEASED |
BUTTON2_CLICKED | BUTTON2_PRESSED | BUTTON2_RELEASED |
BUTTON3_CLICKED | BUTTON3_PRESSED | BUTTON3_RELEASED);
#endif
-#endif /* NOT USE_SLANG_MOUSE */
+#endif /* NOT USE_SLANG */
+
+/***********************************************************************/
+#endif /* USE_MOUSE */
}
PUBLIC void stop_curses NOARGS
diff --git a/src/LYCurses.h b/src/LYCurses.h
index 90dceb70..98ad35cb 100644
--- a/src/LYCurses.h
+++ b/src/LYCurses.h
@@ -6,6 +6,27 @@
#endif
/*
+ * Because we have to configure PDCURSES last, we may get bogus definitions
+ * from the system curses library - cancel these now.
+ */
+#ifdef HAVE_XCURSES
+
+#undef ASSUME_DEFAULT_COLORS
+#undef COLOR_CURSES
+#undef FANCY_CURSES
+#undef HAVE_CBREAK
+#undef HAVE_RESIZETERM
+#undef HAVE_USE_DEFAULT_COLORS
+#undef NCURSES
+#undef USE_DEFAULT_COLORS
+
+#define HAVE_CBREAK 1
+#define COLOR_CURSES 1
+#define FANCY_CURSES 1
+
+#endif
+
+/*
* The simple color scheme maps the 8 combinations of bold/underline/reverse
* to the standard 8 ANSI colors (with some variations based on context).
*/
@@ -90,7 +111,11 @@
# ifdef PDCURSES
# include <pdcurses.h> /* for PDCurses */
# else
-# include <curses.h> /* default */
+# ifdef HAVE_XCURSES
+# include <xcurses.h> /* PDCurses' UNIX port */
+# else
+# include <curses.h> /* default */
+# endif
# endif
# endif
# endif
@@ -124,8 +149,15 @@ extern void LYsubwindow PARAMS((WINDOW * param));
/*
* PDCurses' mouse code does nothing in the DJGPP configuration.
*/
-#if defined(PDCURSES) && !defined(__DJGPP__)
-#define PDCURSES_MOUSE_VERSION 1
+#if defined(PDCURSES) && !defined(__DJGPP__) && !defined(HAVE_XCURSES)
+#define USE_MOUSE 1
+#endif
+
+/*
+ * Pick up the native ncurses name:
+ */
+#if defined(NCURSES_MOUSE_VERSION)
+#define USE_MOUSE 1
#endif
#ifdef VMS
@@ -232,7 +264,7 @@ extern unsigned int Lynx_Color_Flags;
#define SHOW_WHEREIS_TARGETS 1
#if !defined(VMS) && !defined(DJGPP)
-#define USE_SLANG_MOUSE 1
+#define USE_MOUSE 1
#endif
#if !defined(__DJGPP__) && !defined(__CYGWIN__)
diff --git a/src/LYForms.c b/src/LYForms.c
index cbb080bd..3f2538f0 100644
--- a/src/LYForms.c
+++ b/src/LYForms.c
@@ -460,11 +460,13 @@ again:
ch = 7;
}
#endif /* VMS */
-# if defined(NCURSES_MOUSE_VERSION) || defined(PDCURSES_MOUSE_VERSION)
+
+#ifdef USE_MOUSE
+# if defined(NCURSES) || defined(PDCURSES)
if (ch != -1 && (ch & LKC_ISLAC) && !(ch & LKC_ISLECLAC)) /* already lynxactioncode? */
break; /* @@@ maybe move these 2 lines outside ifdef -kw */
if (ch == MOUSE_KEY) { /* Need to process ourselves */
-#if defined(PDCURSES_MOUSE_VERSION)
+#if defined(PDCURSES)
int curx, cury;
request_mouse_pos();
@@ -491,7 +493,7 @@ again:
} else
ch = RTARROW;
}
-#endif /* PDCURSES_MOUSE_VERSION */
+#endif /* PDCURSES */
else {
/* Mouse event passed to us as MOUSE_KEY, and apparently
* not on this field's line? Something is not as it
@@ -504,7 +506,9 @@ again:
}
last_xlkc = -1;
} else
-# endif /* defined NCURSES_MOUSE_VERSION || PDCURSES_MOUSE_VERSION */
+# endif /* NCURSES || PDCURSES */
+#endif /* USE_MOUSE */
+
{
if (!(ch & LKC_ISLECLAC))
ch |= MyEdit.current_modifiers;
@@ -1851,7 +1855,7 @@ restore_popup_statusline:
}
#ifndef USE_SLANG
delwin(form_window);
-#if defined(NCURSES)
+#if defined(NCURSES) || defined(PDCURSES)
LYsubwindow(0);
#endif
#endif /* !USE_SLANG */
diff --git a/src/LYMain.c b/src/LYMain.c
index c0f1fd20..0d82d8cc 100644
--- a/src/LYMain.c
+++ b/src/LYMain.c
@@ -3626,7 +3626,7 @@ treated '>' as a co-terminator for double-quotes and tags"
"underscore", TOGGLE_ARG, &use_underscore,
"toggles use of _underline_ format in dumps"
),
-#if defined(NCURSES_MOUSE_VERSION) || defined(PDCURSES_MOUSE_VERSION) || defined(USE_SLANG_MOUSE)
+#if defined(USE_MOUSE)
PARSE_SET(
"use_mouse", SET_ARG, &LYUseMouse,
"turn on mouse support"
diff --git a/src/LYMainLoop.c b/src/LYMainLoop.c
index a01be1db..040a705d 100644
--- a/src/LYMainLoop.c
+++ b/src/LYMainLoop.c
@@ -452,6 +452,7 @@ PRIVATE void set_curdoc_link ARGS1(
PRIVATE int do_change_link NOARGS
{
+#ifdef USE_MOUSE
/* Is there a mouse-clicked link waiting? */
int mouse_tmp = get_mouse_link();
/* If yes, use it as the link */
@@ -467,6 +468,7 @@ PRIVATE int do_change_link NOARGS
}
set_curdoc_link(mouse_tmp);
}
+#endif /* USE_MOUSE */
return(0); /* indicates OK */
}
diff --git a/src/LYOptions.c b/src/LYOptions.c
index 3f28736e..d1619fc5 100644
--- a/src/LYOptions.c
+++ b/src/LYOptions.c
@@ -28,7 +28,7 @@ BOOLEAN term_options;
PRIVATE void terminate_options PARAMS((int sig));
-#if !defined(NO_OPTION_MENU) || (defined(NCURSES_MOUSE_VERSION) || defined(PDCURSES_MOUSE_VERSION))
+#if !defined(NO_OPTION_MENU) || (defined(USE_MOUSE) && (defined(NCURSES) || defined(PDCURSES)))
#define COL_OPTION_VALUES 36 /* display column where option values start */
#endif
@@ -2138,7 +2138,7 @@ draw_bookmark_list:
signal(SIGINT, cleanup_sig);
}
-#if !defined(NO_OPTION_MENU) || (defined(NCURSES_MOUSE_VERSION) || defined(PDCURSES_MOUSE_VERSION))
+#if !defined(NO_OPTION_MENU) || (defined(USE_MOUSE) && (defined(NCURSES) || defined(PDCURSES)))
/*
** This function prompts for a choice or page number.
** If a 'g' or 'p' suffix is included, that will be
@@ -2384,7 +2384,7 @@ PUBLIC int popup_choice ARGS7(
StrAllocCopy(popup_status_msg, CHOICE_LIST_UNM_MSG);
} else if (!for_mouse) {
StrAllocCopy(popup_status_msg, CHOICE_LIST_MESSAGE);
-#if defined(NCURSES_MOUSE_VERSION) || defined(PDCURSES_MOUSE_VERSION)
+#if defined(USE_MOUSE) && (defined(NCURSES) || defined(PDCURSES))
} else {
StrAllocCopy(popup_status_msg, gettext(
"Left mouse button or return to select, arrow keys to scroll."));
@@ -3148,7 +3148,7 @@ restore_popup_statusline:
#ifndef USE_SLANG
touchwin(stdscr);
delwin(form_window);
-#ifdef NCURSES
+#if defined(NCURSES) || defined(PDCURSES)
LYsubwindow(0);
#endif
#endif /* !USE_SLANG */
diff --git a/src/LYReadCFG.c b/src/LYReadCFG.c
index a2e66a87..772bb7ee 100644
--- a/src/LYReadCFG.c
+++ b/src/LYReadCFG.c
@@ -1563,7 +1563,7 @@ static Config_Type Config_Table [] =
#ifdef VMS
PARSE_SET("use_fixed_records", CONF_BOOL, &UseFixedRecords),
#endif
-#if defined(NCURSES_MOUSE_VERSION) || defined(PDCURSES_MOUSE_VERSION) || defined(USE_SLANG_MOUSE)
+#if defined(USE_MOUSE)
PARSE_SET("use_mouse", CONF_BOOL, &LYUseMouse),
#endif
PARSE_SET("use_select_popups", CONF_BOOL, &LYSelectPopups),
diff --git a/src/LYStrings.c b/src/LYStrings.c
index d617f921..65ecc5b6 100644
--- a/src/LYStrings.c
+++ b/src/LYStrings.c
@@ -15,7 +15,7 @@
#include <HTString.h>
#include <LYCharUtils.h>
#include <HTParse.h>
-#if defined(NCURSES_MOUSE_VERSION) || defined(PDCURSES_MOUSE_VERSION) || defined(USE_SLANG_MOUSE)
+#ifdef USE_MOUSE
#include <LYMainLoop.h>
#endif
@@ -74,14 +74,14 @@ static int mouse_link = -1;
static int have_levent;
-#if defined(NCURSES_MOUSE_VERSION)
+#if defined(USE_MOUSE) && defined(NCURSES)
static MEVENT levent;
#endif
/* Return the value of mouse_link */
PUBLIC int peek_mouse_levent NOARGS
{
-#if defined(NCURSES_MOUSE_VERSION)
+#if defined(USE_MOUSE) && defined(NCURSES)
if (have_levent > 0) {
ungetmouse(&levent);
have_levent--;
@@ -108,14 +108,17 @@ PUBLIC int peek_mouse_link NOARGS
return mouse_link;
}
+
PUBLIC int fancy_mouse ARGS3(
WINDOW *, win,
int, row,
int *, position)
{
int cmd = LYK_DO_NOTHING;
+#ifdef USE_MOUSE
+/*********************************************************************/
-#if defined(WIN_EX) && defined(PDCURSES_MOUSE_VERSION)
+#if defined(WIN_EX) && defined(PDCURSES)
request_mouse_pos();
@@ -171,7 +174,7 @@ PUBLIC int fancy_mouse ARGS3(
cmd = LYK_QUIT;
}
#else
-#if defined(NCURSES_MOUSE_VERSION)
+#if defined(NCURSES)
MEVENT event;
getmouse(&event);
@@ -252,11 +255,15 @@ PUBLIC int fancy_mouse ARGS3(
} else if (event.bstate & (BUTTON3_CLICKED | BUTTON3_DOUBLE_CLICKED | BUTTON3_TRIPLE_CLICKED)) {
cmd = LYK_QUIT;
}
-#endif /* defined(NCURSES_MOUSE_VERSION) */
+#endif /* NCURSES */
#endif /* _WINDOWS */
+
+/************************************************************************/
+#endif /* USE_MOUSE */
return cmd;
}
+
PRIVATE int XYdist ARGS5(
int, x1,
int, y1,
@@ -642,7 +649,7 @@ PUBLIC int LYmbcsstrlen ARGS3(
#endif /* HAVE_KEYPAD */
#endif /* !defined(GetChar) */
-#if defined(NCURSES)
+#if defined(NCURSES) || defined(PDCURSES)
/*
* Workaround a bug in ncurses order-of-refresh by setting a pointer to
* the topmost window that should be displayed.
@@ -661,7 +668,8 @@ PUBLIC void LYsubwindow ARGS1(WINDOW *, param)
}
#endif
-#ifdef USE_SLANG_MOUSE
+
+#if defined(USE_SLANG) && defined(USE_MOUSE)
PRIVATE int sl_parse_mouse_event ARGS3(int *, x, int *, y, int *, button)
{
/* "ESC [ M" has already been processed. There more characters are
@@ -719,7 +727,8 @@ PRIVATE int sl_read_mouse_event ARGS1(
else
return -1;
}
-#endif
+#endif /* USE_SLANG and USE_MOUSE */
+
PRIVATE BOOLEAN csi_is_csi = TRUE;
PUBLIC void ena_csi ARGS1(
@@ -1263,7 +1272,8 @@ PUBLIC int lynx_initialize_keymaps NOARGS
#endif /* USE_KEYMAPS */
-#if defined(NCURSES_MOUSE_VERSION) || defined(PDCURSES_MOUSE_VERSION)
+
+#if defined(USE_MOUSE) && (defined(NCURSES) || defined(PDCURSES))
PRIVATE int LYmouse_menu ARGS4(int, x, int, y, int, atlink, int, code)
{
static char *choices[] = {
@@ -1395,9 +1405,11 @@ PRIVATE int LYmouse_menu ARGS4(int, x, int, y, int, atlink, int, code)
}
return retlac;
}
-#endif /* NCURSES_MOUSE_VERSION */
+#endif /* USE_MOUSE && (NCURSES || PDCURSES) */
+
#if defined(USE_KEYMAPS) && defined(USE_SLANG)
+/************************************************************************/
PRIVATE int current_sl_modifier = 0;
@@ -1423,7 +1435,7 @@ PUBLIC int LYgetch_for ARGS1(
keysym = key->f.keysym;
-#if defined (USE_SLANG_MOUSE)
+#if defined (USE_MOUSE)
if (keysym == MOUSE_KEYSYM)
return sl_read_mouse_event (code);
#endif
@@ -1446,8 +1458,10 @@ PUBLIC int LYgetch_for ARGS1(
return (keysym|current_sl_modifier);
}
+/************************************************************************/
#else /* NOT defined(USE_KEYMAPS) && defined(USE_SLANG) */
+
/*
* LYgetch() translates some escape sequences and may fake noecho.
*/
@@ -1464,7 +1478,7 @@ PUBLIC int LYgetch_for ARGS1(
#if defined(IGNORE_CTRL_C) || defined(USE_GETCHAR) || !defined(NCURSES) || \
(HAVE_KEYPAD && defined(KEY_RESIZE)) || \
- (defined(NCURSES_MOUSE_VERSION) && !defined(DOSPATH))
+ (defined(NCURSES) && defined(USE_MOUSE) && !defined(DOSPATH))
re_read:
#endif /* IGNORE_CTRL_C || USE_GETCHAR etc. */
#if !defined(UCX) || !defined(VAXC) /* errno not modifiable ? */
@@ -1616,7 +1630,7 @@ re_read:
case 'w': c = HOME; break; /* keypad on pc ncsa telnet */
case 'q': c = END_KEY; break; /* keypad on pc ncsa telnet */
case 'M':
-#ifdef USE_SLANG_MOUSE
+#if defined(USE_SLANG) && defined(USE_MOUSE)
if (found_CSI(c,b))
{
c = sl_read_mouse_event (code);
@@ -1813,6 +1827,7 @@ re_read:
case KEY_LL: /* home down or bottom (lower left) */
c = END_KEY;
break;
+#if defined(KEY_A1) && defined(KEY_C3)
/* The keypad is arranged like this:*/
/* a1 up a3 */
/* left b2 right */
@@ -1832,6 +1847,7 @@ re_read:
case KEY_C3: /* lower right of keypad */
c = PGDOWN;
break;
+#endif /* defined(KEY_A1) && defined(KEY_C3) */
#ifdef KEY_ENTER
case KEY_ENTER: /* enter/return */
c = '\n';
@@ -1954,13 +1970,17 @@ re_read:
c = 0x218;
break;
#endif /* PDCurses */
-#if defined(NCURSES_MOUSE_VERSION) || defined(PDCURSES_MOUSE_VERSION)
+
+#if defined(USE_MOUSE)
+/********************************************************************/
+
+#if defined(NCURSES) || defined(PDCURSES)
case KEY_MOUSE:
CTRACE((tfp, "KEY_MOUSE\n"));
if (code == FOR_CHOICE) {
c = MOUSE_KEY; /* Will be processed by the caller */
}
-#if defined(NCURSES_MOUSE_VERSION)
+#if defined(NCURSES)
else if (code == FOR_SINGLEKEY) {
MEVENT event;
getmouse(&event); /* Completely ignore event - kw */
@@ -1968,7 +1988,7 @@ re_read:
}
#endif
else {
-#if defined(NCURSES_MOUSE_VERSION)
+#if defined(NCURSES)
MEVENT event;
int err;
int lac = LYK_UNKNOWN;
@@ -2150,7 +2170,11 @@ re_read:
return(c);
}
break;
-#endif /* NCURSES_MOUSE_VERSION */
+#endif /* NCURSES || PDCURSES */
+
+/********************************************************************/
+#endif /* USE_MOUSE */
+
}
#endif /* HAVE_KEYPAD */
#ifdef DJGPP_KEYHANDLER
@@ -2269,8 +2293,10 @@ re_read:
}
}
+/************************************************************************/
#endif /* NOT defined(USE_KEYMAPS) && defined(USE_SLANG) */
+
PUBLIC int LYgetch NOARGS
{
return LYgetch_for(FOR_PANEL);
diff --git a/src/LYUtils.c b/src/LYUtils.c
index 7b652d1d..6dbf737f 100644
--- a/src/LYUtils.c
+++ b/src/LYUtils.c
@@ -2300,14 +2300,14 @@ PUBLIC int HTCheckForInterrupt NOARGS
#endif /* USE_SLANG */
#endif /* !_WINDOWS */
-#if defined (DOSPATH) && defined (NCURSES)
+#if defined(PDCURSES)
nodelay(stdscr,TRUE);
#endif /* DOSPATH */
/*
* 'c' contains whatever character we're able to read from keyboard
*/
c = LYgetch();
-#if defined (DOSPATH) && defined (NCURSES)
+#if defined(PDCURSES)
nodelay(stdscr,FALSE);
#endif /* DOSPATH */
diff --git a/userdefs.h b/userdefs.h
index 6750c2f2..e0bd3895 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1339,12 +1339,12 @@
* the version definition with the Project Version on checkout. Just
* ignore it. - kw */
/* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
-#define LYNX_VERSION "2.8.3pre.2"
+#define LYNX_VERSION "2.8.3pre.3"
#define LYNX_WWW_HOME "http://lynx.browser.org/"
#define LYNX_WWW_DIST "http://lynx.isc.org/current/"
#define LYNX_RELEASE FALSE
/* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
-#define LYNX_DATE "Sun, 02 Apr 2000 19:44:01 -0700"
+#define LYNX_DATE "Thu, 06 Apr 2000 18:18:53 -0700"
#define LYNX_DATE_OFF 5 /* truncate the automatically-generated date */
#define LYNX_DATE_LEN 11 /* truncate the automatically-generated date */
#define LYNX_RELEASE_DATE "1999"