Fixed to build with new SRE regexp code.

-Olin

Makefile.in

@@ -113,16 +113,15 @@ SCSHOBJS = \
 	scsh/network.o scsh/network1.o \
 	scsh/putenv.o \
 	scsh/rdelim.o \
-	scsh/re.o scsh/re1.o \
+	scsh/rx/re-low.o scsh/rx/re1.o \
-	scsh/regexp/regexp.o \
-	scsh/regexp/regsub.o \
 	scsh/select.o scsh/select1.o \
 	scsh/sleep1.o \
 	scsh/syscalls.o scsh/syscalls1.o \
 	scsh/time.o scsh/time1.o \
 	scsh/tty.o scsh/tty1.o \
 	scsh/userinfo1.o \
-	scsh/sighandlers1.o scsh/sighandlers.o 
+	scsh/sighandlers1.o scsh/sighandlers.o \
+	scsh/regexp/libregex.a
 
 #	scsh/jcontrol2.o scsh/jcontrol1.o \
 #    	scsh/$(DBOPEN) \
@@ -167,12 +166,13 @@ scsh/userinfo1.o: scsh/userinfo1.h
 scsh/fdports1.o	  scsh/fdports.o:  scsh/fdports1.h
 scsh/flock1.o	  scsh/flock.o:	   scsh/flock1.h
 scsh/network1.o	  scsh/network.o:  scsh/network1.h
-scsh/re1.o	  scsh/re.o:	   scsh/re1.h
 scsh/select1.o	  scsh/select.o:   scsh/select1.h
 scsh/syscalls1.o  scsh/syscalls.o: scsh/syscalls1.h
 scsh/time1.o	  scsh/time.o:	   scsh/time1.h
 scsh/tty1.o       scsh/tty.o:	   scsh/tty1.h
 
+scsh/rx/re1.o	  scsh/rx/re-low.o:	   scsh/rx/re1.h
+
 scsh/syscalls.o:  scsh/syscalls1.h scsh/dirstuff1.h scsh/fdports1.h \
 	          scsh/select1.h   scsh/userinfo1.h
 
@@ -607,7 +607,6 @@ SCHEME =scsh/awk.scm \
 	scsh/procobj.scm \
 	scsh/pty.scm \
 	scsh/rdelim.scm \
-	scsh/re.scm \
 	scsh/rw.scm \
 	scsh/scsh-condition.scm \
 	scsh/scsh-interfaces.scm \
@@ -638,7 +637,6 @@ scsh/flock.c:	        scsh/flock.scm
 scsh/jcontrol2.c:	scsh/jcontrol2.scm
 scsh/network.c:	        scsh/network.scm
 scsh/rdelim.c:	        scsh/rdelim.scm
-scsh/re.c:	        scsh/re.scm
 scsh/select.c:	    	scsh/select.scm
 scsh/syscalls.c:	scsh/syscalls.scm
 scsh/tty.c:	        scsh/tty.scm
@@ -650,6 +648,13 @@ scsh/scsh: scsh/scsh-tramp.c
 	-DIMAGE=\"$(LIB)/scsh.image\" \
 	scsh/scsh-tramp.c
 
+loads = $(srcdir)/scsh/let-opt.scm $(srcdir)/scsh/scsh-interfaces.scm \
+         $(srcdir)/scsh/machine/packages.scm \
+	 $(srcdir)/scsh/rx/packages.scm \
+	 $(srcdir)/scsh/rx/cond-package.scm \
+	 $(srcdir)/scsh/scsh-package.scm \
+	 $(srcdir)/scsh/stringpack.scm
+
 scsh/scsh.image: $(VM) $(SCHEME) $(CIG).image
 	(echo ",translate =scheme48/ $(srcdir)/"; \
 	 echo ",batch on"; \
@@ -657,21 +662,21 @@ scsh/scsh.image: $(VM) $(SCHEME) $(CIG).image
 	 echo ",open externals"; \
 	 echo "(lookup-all-externals)"; \
 	 echo ",config"; \
-	 echo ",load $(srcdir)/scsh/let-opt.scm"; \
+	 echo ",load $(loads)"; \
-	 echo ",load $(srcdir)/scsh/scsh-interfaces.scm"; \
-	 echo ",load $(srcdir)/scsh/machine/packages.scm"; \
-	 echo ",load $(srcdir)/scsh/scsh-package.scm"; \
 	 echo ",load-package scsh"; \
 	 echo ",load-package scsh-here-string-hax"; \
 	 echo ",translate =scheme48/ $(LIB)/"; \
+	 echo ",load-package ccp-lib"; \
 	 echo ",in scsh-level-0"; \
 	 echo "(%install-scsh-handlers)"; \
 	 echo "(autoreap-policy 'early)"; \
 	 echo ",user"; \
 	 echo ",open floatnums"; \
 	 echo ",open scsh"; \
+	 echo ",open string-lib"; \
+	 echo ",open ccp-lib"; \
 	 echo "(dump-scsh \"scsh/scsh.image\")") \
-	| ./$(VM) -o ./$(VM) -i $(CIG).image
+	| ./$(VM) -o ./$(VM) -h 10000000 -i $(CIG).image
 
 # Removed these lines from scsh/scsh.image rule so you don't lose so
 # badly when you are debugging in scsh. -Olin 6/95
@@ -683,8 +688,8 @@ scsh/scsh.image: $(VM) $(SCHEME) $(CIG).image
 #	    < scsh/scsh.image > $@
 #	-chmod +x $@
 
-scsh/regexp/libregexp.a:
+scsh/regexp/libregex.a:
-	cd ./scsh/regexp; $(MAKE)
+	cd ./scsh/regexp; $(MAKE) lib
 
 scsh/scsh.vm: $(LIBSCSH) $(VM) scsh/scsh.image
 	./$(VM) -o ./$(VM) -h 8000000 -i scsh/scsh.image \