diff -u -r clucene-0.8.13/Makefile.in clucene-0.8.13.mod/Makefile.in
--- clucene-0.8.13/Makefile.in	2005-01-23 01:57:25.000000000 -0800
+++ clucene-0.8.13.mod/Makefile.in	2005-07-28 01:17:22.000000000 -0700
@@ -134,7 +134,8 @@
 
 INCLUDES = -I$(top_srcdir)
 
-SUBDIRS = src wrappers examples .
+## SUBDIRS = src wrappers examples .
+SUBDIRS = src .
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/./build/gcc/config/mkinstalldirs
diff -u -r clucene-0.8.13/src/CLucene/queryParser/QueryParser.h clucene-0.8.13.mod/src/CLucene/queryParser/QueryParser.h
--- clucene-0.8.13/src/CLucene/queryParser/QueryParser.h	2004-12-20 06:13:31.000000000 -0800
+++ clucene-0.8.13.mod/src/CLucene/queryParser/QueryParser.h	2005-07-28 01:17:22.000000000 -0700
@@ -101,7 +101,13 @@
 
 		//Extracts the first token from the Tokenlist tokenlist
 	    //and destroys it
-		void QueryParser::ExtractAndDeleteToken(void);
+	        // 
+		// void QueryParser::ExtractAndDeleteToken(void);
+		//
+		// removed QueryParser:: because we are within
+		// the namespace & class
+		//
+		void ExtractAndDeleteToken(void);
 	};
 }}
 #endif
diff -u -r clucene-0.8.13/src/Makefile.in clucene-0.8.13.mod/src/Makefile.in
--- clucene-0.8.13/src/Makefile.in	2005-01-23 01:57:27.000000000 -0800
+++ clucene-0.8.13.mod/src/Makefile.in	2005-07-28 01:37:09.000000000 -0700
@@ -47,13 +47,21 @@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+ifeq ($(CC), cl)
+CFLAGS = /MD @CFLAGS@
+else
 CFLAGS = @CFLAGS@
+endif
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
+ifeq ($(CXX), cl)
+CXXFLAGS = /MD @CXXFLAGS@
+else
 CXXFLAGS = @CXXFLAGS@
+endif
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -171,6 +179,10 @@
 utilhdir = $(includedir)/CLucene/util
 
 utilh_HEADERS = $(utildir)/*.h
+debugdir = $(lsrcdir)/debug
+debughdir = $(includedir)/CLucene/debug
+
+debugh_HEADERS = $(debugdir)/*.h
 stdhdir = $(includedir)/CLucene
 @USEUTF8_FALSE@utf8src = 
 
@@ -242,7 +254,8 @@
 	FuzzyQuery.lo MultiSearcher.lo FSDirectory.lo InputStream.lo \
 	Lock.lo OutputStream.lo RAMDirectory.lo Arrays.lo \
 	FastCharStream.lo Reader.lo BitVector.lo Misc.lo \
-	StringBuffer.lo $(am__objects_1) StdHeader.lo
+	StringBuffer.lo $(am__objects_1) StdHeader.lo \
+	dirent.lo
 libclucene_la_OBJECTS = $(am_libclucene_la_OBJECTS)
 
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
@@ -318,7 +331,7 @@
 HEADERS = $(anh_HEADERS) $(doch_HEADERS) $(include_HEADERS) \
 	$(indexh_HEADERS) $(qph_HEADERS) $(searchh_HEADERS) \
 	$(stdanh_HEADERS) $(stdh_HEADERS) $(storeh_HEADERS) \
-	$(utilh_HEADERS)
+	$(utilh_HEADERS) $(debugh_HEADERS)
 
 DIST_COMMON = $(anh_HEADERS) $(doch_HEADERS) $(include_HEADERS) \
 	$(indexh_HEADERS) $(qph_HEADERS) $(searchh_HEADERS) \
@@ -332,7 +345,7 @@
 	$(srcdir)/CLucene/store/Makefile.am \
 	$(srcdir)/CLucene/util/Makefile.am $(srcdir)/Makefile.in \
 	$(stdanh_HEADERS) $(stdh_HEADERS) $(storeh_HEADERS) \
-	$(utilh_HEADERS) Makefile.am
+	$(utilh_HEADERS) $(debugh_HEADERS) Makefile.am
 SOURCES = $(libclucene_la_SOURCES)
 
 all: all-am
@@ -2496,6 +2509,28 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Arrays.lo `test -f '$(utildir)/Arrays.cpp' || echo '$(srcdir)/'`$(utildir)/Arrays.cpp
 
+dirent.obj: $(utildir)/dirent.cpp
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dirent.obj -MD -MP -MF "$(DEPDIR)/dirent.Tpo" \
+@am__fastdepCXX_TRUE@	  -c -o dirent.obj `if test -f '$(utildir)/dirent.cpp'; then $(CYGPATH_W) '$(utildir)/dirent.cpp'; else $(CYGPATH_W) '$(srcdir)/$(utildir)/dirent.cpp'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/dirent.Tpo" "$(DEPDIR)/dirent.Po"; \
+@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/dirent.Tpo"; exit 1; \
+@am__fastdepCXX_TRUE@	fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(utildir)/dirent.cpp' object='dirent.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/dirent.Po' tmpdepfile='$(DEPDIR)/dirent.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dirent.obj `if test -f '$(utildir)/dirent.cpp'; then $(CYGPATH_W) '$(utildir)/dirent.cpp'; else $(CYGPATH_W) '$(srcdir)/$(utildir)/dirent.cpp'; fi`
+
+dirent.lo: $(utildir)/dirent.cpp
+@am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dirent.lo -MD -MP -MF "$(DEPDIR)/dirent.Tpo" \
+@am__fastdepCXX_TRUE@	  -c -o dirent.lo `test -f '$(utildir)/dirent.cpp' || echo '$(srcdir)/'`$(utildir)/dirent.cpp; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/dirent.Tpo" "$(DEPDIR)/dirent.Plo"; \
+@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/dirent.Tpo"; exit 1; \
+@am__fastdepCXX_TRUE@	fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(utildir)/dirent.cpp' object='dirent.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/dirent.Plo' tmpdepfile='$(DEPDIR)/dirent.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dirent.lo `test -f '$(utildir)/dirent.cpp' || echo '$(srcdir)/'`$(utildir)/dirent.cpp
+
 FastCharStream.o: $(utildir)/FastCharStream.cpp
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FastCharStream.o -MD -MP -MF "$(DEPDIR)/FastCharStream.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o FastCharStream.o `test -f '$(utildir)/FastCharStream.cpp' || echo '$(srcdir)/'`$(utildir)/FastCharStream.cpp; \
@@ -2917,6 +2952,25 @@
 	  rm -f $(DESTDIR)$(utilhdir)/$$f; \
 	done
 
+debughHEADERS_INSTALL = $(INSTALL_HEADER)
+install-debughHEADERS: $(debugh_HEADERS)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(debughdir)
+	@list='$(debugh_HEADERS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " $(debughHEADERS_INSTALL) $$d$$p $(DESTDIR)$(debughdir)/$$f"; \
+	  $(debughHEADERS_INSTALL) $$d$$p $(DESTDIR)$(debughdir)/$$f; \
+	done
+
+uninstall-debughHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(debugh_HEADERS)'; for p in $$list; do \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " rm -f $(DESTDIR)$(debughdir)/$$f"; \
+	  rm -f $(DESTDIR)$(debughdir)/$$f; \
+	done
+
 ETAGS = etags
 ETAGSFLAGS =
 
@@ -3008,7 +3062,7 @@
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(anhdir) $(DESTDIR)$(dochdir) $(DESTDIR)$(includedir) $(DESTDIR)$(indexhdir) $(DESTDIR)$(qphdir) $(DESTDIR)$(searchhdir) $(DESTDIR)$(stdanhdir) $(DESTDIR)$(stdhdir) $(DESTDIR)$(storehdir) $(DESTDIR)$(utilhdir)
+	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(anhdir) $(DESTDIR)$(dochdir) $(DESTDIR)$(includedir) $(DESTDIR)$(indexhdir) $(DESTDIR)$(qphdir) $(DESTDIR)$(searchhdir) $(DESTDIR)$(stdanhdir) $(DESTDIR)$(stdhdir) $(DESTDIR)$(storehdir) $(DESTDIR)$(utilhdir) $(DSTDIR)$(debughdir)
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -3055,7 +3109,8 @@
 install-data-am: install-anhHEADERS install-dochHEADERS \
 	install-includeHEADERS install-indexhHEADERS install-qphHEADERS \
 	install-searchhHEADERS install-stdanhHEADERS \
-	install-stdhHEADERS install-storehHEADERS install-utilhHEADERS
+	install-stdhHEADERS install-storehHEADERS install-utilhHEADERS \
+	install-debughHEADERS
 
 install-exec-am: install-libLTLIBRARIES
 
@@ -3088,7 +3143,8 @@
 	uninstall-info-am uninstall-libLTLIBRARIES uninstall-qphHEADERS \
 	uninstall-searchhHEADERS uninstall-stdanhHEADERS \
 	uninstall-stdhHEADERS uninstall-storehHEADERS \
-	uninstall-utilhHEADERS
+	uninstall-utilhHEADERS \
+	uninstall-debughHEADERS
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool ctags distclean \
@@ -3109,7 +3165,8 @@
 	uninstall-info-am uninstall-libLTLIBRARIES uninstall-qphHEADERS \
 	uninstall-searchhHEADERS uninstall-stdanhHEADERS \
 	uninstall-stdhHEADERS uninstall-storehHEADERS \
-	uninstall-utilhHEADERS
+	uninstall-utilhHEADERS \
+	install-debughHEADERS uninstall-debughHEADERS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.