Subject: Problems building -current as of 19 May
To: None <current-users@sun-lamp.cs.berkeley.edu>
From: Noel Cragg <noel@cs.oberlin.edu>
List: current-users
Date: 05/20/1994 07:00:08
I encountered a problems when building the current source because the
Makefile for sh didn't have libedit in its list of directories to
include.  Also, I added a few #if statements to the code to get it to
work correctly for the version compiled with NO_HISTORY (specifically
in the arch/i386/floppy directory).  Patches follow.



./bin/sh/eval.c
*** ./bin/sh/eval.c.orig	Fri May 20 07:32:14 1994
--- ./bin/sh/eval.c	Fri May 20 07:32:41 1994
***************
*** 60,66 ****
--- 60,68 ----
  #include "memalloc.h"
  #include "error.h"
  #include "mystring.h"
+ #ifndef NO_HISTORY
  #include "myhistedit.h"
+ #endif
  #include <signal.h>
  #include <unistd.h>
  
./bin/sh/input.c
*** ./bin/sh/input.c.orig	Fri May 20 07:32:50 1994
--- ./bin/sh/input.c	Fri May 20 07:36:41 1994
***************
*** 55,61 ****
--- 55,63 ----
  #include "error.h"
  #include "alias.h"
  #include "parser.h"
+ #ifndef NO_HISTORY
  #include "myhistedit.h"
+ #endif
  
  #define EOF_NLEFT -99		/* value of parsenleft when EOF pushed back */
  
***************
*** 96,102 ****
--- 98,106 ----
  int init_editline = 0;		/* editline library initialized? */
  int whichprompt;		/* 1 == PS1, 2 == PS2 */
  
+ #ifndef NO_HISTORY
  EditLine *el;			/* cookie for editline package */
+ #endif
  
  #ifdef __STDC__
  STATIC void pushfile(void);
./bin/sh/parser.c
*** ./bin/sh/parser.c.orig	Fri May 20 07:33:21 1994
--- ./bin/sh/parser.c	Fri May 20 07:37:50 1994
***************
*** 52,59 ****
  #include "memalloc.h"
  #include "mystring.h"
  #include "alias.h"
  #include "myhistedit.h"
! 
  
  /*
   * Shell command parser.
--- 52,60 ----
  #include "memalloc.h"
  #include "mystring.h"
  #include "alias.h"
+ #ifndef NO_HISTORY
  #include "myhistedit.h"
! #endif
  
  /*
   * Shell command parser.
***************
*** 1339,1345 ****
--- 1340,1348 ----
  	{
  	whichprompt = which;
  
+ #ifndef NO_HISTORY
  	if (!el)
+ #endif
  		out2str(getprompt(NULL));
  }
  
./bin/sh/Makefile
*** ./bin/sh/Makefile.orig	Fri May 20 07:58:20 1994
--- ./bin/sh/Makefile	Fri May 20 07:58:46 1994
***************
*** 9,15 ****
  LDADD+=	-ll -ledit -ltermcap
  DPADD+=	${LIBL} ${LIBEDIT} ${LIBTERMCAP}
  LFLAGS= -8	# 8-bit lex scanner for arithmetic
! CFLAGS+=-DSHELL -I. -I${.CURDIR}
  .PATH:	${.CURDIR}/bltin ${.CURDIR}/../../usr.bin/printf
  CLEANFILES+=\
  	builtins.c builtins.h init.c mkinit mknodes mksyntax \
--- 9,15 ----
  LDADD+=	-ll -ledit -ltermcap
  DPADD+=	${LIBL} ${LIBEDIT} ${LIBTERMCAP}
  LFLAGS= -8	# 8-bit lex scanner for arithmetic
! CFLAGS+=-DSHELL -I. -I${.CURDIR} -I../../lib/libedit
  .PATH:	${.CURDIR}/bltin ${.CURDIR}/../../usr.bin/printf
  CLEANFILES+=\
  	builtins.c builtins.h init.c mkinit mknodes mksyntax \

-- 
Noel Cragg \\ 283 North Main Street \\ Oberlin OH 44074-1119 \\ 216/774-3140
                 noel@cs.oberlin.edu \\ noel@gnu.ai.mit.edu

-- 
Noel Cragg \\ 283 North Main Street \\ Oberlin OH 44074-1119 \\ 216/774-3140
                 noel@cs.oberlin.edu \\ noel@gnu.ai.mit.edu

-- 
Noel Cragg \\ 283 North Main Street \\ Oberlin OH 44074-1119 \\ 216/774-3140
                 noel@cs.oberlin.edu \\ noel@gnu.ai.mit.edu

------------------------------------------------------------------------------