--- parser3/src/classes/Makefile.in	2008/04/08 12:03:44	1.64
+++ parser3/src/classes/Makefile.in	2010/11/24 16:46:32	1.71
@@ -54,12 +54,13 @@ AR = ar
 ARFLAGS = cru
 libclasses_a_AR = $(AR) $(ARFLAGS)
 libclasses_a_LIBADD =
-am__objects_1 = bool.$(OBJEXT) double.$(OBJEXT) file.$(OBJEXT) \
-	form.$(OBJEXT) image.$(OBJEXT) int.$(OBJEXT) mail.$(OBJEXT) \
-	op.$(OBJEXT) math.$(OBJEXT) response.$(OBJEXT) \
-	string.$(OBJEXT) table.$(OBJEXT) void.$(OBJEXT) hash.$(OBJEXT) \
-	hashfile.$(OBJEXT) date.$(OBJEXT) xnode.$(OBJEXT) \
-	xdoc.$(OBJEXT) memory.$(OBJEXT)
+am__objects_1 = bool.$(OBJEXT) curl.$(OBJEXT) date.$(OBJEXT) \
+	double.$(OBJEXT) file.$(OBJEXT) form.$(OBJEXT) hash.$(OBJEXT) \
+	hashfile.$(OBJEXT) image.$(OBJEXT) inet.$(OBJEXT) \
+	int.$(OBJEXT) json.$(OBJEXT) mail.$(OBJEXT) math.$(OBJEXT) \
+	memory.$(OBJEXT) op.$(OBJEXT) reflection.$(OBJEXT) \
+	regex.$(OBJEXT) response.$(OBJEXT) string.$(OBJEXT) \
+	table.$(OBJEXT) void.$(OBJEXT) xnode.$(OBJEXT) xdoc.$(OBJEXT)
 am_libclasses_a_OBJECTS = $(am__objects_1) classes.$(OBJEXT)
 libclasses_a_OBJECTS = $(am_libclasses_a_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/include
@@ -80,7 +81,9 @@ ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
-APACHE13 = @APACHE13@
+APACHE = @APACHE@
+APACHE_CFLAGS = @APACHE_CFLAGS@
+APACHE_INC = @APACHE_INC@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -88,11 +91,12 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-COMPILE_APACHE13_MODULE_FALSE = @COMPILE_APACHE13_MODULE_FALSE@
-COMPILE_APACHE13_MODULE_TRUE = @COMPILE_APACHE13_MODULE_TRUE@
+COMPILE_APACHE_MODULE_FALSE = @COMPILE_APACHE_MODULE_FALSE@
+COMPILE_APACHE_MODULE_TRUE = @COMPILE_APACHE_MODULE_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CPP_LIBS = @CPP_LIBS@
+CURL_INCLUDES = @CURL_INCLUDES@
 CXX = @CXX@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
@@ -128,6 +132,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PCRE_INCLUDES = @PCRE_INCLUDES@
+PCRE_LIBS = @PCRE_LIBS@
 RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -187,10 +193,10 @@ sqlite_client = @sqlite_client@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-INCLUDES = -I../types -I../sql -I../lib/gd -I../lib/pcre -I../lib/gc/include -I../lib/cord/include -I../lib/sdbm/apr-include -Igd @XML_INCLUDES@ -I../lib/md5 -I../lib/smtp
+INCLUDES = -I../types -I../sql -I../lib/gd -I../lib/gc/include -I../lib/cord/include -I../lib/sdbm/apr-include -Igd $(INCLTDL) @CURL_INCLUDES@ @PCRE_INCLUDES@ @XML_INCLUDES@ -I../lib/md5 -I../lib/smtp -I../lib/json
 noinst_LIBRARIES = libclasses.a
 noinst_HEADERS = classes.h xnode.h
-CLASSES_SOURCE_FILES = classes.awk bool.C double.C file.C form.C image.C int.C mail.C op.C math.C response.C string.C table.C void.C hash.C hashfile.C date.C xnode.C xdoc.C memory.C
+CLASSES_SOURCE_FILES = classes.awk bool.C curl.C date.C double.C file.C form.C hash.C hashfile.C image.C inet.C int.C json.C mail.C math.C memory.C op.C reflection.C regex.C response.C string.C table.C void.C xnode.C xdoc.C
 libclasses_a_SOURCES = $(CLASSES_SOURCE_FILES) classes.C
 CLEANFILES = classes.inc
 EXTRA_DIST = classes.vcproj
@@ -243,6 +249,7 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bool.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/classes.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/date.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/double.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file.Po@am__quote@
@@ -250,11 +257,15 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hash.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hashfile.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inet.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/int.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/json.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mail.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/math.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memory.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/op.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reflection.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/response.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/table.Po@am__quote@