From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 26 Feb 2001 10:35:39 +0000 (+0000)
Subject: Updated for version YAZ 1.6 and higher.
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=c92eb2c721af54306a5596067456f69b0a197c4e;p=egate.git

Updated for version YAZ 1.6 and higher.
---

diff --git a/Makefile.web b/Makefile.web
index c616be7..98e5bbb 100644
--- a/Makefile.web
+++ b/Makefile.web
@@ -1,7 +1,7 @@
 # Top level Makefile for the Web - Z39.50 gateway
 # Europagate, 1995-1996.
 #
-# $Id: Makefile.web,v 1.8 1997/02/19 16:47:04 adam Exp $
+# $Id: Makefile.web,v 1.9 2001/02/26 10:35:39 adam Exp $
 #
 SHELL=/bin/sh
 MAKE=make
@@ -20,8 +20,8 @@ GIFDIR=$(HTDOCS)/egwgif
 EGWUSER=nobody
 
 # Location of Tcl
-TCLLIB=-L/usr/local/lib -ltcl8.0 -lm
-TCLINC=-I/usr/local/include
+TCLLIB=-ltcl8.3 -lm
+TCLINC=
 
 # Location of IrTcl
 IRTCLDIR=../../ir-tcl
@@ -33,7 +33,7 @@ IRTCLINC=-I$(IRTCLDIR)
 
 # If you are using YAZ uncomment these lines
 ZINC=-I../../yaz/include
-ZLIB=../../yaz/lib/libyaz.a
+ZLIB=../../yaz/lib/.libs/libyaz.a
 ZDEFS=
 
 # End of settings ---------------------------------------------
diff --git a/util/ttyemit.c b/util/ttyemit.c
index 7efa1e3..dcebd8b 100644
--- a/util/ttyemit.c
+++ b/util/ttyemit.c
@@ -45,6 +45,9 @@
  * Europagate, 1995
  *
  * $Log: ttyemit.c,v $
+ * Revision 1.3  2001/02/26 10:35:40  adam
+ * Updated for version YAZ 1.6 and higher.
+ *
  * Revision 1.2  1995/05/16 09:40:55  adam
  * LICENSE.
  *
@@ -65,7 +68,7 @@ static int  esc_flag = 0;
 
 static int  line_min = 30;
 static int  line_max = 76;
-static FILE *out_f = stdout;
+static FILE *out_f = 0;
 
 void tty_init (FILE *out, int min, int max)
 {
@@ -82,6 +85,8 @@ static void flush (void)
 {
     int j;
 
+    if (!out_f)
+        out_f = stdout;
     for (j = 0; j<line_col; j++)
         putc (line_buf[j], out_f);
     putc ('\n', out_f);
@@ -92,6 +97,8 @@ static void split (int ch)
 {
     int i = line_col, j;
 
+    if (!out_f)
+        out_f = stdout;
     while (1)
         if (line_buf[--i] == ' ')
         {
diff --git a/www/wirtcl.c b/www/wirtcl.c
index 76e1690..0179c18 100644
--- a/www/wirtcl.c
+++ b/www/wirtcl.c
@@ -41,6 +41,9 @@
  * USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $Log: wirtcl.c,v $
+ * Revision 1.18  2001/02/26 10:35:40  adam
+ * Updated for version YAZ 1.6 and higher.
+ *
  * Revision 1.17  1996/03/15 14:43:26  adam
  * Function egw_wait returns 'cancel' if new request is pending (user
  * has cancelled); or egw_wait returns 'timeout' on timeout.
@@ -117,7 +120,7 @@
 #include <assert.h>
 #include <ctype.h>
 
-#include <log.h>
+#include <yaz/log.h>
 #include "wtcl.h"
 #include "wirtcl.h"
 
@@ -190,7 +193,7 @@ static void *do_create (WCLIENT wcl, void *args)
         gw_log (GW_LOG_FATAL, mod, "Cannot make Irtcl_Interp");
         exit (1);
     }
-    log_init(LOG_ALL, "irtcl", "irtcl_log");
+    yaz_log_init(LOG_ALL, "irtcl", "irtcl_log");
     /* initialize irtcl */
     Tcl_CreateCommand (p->interp, "egw_wait", proc_zwait_invoke, p, NULL);
     for (i=0; i<MAX_CALLBACK; i++)