dnl YAZ Toolkit, Index Data 1994-2006
dnl See the file LICENSE for details.
-dnl $Id: configure.ac,v 1.10 2006-05-03 12:02:23 adam Exp $
+dnl $Id: configure.ac,v 1.11 2006-05-08 10:16:46 adam Exp $
AC_PREREQ(2.59)
AC_INIT([yaz],[2.1.19],[adam@indexdata.dk])
AC_CONFIG_SRCDIR(configure.ac)
LIBS="$OLIBS $LIBTHREAD"
fi
-dnl ----- libXSLT
-AC_SUBST(XSLT_CFLAGS)
+dnl ----- libXSLT/libEXLT/libXML2
AC_SUBST(XML2_CFLAGS)
+
+xml2dir=default
+AC_ARG_WITH(xml2,[[ --with-xml2[=PREFIX] use libxml2 in PREFIX]],xml2dir=$withval)
+dnl -- if no PREFIX or not specified we just search in default locations
+dnl -- try pkg-config. If not found, use xml2-config
+if test "$xml2dir" = "yes" -o "$xml2dir" = "default"; then
+ if test "$pkgconfigpath" != "NONE"; then
+ if $pkgconfigpath --exists libxml-2.0; then
+ pkgmodule="libxml-2.0"
+ fi
+ fi
+ if test -z "$pkgmodule"; then
+ for d in /usr /usr/local; do
+ if test -x $d/bin/xml2-config; then
+ xml2dir=$d
+ fi
+ done
+ fi
+fi
+dnl --- do the real check (pkg-config, xml2-config, not-found)
+if test "$xml2dir" != "no"; then
+ AC_MSG_CHECKING(for libXML2)
+ if test "$pkgmodule"; then
+ XML2_LIBS=`$pkgconfigpath --libs $pkgmodule`
+ XML2_CFLAGS=`$pkgconfigpath --cflags $pkgmodule`
+ XML2_VER=`$pkgconfigpath --modversion $pkgmodule`
+ AC_MSG_RESULT($XML2_VER)
+ AC_DEFINE(HAVE_XML2)
+ elif test -x $xml2dir/bin/xml2-config; then
+ XML2_LIBS=`$xml2dir/bin/xml2-config --libs`
+ XML2_CFLAGS=`$xml2dir/bin/xml2-config --cflags`
+ XML2_VER=`$xml2dir/bin/xml2-config --version`
+ AC_MSG_RESULT($XML2_VER)
+ AC_DEFINE(HAVE_XML2)
+ else
+ AC_MSG_RESULT(Not found)
+
+ if test "$xml2dir" = "default"; then
+ AC_MSG_WARN([libxml2 development libraries not found.])
+ AC_MSG_WARN([YAZ will NOT support SRU.])
+ else
+ AC_MSG_ERROR([libxml2 development libraries not found.])
+ fi
+ fi
+fi
+
+dnl ----- libXSLT
xsltdir=default
-AC_ARG_WITH(xslt,[[ --with-xslt[=PREFIX] use libxslt in PREFIX]],xsltdir=$withval)
+pkgmodule=""
+AC_ARG_WITH(xslt,[[ --with-xslt[=PREFIX] use libXSLT in PREFIX]],xsltdir=$withval)
+
+dnl -- if no PREFIX or not specified we just search in default locations
+dnl -- try pkg-config. If not found, use xslt-config
if test "$xsltdir" = "yes" -o "$xsltdir" = "default"; then
- for d in /usr /usr/local; do
- if test -x $d/bin/xslt-config; then
- xsltdir=$d
+ if test "$pkgconfigpath" != "NONE"; then
+ if $pkgconfigpath --exists libxslt; then
+ pkgmodule="libxslt"
fi
- done
+ fi
+ if test -z "$pkgmodule"; then
+ for d in /usr /usr/local; do
+ if test -x $d/bin/xslt-config; then
+ xsltdir=$d
+ fi
+ done
+ fi
fi
+dnl --- do the real check (pkg-config, xslt-config, not-found)
if test "$xsltdir" != "no"; then
AC_MSG_CHECKING(for libXSLT)
- if test -x $xsltdir/bin/xslt-config; then
- XSLT_LIBS=`$xsltdir/bin/xslt-config --libs`
- XSLT_CFLAGS=`$xsltdir/bin/xslt-config --cflags`
- XML2_CFLAGS=$XSLT_CFLAGS
+ if test "$pkgmodule"; then
+ XML2_LIBS=`$pkgconfigpath --libs $pkgmodule`
+ XML2_CFLAGS=`$pkgconfigpath --cflags $pkgmodule`
+ XSLT_VER=`$pkgconfigpath --modversion $pkgmodule`
+ AC_MSG_RESULT($XSLT_VER)
+ AC_DEFINE(HAVE_XSLT)
+ elif test -x $xsltdir/bin/xslt-config; then
+ XML2_LIBS=`$xsltdir/bin/xslt-config --libs`
+ XML2_CFLAGS=`$xsltdir/bin/xslt-config --cflags`
XSLT_VER=`$xsltdir/bin/xslt-config --version`
- LIBS="$XSLT_LIBS $LIBS"
AC_MSG_RESULT($XSLT_VER)
AC_DEFINE(HAVE_XSLT)
- AC_DEFINE(HAVE_XML2)
else
AC_MSG_RESULT(Not found)
if test "$xsltdir" = "default"; then
- AC_MSG_WARN([libxslt development libraries not found.])
- AC_MSG_WARN([YAZ will NOT support SRU.])
+ AC_MSG_WARN([libXSLT development libraries not found.])
else
- AC_MSG_ERROR([libxslt development libraries not found.])
+ AC_MSG_ERROR([libXSLT development libraries not found.])
fi
fi
fi
-xml2dir=default
-AC_ARG_WITH(xml2,[[ --with-xml2[=PREFIX] OBSOLETE. Use --with-xslt instead]],xml2dir=$withval)
-if test "$xml2dir" != "default"; then
- AC_MSG_ERROR([--with-xml2 OBSOLETE. Use --with-xslt instead.])
+dnl -- get libEXSLT. xslt-config is no good. So use pkg-config only
+exsltdir=default
+pkgmodule=""
+AC_ARG_WITH(exslt,[[ --with-exslt[=PREFIX] use libEXSLT in PREFIX]],exsltdir=$withval)
+if test "$exsltdir" = "yes" -o "$exsltdir" = "default"; then
+ if test "$pkgconfigpath" != "NONE"; then
+ if $pkgconfigpath --exists libexslt; then
+ pkgmodule="libexslt"
+ fi
+ fi
fi
+if test "$exsltdir" != "no"; then
+ AC_MSG_CHECKING(for libEXSLT)
+ if test "$pkgmodule"; then
+ XML2_LIBS=`$pkgconfigpath --libs $pkgmodule`
+ XML2_CFLAGS=`$pkgconfigpath --cflags $pkgmodule`
+ EXSLT_VER=`$pkgconfigpath --modversion $pkgmodule`
+ AC_MSG_RESULT($EXSLT_VER)
+ AC_DEFINE(HAVE_EXSLT)
+ else
+ AC_MSG_RESULT(Not found)
+
+ if test "$exsltdir" = "default"; then
+ AC_MSG_WARN([libEXSLT development libraries not found.])
+ else
+ AC_MSG_ERROR([libEXSLT development libraries not found.])
+ fi
+ fi
+fi
+
+if test "$XML2_LIBS"; then
+ LIBS="$XML2_LIBS $LIBS"
+fi
+
dnl
dnl ------ Memory debugging
AC_ARG_ENABLE(memdebug, [ --enable-memdebug enable memory debugging],[enable_memdebug=$enableval],[enable_memdebug=none])
* Copyright (C) 2005-2006, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: record_conv.c,v 1.6 2006-05-07 17:45:41 adam Exp $
+ * $Id: record_conv.c,v 1.7 2006-05-08 10:16:47 adam Exp $
*/
/**
* \file record_conv.c
#include <yaz/nmem.h>
#include <yaz/tpath.h>
-#if HAVE_XSLT
+#if HAVE_XML2
#include <libxml/parser.h>
#include <libxml/tree.h>
#include <libxml/xinclude.h>
+#if HAVE_XSLT
#include <libxslt/xsltutils.h>
#include <libxslt/transform.h>
+#endif
+#if HAVE_EXSLT
+#include <libexslt/exslt.h>
+#endif
/** \brief The internal structure for yaz_record_conv_t */
struct yaz_record_conv_struct {
struct yaz_record_conv_rule {
enum YAZ_RECORD_CONV_RULE which;
union {
+#if HAVE_XSLT
struct {
xsltStylesheetPtr xsp;
- int dummy;
} xslt;
+#endif
struct {
yaz_iconv_t iconv_t;
int input_format;
if (r->u.marc.iconv_t)
yaz_iconv_close(r->u.marc.iconv_t);
}
+#if HAVE_XSLT
else if (r->which == YAZ_RECORD_CONV_RULE_XSLT)
{
xsltFreeStylesheet(r->u.xslt.xsp);
}
+#endif
}
wrbuf_rewind(p->wr_error);
nmem_reset(p->nmem);
p->rules = 0;
p->path = 0;
+#if HAVE_EXSLT
+ exsltDynRegister();
+#endif
yaz_record_conv_reset(p);
return p;
}
/** \brief parse 'xslt' conversion node */
static int conv_xslt(yaz_record_conv_t p, const xmlNode *ptr)
{
+#if HAVE_XSLT
struct _xmlAttr *attr;
const char *stylesheet = 0;
}
}
return 0;
+#else
+ wrbuf_printf(p->wr_error, "xslt unsupported."
+ " YAZ compiled without XSLT support");
+ return -1;
+#endif
}
/** \brief parse 'marc' conversion node */
if (conv_xslt(p, ptr))
return -1;
}
+ else if (!strcmp((const char *) ptr->name, "exslt"))
+ {
+#if HAVE_EXSLT
+ if (conv_xslt(p, ptr))
+ return -1;
+#else
+ wrbuf_printf(p->wr_error, "exslt unsupported."
+ " YAZ compiled without EXSLT support");
+ return -1;
+#endif
+ }
else if (!strcmp((const char *) ptr->name, "marc"))
{
if (conv_marc(p, ptr))
wrbuf_write(record, input_record_buf, input_record_len);
for (; ret == 0 && r; r = r->next)
{
- if (r->which == YAZ_RECORD_CONV_RULE_XSLT)
- {
- xmlDocPtr doc = xmlParseMemory(wrbuf_buf(record),
- wrbuf_len(record));
- if (!doc)
- {
- wrbuf_printf(p->wr_error, "xmlParseMemory failed");
- ret = -1;
- }
- else
- {
- xmlDocPtr res = xsltApplyStylesheet(r->u.xslt.xsp, doc, 0);
- if (res)
- {
- xmlChar *out_buf;
- int out_len;
- xmlDocDumpFormatMemory (res, &out_buf, &out_len, 1);
-
- wrbuf_rewind(record);
- wrbuf_write(record, (const char *) out_buf, out_len);
-
- xmlFree(out_buf);
- xmlFreeDoc(res);
- }
- else
- {
- wrbuf_printf(p->wr_error, "xsltApplyStylesheet faailed");
- ret = -1;
- }
- xmlFreeDoc(doc);
- }
- }
- else if (r->which == YAZ_RECORD_CONV_RULE_MARC)
+ if (r->which == YAZ_RECORD_CONV_RULE_MARC)
{
yaz_marc_t mt = yaz_marc_create();
}
yaz_marc_destroy(mt);
}
+#if HAVE_XSLT
+ else if (r->which == YAZ_RECORD_CONV_RULE_XSLT)
+ {
+ xmlDocPtr doc = xmlParseMemory(wrbuf_buf(record),
+ wrbuf_len(record));
+ if (!doc)
+ {
+ wrbuf_printf(p->wr_error, "xmlParseMemory failed");
+ ret = -1;
+ }
+ else
+ {
+ xmlDocPtr res = xsltApplyStylesheet(r->u.xslt.xsp, doc, 0);
+ if (res)
+ {
+ xmlChar *out_buf;
+ int out_len;
+ xmlDocDumpFormatMemory (res, &out_buf, &out_len, 1);
+
+ wrbuf_rewind(record);
+ wrbuf_write(record, (const char *) out_buf, out_len);
+
+ xmlFree(out_buf);
+ xmlFreeDoc(res);
+ }
+ else
+ {
+ wrbuf_printf(p->wr_error, "xsltApplyStylesheet faailed");
+ ret = -1;
+ }
+ xmlFreeDoc(doc);
+ }
+ }
+#endif
}
return ret;
}
* Copyright (C) 2005-2006, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: retrieval.c,v 1.4 2006-05-07 17:45:41 adam Exp $
+ * $Id: retrieval.c,v 1.5 2006-05-08 10:16:47 adam Exp $
*/
/**
* \file retrieval.c
#include <yaz/tpath.h>
#include <yaz/proto.h>
-#if HAVE_XSLT
+#if HAVE_XML2
#include <libxml/parser.h>
#include <libxml/tree.h>
#include <libxml/xinclude.h>
-#include <libxslt/xsltutils.h>
-#include <libxslt/transform.h>
/** \brief The internal structure for yaz_retrieval_t */
struct yaz_retrieval_struct {
* Copyright (C) 1995-2005, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: seshigh.c,v 1.77 2006-05-07 14:48:25 adam Exp $
+ * $Id: seshigh.c,v 1.78 2006-05-08 10:16:47 adam Exp $
*/
/**
* \file seshigh.c
static int retrieve_fetch(association *assoc, bend_fetch_rr *rr)
{
-#if HAVE_XSLT
+#if HAVE_XML2
yaz_record_conv_t rc = 0;
const char *match_schema = 0;
int *match_syntax = 0;
assoc->init->implementation_name,
odr_prepend(assoc->encode, "GFS", resp->implementationName));
- version = odr_strdup(assoc->encode, "$Revision: 1.77 $");
+ version = odr_strdup(assoc->encode, "$Revision: 1.78 $");
if (strlen(version) > 10) /* check for unexpanded CVS strings */
version[strlen(version)-2] = '\0';
resp->implementationVersion = odr_prepend(assoc->encode,
* NT threaded server code by
* Chas Woodfield, Fretwell Downing Informatics.
*
- * $Id: statserv.c,v 1.37 2006-05-07 14:48:25 adam Exp $
+ * $Id: statserv.c,v 1.38 2006-05-08 10:16:47 adam Exp $
*/
/**
n->directory = 0;
n->docpath = 0;
n->stylesheet = 0;
-#if HAVE_XSLT
+#if HAVE_XML2
n->retrieval = yaz_retrieval_create();
#endif
return n;
* Copyright (C) 2005-2006, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: tst_record_conv.c,v 1.7 2006-05-07 17:45:41 adam Exp $
+ * $Id: tst_record_conv.c,v 1.8 2006-05-08 10:16:47 adam Exp $
*
*/
#include <yaz/record_conv.h>
#include <config.h>
#endif
-#if HAVE_XSLT
+#if HAVE_XML2
#include <libxml/parser.h>
#include <libxml/tree.h>
YAZ_CHECK(conv_configure_test("<convert><bad/></convert>",
"Bad element 'bad'."
"Expected marc, xslt, ..", 0));
+#if HAVE_XSLT
YAZ_CHECK(conv_configure_test("<convert>"
"<xslt stylesheet=\"tst_record_conv.xsl\"/>"
"<marc"
"/>"
"</convert>",
0, 0));
+#else
+ YAZ_CHECK(conv_configure_test("<convert>"
+ "<xslt stylesheet=\"tst_record_conv.xsl\"/>"
+ "</convert>",
+ "xslt unsupported."
+ " YAZ compiled without XSLT support", 0));
+#endif
}
static int conv_convert_test(yaz_record_conv_t p,
{
YAZ_CHECK_INIT(argc, argv);
libxml2_error_to_yazlog(0 /* disable log */, 0);
-#if HAVE_XSLT
+#if HAVE_XML2
tst_configure();
+#endif
+#if HAVE_XSLT
tst_convert();
#endif
YAZ_CHECK_TERM;
projects / yaz-moved-to-github.git / commitdiff