From bf09a79a00c99c715e7fbc65bf50634704c4233b Mon Sep 17 00:00:00 2001 From: Pierre Habouzit Date: Sat, 11 Nov 2006 14:24:32 +0100 Subject: [PATCH] we don't use the libutil anymore ! Signed-off-by: Pierre Habouzit --- configure.ac | 8 -------- demo/Makefile | 2 +- demo/boxshell.c | 2 +- madtty/madtty.c | 9 +-------- 4 files changed, 3 insertions(+), 18 deletions(-) diff --git a/configure.ac b/configure.ac index 9c997d2..a4906fe 100644 --- a/configure.ac +++ b/configure.ac @@ -24,14 +24,6 @@ if test "${enable_curses}" != "no"; then CFLAGS="$CFLAGS -DUSE_NCURSES" fi -AC_ARG_ENABLE([pty], - AS_HELP_STRING([--disable-pty], [disables pty support (default enabled)])) -if test "${enable_pty}" != "no"; then - AC_CHECK_LIB([util], [forkpty], [], - AC_MSG_ERROR([Need util library (forkpty function) to compile pty support.])) - CFLAGS="$CFLAGS -DUSE_PTY" -fi - dnl Checks for library functions AC_CHECK_FUNCS([memset select setenv]) AC_FUNC_MALLOC diff --git a/demo/Makefile b/demo/Makefile index eb7c01a..0783b00 100644 --- a/demo/Makefile +++ b/demo/Makefile @@ -4,7 +4,7 @@ include $(DEPTH)/am/header.mk bin_PROGRAMS = boxshell boxshell_SOURCES = boxshell.c -boxshell_LDFLAGS = -L../madtty -lmadtty -lncurses -lutil +boxshell_LDFLAGS = -L../madtty -lmadtty -lncurses boxshell_CPPFLAGS = -Wno-error include $(DEPTH)/am/footer.mk diff --git a/demo/boxshell.c b/demo/boxshell.c index 42c2579..a1d1fa8 100644 --- a/demo/boxshell.c +++ b/demo/boxshell.c @@ -72,7 +72,7 @@ int main(int argc, char *argv[]) /* create a window with a frame */ term_win = newwin(h + 2, w + 2, 1, 2); wattrset(term_win, COLOR_PAIR(7*8+7-0)); /* black over white */ - wborder(term_win, ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '); + wborder(term_win, '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0'); mvwprintw(term_win, 0, 27, " Term In a Box "); wrefresh(term_win); diff --git a/madtty/madtty.c b/madtty/madtty.c index 13f6026..f76e743 100644 --- a/madtty/madtty.c +++ b/madtty/madtty.c @@ -22,11 +22,9 @@ #include #include #include -#ifdef USE_PTY -#include -#endif #include #include +#include #include "madtty.h" #include "roteprivate.h" @@ -213,9 +211,6 @@ run_process(const char *path, const char **argv, int *fd_ptr, int *pid_ptr) return 0; } - -#ifdef USE_PTY - pid_t rote_vt_forkpty(RoteTerm *rt, const char *path, const char *argv[]) { struct winsize ws; @@ -240,8 +235,6 @@ void rote_vt_forsake_child(RoteTerm *rt) rt->childpid = 0; } -#endif - void rote_vt_update(RoteTerm *rt) { char buf[512]; -- 2.20.1