Index: src/Makefile.in
===================================================================
RCS file: /cvsroot/tclex/tcLex/src/Makefile.in,v
retrieving revision 1.1.1.1
diff -u -u -p -r1.1.1.1 Makefile.in
--- src/Makefile.in	7 Feb 2001 22:06:51 -0000	1.1.1.1
+++ src/Makefile.in	26 Dec 2003 01:21:16 -0000
@@ -21,6 +21,11 @@ VERSION_DEFINE	= TCLEX_VERSION
 OBJS		= tcLex.o \
 			tcLexRE.o
 
+DESTDIR         =
+
+srcdir		= @srcdir@
+libdir		= @libdir@
+
 # MANS		= tclex.n
 
 #-------------------------------------------------
@@ -35,20 +40,22 @@ TCL_PREFIX      = @TCL_PREFIX@
 TCL_CFLAGS      = @TCL_CFLAGS@
 TCL_SRC_DIR	= @TCL_SRC_DIR@
 
+VPATH           = @srcdir@
+
 INCLUDES        = -I$(TCL_SRC_DIR)/generic -I$(TCL_PREFIX)/include
 
 DLL             = $(PROJECT)$(SHLIB_SUFFIX)
-PROJECTDIR	= $(TCL_PREFIX)/lib/$(PROJECT)$(PROJECT_VERSION)
+PROJECTDIR	= $(libdir)/$(PROJECT)$(PROJECT_VERSION)
 
 CFLAGS          = $(TCL_CFLAGS) $(SHLIB_CFLAGS) $(INCLUDES) \
-		  -D$(VERSION_DEFINE)=\"$(PROJECT_VERSION)\"
+		  -D$(VERSION_DEFINE)=\"$(PROJECT_VERSION)\"  -DUSE_TCL_STUBS=1
 
 MAN_INSTALL_DIR = $(TCL_PREFIX)/man/mann
 
 all: $(DLL) pkgIndex.tcl
 
 $(DLL): $(OBJS)
-	$(SHLIB_LD) -o $@ $(OBJS)
+	$(SHLIB_LD) -o $@ $(OBJS) @TCL_STUB_LIB_SPEC@
 
 pkgIndex.tcl:
 	(if test -f $(PROJECTDIR)/pkgIndex.tcl; \
@@ -57,10 +64,10 @@ pkgIndex.tcl:
 	echo 'package ifneeded $(PROJECT) $(PROJECT_VERSION) [list load [file join $$dir $(DLL).$(PROJECT_VERSION)] $(PROJECT)]' > pkgIndex.tcl
 
 install: all
-	if test ! -d $(PROJECTDIR); then mkdir $(PROJECTDIR); fi
-	$(INSTALL_PROGRAM) $(DLL) $(PROJECTDIR)/$(DLL).$(PROJECT_VERSION)
-	$(INSTALL_DATA) pkgIndex.tcl $(PROJECTDIR)/pkgIndex.tcl
-#	$(INSTALL_DATA) $(MANS) $(MAN_INSTALL_DIR)/
+	if test ! -d $(DESTDIR)$(PROJECTDIR); then mkdir -p $(DESTDIR)$(PROJECTDIR); fi
+	$(INSTALL_PROGRAM) $(DLL) $(DESTDIR)$(PROJECTDIR)/$(DLL).$(PROJECT_VERSION)
+	$(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(PROJECTDIR)/pkgIndex.tcl
+#	$(INSTALL_DATA) $(MANS) $(DESTDIR)$(MAN_INSTALL_DIR)/
 
 test: all
 	true
Index: src/configure.in
===================================================================
RCS file: /cvsroot/tclex/tcLex/src/configure.in,v
retrieving revision 1.1.1.1
diff -u -u -p -r1.1.1.1 configure.in
--- src/configure.in	7 Feb 2001 22:06:51 -0000	1.1.1.1
+++ src/configure.in	26 Dec 2003 01:21:16 -0000
@@ -15,6 +15,13 @@ fi
 AC_PROG_INSTALL
 
 file=${exec_prefix}/lib/tclConfig.sh
+AC_ARG_WITH(tcl, [  --with-tcl              directory containing tcl configuration (tclConfig.sh)], with_tclconfig=${withval})
+if test x"${with_tclconfig}" != x ; then
+    if test -f "${with_tclconfig}/tclConfig.sh" ; then
+        file="${with_tclconfig}/tclConfig.sh"
+    fi
+fi
+
 . $file
 
 CC=$TCL_CC
@@ -31,5 +38,6 @@ AC_SUBST(TCL_EXEC_PREFIX)
 AC_SUBST(TCL_CFLAGS)
 AC_SUBST(TCL_DEFS)
 AC_SUBST(TCL_SRC_DIR)
+AC_SUBST(TCL_STUB_LIB_SPEC)
 
 AC_OUTPUT(Makefile)
Index: src/tcLex.c
===================================================================
RCS file: /cvsroot/tclex/tcLex/src/tcLex.c,v
retrieving revision 1.1.1.1
diff -u -u -p -r1.1.1.1 tcLex.c
--- src/tcLex.c	7 Feb 2001 22:06:50 -0000	1.1.1.1
+++ src/tcLex.c	26 Dec 2003 01:21:18 -0000
@@ -1145,10 +1145,10 @@ LexerCurrentObjCmd(clientData, interp, o
     
     currentLexer = LexerGetCurrent(interp);
     if (currentLexer) {
-	if (((Command*)currentLexer->command)->deleted)
+	/*if (((Command*)currentLexer->command)->deleted)*/
 	    /* If command has been deleted, the token is meaningless. Return no result */
-	    Tcl_ResetResult(interp);
-	else
+	    /*Tcl_ResetResult(interp);
+	else*/
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(Tcl_GetCommandName(interp, currentLexer->command), -1));
 	return TCL_OK;
     } else {