From 7786ecc8ce35a72145aeb9c098a4cfcc9d3c4822 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 17 Apr 2007 20:27:14 +0000
Subject: [PATCH] Update for YAZ 3s libyaz_server.la

---
 configure.ac     |   12 ++----------
 index/zebraidx.c |    5 +----
 index/zebrasrv.c |    3 +--
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/configure.ac b/configure.ac
index b305222..ecc7234 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Zebra, Index Data ApS, 1995-2007
-dnl $Id: configure.ac,v 1.53 2007-03-08 12:57:35 adam Exp $
+dnl $Id: configure.ac,v 1.54 2007-04-17 20:27:14 adam Exp $
 dnl
 AC_PREREQ(2.59)
 AC_INIT([idzebra],[2.0.13],[zebra-help@indexdata.dk])
@@ -32,16 +32,8 @@ if test "$ac_cv_lib_crypt_crypt" = "yes"; then
     AC_CHECK_HEADERS(crypt.h)
 fi
 dnl
-dnl ------ threads
-AC_ARG_ENABLE(threads, [  --disable-threads       disable threads],[enable_threads=$enableval],[enable_threads=yes])
-if test "$enable_threads" = "yes"; then
-    yazflag=threads
-else
-    yazflag=""
-fi
-dnl
 dnl ------ YAZ
-YAZ_INIT($yazflag,2.1.49)
+YAZ_INIT([server],2.1.99)
 if test "$YAZVERSION" = "NONE"; then
     AC_MSG_ERROR([YAZ development libraries required])
 fi
diff --git a/index/zebraidx.c b/index/zebraidx.c
index 8ce6467..fd6d26a 100644
--- a/index/zebraidx.c
+++ b/index/zebraidx.c
@@ -1,4 +1,4 @@
-/* $Id: zebraidx.c,v 1.4 2007-01-15 15:10:17 adam Exp $
+/* $Id: zebraidx.c,v 1.5 2007-04-17 20:27:14 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -66,8 +66,6 @@ int main (int argc, char **argv)
     ZebraService zs = 0;
     ZebraHandle zh = 0;
 
-    nmem_init ();
-
 #ifdef WIN32
 #else
     sprintf(nbuf, "%.40s(%ld)", *argv, (long) getpid());
@@ -280,7 +278,6 @@ int main (int argc, char **argv)
 
     res_close(res);
     res_close(default_res);
-    nmem_exit();
     exit (0);
     return 0;
 }
diff --git a/index/zebrasrv.c b/index/zebrasrv.c
index 47f2e01..c57fbc4 100644
--- a/index/zebrasrv.c
+++ b/index/zebrasrv.c
@@ -1,4 +1,4 @@
-/* $Id: zebrasrv.c,v 1.14 2007-04-16 21:54:37 adam Exp $
+/* $Id: zebrasrv.c,v 1.15 2007-04-17 20:27:14 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -399,7 +399,6 @@ void bend_close (void *handle)
 {
     zebra_close ((ZebraHandle) handle);
     xmalloc_trav("bend_close");
-    nmem_print_list();
 }
 
 int bend_sort (void *handle, bend_sort_rr *rr)
-- 
1.7.10.4