diff options
| author | Joshua Judson Rosen | 2017-03-31 05:28:00 -0400 |
|---|---|---|
| committer | Joshua Judson Rosen | 2017-04-01 16:01:10 -0400 |
| commit | 582d3bf96bc0ff3e3b242536d2433a8ed8d01e40 (patch) | |
| tree | eb4fbff18395ca0e9e90250c00a4e62847912dbc | |
| parent | configure: check for GLib from beyond the g_type_init era (diff) | |
| download | gnurobots-582d3bf96bc0ff3e3b242536d2433a8ed8d01e40.tar.gz | |
Drop undocumented readline dependency
Yet another of the niceties that comes out of just using guile's REPL
is that readline support is just figured out when building guile;
so by the time gnurobots is being built, readline support is either
there or it isn't--and even if our guile isn't readline-enabled,
we can still just run without readline (though, in practice,
I don't think I've ever seen a build of guile in the last 15 years
that didn't have readline...).
| -rw-r--r-- | configure.ac | 24 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/ui-cmdwin.c | 2 |
3 files changed, 2 insertions, 28 deletions
diff --git a/configure.ac b/configure.ac index 26ffaa1..d102a3f 100644 --- a/configure.ac +++ b/configure.ac @@ -39,30 +39,6 @@ AC_SUBST(schemedir) mapsdir="\$(pkgdatadir)/maps" AC_SUBST(mapsdir) -for termlib in ncurses curses termcap terminfo termlib ; do - AC_CHECK_LIB(${termlib}, tgoto, - [READLINE_EXTRA="-l${termlib}"; break]) -done - -AC_CHECK_LIB(readline,readline,[READLINE_LIBS=-lreadline], - AC_MSG_ERROR([ - -You need the GNU Readline library to build this program. - -]),[$READLINE_EXTRA]) - -AC_CHECK_HEADER(readline/readline.h, - [READLINE_CFLAGS=-I/usr/include/readline/], AC_MSG_ERROR([ - -You need the GNU Readline headers to build this program. - -])) - -READLINE_LIBS="$READLINE_LIBS $READLINE_EXTRA" - -AC_SUBST(READLINE_LIBS) -AC_SUBST(READLINE_CFLAGS) - dnl Checks for header files. AC_HEADER_STDC AC_CHECK_HEADERS(unistd.h) diff --git a/src/Makefile.am b/src/Makefile.am index 75f16de..4900c93 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,7 +19,7 @@ bin_PROGRAMS = gnurobots AM_CFLAGS = -pedantic-errors -Werror -Wall -INCLUDES = $(GUILE_CFLAGS) $(READLINE_CFLAGS) $(GTK2_CFLAGS) \ +INCLUDES = $(GUILE_CFLAGS) $(GTK2_CFLAGS) \ $(VTE_CFLAGS) $(GTHREAD2_CFLAGS) \ -I$(top_builddir)/include \ -DPKGLIBDIR=\"$(pkglibdir)\" \ @@ -30,5 +30,5 @@ INCLUDES = $(GUILE_CFLAGS) $(READLINE_CFLAGS) $(GTK2_CFLAGS) \ gnurobots_SOURCES = main.c api.c map.c grobot.c \ ui-window.c ui-cmdwin.c ui-arena.c -gnurobots_LDFLAGS = $(GUILE_LDFLAGS) $(READLINE_LIBS) $(GTHREAD2_LIBS) \ +gnurobots_LDFLAGS = $(GUILE_LDFLAGS) $(GTHREAD2_LIBS) \ $(GTK2_LIBS) $(VTE_LIBS) -lutil diff --git a/src/ui-cmdwin.c b/src/ui-cmdwin.c index 003b845..f48e72f 100644 --- a/src/ui-cmdwin.c +++ b/src/ui-cmdwin.c @@ -22,8 +22,6 @@ #include <pty.h> #include <vte/vte.h> -#include <readline/readline.h> -#include <history.h> struct _UICmdWinPrivate { |