diff -c -r blt2.1.orig/Makefile.in blt2.1/Makefile.in
*** blt2.1.orig/Makefile.in	Sun Apr 21 12:47:30 1996
--- blt2.1/Makefile.in	Mon Jul 14 01:58:23 1997
***************
*** 2,7 ****
--- 2,10 ----
  #       Makefile for demonstation shell of BLT library
  # ------------------------------------------------------------------------
  
+ LIBROOT		= BLT
+ LIBBLT		= lib$(LIBROOT)$(SHLIB_SUFFIX)
+ 
  # ------------------------------------------------------------------------
  #       C Compiler options 
  # ------------------------------------------------------------------------
***************
*** 9,14 ****
--- 12,18 ----
  DEFINES      = 
  CFLAGS       = @CFLAGS@ @GCCFLAGS@
  CC 	     = @CC@
+ SHLIB_SUFFIX = @SHLIB_SUFFIX@
  
  TOPDIR	     = @DESTDIR@
  BINDIR       = @BINDIR@
***************
*** 29,39 ****
  EXTRA_LIBS   = @LIBS@ 
  
  LIBDIR       = @LIBDIR@
  XLIBDIR      = @XLIBDIR@
  TCLLIBDIR    = @TCLLIBDIR@
  TKLIBDIR     = @TKLIBDIR@
  
! LIBRARIES    = ./src/libBLT.a $(INCR_LIBS) $(STD_LIBS) $(EXTRA_LIBS)
  
  # ------------------------------------------------------------------------
  #       Don't edit anything beyond this point
--- 33,44 ----
  EXTRA_LIBS   = @LIBS@ 
  
  LIBDIR       = @LIBDIR@
+ LIBBLTDIR    = @LIBBLTDIR@
  XLIBDIR      = @XLIBDIR@
  TCLLIBDIR    = @TCLLIBDIR@
  TKLIBDIR     = @TKLIBDIR@
  
! LIBRARIES    = ./src/shared/$(LIBBLT) $(INCR_LIBS) $(STD_LIBS) $(EXTRA_LIBS)
  
  # ------------------------------------------------------------------------
  #       Don't edit anything beyond this point
***************
*** 50,71 ****
  RM 	     = rm -f
  srcdir	     = @srcdir@
  
! all: lib-static $(demo) @SHLIB_TARGET@ 
  	@echo "make finished on `date`"
  
! $(demo): lib-static 
  	@echo "making BLT demo \"$(demo)\"..."
  	$(RM) $(demo)
  	$(CC) $(CC_SWITCHES) $(LD_FLAGS) \
  		$(srcdir)/tkAppInit.c -o $(demo) $(LIBRARIES) 
  
! libs: lib-static lib-shared
  shared: lib-shared
  
- lib-static:
- 	@echo "making all in ./src"
- 	@(cd src; $(MAKE) CFLAGS="$(CFLAGS)" all)
- 
  lib-shared: 
  	@echo "making shared library in ./src/shared"
  	@(cd src/shared; $(MAKE) CFLAGS="$(CFLAGS)" all)
--- 55,72 ----
  RM 	     = rm -f
  srcdir	     = @srcdir@
  
! all: $(demo) @SHLIB_TARGET@ 
  	@echo "make finished on `date`"
  
! $(demo): @SHLIB_TARGET@
  	@echo "making BLT demo \"$(demo)\"..."
  	$(RM) $(demo)
  	$(CC) $(CC_SWITCHES) $(LD_FLAGS) \
  		$(srcdir)/tkAppInit.c -o $(demo) $(LIBRARIES) 
  
! libs: lib-shared
  shared: lib-shared
  
  lib-shared: 
  	@echo "making shared library in ./src/shared"
  	@(cd src/shared; $(MAKE) CFLAGS="$(CFLAGS)" all)
***************
*** 91,97 ****
  	$(INSTALL) $(HEADERS) $(INCDIR)
  
  install-lib:
- 	@(cd src; $(MAKE) install)
  	@(cd src/shared; $(MAKE) install)
  
  install-library:
--- 92,97 ----
***************
*** 99,106 ****
  
  
  clean:
- 	@echo "cleaning in ./src"
- 	@(cd src; $(MAKE) clean)
  	@echo "cleaning in ./src/shared"
  	@(cd src/shared; $(MAKE) clean)
  	@echo "cleaning in ./man"
--- 99,104 ----
***************
*** 127,139 ****
  
  distclean: clean
  	$(RM) $(GENERATED_FILES)
- 
- PUREFLAGS=
- pure: lib-static
- 	$(PURIFYHOME)/purify $(PUREFLAGS) \
- 	$(CC) $(CC_SWITCHES) $(srcdir)/tkAppInit.c -o $(demo) $(LIBRARIES)
- 
- QUANTIFYFLAGS=
- profile: lib-static
- 	$(QUANTIFYHOME)/quantify $(QUANTIFYFLAGS) \
- 	$(CC) $(CC_SWITCHES) $(srcdir)/tkAppInit.c -o $(demo) $(LIBRARIES)
--- 125,127 ----
Only in blt2.1: Makefile.in.orig
diff -c -r blt2.1.orig/cf/config.sub blt2.1/cf/config.sub
*** blt2.1.orig/cf/config.sub	Sat Apr 20 13:25:11 1996
--- blt2.1/cf/config.sub	Mon Jul 14 01:50:38 1997
***************
*** 122,128 ****
  	tahoe | i[345]86 | i860 | m68k | m68000 | m88k | ns32k | arm | pyramid \
  		| tron | a29k | 580 | i960 | h8300 | hppa1.0 | hppa1.1 \
  		| alpha | we32k | ns16k | clipper | sparclite | i370 | sh \
! 		| powerpc | sparc64 | 1750a | dsp16xx | mips64 | mipsel \
  		| pdp11 | mips64el | mips64orion | mips64orionel )
  		basic_machine=$basic_machine-unknown
  		;;
--- 122,128 ----
  	tahoe | i[345]86 | i860 | m68k | m68000 | m88k | ns32k | arm | pyramid \
  		| tron | a29k | 580 | i960 | h8300 | hppa1.0 | hppa1.1 \
  		| alpha | we32k | ns16k | clipper | sparclite | i370 | sh \
! 		| powerpc | ppc* | sparc64 | 1750a | dsp16xx | mips64 | mipsel \
  		| pdp11 | mips64el | mips64orion | mips64orionel )
  		basic_machine=$basic_machine-unknown
  		;;
Only in blt2.1/cf: config.sub.orig
diff -c -r blt2.1.orig/configure blt2.1/configure
*** blt2.1.orig/configure	Sun Apr 21 12:47:32 1996
--- blt2.1/configure	Mon Jul 14 02:00:08 1997
***************
*** 2615,2620 ****
--- 2615,2629 ----
      SHLIB_LIBS="-ldl"
      ;;
    *-hpux9*)
+     SHLIB_LOADER="ld"
+     SHLIB_CCFLAGS="+z"
+     SHLIB_LDFLAGS="-b -n"
+     SHLIB_SUFFIX=".sl"
+     SHLIB_LIBS="-ldld"
+     SHLIB_EXTRA_FLAGS='-Wl,+b,${LIBDIR}'
+     ;;
+   *-hpux10*)
+     SHLIB_LOADER="ld"
      SHLIB_CCFLAGS="+z"
      SHLIB_LDFLAGS="-b -n"
      SHLIB_SUFFIX=".sl"
***************
*** 2664,2670 ****
      if test "${blt_cv_sys_elf}" = "elf"; then
  	SHLIB_CCFLAGS="-fpic"
  	SHLIB_LDFLAGS="-shared -Wl,-soname,libBLT${SHLIB_SUFFIX}"
! 	SHLIB_EXTRA_FLAGS='-Wl,-rpath,$(LIBDIR):$(TKLIBDIR):$(TCLLIBDIR):$(XLIBDIR)'
  	SHLIB_SUFFIX=".so.${blt_cv_major_version}.${blt_cv_minor_version}"
  	SHLIB_LIBS="-ldl"
      fi
--- 2673,2679 ----
      if test "${blt_cv_sys_elf}" = "elf"; then
  	SHLIB_CCFLAGS="-fpic"
  	SHLIB_LDFLAGS="-shared -Wl,-soname,libBLT${SHLIB_SUFFIX}"
! 	SHLIB_EXTRA_FLAGS='-Wl,-rpath,$(LIBBLTDIR):$(TKLIBDIR):$(TCLLIBDIR):$(XLIBDIR)'
  	SHLIB_SUFFIX=".so.${blt_cv_major_version}.${blt_cv_minor_version}"
  	SHLIB_LIBS="-ldl"
      fi
***************
*** 2695,2706 ****
  #--------------------------------------------------------------------
  
  
! DESTDIR=$PREFIX
! BINDIR="$PREFIX/bin"
! LIBDIR="$PREFIX/lib"
! INCDIR="$PREFIX/include"
! BLT_LIBRARY="$PREFIX/lib/blt${blt_cv_major_version}.${blt_cv_minor_version}"
! MANDIR="$PREFIX/man"
  
  
  
--- 2704,2716 ----
  #--------------------------------------------------------------------
  
  
! DESTDIR=
! BINDIR='$(TOPDIR)'"$PREFIX/bin"
! LIBDIR='$(TOPDIR)'"$PREFIX/lib"
! LIBBLTDIR="$PREFIX/lib"
! INCDIR='$(TOPDIR)'"$PREFIX/include"
! BLT_LIBRARY='$(TOPDIR)'"$PREFIX/lib/blt${blt_cv_major_version}.${blt_cv_minor_version}"
! MANDIR='$(TOPDIR)'"$PREFIX/man"
  
  
  
***************
*** 2905,2910 ****
--- 2915,2921 ----
  s%@BINDIR@%$BINDIR%g
  s%@INCDIR@%$INCDIR%g
  s%@LIBDIR@%$LIBDIR%g
+ s%@LIBBLTDIR@%$LIBBLTDIR%g
  s%@MANDIR@%$MANDIR%g
  s%@BLT_LIBRARY@%$BLT_LIBRARY%g
  
Only in blt2.1: configure.orig
diff -c -r blt2.1.orig/src/bltBgexec.c blt2.1/src/bltBgexec.c
*** blt2.1.orig/src/bltBgexec.c	Sun Apr 21 13:28:26 1996
--- blt2.1/src/bltBgexec.c	Mon Jul 14 01:50:38 1997
***************
*** 328,333 ****
--- 328,385 ----
  };
  
  
+ 
+ #if (TCL_MAJOR_VERSION == 7) && (TCL_MINOR_VERSION > 5)
+ /* revive Tcl_CreatePipeline from Tcl 7.5 (thanks to Peter Waltenberg) */
+ /* [todo] rewrite this file to use the newer Tcl_OpenCommandChannel()  */
+ int
+ Tcl_CreatePipeline(interp, argc, argv, pidArrayPtr, inPipePtr,
+ 	outPipePtr, errFilePtr)
+     Tcl_Interp *interp;
+     int argc;
+     char **argv;
+     int **pidArrayPtr;
+     int *inPipePtr;
+     int *outPipePtr;
+     int *errFilePtr;
+ {
+     Tcl_File inFile, outFile, errFile;
+     int result;
+ 
+     result = TclCreatePipeline(interp, argc, argv, pidArrayPtr,
+ 	    (inPipePtr ? &inFile : NULL),
+ 	    (outPipePtr ? &outFile : NULL),
+ 	    (errFilePtr ? &errFile : NULL));
+ 
+     if (inPipePtr) {
+ 	if (inFile) {
+ 	    *inPipePtr = (int) Tcl_GetFileInfo(inFile, NULL);
+ 	    Tcl_FreeFile(inFile);
+ 	} else {
+ 	    *inPipePtr = -1;
+ 	}
+     }
+     if (outPipePtr) {
+ 	if (outFile) {
+ 	    *outPipePtr = (int) Tcl_GetFileInfo(outFile, NULL);
+ 	    Tcl_FreeFile(outFile);
+ 	} else {
+ 	    *outPipePtr = -1;
+ 	}
+     }
+     if (errFilePtr) {
+ 	if (errFile) {
+ 	    *errFilePtr = (int) Tcl_GetFileInfo(errFile, NULL);
+ 	    Tcl_FreeFile(errFile);
+ 	} else {
+ 	    *errFilePtr = -1;
+ 	}
+     }
+     return result;
+ }
+ #endif
+ 
+ 
  /*
   *----------------------------------------------------------------------
   *
***************
*** 790,796 ****
      if (bgPtr->outputId != -1) {
  	close(bgPtr->outputId);
  #if (TK_MAJOR_VERSION == 4) && (TK_MINOR_VERSION > 0)
! 	Tk_DeleteFileHandler(bgPtr->outFileId);
  #else 
  	Tk_DeleteFileHandler(bgPtr->outputId);
  #endif
--- 842,848 ----
      if (bgPtr->outputId != -1) {
  	close(bgPtr->outputId);
  #if (TK_MAJOR_VERSION == 4) && (TK_MINOR_VERSION > 0)
! 	Tcl_DeleteFileHandler(bgPtr->outFileId);
  #else 
  	Tk_DeleteFileHandler(bgPtr->outputId);
  #endif
***************
*** 1077,1083 ****
  
      close(bgPtr->outputId);
  #if (TK_MAJOR_VERSION == 4) && (TK_MINOR_VERSION > 0)
!     Tk_DeleteFileHandler(bgPtr->outFileId);
  #else
      Tk_DeleteFileHandler(bgPtr->outputId);
  #endif
--- 1129,1135 ----
  
      close(bgPtr->outputId);
  #if (TK_MAJOR_VERSION == 4) && (TK_MINOR_VERSION > 0)
!     Tcl_DeleteFileHandler(bgPtr->outFileId);
  #else
      Tk_DeleteFileHandler(bgPtr->outputId);
  #endif
***************
*** 1221,1227 ****
  #endif
  #if (TK_MAJOR_VERSION == 4) && (TK_MINOR_VERSION > 0)
  	bgPtr->outFileId = Tcl_GetFile((ClientData)bgPtr->outputId, TCL_UNIX_FD);
! 	Tk_CreateFileHandler(bgPtr->outFileId, TK_READABLE, BackgroundProc,
  	    (ClientData)bgPtr);
  #else
  	Tk_CreateFileHandler(bgPtr->outputId, TK_READABLE, BackgroundProc,
--- 1273,1279 ----
  #endif
  #if (TK_MAJOR_VERSION == 4) && (TK_MINOR_VERSION > 0)
  	bgPtr->outFileId = Tcl_GetFile((ClientData)bgPtr->outputId, TCL_UNIX_FD);
! 	Tcl_CreateFileHandler(bgPtr->outFileId, TK_READABLE, BackgroundProc,
  	    (ClientData)bgPtr);
  #else
  	Tk_CreateFileHandler(bgPtr->outputId, TK_READABLE, BackgroundProc,
Only in blt2.1/src: bltBgexec.c.orig