dnl Zebra, Index Data Aps, 1995-2004
-dnl $Id: configure.in,v 1.109 2004-12-08 09:12:50 adam Exp $
+dnl $Id: configure.in,v 1.110 2004-12-13 20:51:27 adam Exp $
dnl
AC_INIT(include/idzebra/version.h)
AM_INIT_AUTOMAKE(idzebra,1.4.0)
test/xelm/Makefile
test/dmoz/Makefile test/sort/Makefile test/zsh/Makefile
test/marcxml/Makefile test/charmap/Makefile test/codec/Makefile
+ test/espec/Makefile
examples/Makefile examples/gils/Makefile examples/zthes/Makefile
idzebra.spec
idzebra-config
-/* $Id: d1_absyn.c,v 1.15 2004-11-19 10:26:53 heikki Exp $
+/* $Id: d1_absyn.c,v 1.16 2004-12-13 20:51:27 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#include <stdlib.h>
#include <string.h>
+#include <yaz/log.h>
#include <yaz/oid.h>
-#include <yaz/ylog.h>
#include <idzebra/data1.h>
#include <zebra_xpath.h>
#include <d1_absyn.h>
-/* $Id: d1_attset.c,v 1.5 2004-11-19 10:26:53 heikki Exp $
+/* $Id: d1_attset.c,v 1.6 2004-12-13 20:51:28 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#include <assert.h>
#include <stdlib.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <idzebra/data1.h>
data1_att *data1_getattbyname(data1_handle dh, data1_attset *s, char *name)
-/* $Id: d1_doespec.c,v 1.4 2004-11-19 10:26:53 heikki Exp $
+/* $Id: d1_doespec.c,v 1.5 2004-12-13 20:51:28 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
#include <assert.h>
+#include <yaz/log.h>
#include <yaz/oid.h>
-#include <yaz/ylog.h>
#include <yaz/proto.h>
#include <idzebra/data1.h>
-/* $Id: d1_espec.c,v 1.5 2004-11-19 10:26:53 heikki Exp $
+/* $Id: d1_espec.c,v 1.6 2004-12-13 20:51:28 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#include <assert.h>
#include <string.h>
+#include <yaz/log.h>
#include <yaz/odr.h>
#include <yaz/proto.h>
-#include <yaz/ylog.h>
#include <idzebra/data1.h>
static Z_Variant *read_variant(int argc, char **argv, NMEM nmem,
-/* $Id: d1_expout.c,v 1.4 2004-11-19 10:26:53 heikki Exp $
+/* $Id: d1_expout.c,v 1.5 2004-12-13 20:51:28 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
#include <string.h>
#include <stdlib.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <yaz/proto.h>
#include <idzebra/data1.h>
-/* $Id: d1_grs.c,v 1.5 2004-11-19 10:26:53 heikki Exp $
+/* $Id: d1_grs.c,v 1.6 2004-12-13 20:51:28 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
#include <stdlib.h>
#include <yaz/proto.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <d1_absyn.h>
#define D1_VARIANTARRAY 20 /* fixed max length on sup'd variant-list. Lazy me */
-/* $Id: d1_handle.c,v 1.5 2004-11-19 10:26:53 heikki Exp $
+/* $Id: d1_handle.c,v 1.6 2004-12-13 20:51:28 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
#include <stdio.h>
#include <stdlib.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <idzebra/data1.h>
struct data1_handle_info {
-/* $Id: d1_if.c,v 1.4 2004-11-19 10:26:53 heikki Exp $
+/* $Id: d1_if.c,v 1.5 2004-12-13 20:51:28 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
#include <string.h>
#include <idzebra/data1.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <string.h>
-/* $Id: d1_map.c,v 1.6 2004-11-19 10:26:53 heikki Exp $
+/* $Id: d1_map.c,v 1.7 2004-12-13 20:51:28 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
#include <stdlib.h>
#include <string.h>
+#include <yaz/log.h>
#include <yaz/oid.h>
-#include <yaz/ylog.h>
#include <yaz/readconf.h>
#include <yaz/tpath.h>
#include <d1_absyn.h>
-/* $Id: d1_marc.c,v 1.8 2004-11-19 10:26:53 heikki Exp $
+/* $Id: d1_marc.c,v 1.9 2004-12-13 20:51:28 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
#include <stdlib.h>
#include <string.h>
+#include <yaz/log.h>
#include <yaz/oid.h>
-#include <yaz/ylog.h>
#include <yaz/marcdisp.h>
#include <yaz/readconf.h>
#include <yaz/xmalloc.h>
-/* $Id: d1_prtree.c,v 1.5 2004-11-19 10:26:53 heikki Exp $
+/* $Id: d1_prtree.c,v 1.6 2004-12-13 20:51:28 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
02111-1307, USA.
*/
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <idzebra/data1.h>
static void pr_string (FILE *out, const char *str, int len)
-/* $Id: d1_read.c,v 1.12 2004-12-10 11:56:21 heikki Exp $
+/* $Id: d1_read.c,v 1.13 2004-12-13 20:51:28 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#include <stdio.h>
#include <stdlib.h>
-/* Old yaz-util includes (FIXME - clean up what is not needed)*/
-#include <yaz/yconfig.h>
-#include <yaz/yaz-version.h>
-#include <yaz/xmalloc.h>
-#include <yaz/ylog.h>
-#include <yaz/tpath.h>
-#include <yaz/options.h>
-#include <yaz/wrbuf.h>
-#include <yaz/nmem.h>
-#include <yaz/readconf.h>
-#include <yaz/marcdisp.h>
-#include <yaz/yaz-iconv.h>
+#include <yaz/yaz-util.h>
#include <d1_absyn.h>
data1_node *data1_get_root_tag (data1_handle dh, data1_node *n)
-/* $Id: d1_sumout.c,v 1.4 2004-11-19 10:26:53 heikki Exp $
+/* $Id: d1_sumout.c,v 1.5 2004-12-13 20:51:28 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
#include <string.h>
#include <stdlib.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <yaz/proto.h>
#include <idzebra/data1.h>
-/* $Id: d1_tagset.c,v 1.4 2004-11-19 10:26:53 heikki Exp $
+/* $Id: d1_tagset.c,v 1.5 2004-12-13 20:51:28 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
#include <stdlib.h>
#include <string.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <idzebra/data1.h>
/*
-/* $Id: d1_varset.c,v 1.4 2004-11-19 10:26:53 heikki Exp $
+/* $Id: d1_varset.c,v 1.5 2004-12-13 20:51:28 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
#include <stdlib.h>
#include <yaz/oid.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <d1_absyn.h>
data1_vartype *data1_getvartypebyct (data1_handle dh, data1_varset *set,
-/* $Id: dcompact.c,v 1.11 2004-12-08 12:23:08 adam Exp $
+/* $Id: dcompact.c,v 1.12 2004-12-13 20:51:28 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
#include <string.h>
#include <stdio.h>
-#include <yaz/ylog.h>
#include "dict-p.h"
static void dict_copy_page(Dict dict, char *to_p, char *from_p, int *map)
-/* $Id: dict-p.h,v 1.1 2004-12-08 12:23:08 adam Exp $
+/* $Id: dict-p.h,v 1.2 2004-12-13 20:51:29 adam Exp $
Copyright (C) 2004
Index Data Aps
#ifndef DICT_P_H
#define DICT_P_H
+#include <yaz/log.h>
+#include <yaz/xmalloc.h>
#include <idzebra/dict.h>
YAZ_BEGIN_CDECL
-/* $Id: bfile.h,v 1.1 2004-12-08 12:23:09 adam Exp $
+/* $Id: bfile.h,v 1.2 2004-12-13 20:51:30 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#ifndef BFILE_H
#define BFILE_H
+#include <yaz/yconfig.h>
#include <idzebra/version.h>
YAZ_BEGIN_CDECL
-/* $Id: data1.h,v 1.5 2004-12-10 11:56:21 heikki Exp $
+/* $Id: data1.h,v 1.6 2004-12-13 20:51:30 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#include <idzebra/version.h>
-/* Old yaz-util includes */
-#include <yaz/yconfig.h>
-#include <yaz/yaz-version.h>
-#include <yaz/xmalloc.h>
-#include <yaz/ylog.h>
-#include <yaz/tpath.h>
-#include <yaz/options.h>
-#include <yaz/wrbuf.h>
-#include <yaz/nmem.h>
-#include <yaz/readconf.h>
-#include <yaz/marcdisp.h>
-#include <yaz/yaz-iconv.h>
+#include <yaz/yaz-util.h>
#define d1_isspace(c) strchr(" \r\n\t\f", c)
#define d1_isdigit(c) ((c) <= '9' && (c) >= '0')
-/* $Id: dict.h,v 1.1 2004-12-08 12:23:09 adam Exp $
+/* $Id: dict.h,v 1.2 2004-12-13 20:51:30 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#ifndef DICT_H
#define DICT_H
-#include <yaz/ylog.h>
+#include <yaz/yconfig.h>
#include <idzebra/bfile.h>
YAZ_BEGIN_CDECL
-/* $Id: zebrautl.h,v 1.11 2004-12-10 11:56:21 heikki Exp $
+/* $Id: zebrautl.h,v 1.12 2004-12-13 20:51:30 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#ifndef ZEBRA_UTIL_H
#define ZEBRA_UTIL_H
-/* Old yaz-util includes */
-#include <yaz/yconfig.h>
-#include <yaz/yaz-version.h>
-#include <yaz/xmalloc.h>
-#include <yaz/ylog.h>
-#include <yaz/tpath.h>
-#include <yaz/options.h>
-#include <yaz/wrbuf.h>
-#include <yaz/nmem.h>
-#include <yaz/readconf.h>
-#include <yaz/marcdisp.h>
-#include <yaz/yaz-iconv.h>
+#include <yaz/yaz-util.h>
#include <idzebra/res.h>
#include <idzebra/version.h>
/* check that we don't have all too old yaz */
#ifndef YLOG_ERRNO
-#error Need a modern yaz with ylog.h
+#error Need a modern yaz with YLOG_ defines
#endif
YAZ_BEGIN_CDECL
-/* $Id: apitest.c,v 1.18 2004-11-19 10:26:56 heikki Exp $
+/* $Id: apitest.c,v 1.19 2004-12-13 20:51:30 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
#include <stdio.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <yaz/pquery.h>
#include <idzebra/api.h>
-/* $Id: attribute.c,v 1.17 2004-11-19 10:26:56 heikki Exp $
+/* $Id: attribute.c,v 1.18 2004-12-13 20:51:30 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
#include <stdio.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <idzebra/res.h>
#include <zebrautl.h>
#include "index.h"
-/* $Id: main.c,v 1.118 2004-11-19 10:27:00 heikki Exp $
+/* $Id: main.c,v 1.119 2004-12-13 20:51:30 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#include <sys/times.h>
#endif
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <yaz/options.h>
#include <idzebra/api.h>
-/* $Id: sortidx.c,v 1.11 2004-12-08 12:23:09 adam Exp $
+/* $Id: sortidx.c,v 1.12 2004-12-13 20:51:30 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#include <string.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
+#include <yaz/xmalloc.h>
#include <idzebra/bfile.h>
#include <sortidx.h>
-/* $Id: zebrash.c,v 1.30 2004-11-19 10:27:04 heikki Exp $
+/* $Id: zebrash.c,v 1.31 2004-12-13 20:51:30 adam Exp $
Copyright (C) 2002,2003,2004
Index Data Aps
#endif
#include <idzebra/api.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <yaz/proto.h>
#include <yaz/sortspec.h>
#include <yaz/options.h>
-/* $Id: zserver.c,v 1.124 2004-11-29 21:45:11 adam Exp $
+/* $Id: zserver.c,v 1.125 2004-12-13 20:51:30 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#endif
#include <errno.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <yaz/ill.h>
#include <yaz/yaz-util.h>
-/* $Id: isamb.c,v 1.61 2004-12-08 14:02:36 adam Exp $
+/* $Id: isamb.c,v 1.62 2004-12-13 20:51:31 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
*/
#include <string.h>
+#include <yaz/log.h>
#include <yaz/xmalloc.h>
-#include <yaz/ylog.h>
#include <idzebra/isamb.h>
#include <assert.h>
-/* $Id: tstisamb.c,v 1.12 2004-12-08 14:02:37 adam Exp $
+/* $Id: tstisamb.c,v 1.13 2004-12-13 20:51:31 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
*/
#include <string.h>
+#include <yaz/log.h>
#include <yaz/xmalloc.h>
-#include <yaz/ylog.h>
#include <idzebra/isamb.h>
#include <assert.h>
-/* $Id: isamc.c,v 1.27 2004-11-19 10:27:09 heikki Exp $
+/* $Id: isamc.c,v 1.28 2004-12-13 20:51:31 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#include <string.h>
#include <stdio.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
+#include <yaz/xmalloc.h>
#include "isamc-p.h"
static void flush_block (ISAMC is, int cat);
-/* $Id: merge.c,v 1.27 2004-11-19 10:27:09 heikki Exp $
+/* $Id: merge.c,v 1.28 2004-12-13 20:51:31 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#include <assert.h>
#include <string.h>
#include <stdio.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include "isamc-p.h"
struct isc_merge_block {
-/* $Id: isams.c,v 1.9 2004-12-08 14:02:37 adam Exp $
+/* $Id: isams.c,v 1.10 2004-12-13 20:51:31 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#include <string.h>
#include <stdio.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
+#include <yaz/xmalloc.h>
#include <idzebra/isams.h>
typedef struct {
#include <yaz/yaz-util.h>
#include <yaz/proto.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <yaz/cql.h>
#include <yaz/pquery.h>
-/* $Id: danbibr.c,v 1.7 2004-11-19 10:27:12 heikki Exp $
+/* $Id: danbibr.c,v 1.8 2004-12-13 20:51:32 adam Exp $
Copyright (C) 2004
Index Data Aps
#include <stdio.h>
#include <stdlib.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <idzebra/recgrs.h>
/*
- $Id: inline.c,v 1.4 2004-12-10 11:56:22 heikki Exp $
+ $Id: inline.c,v 1.5 2004-12-13 20:51:32 adam Exp $
*/
#include <stdio.h>
#include <string.h>
#include <ctype.h>
-/* Old yaz-util includes (FIXME - clean up what is not needed)*/
-#include <yaz/yconfig.h>
-#include <yaz/yaz-version.h>
-#include <yaz/xmalloc.h>
-#include <yaz/ylog.h>
-#include <yaz/tpath.h>
-#include <yaz/options.h>
-#include <yaz/wrbuf.h>
-#include <yaz/nmem.h>
-#include <yaz/readconf.h>
-#include <yaz/marcdisp.h>
-#include <yaz/yaz-iconv.h>
-
+#include <yaz/yaz-util.h>
#include "inline.h"
static void inline_destroy_subfield_recursive(inline_subfield *p);
/*
- $Id: marcomp.c,v 1.3 2004-12-10 11:56:22 heikki Exp $
+ $Id: marcomp.c,v 1.4 2004-12-13 20:51:32 adam Exp $
marcomp.c - compiler of MARC statements.
*/
#include <string.h>
#include <ctype.h>
-
-/* Old yaz-util includes (FIXME - clean up what is not needed)*/
-#include <yaz/yconfig.h>
-#include <yaz/yaz-version.h>
-#include <yaz/xmalloc.h>
-#include <yaz/ylog.h>
-#include <yaz/tpath.h>
-#include <yaz/options.h>
-#include <yaz/wrbuf.h>
-#include <yaz/nmem.h>
-#include <yaz/readconf.h>
-#include <yaz/marcdisp.h>
-#include <yaz/yaz-iconv.h>
+#include <yaz/yaz-util.h>
#include "marcomp.h"
-/* $Id: marcread.c,v 1.27 2004-11-19 10:27:12 heikki Exp $
+/* $Id: marcread.c,v 1.28 2004-12-13 20:51:32 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#include <ctype.h>
#include <assert.h>
-#include <yaz/ylog.h>
#include <yaz/yaz-util.h>
#include <yaz/marcdisp.h>
#include <idzebra/recgrs.h>
-/* $Id: recgrs.c,v 1.94 2004-11-29 21:45:12 adam Exp $
+/* $Id: recgrs.c,v 1.95 2004-12-13 20:51:32 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#include <dlfcn.h>
#endif
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <yaz/oid.h>
#include <d1_absyn.h>
-/* $Id: sgmlread.c,v 1.14 2004-11-19 10:27:13 heikki Exp $
+/* $Id: sgmlread.c,v 1.15 2004-12-13 20:51:32 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
#include <assert.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <idzebra/recgrs.h>
-/* $Id: xmlread.c,v 1.16 2004-11-19 10:27:13 heikki Exp $
+/* $Id: xmlread.c,v 1.17 2004-12-13 20:51:32 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#include <iconv.h>
#endif
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <idzebra/recgrs.h>
+#include <yaz/log.h>
#include <yaz/xmalloc.h>
-#include <yaz/ylog.h>
#include <expat.h>
SUBDIRS=codec api xpath gils malxml config usmarc dmoz sort sort2 xelm cddb \
- rusmarc zsh marcxml charmap mbox
+ rusmarc zsh marcxml charmap mbox espec
-/* $Id: testlib.c,v 1.7 2004-12-02 14:05:04 adam Exp $
+/* $Id: testlib.c,v 1.8 2004-12-13 20:51:33 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
/** testlib - utilities for the api tests */
#include <assert.h>
+#include <yaz/log.h>
#include <yaz/pquery.h>
#include <idzebra/api.h>
#include "testlib.h"
-/* $Id: testlib.h,v 1.5 2004-11-29 21:55:28 adam Exp $
+/* $Id: testlib.h,v 1.6 2004-12-13 20:51:33 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
/** testlib - utilities for the api tests */
#include <stdlib.h>
-#include <yaz/ylog.h>
+#include <yaz/yconfig.h>
#include <yaz/pquery.h>
#include <idzebra/api.h>
-/* $Id: charmap.c,v 1.32 2004-12-10 11:56:23 heikki Exp $
+/* $Id: charmap.c,v 1.33 2004-12-13 20:51:33 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#include <charmap.h>
-/* Old yaz-util includes */
-#include <yaz/yconfig.h>
-#include <yaz/yaz-version.h>
-#include <yaz/xmalloc.h>
-#include <yaz/ylog.h>
-#include <yaz/tpath.h>
-#include <yaz/options.h>
-#include <yaz/wrbuf.h>
-#include <yaz/nmem.h>
-#include <yaz/readconf.h>
-#include <yaz/marcdisp.h>
-#include <yaz/yaz-iconv.h>
-
+#include <yaz/yaz-util.h>
#define CHR_MAXSTR 1024
#define CHR_MAXEQUIV 32
-/* $Id: passwddb.c,v 1.8 2004-11-19 10:27:17 heikki Exp $
+/* $Id: passwddb.c,v 1.9 2004-12-13 20:51:34 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
#include <crypt.h>
#endif
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <yaz/xmalloc.h>
#include <passwddb.h>
-/* $Id: zebramap.c,v 1.36 2004-12-10 11:56:23 heikki Exp $
+/* $Id: zebramap.c,v 1.37 2004-12-13 20:51:34 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#include <ctype.h>
#include <charmap.h>
-/* Old yaz-util includes */
-#include <yaz/yconfig.h>
-#include <yaz/yaz-version.h>
-#include <yaz/xmalloc.h>
-#include <yaz/ylog.h>
-#include <yaz/tpath.h>
-#include <yaz/options.h>
-#include <yaz/wrbuf.h>
-#include <yaz/nmem.h>
-#include <yaz/readconf.h>
-#include <yaz/marcdisp.h>
-#include <yaz/yaz-iconv.h>
+#include <yaz/yaz-util.h>
#include <idzebra/zebramap.h>
if test "$have_yaz_version" -lt "$req_yaz_version"; then
AC_MSG_ERROR([$YAZVERSION. Requires $2 or later])
fi
+ if test "$req_yaz_version" -gt "2000028"; then
+ YAZINC="$YAZINC -DYAZ_USE_NEW_LOG=1"
+ fi
fi
fi
])