Commit adcb1e06 authored by Jason Molenda's avatar Jason Molenda
Browse files

1998-12-30 Jason Molenda (jsm@bugshack.cygnus.com)

        * utils.c: <readline/readline.h> instead of "readline/readline.h".

        * configure.in (TERM_LIB): Search for the appropriate term library
        on the host system.
        * configure: Regenerated.
        * Makefile.in (TERMCAP): Set based on autoconf check.
        * config/*/*.mh: Don't override TERMCAP setting.
parent 1b0df0ad
1998-12-30 Jason Molenda (jsm@bugshack.cygnus.com)
* utils.c: <readline/readline.h> instead of "readline/readline.h".
* configure.in (TERM_LIB): Search for the appropriate term library
on the host system.
* configure: Regenerated.
* Makefile.in (TERMCAP): Set based on autoconf check.
* config/*/*.mh: Don't override TERMCAP setting.
Wed Dec 30 17:23:14 1998 Mark Alexander <marka@cygnus.com>
* value.c (value_virtual_fn_field): Handle the situation where
......
......@@ -59,7 +59,7 @@ WINDRES = @WINDRES@
# Flags that describe where you can find the termcap library.
# This can be overridden in the host Makefile fragment file.
TERMCAP = -ltermcap
TERMCAP = @TERM_LIB@
# If you are compiling with GCC, make sure that either 1) You have the
# fixed include files where GCC can reach them, or 2) You use the
......
......@@ -6,7 +6,5 @@ XDEPFILES=
NAT_FILE= nm-i386aix.h
NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o i386aix-nat.o
TERMCAP=-lcurses
# Use gcc. Only coff output can be debugged
CC=gcc
......@@ -7,8 +7,3 @@ XM_CLIBS= -lsocket -lnsl
NAT_FILE= nm-i386v4.h
NATDEPFILES= corelow.o core-regset.o solib.o procfs.o fork-child.o i386v4-nat.o
# SVR4 comes standard with terminfo, and in some implementations, the
# old termcap descriptions are incomplete. So ensure that we use the
# new terminfo interface and latest terminal descriptions.
TERMCAP=-lcurses
......@@ -13,6 +13,5 @@ $(XDEPFILES):
$(MAKE) $(FLAGS_TO_PASS) all )
XM_FILE=xm-windows.h
TERMCAP=
MMALLOC=
SER_HARDWIRE =
......@@ -5,5 +5,3 @@ XDEPFILES=
NAT_FILE= nm-dpx2.h
NATDEPFILES= infptrace.o corelow.o core-aout.o inftarg.o dpx2-nat.o fork-child.o
TERMCAP=-lcurses
......@@ -5,8 +5,3 @@ XDEPFILES=
NAT_FILE= nm-sysv4.h
NATDEPFILES= corelow.o core-regset.o solib.o procfs.o fork-child.o
# SVR4 comes standard with terminfo, and in some implementations, the
# old termcap descriptions are incomplete. So ensure that we use the
# new terminfo interface and latest terminal descriptions.
TERMCAP=-ltermlib
# Host: Hewlett-Packard PA-RISC machine, running HPUX
# Some versions of HPUX (10.10 for example) have a libcurses.a that contains a broken
# select(), which if linked into gdb ahead of libc, will cause gdb to core dump on
# startup. As a workaround, always link libc first when using libcurses.
TERMCAP = -lc -lcurses
XM_FILE= xm-hppah.h
XDEPFILES= ser-tcp.o
......
MH_CFLAGS=
XM_FILE=xm-cygwin.h
XDEP_FILES=ser-tcp.o
TERMCAP=
NATDEPFILES=win32-nat.o
XM_CLIBS=-lkernel32
......@@ -7,11 +7,6 @@ XM_CLIBS= -lsocket -lnsl
NAT_FILE= nm-solaris.h
NATDEPFILES= corelow.o core-sol2.o solib.o procfs.o fork-child.o
# SVR4 comes standard with terminfo, and in some implementations, the
# old termcap descriptions are incomplete. So ensure that we use the
# new terminfo interface and latest terminal descriptions.
TERMCAP=-ltermlib
# If you are compiling with Sun's compiler, add the -xs option to CC
# (e.g. `make CC="cc -xs"').
# Sun's compilers require the -xs option to produce debug information
......
......@@ -7,11 +7,6 @@ XM_CLIBS= -lsocket -lnsl
NAT_FILE= nm-sun4sol2.h
NATDEPFILES= corelow.o core-sol2.o solib.o procfs.o fork-child.o
# SVR4 comes standard with terminfo, and in some implementations, the
# old termcap descriptions are incomplete. So ensure that we use the
# new terminfo interface and latest terminal descriptions.
TERMCAP=-ltermlib
# If you are compiling with Sun's compiler, add the -xs option to CC
# (e.g. `make CC="cc -xs"').
# Sun's compilers require the -xs option to produce debug information
......
This diff is collapsed.
......@@ -120,6 +120,21 @@ dnl under Solaris 2.6 because it is some funky empty library.
dnl So only link in libw if we have to.
AC_CHECK_LIB(c, wctype,: ,AC_CHECK_LIB(w, wctype))
dnl Figure out which term library to use.
TERM_LIB=
AC_CHECK_LIB(ncurses, tgetent, TERM_LIB=-lncurses,
AC_CHECK_LIB(termlib, tgetent, TERM_LIB=-ltermlib,
AC_CHECK_LIB(termcap, tgetent, TERM_LIB=-ltermcap,
AC_CHECK_LIB(curses, tgetent, TERM_LIB=-lcurses,
AC_CHECK_LIB(terminfo, tgetent, TERM_LIB=-lterminfo)))))
if test "x$TERM_LIB" = x
then
AC_MSG_ERROR(Could not find a term library, e.g. termcap or termlib!)
fi
AC_SUBST(TERM_LIB)
dnl See if compiler supports "long long" type.
AC_MSG_CHECKING(for long long support in compiler)
......
......@@ -46,7 +46,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "language.h"
#include "annotate.h"
#include "readline/readline.h"
#include <readline/readline.h>
/* readline defines this. */
#undef savestring
......
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