X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fyaz-proxy-main.cpp;h=aa6b7c0a8cea22aab35a0b7a46eaa6386df1b91c;hb=77e4d83cc9e1d55c7d47c80b33f3b04125ae8c15;hp=5210d3618dfb0c936f181bc86389ac3eb3862484;hpb=8dc6d0bc4ddbb2d37b3aafd93396a0e4a8e87560;p=yazproxy-moved-to-github.git

diff --git a/src/yaz-proxy-main.cpp b/src/yaz-proxy-main.cpp
index 5210d36..aa6b7c0 100644
--- a/src/yaz-proxy-main.cpp
+++ b/src/yaz-proxy-main.cpp
@@ -1,7 +1,7 @@
-/* $Id: yaz-proxy-main.cpp,v 1.18 2006-03-29 13:33:48 adam Exp $
-   Copyright (c) 1998-2005, Index Data.
+/* $Id: yaz-proxy-main.cpp,v 1.21 2007-10-08 11:47:21 adam Exp $
+   Copyright (c) 1998-2006, Index Data.
 
-This file is part of the yaz-proxy.
+This file is part of the yazproxy.
 
 YAZ proxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -49,13 +49,17 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <yazpp/pdu-assoc.h>
 #include <yazproxy/proxy.h>
 
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <libxslt/xsltutils.h>
 #include <libxslt/transform.h>
 #endif
 
+#if YAZ_HAVE_EXSLT
+#include <libexslt/exslt.h>
+#endif
+
 using namespace yazpp_1;
 
 void usage(char *prog)
@@ -179,7 +183,7 @@ static void sighup_handler(int num)
         static_yaz_proxy->reconfig();
 }
 
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
 static void proxy_xml_error_handler(void *ctx, const char *fmt, ...)
 {
     char buf[1024];
@@ -205,10 +209,14 @@ static void child_run(SocketManager *m, int run)
     signal(SIGHUP, sighup_handler);
 #endif
 
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
     xmlSetGenericErrorFunc((void *) "XML", proxy_xml_error_handler);
     xsltSetGenericErrorFunc((void *) "XSLT", proxy_xml_error_handler);
 #endif
+
+#if YAZ_HAVE_EXSLT
+    exsltRegisterAll();
+#endif
 #ifdef WIN32
 #else
     yaz_log(YLOG_LOG, "0 proxy run=%d pid=%ld", run, (long) getpid());
@@ -279,7 +287,7 @@ static void child_run(SocketManager *m, int run)
 
 int main(int argc, char **argv)
 {
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
     xmlInitMemory();
     
     LIBXML_TEST_VERSION