diff -Nru clearsilver-0.9.0/ClearSilver.h clearsilver-0.9.1/ClearSilver.h
--- clearsilver-0.9.0/ClearSilver.h	Wed Dec 31 16:00:00 1969
+++ clearsilver-0.9.1/ClearSilver.h	Mon Apr 14 16:05:07 2003
@@ -0,0 +1,60 @@
+
+/*
+ * Neotonic ClearSilver Templating System
+ *
+ * This code is made available under the terms of the 
+ * Neotonic ClearSilver License.
+ * http://www.neotonic.com/clearsilver/license.hdf
+ *
+ * Copyright (C) 2001 by Brandon Long
+ */
+
+#ifndef __CLEARSILVER_H_
+#define __CLEARSILVER_H_ 1
+
+#include "cs_config.h"
+
+#include <stdlib.h>
+#include <sys/stat.h>
+
+/* Base libraries */
+#include "util/neo_misc.h"
+#include "util/neo_err.h"
+#include "util/neo_date.h"
+#include "util/neo_files.h"
+#include "util/neo_hash.h"
+#include "util/neo_hdf.h"
+#include "util/neo_rand.h"
+#include "util/neo_net.h"
+#include "util/neo_server.h"
+#include "util/neo_str.h"
+#include "util/ulist.h"
+#include "util/wildmat.h"
+#include "util/filter.h"
+
+#ifdef HAVE_LOCKF
+# include "util/ulocks.h"
+# include "util/rcfs.h"
+
+/* These are dependent on the pthread locking code in ulocks */
+# ifdef HAVE_PTHREADS
+#  include "util/skiplist.h"
+#  include "util/dict.h"
+# endif
+#endif
+
+/* This is dependent on Berkeley DB v2 */
+#ifdef HAVE_DB2
+# include "util/wdb.h"
+#endif
+
+/* The ClearSilver Template language */
+#include "cs/cs.h"
+
+/* The ClearSilver CGI connector */
+#include "cgi/cgi.h"
+#include "cgi/cgiwrap.h"
+#include "cgi/date.h"
+#include "cgi/html.h"
+
+#endif /* __CLEARSILVER_H_ */
diff -Nru clearsilver-0.9.0/Makefile clearsilver-0.9.1/Makefile
--- clearsilver-0.9.0/Makefile	Mon Apr 14 17:15:51 2003
+++ clearsilver-0.9.1/Makefile	Mon Jul  7 23:33:47 2003
@@ -105,9 +105,9 @@
 		mkdir -p $$mdir; \
 	done
 
-CS_DISTDIR = clearsilver-0.8.1
-CS_LABEL = CLEARSILVER-0_8_1
-CS_FILES = LICENSE CS_LICENSE rules.mk.in Makefile util cs cgi python scripts mod_ecs imd java-jni perl acconfig.h autogen.sh config.guess config.sub configure.in cs_config.h.in mkinstalldirs install-sh
+CS_DISTDIR = clearsilver-0.9.1
+CS_LABEL = CLEARSILVER-0_9_1
+CS_FILES = LICENSE CS_LICENSE rules.mk.in Makefile util cs cgi python scripts mod_ecs imd java-jni perl ruby acconfig.h autogen.sh config.guess config.sub configure.in cs_config.h.in mkinstalldirs install-sh ClearSilver.h
 cs_dist:
 	rm -rf $(CS_DISTDIR)
 	cvs -q tag -F $(CS_LABEL) $(CS_FILES)
diff -Nru clearsilver-0.9.0/cs/csparse.c clearsilver-0.9.1/cs/csparse.c
--- clearsilver-0.9.0/cs/csparse.c	Wed Jul  2 18:04:16 2003
+++ clearsilver-0.9.1/cs/csparse.c	Mon Jul  7 23:33:28 2003
@@ -742,7 +742,7 @@
     x = 0;
     found = FALSE;
 
-    /* If we already so an operator, and this is a +/-, assume its 
+    /* If we already saw an operator, and this is a +/-, assume its 
      * a number */
     if (!(last_is_op && (*arg == '+' || *arg == '-')))
     {
diff -Nru clearsilver-0.9.0/ruby/Makefile clearsilver-0.9.1/ruby/Makefile
--- clearsilver-0.9.0/ruby/Makefile	Tue Jun 17 14:20:10 2003
+++ clearsilver-0.9.1/ruby/Makefile	Mon Jul  7 23:10:28 2003
@@ -9,13 +9,13 @@
 all: config.save ext/hdf/hdf.so test
 
 config.save: install.rb
-	$(RUBY) install.rb config
+	$(RUBY) install.rb config -- --with-hdf-include=../../.. --with-hdf-lib=../../../libs
 
 ext/hdf/Makefile:
-	$(RUBY) install.rb config
+	$(RUBY) install.rb config -- --with-hdf-include=../../.. --with-hdf-lib=../../../libs
 
 ext/hdf/hdf.so: config.save
-	$(RUBY) install.rb setup
+	$(RUBY) install.rb setup 
 
 test: ext/hdf/hdf.so
 	$(RUBY) -Ilib -Iext/hdf test/hdftest.rb
diff -Nru clearsilver-0.9.0/ruby/ext/hdf/extconf.rb clearsilver-0.9.1/ruby/ext/hdf/extconf.rb
--- clearsilver-0.9.0/ruby/ext/hdf/extconf.rb	Tue Jun 17 14:20:12 2003
+++ clearsilver-0.9.1/ruby/ext/hdf/extconf.rb	Mon Jul  7 23:10:29 2003
@@ -2,8 +2,9 @@
 
 require 'mkmf'
 
-dir_config("hdf","../../..","../../../libs")
+# dir_config("hdf","../../..","../../../libs")
+dir_config("hdf")
 
-if have_header("util/neo_hdf.h") && have_library("neo_utl","hdf_init") && have_library("neo_cs","cs_init")
+if have_header("ClearSilver.h") && have_library("neo_utl","hdf_init") && have_library("neo_cs","cs_init")
   create_makefile("hdf")
 end
diff -Nru clearsilver-0.9.0/ruby/ext/hdf/neo_cs.c clearsilver-0.9.1/ruby/ext/hdf/neo_cs.c
--- clearsilver-0.9.0/ruby/ext/hdf/neo_cs.c	Tue Jun 17 14:20:12 2003
+++ clearsilver-0.9.1/ruby/ext/hdf/neo_cs.c	Mon Jul  7 23:10:29 2003
@@ -72,7 +72,7 @@
 
   /* This should be changed to use memory from the gc */
   ms = strdup(s);
-  if (ms == NULL) rb_raise(rb_eNoMemError, "out of memory");
+  if (ms == NULL) rb_raise(rb_eException, "out of memory");
 
   err = cs_parse_string (cs, ms, l);
   if (err) rb_raise(eHdfError, "%s", r_neo_error(err));
diff -Nru clearsilver-0.9.0/ruby/ext/hdf/neo_util.c clearsilver-0.9.1/ruby/ext/hdf/neo_util.c
--- clearsilver-0.9.0/ruby/ext/hdf/neo_util.c	Tue Jun 17 14:20:12 2003
+++ clearsilver-0.9.1/ruby/ext/hdf/neo_util.c	Mon Jul  7 23:10:29 2003
@@ -474,7 +474,7 @@
 
   /* This should be changed to use memory from the gc */
   copy = strdup(s);
-  if (copy == NULL) rb_raise(rb_eNoMemError, "out of memory");
+  if (copy == NULL) rb_raise(rb_eException, "out of memory");
 
   neos_unescape(copy, buflen, esc_char[0]);