Commit c5a68906 authored by Glenn Morris's avatar Glenn Morris
Browse files

Auto-commit of generated files.

parent 01d972a9
...@@ -14265,68 +14265,76 @@ done ...@@ -14265,68 +14265,76 @@ done
# It's better to believe a function is not available # It's better to believe a function is not available
# than to expect to find it in ncurses. # than to expect to find it in ncurses.
# Also we need tputs and friends to be able to build at all. # Also we need tputs and friends to be able to build at all.
have_tputs_et_al=true
# Maybe curses should be tried earlier?
# See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9736#35
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tputs" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tputs" >&5
$as_echo_n "checking for library containing tputs... " >&6; } $as_echo_n "checking for library containing tputs... " >&6; }
if test "${ac_cv_search_tputs+set}" = set; then : # Run a test program that contains a call to tputs, a call that is
$as_echo_n "(cached) " >&6 # never executed. This tests whether a pre-'main' dynamic linker
else # works with the library. It's too much trouble to actually call
ac_func_search_save_LIBS=$LIBS # tputs in the test program, due to portability hassles. When
cat confdefs.h - <<_ACEOF >conftest.$ac_ext # cross-compiling, assume the test program will run if it links.
/* end confdefs.h. */
   
/* Override any GCC internal prototype to avoid an error. # Maybe curses should be tried earlier?
Use char because int might match the return type of a GCC # See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9736#35
builtin and then its argument prototype would still apply. */ for tputs_library in '' ncurses terminfo termcap curses; do
#ifdef __cplusplus OLIBS=$LIBS
extern "C" if test -z "$tputs_library"; then
#endif LIBS_TERMCAP=
char tputs (); msg='none required'
int
main ()
{
return tputs ();
;
return 0;
}
_ACEOF
for ac_lib in '' ncurses terminfo termcap curses; do
if test -z "$ac_lib"; then
ac_res="none required"
else else
ac_res=-l$ac_lib LIBS_TERMCAP=-l$tputs_library
LIBS="-l$ac_lib $ac_func_search_save_LIBS" msg=$LIBS_TERMCAP
LIBS="$LIBS_TERMCAP $LIBS"
fi fi
if ac_fn_c_try_link "$LINENO"; then : if test "$cross_compiling" = yes; then :
ac_cv_search_tputs=$ac_res cat confdefs.h - <<_ACEOF >conftest.$ac_ext
fi /* end confdefs.h. */
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext extern void tputs (const char *, int, int (*)(int));
if test "${ac_cv_search_tputs+set}" = set; then : int main (int argc, char **argv)
break {
fi if (argc == 10000)
done tputs (argv[0], 0, 0);
if test "${ac_cv_search_tputs+set}" = set; then : return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
   
else else
ac_cv_search_tputs=no msg=no
fi fi
rm conftest.$ac_ext rm -f core conftest.err conftest.$ac_objext \
LIBS=$ac_func_search_save_LIBS conftest$ac_exeext conftest.$ac_ext
fi else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_tputs" >&5 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
$as_echo "$ac_cv_search_tputs" >&6; } /* end confdefs.h. */
ac_res=$ac_cv_search_tputs
if test "$ac_res" != no; then : extern void tputs (const char *, int, int (*)(int));
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" int main (int argc, char **argv)
{
if (argc == 10000)
tputs (argv[0], 0, 0);
return 0;
}
_ACEOF
if ac_fn_c_try_run "$LINENO"; then :
   
else else
have_tputs_et_al=false msg=no
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi fi
   
if test "$have_tputs_et_al" != true; then LIBS=$OLIBS
if test "X$msg" != Xno; then
break
fi
done
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $msg" >&5
$as_echo "$msg" >&6; }
if test "X$msg" = Xno; then
as_fn_error "The required function \`tputs' was not found in any library. as_fn_error "The required function \`tputs' was not found in any library.
These libraries were tried: libncurses, libterminfo, libtermcap, libcurses. These libraries were tried: libncurses, libterminfo, libtermcap, libcurses.
Please try installing whichever of these libraries is most appropriate Please try installing whichever of these libraries is most appropriate
...@@ -14346,7 +14354,6 @@ HAVE_LIBNCURSES=yes ...@@ -14346,7 +14354,6 @@ HAVE_LIBNCURSES=yes
## freebsd < 40000, ms-w32, msdos, netbsd < 599002500, and ## freebsd < 40000, ms-w32, msdos, netbsd < 599002500, and
## darwin|gnu without ncurses. ## darwin|gnu without ncurses.
TERMINFO=no TERMINFO=no
LIBS_TERMCAP=
case "$opsys" in case "$opsys" in
## cygwin: Fewer environment variables to go wrong, more terminal types. ## cygwin: Fewer environment variables to go wrong, more terminal types.
## hpux10-20: Use the system provided termcap(3) library. ## hpux10-20: Use the system provided termcap(3) library.
...@@ -14435,10 +14442,6 @@ if test $TERMINFO = yes; then ...@@ -14435,10 +14442,6 @@ if test $TERMINFO = yes; then
   
$as_echo "#define TERMINFO 1" >>confdefs.h $as_echo "#define TERMINFO 1" >>confdefs.h
   
## Default used to be -ltermcap. Add a case above if need something else.
test "x$LIBS_TERMCAP" = "x" && LIBS_TERMCAP="-lcurses"
TERMCAP_OBJ=terminfo.o TERMCAP_OBJ=terminfo.o
fi fi
   
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment