Implemented the first version of the XML request. Fixed eXpat incompatability with XML_Get/SetUserData and the void* in the handler functions.

1 files changed, 38 insertions, 32 deletions

diff --git a/server/configure.in b/server/configure.in
index f32ad30..553eb16 100644
--- a/server/configure.in
+++ b/server/configure.in
@@ -60,41 +60,47 @@ PKG_CHECK_MODULES(PQXX, libpqxx >= 0.20)
 dnl ======================
 dnl Check for libconfig++
 dnl ======================
-PKG_CHECK_MODULES(CONFIG, libconfig++ = 1.0.1)
-
+PKG_CHECK_MODULES(CONFIG, libconfig++ >= 1.0.1)
 
 dnl ======================
-dnl Check for xerces-x
+dnl Check for eXpat library
 dnl ======================
-AC_ARG_WITH(xercescinc,
-        [  --with-xercescinc       Set the incude dir for xerces],
-        [if test -n ${with_xercescinc}; then
-            xercesc_inc=${with_xercescinc};
-            dcheck="$dcheck --with-xercescinc=${with_xercescinc} ";
-         else
-            xercesc_inc=${oldincludedir}/xercesc;
-         fi
-        ],
-        [xercesc_inc=${oldincludedir}/xercesc;]
-)
-AC_ARG_WITH(xercesclib,
-        [  --with-xercesclib       Set the lib dir for xerces],
-        [if test -n ${with_xercesclib}; then
-            xercesc_lib=${with_xercesclib};
-            dcheck="$dcheck --with-xercesclib=${with_xercesclib} "
-         else
-            xercesc_lib=${libdir};
-         fi
-        ],
-        [xercesc_lib=${libdir};]
-)
-CXXFLAGS="${CXXFLAGS} -I${xercesc_inc}"
-LIBS="${LIBS} -L${xercesc_lib} -lxerces-c"
-AC_SUBST(CXXFLAGS)
-AC_SUBST(LIBS)
-AC_CHECK_HEADER(xercesc/util/XercesVersion.hpp, ,
-  AC_MSG_ERROR([*** libxerces-c headers not found!]))
-AC_CHECK_LIB(xerces-c, main, , AC_MSG_ERROR([*** libxerces-c not found!]))
+AC_CHECK_HEADER(expat.h, , AC_MSG_ERROR([*** eXpat header file not found!]))
+AC_CHECK_LIB(expat, XML_ParserCreate, ,  AC_MSG_ERROR([*** eXpat library not found!]))
+
+
+#dnl ======================
+#dnl Check for xerces-x
+#dnl ======================
+#AC_ARG_WITH(xercescinc,
+#        [  --with-xercescinc       Set the incude dir for xerces],
+#        [if test -n ${with_xercescinc}; then
+#            xercesc_inc=${with_xercescinc};
+#            dcheck="$dcheck --with-xercescinc=${with_xercescinc} ";
+#         else
+#            xercesc_inc=${oldincludedir}/xercesc;
+#         fi
+#        ],
+#        [xercesc_inc=${oldincludedir}/xercesc;]
+#)
+#AC_ARG_WITH(xercesclib,
+#        [  --with-xercesclib       Set the lib dir for xerces],
+#        [if test -n ${with_xercesclib}; then
+#            xercesc_lib=${with_xercesclib};
+#            dcheck="$dcheck --with-xercesclib=${with_xercesclib} "
+#         else
+#            xercesc_lib=${libdir};
+#         fi
+#        ],
+#        [xercesc_lib=${libdir};]
+#)
+#CXXFLAGS="${CXXFLAGS} -I${xercesc_inc}"
+#LIBS="${LIBS} -L${xercesc_lib} -lxerces-c"
+#AC_SUBST(CXXFLAGS)
+#AC_SUBST(LIBS)
+#AC_CHECK_HEADER(xercesc/util/XercesVersion.hpp, ,
+#  AC_MSG_ERROR([*** libxerces-c headers not found!]))
+#AC_CHECK_LIB(xerces-c, main, , AC_MSG_ERROR([*** libxerces-c not found!]))
 
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)